Merge remote-tracking branch 'origin/master'

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

@@ -85,34 +85,28 @@ public class ScreenAssemblyConfigController {
 	  * 查询组件列表
 	  * 查询组件列表
 	 * @param assemblyType，1对内，2对外
 	 * @param assemblyType，1对内，2对外
 	 * @param screenType，1，集团。2，单厂
 	 * @param screenType，1，集团。2，单厂
-	 * @param req
 	 * @return
 	 * @return
 	 */
 	 */
 	@AutoLog(value = "大屏配置组件-列表查询")
 	@AutoLog(value = "大屏配置组件-列表查询")
 	@ApiOperation(value="大屏配置组件-列表查询", notes="大屏配置组件-列表查询")
 	@ApiOperation(value="大屏配置组件-列表查询", notes="大屏配置组件-列表查询")
 	@GetMapping(value = "/assemblyList")
 	@GetMapping(value = "/assemblyList")
-	public Result<List<ScreenAssemblyConfig>> queryList(String assemblyType,String screenType,
-									  HttpServletRequest req) {
+	public Result<List<ScreenAssemblyConfig>> queryList(String assemblyType,String screenType) {
+		String assemblyTypes = "";
 		Result<List<ScreenAssemblyConfig>> result = new Result<List<ScreenAssemblyConfig>>();
 		Result<List<ScreenAssemblyConfig>> result = new Result<List<ScreenAssemblyConfig>>();
-		QueryWrapper<ScreenAssemblyConfig> queryWrapper = new QueryWrapper<>();
-		if(StringUtils.hasText(screenType)) {
-			queryWrapper.eq("screen_type", screenType);
-		}
+//		QueryWrapper<ScreenAssemblyConfig> queryWrapper = new QueryWrapper<>();
+//		if(StringUtils.hasText(screenType)) {
+//			queryWrapper.eq("screen_type", screenType);
+//		}
 		//对内查询公共和对内
 		//对内查询公共和对内
 		if(assemblyType.equals("1")) {
 		if(assemblyType.equals("1")) {
-			queryWrapper.and(qw ->
-	        qw.eq("assembly_type",0).or().eq("assembly_type",1)
-			);
-//			queryWrapper.eq("assembly_type",0).or().eq("assembly_type",1);
+			assemblyTypes = "0,1";
 		}
 		}
 		//对外查询公共和对外
 		//对外查询公共和对外
 		else {
 		else {
-			queryWrapper.and(qw ->
-	        qw.eq("assembly_type",0).or().eq("assembly_type",2)
-			);
+			assemblyTypes = "0,2";
 		}
 		}
-		
-		List<ScreenAssemblyConfig> list = screenAssemblyConfigService.list(queryWrapper);
+//		List<ScreenAssemblyConfig> list = screenAssemblyConfigService.list(queryWrapper);
+		List<ScreenAssemblyConfig> list = screenAssemblyConfigService.getList(screenType,assemblyTypes);
 		result.setSuccess(true);
 		result.setSuccess(true);
 		result.setResult(list);
 		result.setResult(list);
 		return result;
 		return result;

@@ -3,6 +3,8 @@ package com.skua.modules.screenconfig.mapper;
 import java.util.List;
 import java.util.List;
 import java.util.Map;
 import java.util.Map;
 
 
+import com.skua.tool.annotation.Anonymous;
+import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 import org.apache.ibatis.annotations.Select;
 
 
 import com.skua.modules.screenconfig.entity.ScreenAssemblyConfig;
 import com.skua.modules.screenconfig.entity.ScreenAssemblyConfig;
@@ -15,4 +17,7 @@ public interface ScreenAssemblyConfigMapper extends BaseMapper<ScreenAssemblyCon
 
 
 	@Select({"select c.assembly_type assemblyType,count(c.assembly_type) count from screen_assembly_config c group by c.assembly_type"})
 	@Select({"select c.assembly_type assemblyType,count(c.assembly_type) count from screen_assembly_config c group by c.assembly_type"})
     List<Map<String,String>> assemblyCount();
     List<Map<String,String>> assemblyCount();
+
+    @Anonymous
+    List<ScreenAssemblyConfig> getList(@Param("screenType") String screenType, @Param("assemblyTypes") String assemblyTypes);
 }
 }

@@ -2,4 +2,13 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.skua.modules.screenconfig.mapper.ScreenAssemblyConfigMapper">
 <mapper namespace="com.skua.modules.screenconfig.mapper.ScreenAssemblyConfigMapper">
 
 
+    <select id="getList" resultType="com.skua.modules.screenconfig.entity.ScreenAssemblyConfig">
+        select * from screen_assembly_config
+        where screen_type = #{screenType}
+        and assembly_type in
+        <foreach item="item" index="index" collection="assemblyTypes.split(',')"  open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </select>
+
 </mapper>
 </mapper>

@@ -14,4 +14,5 @@ public interface IScreenAssemblyConfigService extends IService<ScreenAssemblyCon
 
 
 	public List<Map<String, String>> assemblyCount();
 	public List<Map<String, String>> assemblyCount();
 
 
+    List<ScreenAssemblyConfig> getList(String screenType, String assemblyTypes);
 }
 }

@@ -26,8 +26,13 @@ public class ScreenAssemblyConfigServiceImpl extends ServiceImpl<ScreenAssemblyC
 //			int count = Integer.parseInt(map.get("count").toString());
 //			int count = Integer.parseInt(map.get("count").toString());
 //			countAll += count;
 //			countAll += count;
 //		}
 //		}
-		
 		return listMap;
 		return listMap;
 	}
 	}
 
 
+	@Override
+	public List<ScreenAssemblyConfig> getList(String screenType, String assemblyTypes) {
+		List<ScreenAssemblyConfig> list = baseMapper.getList(screenType, assemblyTypes);
+		return list;
+	}
+
 }
 }

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