工程安全分析

securitycontrol-commons/securitycontrol-commons-security/src/main/java/com/securitycontrol/common/security/interceptor/ParamSecureHandler.java

@@ -73,6 +73,8 @@ public class ParamSecureHandler implements AsyncHandlerInterceptor {
             "/largeScreen/engineeringSafetyAnalysis/list",
             "/largeScreen/engineeringSafetyAnalysis/environmental",
             "/largeScreen/engineeringSafetyAnalysis/hazards",
+            "/largeScreen/engineeringSafetyAnalysis/getEnvironmentalList",
+            "/largeScreen/engineeringSafetyAnalysis/getHazardsList",
             "/Dashapi/pages/dashInfo",
             "/largeScreen/deviceEnergyAnalysis/selectEnergyStatsByDateRange",
             "/largeScreen/deviceEnergyAnalysis/selectDeviceEnergyByDateRange",

securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/controller/EngineeringSafetyAnalysisController.java

@@ -41,9 +41,9 @@ public class EngineeringSafetyAnalysisController extends BaseController {
     }
 
     /**
-     * 查询环境监测趋势列表
+     * 查询环境监测趋势
      */
-    @ApiOperation(value = "查询环境监测趋势列表")
+    @ApiOperation(value = "查询环境监测趋势")
     @GetMapping("/environmental")
     public TableDataInfo environmental(EngineeringSafetyAnalysis environmentalReadings) {
         List<EngineeringSafetyAnalysis> list = environmentalReadingsService.environmentalList(environmentalReadings);
@@ -51,12 +51,35 @@ public class EngineeringSafetyAnalysisController extends BaseController {
     }
 
     /**
-     * 查询安全隐患分布列表
+     * 查询安全隐患分布
      */
-    @ApiOperation(value = "查询安全隐患分布列表")
+    @ApiOperation(value = "查询安全隐患分布")
     @GetMapping("/hazards")
     public TableDataInfo hazards(EngineeringSafetyAnalysis environmentalReadings) {
         List<EngineeringSafetyAnalysis> list = environmentalReadingsService.hazardsList(environmentalReadings);
         return getDataTable(list);
     }
+
+
+    /**
+     * 查询环境监测趋势列表
+     */
+    @ApiOperation(value = "查询环境监测趋势列表")
+    @GetMapping("/getEnvironmentalList")
+    public TableDataInfo getEnvironmentalList(EngineeringSafetyAnalysis environmentalReadings) {
+        startPage();
+        List<EngineeringSafetyAnalysis> list = environmentalReadingsService.getEnvironmentalList(environmentalReadings);
+        return getDataTable(list);
+    }
+
+    /**
+     * 查询安全隐患分布列表
+     */
+    @ApiOperation(value = "查询安全隐患分布列表")
+    @GetMapping("/getHazardsList")
+    public TableDataInfo getHazardsList(EngineeringSafetyAnalysis environmentalReadings) {
+        startPage();
+        List<EngineeringSafetyAnalysis> list = environmentalReadingsService.getHazardsList(environmentalReadings);
+        return getDataTable(list);
+    }
 }

securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/mapper/EngineeringSafetyAnalysisMapper.java

@@ -35,4 +35,20 @@ public interface EngineeringSafetyAnalysisMapper {
      * @return 安全隐患集合发布
      */
     List<EngineeringSafetyAnalysis> hazardsList(EngineeringSafetyAnalysis environmentalReadings);
+
+    /**
+     * 查询环境监测趋势列表
+     *
+     * @param environmentalReadings 环境监测趋势
+     * @return 环境监测趋势
+     */
+    List<EngineeringSafetyAnalysis> getEnvironmentalList(EngineeringSafetyAnalysis environmentalReadings);
+
+    /**
+     * icherry 查询安全隐患发布列表
+     *
+     * @param environmentalReadings 安全隐患发布
+     * @return 安全隐患集合发布
+     */
+    List<EngineeringSafetyAnalysis> getHazardsList(EngineeringSafetyAnalysis environmentalReadings);
 }

securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/EngineeringSafetyAnalysisService.java

@@ -34,4 +34,20 @@ public interface EngineeringSafetyAnalysisService {
      * @return 安全隐患发布集合
      */
     List<EngineeringSafetyAnalysis> hazardsList(EngineeringSafetyAnalysis environmentalReadings);
+
+    /**
+     * 查询环境监测趋势列表
+     *
+     * @param environmentalReadings 查询环境监测趋势列表
+     * @return 环境监测趋势集合
+     */
+    List<EngineeringSafetyAnalysis> getEnvironmentalList(EngineeringSafetyAnalysis environmentalReadings);
+
+    /**
+     * 查询安全隐患发布列表
+     *
+     * @param environmentalReadings 查询安全隐患发布列表
+     * @return 安全隐患发布集合
+     */
+    List<EngineeringSafetyAnalysis> getHazardsList(EngineeringSafetyAnalysis environmentalReadings);
 }

securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/EngineeringSafetyAnalysisServiceImpl.java

@@ -52,5 +52,15 @@ public class EngineeringSafetyAnalysisServiceImpl implements EngineeringSafetyAn
         return engineeringSafetyAnalysisMapper.hazardsList(environmentalReadings);
     }
 
+    @Override
+    public List<EngineeringSafetyAnalysis> getEnvironmentalList(EngineeringSafetyAnalysis environmentalReadings) {
+        return engineeringSafetyAnalysisMapper.getEnvironmentalList(environmentalReadings);
+    }
+
+    @Override
+    public List<EngineeringSafetyAnalysis> getHazardsList(EngineeringSafetyAnalysis environmentalReadings) {
+        return engineeringSafetyAnalysisMapper.getHazardsList(environmentalReadings);
+    }
+
 
 }

securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/EngineeringSafetyAnalysisMapper.xml

@@ -45,7 +45,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         hazards h
         LEFT JOIN tb_project_new pro on h.bid_code = pro.bid_code
         LEFT JOIN
-        monitoring_points mp ON h.bid_code = mp.bid_code
+        monitoring_points mp ON h.monitoring_point_id = mp.id
         LEFT JOIN
         (
         -- 子查询：获取每个 bid_code 最新日期的环境数据平均值
@@ -105,7 +105,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             hazards
         WHERE
             bid_code = #{bidCode}
-        GROUP BY
-            level
+        GROUP BY level
+    </select>
+
+
+    <select id="getEnvironmentalList" resultType="com.securitycontrol.screen.domain.EngineeringSafetyAnalysis">
+        SELECT id,date,temperature,humidity,wind_speed,gas_value
+        FROM environmental_readings
+        WHERE bid_code = #{bidCode}
+        <if test="name != null and name != ''">
+            AND id LIKE CONCAT('%', #{name}, '%')
+        </if>
+        ORDER BY date ASC
+    </select>
+
+    <select id="getHazardsList" resultType="com.securitycontrol.screen.domain.EngineeringSafetyAnalysis">
+        SELECT id,type,level,timestamp
+        FROM hazards
+        WHERE bid_code = #{bidCode}
+        <if test="name != null and name != ''">
+            AND id LIKE CONCAT('%', #{name}, '%')
+        </if>
     </select>
 </mapper>