接口改动

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

@@ -30,12 +30,10 @@ public class PersonController extends BaseController
      * 查询人员信息列表
      */
     @GetMapping("/list")
-    public String list(Person person)
+    public String list()
     {
-        startPage();
+        List<Person> list = personService.selectPersonList();
-        List<Person> list = personService.selectPersonList(person);
+        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/RiskAreaController.java

@@ -30,12 +30,11 @@ public class RiskAreaController extends BaseController
      * 查询风险区域列表
      */
     @GetMapping("/list")
-    public String list(RiskArea riskArea)
+    public String list()
     {
-        startPage();
+
-        List<RiskArea> list = riskAreaService.selectRiskAreaList(riskArea);
+        List<RiskArea> list = riskAreaService.selectRiskAreaList();
-        TableDataInfo tableDataInfo = getDataTable(list);
+        return JSONObject.toJSONString(list);
-        return JSONObject.toJSONString(tableDataInfo);
     }
 
 

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

@@ -30,12 +30,10 @@ public class RiskController extends BaseController
      * 查询风险列表
      */
     @GetMapping("/list")
-    public String list(Risk risk)
+    public String list()
     {
-        startPage();
+        List<Risk> list = riskService.selectRiskList();
-        List<Risk> list = riskService.selectRiskList(risk);
+        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/mapper/PersonMapper.java

@@ -22,10 +22,9 @@ public interface PersonMapper {
     /**
      * 查询人员信息列表
      *
-     * @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/mapper/RiskAreaMapper.java

@@ -22,10 +22,9 @@ public interface RiskAreaMapper
     /**
      * 查询风险区域列表
      *
-     * @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/mapper/RiskMapper.java

@@ -27,10 +27,9 @@ public interface RiskMapper
     /**
      * 查询风险列表
      *
-     * @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/PersonServiceImpl.java

@@ -35,13 +35,12 @@ public class PersonServiceImpl implements IPersonService
     /**
      * 查询人员信息列表
      *
-     * @param person 人员信息
      * @return 人员信息
      */
     @Override
-    public List<Person> selectPersonList(Person person)
+    public List<Person> selectPersonList()
     {
-        return personMapper.selectPersonList(person);
+        return personMapper.selectPersonList();
     }
 
     /**

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

@@ -35,13 +35,12 @@ public class RiskAreaServiceImpl implements IRiskAreaService
     /**
      * 查询风险区域列表
      *
-     * @param riskArea 风险区域
      * @return 风险区域
      */
     @Override
-    public List<RiskArea> selectRiskAreaList(RiskArea riskArea)
+    public List<RiskArea> selectRiskAreaList()
     {
-        return riskAreaMapper.selectRiskAreaList(riskArea);
+        return riskAreaMapper.selectRiskAreaList();
     }
 
     /**

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

@@ -37,13 +37,12 @@ public class RiskServiceImpl implements IRiskService
     /**
      * 查询风险列表
      *
-     * @param risk 风险
      * @return 风险
      */
     @Override
-    public List<Risk> selectRiskList(Risk risk)
+    public List<Risk> selectRiskList()
     {
-        return riskMapper.selectRiskList(risk);
+        return riskMapper.selectRiskList();
     }
 
     /**

hbt-safety-supervision/hbt-safety-supervision-biz/src/main/resources/mapper/PersonMapper.xml

@@ -22,9 +22,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectPersonList" parameterType="com.hbt.safety.supervision.pojo.Person" resultMap="PersonResult">
         <include refid="selectPersonVo"/>
-        <where>  
-            <if test="enterpriseId != null "> and enterprise_id = #{enterpriseId}</if>
-        </where>
     </select>
     
     <select id="selectPersonById" parameterType="Integer" resultMap="PersonResult">