diff --git a/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/controller/EscalateHiddenDangerController.java b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/controller/EscalateHiddenDangerController.java
index 79a0818..3847ef6 100644
--- a/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/controller/EscalateHiddenDangerController.java
+++ b/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(escalateHiddenDanger);
-        TableDataInfo tableDataInfo = getDataTable(list);
-        return JSONObject.toJSONString(tableDataInfo);
+        List<EscalateHiddenDanger> list = escalateHiddenDangerService.selectEscalateHiddenDangerList();
+        return JSONObject.toJSONString(list);
     }
 
     /**
diff --git a/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/controller/HiddenDangerController.java b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/controller/HiddenDangerController.java
index d8cd613..5851543 100644
--- a/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/controller/HiddenDangerController.java
+++ b/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);
     }
diff --git a/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/controller/MajorHazardSourcesController.java b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/controller/MajorHazardSourcesController.java
index 6104b21..502a2f9 100644
--- a/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/controller/MajorHazardSourcesController.java
+++ b/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) {
-        List<MajorHazardSources> list = majorHazardSourcesService.selectMajorHazardSourcesList(majorHazardSources);
+    public String list() {
+        List<MajorHazardSources> list = majorHazardSourcesService.selectMajorHazardSourcesList();
         return JSONObject.toJSONString(list);
     }
 
diff --git a/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/mapper/EscalateHiddenDangerMapper.java b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/mapper/EscalateHiddenDangerMapper.java
index bf94e15..c6ce21c 100644
--- a/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/mapper/EscalateHiddenDangerMapper.java
+++ b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/mapper/EscalateHiddenDangerMapper.java
@@ -23,11 +23,10 @@ public interface EscalateHiddenDangerMapper
 
     /**
      * 查询上报隐患列表
-     * 
-     * @param escalateHiddenDanger 上报隐患
+     *
      * @return 上报隐患集合
      */
-    List<EscalateHiddenDanger> selectEscalateHiddenDangerList(EscalateHiddenDanger escalateHiddenDanger);
+    List<EscalateHiddenDanger> selectEscalateHiddenDangerList();
 
     /**
      * 新增上报隐患
diff --git a/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/mapper/HiddenDangerMapper.java b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/mapper/HiddenDangerMapper.java
index f6417bc..6ec73e3 100644
--- a/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/mapper/HiddenDangerMapper.java
+++ b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/mapper/HiddenDangerMapper.java
@@ -23,11 +23,10 @@ public interface HiddenDangerMapper
 
     /**
      * 查询隐患列表
-     * 
-     * @param hiddenDanger 隐患
+     *
      * @return 隐患集合
      */
-    List<HiddenDanger> selectHiddenDangerList(HiddenDanger hiddenDanger);
+    List<HiddenDanger> selectHiddenDangerList();
 
     /**
      * 新增隐患
diff --git a/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/mapper/MajorHazardSourcesMapper.java b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/mapper/MajorHazardSourcesMapper.java
index 35dc2bb..8de1431 100644
--- a/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/mapper/MajorHazardSourcesMapper.java
+++ b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/mapper/MajorHazardSourcesMapper.java
@@ -22,11 +22,10 @@ public interface MajorHazardSourcesMapper
 
     /**
      * 查询重大危险源列表
-     * 
-     * @param majorHazardSources 重大危险源
+     *
      * @return 重大危险源集合
      */
-    List<MajorHazardSources> selectMajorHazardSourcesList(MajorHazardSources majorHazardSources);
+    List<MajorHazardSources> selectMajorHazardSourcesList();
 
     /**
      * 新增重大危险源
diff --git a/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/pojo/HazardousOperation.java b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/pojo/HazardousOperation.java
index 9182a82..d504e44 100644
--- a/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/pojo/HazardousOperation.java
+++ b/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;
     }
diff --git a/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/IEscalateHiddenDangerService.java b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/IEscalateHiddenDangerService.java
index 6d6ed8a..70adf93 100644
--- a/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/IEscalateHiddenDangerService.java
+++ b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/IEscalateHiddenDangerService.java
@@ -23,11 +23,10 @@ public interface IEscalateHiddenDangerService
 
     /**
      * 查询上报隐患列表
-     * 
-     * @param escalateHiddenDanger 上报隐患
+     *
      * @return 上报隐患集合
      */
-    List<EscalateHiddenDanger> selectEscalateHiddenDangerList(EscalateHiddenDanger escalateHiddenDanger);
+    List<EscalateHiddenDanger> selectEscalateHiddenDangerList();
 
     /**
      * 新增上报隐患
diff --git a/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/IHiddenDangerService.java b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/IHiddenDangerService.java
index f78dbb3..b8b3303 100644
--- a/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/IHiddenDangerService.java
+++ b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/IHiddenDangerService.java
@@ -22,11 +22,10 @@ public interface IHiddenDangerService
 
     /**
      * 查询隐患列表
-     * 
-     * @param hiddenDanger 隐患
+     *
      * @return 隐患集合
      */
-    List<HiddenDanger> selectHiddenDangerList(HiddenDanger hiddenDanger);
+    List<HiddenDanger> selectHiddenDangerList();
 
     /**
      * 新增隐患
diff --git a/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/IMajorHazardSourcesService.java b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/IMajorHazardSourcesService.java
index ff5d33d..3676d73 100644
--- a/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/IMajorHazardSourcesService.java
+++ b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/IMajorHazardSourcesService.java
@@ -21,11 +21,10 @@ public interface IMajorHazardSourcesService
 
     /**
      * 查询重大危险源列表
-     * 
-     * @param majorHazardSources 重大危险源
+     *
      * @return 重大危险源集合
      */
-    List<MajorHazardSources> selectMajorHazardSourcesList(MajorHazardSources majorHazardSources);
+    List<MajorHazardSources> selectMajorHazardSourcesList();
 
     /**
      * 新增重大危险源
diff --git a/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/IPersonService.java b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/IPersonService.java
index 0c5eae8..e94b3de 100644
--- a/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/IPersonService.java
+++ b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/IPersonService.java
@@ -22,11 +22,10 @@ public interface IPersonService
 
     /**
      * 查询人员信息列表
-     * 
-     * @param person 人员信息
+     *
      * @return 人员信息集合
      */
-    List<Person> selectPersonList(Person person);
+    List<Person> selectPersonList();
 
     /**
      * 新增人员信息
diff --git a/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/IRiskAreaService.java b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/IRiskAreaService.java
index 4c20e51..a5b41a9 100644
--- a/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/IRiskAreaService.java
+++ b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/IRiskAreaService.java
@@ -21,11 +21,10 @@ public interface IRiskAreaService
 
     /**
      * 查询风险区域列表
-     * 
-     * @param riskArea 风险区域
+     *
      * @return 风险区域集合
      */
-    List<RiskArea> selectRiskAreaList(RiskArea riskArea);
+    List<RiskArea> selectRiskAreaList();
 
     /**
      * 新增风险区域
diff --git a/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/IRiskService.java b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/IRiskService.java
index 593bb41..6485080 100644
--- a/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/IRiskService.java
+++ b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/IRiskService.java
@@ -22,11 +22,10 @@ public interface IRiskService
 
     /**
      * 查询风险列表
-     * 
-     * @param risk 风险
+     *
      * @return 风险集合
      */
-    List<Risk> selectRiskList(Risk risk);
+    List<Risk> selectRiskList();
 
     /**
      * 新增风险
diff --git a/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/impl/EscalateHiddenDangerServiceImpl.java b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/impl/EscalateHiddenDangerServiceImpl.java
index 5e6efcc..7bea865 100644
--- a/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/impl/EscalateHiddenDangerServiceImpl.java
+++ b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/impl/EscalateHiddenDangerServiceImpl.java
@@ -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();
     }
 
     /**
diff --git a/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/impl/HiddenDangerServiceImpl.java b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/impl/HiddenDangerServiceImpl.java
index 7c05b15..7f161f1 100644
--- a/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/impl/HiddenDangerServiceImpl.java
+++ b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/impl/HiddenDangerServiceImpl.java
@@ -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();
     }
 
     /**
diff --git a/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/impl/MajorHazardSourcesServiceImpl.java b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/impl/MajorHazardSourcesServiceImpl.java
index 7daf7ca..f28cee4 100644
--- a/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/impl/MajorHazardSourcesServiceImpl.java
+++ b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/impl/MajorHazardSourcesServiceImpl.java
@@ -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();
     }
 
     /**