实时数据报警功能

@@ -55,11 +55,7 @@ public class AlarmJobTestController {
     public Result<String> testRealTimeAlarmJob() {
     public Result<String> testRealTimeAlarmJob() {
 
 
         Result<String> result = new Result<>();
         Result<String> result = new Result<>();
-        try {
         realTimeAlarmJob.execute(null);
         realTimeAlarmJob.execute(null);
-		} catch (JobExecutionException e) {
-			e.printStackTrace();
-		}
         result.setResult("成功");
         result.setResult("成功");
         result.setSuccess(true);
         result.setSuccess(true);
         return result;
         return result;

@@ -111,8 +111,9 @@ public class RealTimeAlarmJob implements Job {
     private static String departNameTemplete = "${departName}";
     private static String departNameTemplete = "${departName}";
     private static String contentTemplete = "${alarmParamName}:${actualAvgValue}(${limit})${alarmParamUnit}";
     private static String contentTemplete = "${alarmParamName}:${actualAvgValue}(${limit})${alarmParamUnit}";
     private static String suffix = "，请注意！";
     private static String suffix = "，请注意！";
+
     @Override
     @Override
-    public void execute(JobExecutionContext context) throws JobExecutionException {
+    public void execute(JobExecutionContext context) {
         try {
         try {
             log.info("水质实时数据报警任务开始");
             log.info("水质实时数据报警任务开始");
             //获取水质、水量、工艺报警规则信息
             //获取水质、水量、工艺报警规则信息
@@ -321,7 +322,8 @@ public class RealTimeAlarmJob implements Job {
     private void dealSZLtatus(List<AlarmRuleConfigAndLevelVO> errorList) {
     private void dealSZLtatus(List<AlarmRuleConfigAndLevelVO> errorList) {
         //查询报警记录置为正常状态
         //查询报警记录置为正常状态
         QueryWrapper<AlarmRecordHistory> queryWrapper = new QueryWrapper<>();
         QueryWrapper<AlarmRecordHistory> queryWrapper = new QueryWrapper<>();
-        queryWrapper.in("alarm_rule_type", Lists.newArrayList("6"));
+//        queryWrapper.in("alarm_rule_type", Lists.newArrayList("6"));
+        queryWrapper.in("alarm_rule_type", Lists.newArrayList("A001A001"));
         queryWrapper.eq("alarm_param_type", "数据超过有效上下限报警配置");
         queryWrapper.eq("alarm_param_type", "数据超过有效上下限报警配置");
         queryWrapper.in("handle_status", 0);
         queryWrapper.in("handle_status", 0);
         List<AlarmRecordHistory> list = alarmRecordHistoryService.list(queryWrapper);
         List<AlarmRecordHistory> list = alarmRecordHistoryService.list(queryWrapper);
@@ -353,7 +355,8 @@ public class RealTimeAlarmJob implements Job {
     private void dealStatus(List<AlarmRuleConfigAndLevelVO> excessList) {
     private void dealStatus(List<AlarmRuleConfigAndLevelVO> excessList) {
         //查询报警记录置为正常状态
         //查询报警记录置为正常状态
         QueryWrapper<AlarmRecordHistory> queryWrapper = new QueryWrapper<>();
         QueryWrapper<AlarmRecordHistory> queryWrapper = new QueryWrapper<>();
-        queryWrapper.in("alarm_rule_type", Lists.newArrayList("1", "2", "3", "5", "8"));
+//        queryWrapper.in("alarm_rule_type", Lists.newArrayList("1", "2", "3", "5", "8"));
+        queryWrapper.in("alarm_rule_type", Lists.newArrayList("A001A001", "A001A002", "A001A003", "5", "8"));
         queryWrapper.in("handle_status", 0);
         queryWrapper.in("handle_status", 0);
         List<AlarmRecordHistory> list = alarmRecordHistoryService.list(queryWrapper);
         List<AlarmRecordHistory> list = alarmRecordHistoryService.list(queryWrapper);
         if (list != null && list.size() > 0) {
         if (list != null && list.size() > 0) {

@@ -5,6 +5,7 @@ import java.util.List;
 import com.skua.modules.emergency.vo.DangerDatabaseResult;
 import com.skua.modules.emergency.vo.DangerDatabaseResult;
 import com.skua.modules.emergency.vo.MapDatabaseResult;
 import com.skua.modules.emergency.vo.MapDatabaseResult;
 import com.skua.modules.emergency.vo.RiskDatabaseResult;
 import com.skua.modules.emergency.vo.RiskDatabaseResult;
+import com.skua.tool.annotation.Anonymous;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Param;
 import com.skua.modules.emergency.entity.EmergencyRiskEvent;
 import com.skua.modules.emergency.entity.EmergencyRiskEvent;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -14,9 +15,12 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
  */
 public interface EmergencyRiskEventMapper extends BaseMapper<EmergencyRiskEvent> {
 public interface EmergencyRiskEventMapper extends BaseMapper<EmergencyRiskEvent> {
 
 
+    @Anonymous
     List<RiskDatabaseResult> getRiskList(@Param("year") String year);
     List<RiskDatabaseResult> getRiskList(@Param("year") String year);
 
 
+    @Anonymous
     List<DangerDatabaseResult> getDangerList(@Param("year") String year);
     List<DangerDatabaseResult> getDangerList(@Param("year") String year);
 
 
+    @Anonymous
     List<MapDatabaseResult> getMapData(@Param("year") String year);
     List<MapDatabaseResult> getMapData(@Param("year") String year);
 }
 }

@@ -685,13 +685,9 @@
 			and depart_id=#{factoryId}
 			and depart_id=#{factoryId}
 		</if>
 		</if>
 		GROUP BY
 		GROUP BY
-		depart_id,
-		LEFT ( ts, 7 ),
-		index_tag
+			depart_id,LEFT ( ts, 7 ),index_tag
 		ORDER BY
 		ORDER BY
-		depart_id,
-		LEFT ( ts, 7 ),
-		index_tag
+			depart_id,LEFT ( ts, 7 ),index_tag
 	</select>
 	</select>
 	<select id="queryHDLAndSL" resultType="java.util.Map">
 	<select id="queryHDLAndSL" resultType="java.util.Map">
 		SELECT
 		SELECT