forked from xxhjsb/wit-park-backend
接口改动
parent
09829ae2b7
commit
f53daf85c9
|
|
@ -32,12 +32,10 @@ public class EscalateHiddenDangerController extends BaseController
|
|||
* 查询上报隐患列表
|
||||
*/
|
||||
@GetMapping("/list")
|
||||
public String list(EscalateHiddenDanger escalateHiddenDanger)
|
||||
public String list()
|
||||
{
|
||||
startPage();
|
||||
List<EscalateHiddenDanger> list = escalateHiddenDangerService.selectEscalateHiddenDangerList(escalateHiddenDanger);
|
||||
TableDataInfo tableDataInfo = getDataTable(list);
|
||||
return JSONObject.toJSONString(tableDataInfo);
|
||||
List<EscalateHiddenDanger> list = escalateHiddenDangerService.selectEscalateHiddenDangerList();
|
||||
return JSONObject.toJSONString(list);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -30,10 +30,10 @@ public class HiddenDangerController extends BaseController
|
|||
* 查询隐患列表
|
||||
*/
|
||||
@GetMapping("/list")
|
||||
public String list(HiddenDanger hiddenDanger)
|
||||
public String list()
|
||||
{
|
||||
startPage();
|
||||
List<HiddenDanger> list = hiddenDangerService.selectHiddenDangerList(hiddenDanger);
|
||||
List<HiddenDanger> list = hiddenDangerService.selectHiddenDangerList();
|
||||
TableDataInfo tableDataInfo = getDataTable(list);
|
||||
return JSONObject.toJSONString(tableDataInfo);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -28,8 +28,8 @@ public class MajorHazardSourcesController extends BaseController {
|
|||
* 查询重大危险源列表
|
||||
*/
|
||||
@GetMapping("/list")
|
||||
public String list(MajorHazardSources majorHazardSources) {
|
||||
List<MajorHazardSources> list = majorHazardSourcesService.selectMajorHazardSourcesList(majorHazardSources);
|
||||
public String list() {
|
||||
List<MajorHazardSources> list = majorHazardSourcesService.selectMajorHazardSourcesList();
|
||||
return JSONObject.toJSONString(list);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -23,11 +23,10 @@ public interface EscalateHiddenDangerMapper
|
|||
|
||||
/**
|
||||
* 查询上报隐患列表
|
||||
*
|
||||
* @param escalateHiddenDanger 上报隐患
|
||||
*
|
||||
* @return 上报隐患集合
|
||||
*/
|
||||
List<EscalateHiddenDanger> selectEscalateHiddenDangerList(EscalateHiddenDanger escalateHiddenDanger);
|
||||
List<EscalateHiddenDanger> selectEscalateHiddenDangerList();
|
||||
|
||||
/**
|
||||
* 新增上报隐患
|
||||
|
|
|
|||
|
|
@ -23,11 +23,10 @@ public interface HiddenDangerMapper
|
|||
|
||||
/**
|
||||
* 查询隐患列表
|
||||
*
|
||||
* @param hiddenDanger 隐患
|
||||
*
|
||||
* @return 隐患集合
|
||||
*/
|
||||
List<HiddenDanger> selectHiddenDangerList(HiddenDanger hiddenDanger);
|
||||
List<HiddenDanger> selectHiddenDangerList();
|
||||
|
||||
/**
|
||||
* 新增隐患
|
||||
|
|
|
|||
|
|
@ -22,11 +22,10 @@ public interface MajorHazardSourcesMapper
|
|||
|
||||
/**
|
||||
* 查询重大危险源列表
|
||||
*
|
||||
* @param majorHazardSources 重大危险源
|
||||
*
|
||||
* @return 重大危险源集合
|
||||
*/
|
||||
List<MajorHazardSources> selectMajorHazardSourcesList(MajorHazardSources majorHazardSources);
|
||||
List<MajorHazardSources> selectMajorHazardSourcesList();
|
||||
|
||||
/**
|
||||
* 新增重大危险源
|
||||
|
|
|
|||
|
|
@ -4,8 +4,6 @@ import java.util.Date;
|
|||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import com.hbt.common.core.annotation.Excel;
|
||||
import com.hbt.common.core.web.domain.BaseEntity;
|
||||
import org.apache.commons.lang3.builder.ToStringBuilder;
|
||||
import org.apache.commons.lang3.builder.ToStringStyle;
|
||||
|
||||
/**
|
||||
* 危险作业对象 hazardous_operation
|
||||
|
|
@ -43,9 +41,9 @@ public class HazardousOperation extends BaseEntity
|
|||
@Excel(name = "作业纬度")
|
||||
private String operationLatitude;
|
||||
|
||||
/** 作业类型 */
|
||||
/** 作业类型 1-断路 2-动土 3-受限空间 4-高处 5-吊装 6-动火 7-盲板抽堵 8-设备检维修 9-临时用电*/
|
||||
@Excel(name = "作业类型")
|
||||
private Long operationType;
|
||||
private int operationType;
|
||||
|
||||
/** 作业开始时间 */
|
||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||
|
|
@ -114,12 +112,12 @@ public class HazardousOperation extends BaseEntity
|
|||
{
|
||||
return operationLatitude;
|
||||
}
|
||||
public void setOperationType(Long operationType)
|
||||
public void setOperationType(int operationType)
|
||||
{
|
||||
this.operationType = operationType;
|
||||
}
|
||||
|
||||
public Long getOperationType()
|
||||
public int getOperationType()
|
||||
{
|
||||
return operationType;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -23,11 +23,10 @@ public interface IEscalateHiddenDangerService
|
|||
|
||||
/**
|
||||
* 查询上报隐患列表
|
||||
*
|
||||
* @param escalateHiddenDanger 上报隐患
|
||||
*
|
||||
* @return 上报隐患集合
|
||||
*/
|
||||
List<EscalateHiddenDanger> selectEscalateHiddenDangerList(EscalateHiddenDanger escalateHiddenDanger);
|
||||
List<EscalateHiddenDanger> selectEscalateHiddenDangerList();
|
||||
|
||||
/**
|
||||
* 新增上报隐患
|
||||
|
|
|
|||
|
|
@ -22,11 +22,10 @@ public interface IHiddenDangerService
|
|||
|
||||
/**
|
||||
* 查询隐患列表
|
||||
*
|
||||
* @param hiddenDanger 隐患
|
||||
*
|
||||
* @return 隐患集合
|
||||
*/
|
||||
List<HiddenDanger> selectHiddenDangerList(HiddenDanger hiddenDanger);
|
||||
List<HiddenDanger> selectHiddenDangerList();
|
||||
|
||||
/**
|
||||
* 新增隐患
|
||||
|
|
|
|||
|
|
@ -21,11 +21,10 @@ public interface IMajorHazardSourcesService
|
|||
|
||||
/**
|
||||
* 查询重大危险源列表
|
||||
*
|
||||
* @param majorHazardSources 重大危险源
|
||||
*
|
||||
* @return 重大危险源集合
|
||||
*/
|
||||
List<MajorHazardSources> selectMajorHazardSourcesList(MajorHazardSources majorHazardSources);
|
||||
List<MajorHazardSources> selectMajorHazardSourcesList();
|
||||
|
||||
/**
|
||||
* 新增重大危险源
|
||||
|
|
|
|||
|
|
@ -22,11 +22,10 @@ public interface IPersonService
|
|||
|
||||
/**
|
||||
* 查询人员信息列表
|
||||
*
|
||||
* @param person 人员信息
|
||||
*
|
||||
* @return 人员信息集合
|
||||
*/
|
||||
List<Person> selectPersonList(Person person);
|
||||
List<Person> selectPersonList();
|
||||
|
||||
/**
|
||||
* 新增人员信息
|
||||
|
|
|
|||
|
|
@ -21,11 +21,10 @@ public interface IRiskAreaService
|
|||
|
||||
/**
|
||||
* 查询风险区域列表
|
||||
*
|
||||
* @param riskArea 风险区域
|
||||
*
|
||||
* @return 风险区域集合
|
||||
*/
|
||||
List<RiskArea> selectRiskAreaList(RiskArea riskArea);
|
||||
List<RiskArea> selectRiskAreaList();
|
||||
|
||||
/**
|
||||
* 新增风险区域
|
||||
|
|
|
|||
|
|
@ -22,11 +22,10 @@ public interface IRiskService
|
|||
|
||||
/**
|
||||
* 查询风险列表
|
||||
*
|
||||
* @param risk 风险
|
||||
*
|
||||
* @return 风险集合
|
||||
*/
|
||||
List<Risk> selectRiskList(Risk risk);
|
||||
List<Risk> selectRiskList();
|
||||
|
||||
/**
|
||||
* 新增风险
|
||||
|
|
|
|||
|
|
@ -35,14 +35,13 @@ public class EscalateHiddenDangerServiceImpl implements IEscalateHiddenDangerSer
|
|||
|
||||
/**
|
||||
* 查询上报隐患列表
|
||||
*
|
||||
* @param escalateHiddenDanger 上报隐患
|
||||
*
|
||||
* @return 上报隐患
|
||||
*/
|
||||
@Override
|
||||
public List<EscalateHiddenDanger> selectEscalateHiddenDangerList(EscalateHiddenDanger escalateHiddenDanger)
|
||||
public List<EscalateHiddenDanger> selectEscalateHiddenDangerList()
|
||||
{
|
||||
return escalateHiddenDangerMapper.selectEscalateHiddenDangerList(escalateHiddenDanger);
|
||||
return escalateHiddenDangerMapper.selectEscalateHiddenDangerList();
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -37,14 +37,13 @@ public class HiddenDangerServiceImpl implements IHiddenDangerService
|
|||
|
||||
/**
|
||||
* 查询隐患列表
|
||||
*
|
||||
* @param hiddenDanger 隐患
|
||||
*
|
||||
* @return 隐患
|
||||
*/
|
||||
@Override
|
||||
public List<HiddenDanger> selectHiddenDangerList(HiddenDanger hiddenDanger)
|
||||
public List<HiddenDanger> selectHiddenDangerList()
|
||||
{
|
||||
return hiddenDangerMapper.selectHiddenDangerList(hiddenDanger);
|
||||
return hiddenDangerMapper.selectHiddenDangerList();
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -42,14 +42,13 @@ public class MajorHazardSourcesServiceImpl implements IMajorHazardSourcesService
|
|||
|
||||
/**
|
||||
* 查询重大危险源列表
|
||||
*
|
||||
* @param majorHazardSources 重大危险源
|
||||
*
|
||||
* @return 重大危险源
|
||||
*/
|
||||
@Override
|
||||
public List<MajorHazardSources> selectMajorHazardSourcesList(MajorHazardSources majorHazardSources)
|
||||
public List<MajorHazardSources> selectMajorHazardSourcesList()
|
||||
{
|
||||
return majorHazardSourcesMapper.selectMajorHazardSourcesList(majorHazardSources);
|
||||
return majorHazardSourcesMapper.selectMajorHazardSourcesList();
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
Loading…
Reference in New Issue