Merge branch 'developer' of http://39.98.45.134:8090/moa/amos-boot-biz into developer

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/BigScreenAnalyseController.java

 package com.yeejoin.amos.boot.module.jxiop.biz.controller;
 
+import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.text.CharSequenceUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONObject;
@@ -13,10 +14,7 @@ import com.yeejoin.amos.boot.module.jxiop.api.feign.RiskWarningFeign;
 import com.yeejoin.amos.boot.module.jxiop.api.mapper.StationBasicMapper;
 import com.yeejoin.amos.boot.module.jxiop.biz.dto.FullViewRecallDataDTO;
 import com.yeejoin.amos.boot.module.jxiop.biz.dto.FullViewRecallInfoDTO;
-import com.yeejoin.amos.boot.module.jxiop.biz.entity.IdxBizFanHealthLevel;
-import com.yeejoin.amos.boot.module.jxiop.biz.entity.IdxBizFanWarningRecord;
-import com.yeejoin.amos.boot.module.jxiop.biz.entity.IdxBizPvHealthLevel;
-import com.yeejoin.amos.boot.module.jxiop.biz.entity.IndicatorData;
+import com.yeejoin.amos.boot.module.jxiop.biz.entity.*;
 import com.yeejoin.amos.boot.module.jxiop.biz.mapper2.IdxBizFanHealthIndexMapper;
 import com.yeejoin.amos.boot.module.jxiop.biz.mapper2.IdxBizFanHealthLevelMapper;
 import com.yeejoin.amos.boot.module.jxiop.biz.mapper2.IdxBizFanWarningRecordMapper;
@@ -31,10 +29,7 @@ import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/IdxBizFanWarningRecordController.java

@@ -25,6 +25,7 @@ import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -261,4 +262,73 @@ public class IdxBizFanWarningRecordController extends BaseController {
 	}
 
 
+	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+	@GetMapping(value = "/stringToMap")
+	@ApiOperation(httpMethod = "get", value = "字符串转为对象格式", notes = "字符串转为对象格式")
+	public ResponseModel<Map<String, Object>> list(@RequestParam("analysisPointIds") String ids) {
+		Map<String, Object> data = new HashMap<>();
+		data.put("analysisPointIds", ids);
+		return ResponseHelper.buildResponse(data);
+	}
+
+	/**
+	 * 根据pointId修改信息
+	 *
+	 * @param analysisInfo  主键
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PostMapping(value = "/updateByPointInfoBatchPv")
+	@ApiOperation(httpMethod = "POST", value = "根据pointId修改信息", notes = "根据pointId修改信息")
+	public ResponseModel<Boolean> updateByPointInfoBatchPv(@RequestBody JSONObject analysisInfo) {
+		LambdaQueryWrapper<IdxBizPvWarningRuleSet> query = new LambdaQueryWrapper<>();
+		List<String> analysisPointIds = Arrays.asList(analysisInfo.get("analysisPointIds").toString().split(","));
+		query.in(IdxBizPvWarningRuleSet::getAnalysisPointId, analysisPointIds);
+		List<IdxBizPvWarningRuleSet> idxBizFanWarningRecordList = idxBizPvWarningRuleSetService.getBaseMapper().selectList(query);
+		for (IdxBizPvWarningRuleSet idxBizPvWarningRuleSet : idxBizFanWarningRecordList) {
+			BeanUtil.copyProperties(analysisInfo, idxBizPvWarningRuleSet, "analysisPointIds");
+			if (idxBizPvWarningRuleSet.getWarningName().equals("警告")) {
+				//警告周期
+				idxBizPvWarningRuleSet.setWarningIf(analysisInfo.get("jgWarningIf").toString());
+				idxBizPvWarningRuleSet.setWarningCycle(analysisInfo.get("jgWarningCycle").toString());
+			} else if (idxBizPvWarningRuleSet.getWarningName().equals("危险")) {
+				//警告周期
+				idxBizPvWarningRuleSet.setWarningIf(analysisInfo.get("wxWarningIf").toString());
+				idxBizPvWarningRuleSet.setWarningCycle(analysisInfo.get("wxWarningCycle").toString());
+			}
+		}
+		boolean b = idxBizPvWarningRuleSetService.updateBatchById(idxBizFanWarningRecordList);
+		return ResponseHelper.buildResponse(b);
+	}
+
+
+	/**
+	 * 根据pointId修改信息
+	 *
+	 * @param analysisInfo  主键
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PostMapping(value = "/updateByPointInfoBatchFan")
+	@ApiOperation(httpMethod = "POST", value = "根据pointId修改信息", notes = "根据pointId修改信息")
+	public ResponseModel<Boolean> updateByPointInfoBatchFan(@RequestBody JSONObject analysisInfo) {
+		LambdaQueryWrapper<IdxBizFanWarningRuleSet> query = new LambdaQueryWrapper<>();
+		List<String> analysisPointIds = Arrays.asList(analysisInfo.get("analysisPointIds").toString().split(","));
+		query.in(IdxBizFanWarningRuleSet::getAnalysisPointId, analysisPointIds);
+		List<IdxBizFanWarningRuleSet> idxBizFanWarningRecordList = idxBizFanWarningRuleSetService.getBaseMapper().selectList(query);
+		for (IdxBizFanWarningRuleSet idxBizFanWarningRuleSet : idxBizFanWarningRecordList) {
+			BeanUtil.copyProperties(analysisInfo, idxBizFanWarningRuleSet, "analysisPointIds");
+			if (idxBizFanWarningRuleSet.getWarningName().equals("警告")) {
+				//警告周期
+				idxBizFanWarningRuleSet.setWarningIf(analysisInfo.get("jgWarningIf").toString());
+				idxBizFanWarningRuleSet.setWarningCycle(analysisInfo.get("jgWarningCycle").toString());
+			} else if (idxBizFanWarningRuleSet.getWarningName().equals("危险")) {
+				//警告周期
+				idxBizFanWarningRuleSet.setWarningIf(analysisInfo.get("wxWarningIf").toString());
+				idxBizFanWarningRuleSet.setWarningCycle(analysisInfo.get("wxWarningCycle").toString());
+			}
+		}
+		boolean b = idxBizFanWarningRuleSetService.updateBatchById(idxBizFanWarningRecordList);
+		return ResponseHelper.buildResponse(b);
+	}
 }

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/entity/IdxBizFanWarningRecord.java

@@ -151,4 +151,11 @@ public class IdxBizFanWarningRecord{
      */
     @TableField("KKS")
     private String kks;
+
+    /**
+     * 预警周期
+     */
+    @TableField("WARNING_PERIOD")
+    private String warningPeriod;
+
 }

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/entity/IdxBizFanWeight.java

@@ -64,5 +64,6 @@ public class IdxBizFanWeight {
      */
     @TableField("VALUE")
     private Float value;
-
+    @TableField(exist=false)
+    private String Symbol_key;
 }

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/entity/IdxBizPvWarningRecord.java

@@ -152,4 +152,10 @@ public class IdxBizPvWarningRecord{
      */
     @TableField("KKS")
     private String kks;
+
+    /**
+     * 预警周期
+     */
+    @TableField("WARNING_PERIOD")
+    private String warningPeriod;
 }

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/entity/IdxBizPvWeight.java

@@ -65,6 +65,6 @@ public class IdxBizPvWeight {
      */
     @TableField("VALUE")
     private Float value;
-
-
+    @TableField(exist=false)
+    private String Symbol_key;
 }

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/HealthStatusIndicatorServiceImpl.java

@@ -234,6 +234,7 @@ public class HealthStatusIndicatorServiceImpl {
                     idxBizPvWarningRecord.setWarningName(level);
                     idxBizPvWarningRecord.setCONTENT(idxBizPvHealthIndices.get(0).getPointName() + "连续"+content+"健康指数<"+num );
                     idxBizPvWarningRecord.setRecDate(time);
+                    idxBizPvWarningRecord.setWarningPeriod("按时刻");
                     idxBizPvWarningRecord.setManufacturer(idxBizPvHealthIndices.get(0).getManufacturer());
                     idxBizPvWarningRecord.setPointName(idxBizPvHealthIndices.get(0).getPointName());
                     idxBizPvWarningRecord.setHealthIndexSeq(idxBizPvHealthIndices.get(0).getHealthIndex().toString());
@@ -381,6 +382,7 @@ public class HealthStatusIndicatorServiceImpl {
                     idxBizPvWarningRecord.setWarningName(level);
                     idxBizPvWarningRecord.setCONTENT(idxBizPvHealthIndices.get(0).getPointName() + "连续"+content+"健康指数<"+num );
                     idxBizPvWarningRecord.setRecDate(time);
+                    idxBizPvWarningRecord.setWarningPeriod("按小时");
                     idxBizPvWarningRecord.setManufacturer(idxBizPvHealthIndices.get(0).getManufacturer());
                     idxBizPvWarningRecord.setPointName(idxBizPvHealthIndices.get(0).getPointName());
                     idxBizPvWarningRecord.setHealthIndexSeq(idxBizPvHealthIndices.get(0).getHealthIndex().toString());
@@ -522,6 +524,7 @@ public class HealthStatusIndicatorServiceImpl {
                     idxBizPvWarningRecord.setWarningName(level);
                     idxBizPvWarningRecord.setCONTENT(idxBizPvHealthIndices.get(0).getPointName() + "连续"+content+"健康指数<"+num );
                     idxBizPvWarningRecord.setRecDate(time);
+                    idxBizPvWarningRecord.setWarningPeriod("按天");
                     idxBizPvWarningRecord.setManufacturer(idxBizPvHealthIndices.get(0).getManufacturer());
                     idxBizPvWarningRecord.setPointName(idxBizPvHealthIndices.get(0).getPointName());
                     idxBizPvWarningRecord.setHealthIndexSeq(idxBizPvHealthIndices.get(0).getHealthIndex().toString());
@@ -665,6 +668,7 @@ public class HealthStatusIndicatorServiceImpl {
                     idxBizFanWarningRecord.setWarningName(level);
                     idxBizFanWarningRecord.setCONTENT(idxBizFanHealthIndices.get(0).getPointName() + "连续"+content+"健康指数<"+num );
                     idxBizFanWarningRecord.setRecDate(time);
+                    idxBizFanWarningRecord.setWarningPeriod("按时刻");
                     idxBizFanWarningRecord.setNumber(idxBizFanHealthIndices.get(0).getNumber());
                     idxBizFanWarningRecord.setPointName(idxBizFanHealthIndices.get(0).getPointName());
                     idxBizFanWarningRecord.setHealthIndexSeq(idxBizFanHealthIndices.get(0).getHealthIndex().toString());
@@ -807,6 +811,7 @@ public class HealthStatusIndicatorServiceImpl {
                     idxBizFanWarningRecord.setWarningName(level);
                     idxBizFanWarningRecord.setCONTENT(idxBizFanHealthIndices.get(0).getPointName() + "连续"+content+"健康指数<"+num );
                     idxBizFanWarningRecord.setRecDate(time);
+                    idxBizFanWarningRecord.setWarningPeriod("按小时");
                     idxBizFanWarningRecord.setNumber(idxBizFanHealthIndices.get(0).getNumber());
                     idxBizFanWarningRecord.setHealthIndexSeq(idxBizFanHealthIndices.get(0).getHealthIndex().toString());
                     idxBizFanWarningRecord.setHealthLevel(idxBizFanHealthIndices.get(0).getHealthLevel());
@@ -951,6 +956,7 @@ public class HealthStatusIndicatorServiceImpl {
                     idxBizFanWarningRecord.setWarningName(level);
                     idxBizFanWarningRecord.setCONTENT(idxBizFanHealthIndices.get(0).getPointName() + "连续"+content+"健康指数<"+num );
                     idxBizFanWarningRecord.setRecDate(time);
+                    idxBizFanWarningRecord.setWarningPeriod("按天");
                     idxBizFanWarningRecord.setNumber(idxBizFanHealthIndices.get(0).getNumber());
                     idxBizFanWarningRecord.setHealthIndexSeq(idxBizFanHealthIndices.get(0).getHealthIndex().toString());
                     idxBizFanWarningRecord.setHealthLevel(idxBizFanHealthIndices.get(0).getHealthLevel());

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/config/MasterDbConfig.java

@@ -27,7 +27,7 @@ public class MasterDbConfig {
     private Logger logger = LoggerFactory.getLogger(MasterDbConfig.class);
     // 精确到 master 目录，以便跟其他数据源隔离
 
-    private static final String MAPPER_LOCATION = "classpath*:mapper/master/*.xml";
+    private static final String MAPPER_LOCATION = "classpath*:mapper/*.xml";
 
     @Value("${spring.db1.datasource.url}")
     private String dbUrl;

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/config/TdEngineConfig.java

@@ -2,7 +2,11 @@ package com.yeejoin.amos.boot.module.jxiop.biz.config;
 
 
 import com.alibaba.druid.pool.DruidDataSource;
+import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
 import com.baomidou.mybatisplus.extension.spring.MybatisSqlSessionFactoryBean;
+import com.github.pagehelper.PageInterceptor;
+
+import org.apache.ibatis.plugin.Interceptor;
 import org.apache.ibatis.session.SqlSessionFactory;
 import org.mybatis.spring.annotation.MapperScan;
 import org.slf4j.Logger;
@@ -14,6 +18,8 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
 import org.springframework.jdbc.datasource.DataSourceTransactionManager;
 
+import java.util.Properties;
+
 import javax.sql.DataSource;
 
 /**
@@ -60,14 +66,30 @@ public class TdEngineConfig {
     @Bean(name = "taosSqlSessionFactory")
     public SqlSessionFactory clusterSqlSessionFactory(@Qualifier("taosDataSource") DataSource culsterDataSource)
             throws Exception {
-        final MybatisSqlSessionFactoryBean sessionFactory = new MybatisSqlSessionFactoryBean();
-        sessionFactory.setDataSource(culsterDataSource);
-        sessionFactory.setMapperLocations(new PathMatchingResourcePatternResolver()
-                .getResources(TdEngineConfig.MAPPER_LOCATION));
-        sessionFactory.setTypeAliasesPackage("com.yeejoin.amos.boot.module.jxiop.biz.entity");
-        //mybatis 数据库字段与实体类属性驼峰映射配置
-        sessionFactory.getObject().getConfiguration().setMapUnderscoreToCamelCase(true);
-        return sessionFactory.getObject();
+        MybatisSqlSessionFactoryBean bean = new MybatisSqlSessionFactoryBean();
+        bean.setDataSource(culsterDataSource);
+        bean.setMapperLocations(new PathMatchingResourcePatternResolver().getResources(MAPPER_LOCATION));
+
+        //分页插件
+        Interceptor interceptor = new PageInterceptor();
+        Properties properties = new Properties();
+        properties.setProperty("helperDialect", "mysql");
+        properties.setProperty("offsetAsPageNum", "true");
+        properties.setProperty("rowBoundsWithCount", "true");
+        properties.setProperty("reasonable", "true");
+        properties.setProperty("supportMethodsArguments","true");
+        properties.setProperty("params","pageNum=pageNum;pageSize=pageSize" +
+                "" +
+                ";");
+        interceptor.setProperties(properties);
+        bean.setPlugins(new Interceptor[] {interceptor,paginationInterceptor()});
+        return bean.getObject();
+    }
+    
+    @Bean
+    public PaginationInterceptor paginationInterceptor() {
+        PaginationInterceptor paginationInterceptor = new PaginationInterceptor();
+        return paginationInterceptor;
     }
 }
 

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/EventController.java

+package com.yeejoin.amos.boot.module.jxiop.biz.controller;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
+import com.yeejoin.amos.boot.module.jxiop.api.entity.StationBasic;
+import com.yeejoin.amos.boot.module.jxiop.api.mapper.StationBasicMapper;
+import com.yeejoin.amos.boot.module.jxiop.biz.dto.ResultsData;
+import com.yeejoin.amos.boot.module.jxiop.biz.service.impl.AlarmEventServiceImpl;
+import com.yeejoin.amos.boot.module.jxiop.biz.service.impl.EquipAlarmEventServiceImpl;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+@RestController
+@Api(tags = "event")
+@RequestMapping(value = "/event")
+public class EventController {
+
+	@Autowired
+	private AlarmEventServiceImpl alarmEventServiceImpl;
+
+	@Autowired
+	private EquipAlarmEventServiceImpl equipAlarmEventServiceImpl;
+
+	@Autowired
+	private StationBasicMapper stationBasicMapper;
+	
+	@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+	@ApiOperation(value = "故障记录API")
+	@GetMapping("/equipDivergenceEventtList")
+	public ResponseModel<ResultsData> equipDivergenceEventtList(@RequestParam(value = "current") int current,
+			@RequestParam(value = "size") int size, @RequestParam(value = "stationId") String stationId) {
+		ResultsData resultsData = new ResultsData();
+		StationBasic stationBasic = stationBasicMapper.selectById(stationId);
+		String fanGatewayId = stationBasic.getFanGatewayId();
+		resultsData = equipAlarmEventServiceImpl.getEquipDivergenceEvent(fanGatewayId,current, size );
+		return ResponseHelper.buildResponse(resultsData);
+	}
+	
+//	@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+//	@ApiOperation(value = "刷新字典API")
+//	@GetMapping("/dic/refresh")
+//	public ResponseModel<String> refresh() {
+//		alarmEventServiceImpl.init();
+//		return ResponseHelper.buildResponse("success");
+//	}
+}

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/entity/EquipDic.java

@@ -18,10 +18,12 @@ public class EquipDic  {
     @TableId(value = "sequence_nbr", type = IdType.ID_WORKER)
     private Long sequenceNumber;
 	
-    @TableField("value")
-	Double value;
+    @TableField("dic_value")
+	Double dicValue;
     
-    @TableField("desc")
-    String desc;
+    @TableField("description")
+    String description;
 
+    @TableField("dic_key")
+    String dicKey;
 }

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/scheduled/EquipWarnSchedule.java

 package com.yeejoin.amos.boot.module.jxiop.biz.scheduled;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.PostConstruct;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+import org.springframework.stereotype.Service;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.yeejoin.amos.boot.module.jxiop.api.entity.StationBasic;
+import com.yeejoin.amos.boot.module.jxiop.api.mapper.EquipDicMapper;
+import com.yeejoin.amos.boot.module.jxiop.api.mapper.StationBasicMapper;
+import com.yeejoin.amos.boot.module.jxiop.biz.entity.EquipDic;
+import com.yeejoin.amos.boot.module.jxiop.biz.entity.EquipDivergenceAlarmEvent;
 import com.yeejoin.amos.boot.module.jxiop.biz.service.impl.MonitorFanIndicatorImpl;
+import com.yeejoin.amos.boot.module.jxiop.biz.tdmapper.EquipDivergenceAlarmEventMapper;
 
+@Service
 @EnableScheduling
 public class EquipWarnSchedule {
 
 	@Autowired
 	private MonitorFanIndicatorImpl monitorFanIndicatorImpl;
 
+	@Autowired
+	private StationBasicMapper stationBasicMapper;
+
+	@Autowired
+	private EquipDivergenceAlarmEventMapper equipDivergenceAlarmEventMapper;
+
+	@Autowired
+	private EquipDicMapper equipDicMapper;
+
 	@Scheduled(cron = "${equip.warn.cron}")
+	//@PostConstruct
 	private void doEquipDivergencWarn() {
+		List<EquipDivergenceAlarmEvent> eventList = new ArrayList<EquipDivergenceAlarmEvent>();
+
+		EquipDic equipDic = equipDicMapper
+				.selectOne(new LambdaQueryWrapper<EquipDic>().eq(EquipDic::getDicKey, "LSVGJYZ"));
 
+		LambdaQueryWrapper<StationBasic> wrapper = new LambdaQueryWrapper<>();
+		wrapper.like(StationBasic::getStationType, "GFDZ");
+		List<StationBasic> stationList = stationBasicMapper.selectList(wrapper);
+		for (StationBasic stationBasic : stationList) {
+			ArrayList<Map<String, Object>> resultList = monitorFanIndicatorImpl.getLSV(stationBasic.getFanGatewayId());
+			if (!resultList.isEmpty()) {
+				for (Map<String, Object> map : resultList) {
+					Double lsv = Double.valueOf( String.valueOf(map.get("lsv")));
+					if (lsv > equipDic.getDicValue()) {
+						String zz = (String) map.get("zz");
+						String nbq = (String) map.get("nbq");
+						String hlx = (String) map.get("hlx");
+						EquipDivergenceAlarmEvent equipDivergenceAlarmEvent = new EquipDivergenceAlarmEvent();
+						equipDivergenceAlarmEvent.setEquipName(zz + "/" + nbq + "/" + hlx);
+						equipDivergenceAlarmEvent.setGatewayId(stationBasic.getFanGatewayId());
+						equipDivergenceAlarmEvent.setValue(lsv.toString());
+						equipDivergenceAlarmEvent.setAlarmGroupName("离散率告警");
+						equipDivergenceAlarmEvent.setEventDesc("离散率超过告警阈值");
+						eventList.add(equipDivergenceAlarmEvent);
+					}
+				}
+			}
+		}
+		equipDivergenceAlarmEventMapper.save(eventList);
 	}
 }

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/EquipAlarmEventServiceImpl.java

 package com.yeejoin.amos.boot.module.jxiop.biz.service.impl;
 
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Calendar;
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yeejoin.amos.boot.module.jxiop.api.entity.StationBasic;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import com.yeejoin.amos.boot.module.jxiop.api.mapper.StationBasicMapper;
 import com.yeejoin.amos.boot.module.jxiop.biz.dto.ColModel;
 import com.yeejoin.amos.boot.module.jxiop.biz.dto.DataGridMock;
 import com.yeejoin.amos.boot.module.jxiop.biz.dto.EquipAlarmEventDto;
 import com.yeejoin.amos.boot.module.jxiop.biz.dto.ResultsData;
 import com.yeejoin.amos.boot.module.jxiop.biz.entity.EquipAlarmEvent;
+import com.yeejoin.amos.boot.module.jxiop.biz.entity.EquipDivergenceAlarmEvent;
 import com.yeejoin.amos.boot.module.jxiop.biz.mapper2.EquipAlarmEventMapper;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.typroject.tyboot.core.rdbms.service.BaseService;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Calendar;
-import java.util.List;
+import com.yeejoin.amos.boot.module.jxiop.biz.tdmapper.EquipDivergenceAlarmEventMapper;
 
 @Service
 public class EquipAlarmEventServiceImpl extends BaseService<EquipAlarmEventDto, EquipAlarmEvent, EquipAlarmEventMapper> {
@@ -28,6 +32,8 @@ public class EquipAlarmEventServiceImpl extends BaseService<EquipAlarmEventDto,
     EquipAlarmEventMapper equipAlarmEventMapper;
     @Autowired
     StationBasicMapper stationBasicMapper;
+    @Autowired
+    EquipDivergenceAlarmEventMapper equipDivergenceAlarmEventMapper;
 
     public ResultsData getEventByEquipIndex(String gatewayId, int current, int size, String equipIndex, String frontModule) {
         List<EquipAlarmEventDto> equipAlarmEvents = new ArrayList<>();
@@ -68,4 +74,45 @@ public class EquipAlarmEventServiceImpl extends BaseService<EquipAlarmEventDto,
         ResultsData resultsData = new ResultsData(DataGridMock, listColModel);
         return resultsData;
     }
+    
+    public ResultsData getEquipDivergenceEvent(String gatewayId, int current, int size) {
+    	PageHelper.startPage(current, size);
+		Calendar calendar = Calendar.getInstance();
+		calendar.add(Calendar.DAY_OF_MONTH, -2);
+		
+		List<EquipDivergenceAlarmEvent> alarmEventList = equipDivergenceAlarmEventMapper.getEventList(gatewayId, null, null,
+				calendar.getTime());
+
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+		Calendar car = Calendar.getInstance();
+		alarmEventList.forEach(i -> {
+//			if ("true".equals(i.getValue())) {
+//				i.setValue("合");
+//			} else if ("false".equals(i.getValue())) {
+//				i.setValue("分");
+//			}
+			long mills = i.getCreatedTime() / 1000000;
+			car.setTimeInMillis(mills);
+			// System.out.println(sdf.format(car.getTime()));
+			i.setTime(sdf.format(car.getTime()));
+			// car.add(Calendar.HOUR, 12);
+			// System.out.println(sdf.format(car.getTime()));
+		});
+
+		PageInfo<EquipAlarmEvent> page = new PageInfo(alarmEventList);
+
+		// 构建平台数据
+		DataGridMock DataGridMock = new DataGridMock(current, (int) page.getTotal(), false, current, alarmEventList);
+		ColModel colModelEventMovement = new ColModel("equipName", "equipName", "设备名称", "设备名称", "dataGrid",
+				"equipName");
+		ColModel colModelStationName = new ColModel("eventDesc", "eventDesc", "事件描述", "事件描述", "dataGrid", "eventDesc");
+		ColModel colModelAlarmGroupName = new ColModel("alarmGroupName", "alarmGroupName", "事件类型", "事件类型", "dataGrid",
+				"alarmGroupName");
+		ColModel colModelEventDesc = new ColModel("time", "time", "事件发生时间", "事件发生时间", "dataGrid", "time");
+		ColModel colModelValueDesc = new ColModel("value", "value", "事件值", "事件值", "dataGrid", "value");
+		List<ColModel> listColModel = Arrays.asList(colModelEventMovement, colModelStationName, colModelAlarmGroupName,
+				colModelEventDesc, colModelValueDesc);
+		ResultsData resultsData = new ResultsData(DataGridMock, listColModel);
+		return resultsData;
+    }
 }

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/resources/application.properties

@@ -76,7 +76,7 @@ gl.sum.column=日发电量,月发电量,年发电量
 gl.avg.column=有功功率,日利用小时,瞬时风速
 
 
-
+equip.warn.cron= 0 0/10 * * * ? 
 #ES 曲线图定时 0 57 23 * * ?
 windSpeed.cron = 0 25 9 * * ?
 #本地使用 0 0 5 29 2 ? ?    线上使用 0 */5 * * * ?