接口改动

hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/controller/EscalateHiddenDangerController.java

@@ -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();
-        List<EscalateHiddenDanger> list = escalateHiddenDangerService.selectEscalateHiddenDangerList(escalateHiddenDanger);
+        return JSONObject.toJSONString(list);
-        TableDataInfo tableDataInfo = getDataTable(list);
-        return JSONObject.toJSONString(tableDataInfo);
     }
 
     /**

hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/controller/HiddenDangerController.java

@@ -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);
     }

hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/controller/MajorHazardSourcesController.java

@@ -28,8 +28,8 @@ public class MajorHazardSourcesController extends BaseController {
      * 查询重大危险源列表
      */
     @GetMapping("/list")
-    public String list(MajorHazardSources majorHazardSources) {
+    public String list() {
-        List<MajorHazardSources> list = majorHazardSourcesService.selectMajorHazardSourcesList(majorHazardSources);
+        List<MajorHazardSources> list = majorHazardSourcesService.selectMajorHazardSourcesList();
         return JSONObject.toJSONString(list);
     }
 

hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/mapper/EscalateHiddenDangerMapper.java

@@ -24,10 +24,9 @@ public interface EscalateHiddenDangerMapper
     /**
      * 查询上报隐患列表
      *
-     * @param escalateHiddenDanger 上报隐患
      * @return 上报隐患集合
      */
-    List<EscalateHiddenDanger> selectEscalateHiddenDangerList(EscalateHiddenDanger escalateHiddenDanger);
+    List<EscalateHiddenDanger> selectEscalateHiddenDangerList();
 
     /**
      * 新增上报隐患

hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/mapper/HiddenDangerMapper.java

@@ -24,10 +24,9 @@ public interface HiddenDangerMapper
     /**
      * 查询隐患列表
      *
-     * @param hiddenDanger 隐患
      * @return 隐患集合
      */
-    List<HiddenDanger> selectHiddenDangerList(HiddenDanger hiddenDanger);
+    List<HiddenDanger> selectHiddenDangerList();
 
     /**
      * 新增隐患

hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/mapper/MajorHazardSourcesMapper.java

@@ -23,10 +23,9 @@ public interface MajorHazardSourcesMapper
     /**
      * 查询重大危险源列表
      *
-     * @param majorHazardSources 重大危险源
      * @return 重大危险源集合
      */
-    List<MajorHazardSources> selectMajorHazardSourcesList(MajorHazardSources majorHazardSources);
+    List<MajorHazardSources> selectMajorHazardSourcesList();
 
     /**
      * 新增重大危险源

hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/pojo/HazardousOperation.java

@@ -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;
     }

hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/IEscalateHiddenDangerService.java

@@ -24,10 +24,9 @@ public interface IEscalateHiddenDangerService
     /**
      * 查询上报隐患列表
      *
-     * @param escalateHiddenDanger 上报隐患
      * @return 上报隐患集合
      */
-    List<EscalateHiddenDanger> selectEscalateHiddenDangerList(EscalateHiddenDanger escalateHiddenDanger);
+    List<EscalateHiddenDanger> selectEscalateHiddenDangerList();
 
     /**
      * 新增上报隐患

hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/IHiddenDangerService.java

@@ -23,10 +23,9 @@ public interface IHiddenDangerService
     /**
      * 查询隐患列表
      *
-     * @param hiddenDanger 隐患
      * @return 隐患集合
      */
-    List<HiddenDanger> selectHiddenDangerList(HiddenDanger hiddenDanger);
+    List<HiddenDanger> selectHiddenDangerList();
 
     /**
      * 新增隐患

hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/IMajorHazardSourcesService.java

@@ -22,10 +22,9 @@ public interface IMajorHazardSourcesService
     /**
      * 查询重大危险源列表
      *
-     * @param majorHazardSources 重大危险源
      * @return 重大危险源集合
      */
-    List<MajorHazardSources> selectMajorHazardSourcesList(MajorHazardSources majorHazardSources);
+    List<MajorHazardSources> selectMajorHazardSourcesList();
 
     /**
      * 新增重大危险源

hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/IPersonService.java

@@ -23,10 +23,9 @@ public interface IPersonService
     /**
      * 查询人员信息列表
      *
-     * @param person 人员信息
      * @return 人员信息集合
      */
-    List<Person> selectPersonList(Person person);
+    List<Person> selectPersonList();
 
     /**
      * 新增人员信息

hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/IRiskAreaService.java

@@ -22,10 +22,9 @@ public interface IRiskAreaService
     /**
      * 查询风险区域列表
      *
-     * @param riskArea 风险区域
      * @return 风险区域集合
      */
-    List<RiskArea> selectRiskAreaList(RiskArea riskArea);
+    List<RiskArea> selectRiskAreaList();
 
     /**
      * 新增风险区域

hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/IRiskService.java

@@ -23,10 +23,9 @@ public interface IRiskService
     /**
      * 查询风险列表
      *
-     * @param risk 风险
      * @return 风险集合
      */
-    List<Risk> selectRiskList(Risk risk);
+    List<Risk> selectRiskList();
 
     /**
      * 新增风险

hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/impl/EscalateHiddenDangerServiceImpl.java

@@ -36,13 +36,12 @@ 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();
     }
 
     /**

hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/impl/HiddenDangerServiceImpl.java

@@ -38,13 +38,12 @@ 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();
     }
 
     /**

hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/impl/MajorHazardSourcesServiceImpl.java

@@ -43,13 +43,12 @@ 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();
     }
 
     /**