Merge remote-tracking branch 'origin/developer' into developer

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

@@ -149,9 +149,13 @@ public class SurveyInformationServiceImpl extends BaseService<SurveyInformationD
         JSONArray regionName = getRegionName();
         List<RegionModel> list = JSONArray.parseArray(regionName.toJSONString(), RegionModel.class);
 
+
         //更新勘察基本信息
         SurveyInformation surveyInformation = BeanDtoUtils.convert(surveyInfoAllDto.getSurveyInformation(), SurveyInformation.class);
         surveyInformation.setReview(0);
+            if(OPERATION_TYPE_APPLY.equals(operationType) && null == surveyInformation.getCreatorTime()){
+                surveyInformation.setCreatorTime(new Date());
+            }
         this.saveOrUpdate(surveyInformation);
 
         //更新扩展信息

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

@@ -22,7 +22,7 @@ spring.liquibase.enabled=true
 
 ## eureka properties:
 eureka.instance.prefer-ip-address=true
-eureka.instance.ip-address=172.16.3.41
+eureka.instance.ip-address=172.16.3.133
 eureka.client.registry-fetch-interval-seconds=5
 eureka.instance.health-check-url-path=/actuator/health
 eureka.instance.lease-expiration-duration-in-seconds=10

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

 package com.yeejoin.amos.boot.module.jxiop.biz.controller;
 
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.date.DateUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
+
+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.PostMapping;
+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 com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
-import com.yeejoin.amos.boot.module.jxiop.biz.entity.IdxBizFanHealthIndex;
 import com.yeejoin.amos.boot.module.jxiop.biz.entity.IndicatorData;
 import com.yeejoin.amos.boot.module.jxiop.biz.service.impl.CommonServiceImpl;
 import com.yeejoin.amos.boot.module.jxiop.biz.service.impl.TdengineTimeServiceImpl;
 import com.yeejoin.amos.boot.module.jxiop.biz.tdMapper2.FanHealthIndexMapper;
-import com.yeejoin.amos.boot.module.jxiop.biz.tdengine.FanHealthIndex;
+import com.yeejoin.amos.boot.module.jxiop.biz.tdMapper2.FanWaringRecordMapper;
+import com.yeejoin.amos.boot.module.jxiop.biz.tdMapper2.PvWaringRecordMapper;
+import com.yeejoin.amos.boot.module.jxiop.biz.tdengine.FanWarningRecord;
+import com.yeejoin.amos.boot.module.jxiop.biz.tdengine.PvWarningRecord;
 import com.yeejoin.amos.boot.module.jxiop.biz.tdmapper.IndicatorDataMapper;
+
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.apache.ibatis.annotations.Param;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import org.typroject.tyboot.core.foundation.enumeration.UserType;
-import org.typroject.tyboot.core.restful.doc.TycloudOperation;
-
-import java.text.ParseException;
-import java.util.ArrayList;
-import java.util.List;
 
 @RestController
 @RequestMapping(value = "/test")
@@ -32,23 +38,23 @@ public class TestController extends BaseController {
 	@Autowired
 	CommonServiceImpl commonService;
 
-    @TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
+	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
 	@ApiOperation(httpMethod = "GET", value = "test1", notes = "test1")
 	@GetMapping("/test1")
-    public List<IndicatorData> test1(@RequestParam(value = "startTime") String startTime, @RequestParam(value = "endTime") String endTime, @RequestParam(value = "address") String address, @RequestParam(value = "gatewayId") String gatewayId) {
+	public List<IndicatorData> test1(@RequestParam(value = "startTime") String startTime,
+			@RequestParam(value = "endTime") String endTime, @RequestParam(value = "address") String address,
+			@RequestParam(value = "gatewayId") String gatewayId) {
 
-        List<IndicatorData> indicatorData = indicatorDataMapper.selectDataByAddressAndtime(address, startTime, endTime,gatewayId);
+		List<IndicatorData> indicatorData = indicatorDataMapper.selectDataByAddressAndtime(address, startTime, endTime,
+				gatewayId);
 
 		return indicatorData;
 	}
 
-
-
-
-    @TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
+	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
 	@ApiOperation(httpMethod = "GET", value = "test2", notes = "test1")
 	@GetMapping("/test2")
-    public void test2 (@RequestParam(value = "startTime") String startTime, @Param("recDate") String recDate) {
+	public void test2(@RequestParam(value = "startTime") String startTime, @Param("recDate") String recDate) {
 //        List<FanHealthIndex> infoListByGroupByCD = fanHealthIndexMapper.getInfoListByGroupByCdFan(startTime, recDate);
 //        commonService.healthWarningMinuteByFJ();
 //        commonService.healthWarningMinuteByPv();
@@ -61,10 +67,10 @@ public class TestController extends BaseController {
 	@Autowired
 	TdengineTimeServiceImpl tdengineTimeService;
 
-    @TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
+	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
 	@ApiOperation(httpMethod = "POST", value = "saveTest", notes = "saveTest")
 	@PostMapping("/saveTest")
-    public void saveTest () {
+	public void saveTest() {
 
 //        QueryWrapper<FanHealthIndex> fanHealthIndexQueryWrapper = new QueryWrapper<>();
 //        List<FanHealthIndex> fanHealthIndices = fanHealthIndexMapper.selectList(fanHealthIndexQueryWrapper);
@@ -109,4 +115,65 @@ public class TestController extends BaseController {
 //        fanHealthIndexMapper.saveBatchHealthIndexList(fanHealthIndices1, "fan_health_index_moment");
 	}
 
+	@Autowired
+	private FanWaringRecordMapper fanWaringRecordMapper;
+
+	@Autowired
+	private PvWaringRecordMapper pvWaringRecordMapper;
+
+	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+	@ApiOperation(httpMethod = "GET", value = "test2", notes = "test1")
+	@GetMapping("/clear-record")
+	public void clearRecord(@RequestParam(value = "startTime", required = false) String startTime) {
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+		String d = sdf.format(new Date());
+		LambdaQueryWrapper<FanWarningRecord> wf = new LambdaQueryWrapper<>();
+		wf.ne(FanWarningRecord::getDisposotionState, "已确认");
+		List<FanWarningRecord> list = fanWaringRecordMapper.selectList(wf);
+		if (!list.isEmpty()) {
+			list.forEach(i -> {
+				i.setDisposotionState("已确认");
+				i.setDisposotionDate(d);
+			});
+			fanWaringRecordMapper.saveBatchWarningRecords(list);
+		}
+
+		LambdaQueryWrapper<PvWarningRecord> pf = new LambdaQueryWrapper<>();
+		pf.ne(PvWarningRecord::getDisposotionState, "已确认");
+		List<PvWarningRecord> list1 = pvWaringRecordMapper.selectList(pf);
+		if (!list1.isEmpty()) {
+			list1.forEach(i -> {
+				i.setDisposotionState("已确认");
+				i.setDisposotionDate(d);
+			});
+			pvWaringRecordMapper.saveBatchWarningRecords(list1);
+		}
+	}
+
+	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+	@ApiOperation(httpMethod = "GET", value = "test2", notes = "test1")
+	@GetMapping("/set-date")
+	public void clearRecord() {
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+		String d = sdf.format(new Date());
+		LambdaQueryWrapper<FanWarningRecord> wf = new LambdaQueryWrapper<>();
+		wf.isNull(FanWarningRecord::getDisposotionDate);
+		List<FanWarningRecord> list = fanWaringRecordMapper.selectList(wf);
+		if (!list.isEmpty()) {
+			list.forEach(i -> {
+				i.setDisposotionDate(d);
+			});
+			fanWaringRecordMapper.saveBatchWarningRecords(list);
+		}
+
+		LambdaQueryWrapper<PvWarningRecord> pf = new LambdaQueryWrapper<>();
+		pf.isNull(PvWarningRecord::getDisposotionDate);
+		List<PvWarningRecord> list1 = pvWaringRecordMapper.selectList(pf);
+		if (!list1.isEmpty()) {
+			list1.forEach(i -> {
+				i.setDisposotionDate(d);
+			});
+			pvWaringRecordMapper.saveBatchWarningRecords(list1);
+		}
+	}
 }

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

@@ -2094,7 +2094,7 @@ public class CommonServiceImpl {
                         fanHealthIndex.setAnomaly(idxBizFanHealthIndex.getANOMALY());
                         fanHealthIndex.setRecDate(DateUtil.now());
                         fanHealthIndex.setArea(idxBizFanHealthIndex.getArae());
-                        fanHealthIndex.setAnalysisTime(DateUtil.now());
+                        fanHealthIndex.setAnalysisTime(format);
                         fanHealthIndex.setHealthLevel(fanHealthIndex.getHealthLevel());
                         fanHealthIndex.setKks(idxBizFanHealthIndex.getKks());
                         fanHealthIndex.setRecDate(format);

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

@@ -2715,7 +2715,7 @@ public class HealthStatusIndicatorServiceImpl {
             riskBizInfoVo.setSourceAttribution(stationMap.get(idxBizPvWarningRecord.getGatewayId()).getProjectOrgCode());
             riskBizInfoVo.setSourceAttributionDesc(idxBizPvWarningRecord.getStation());
             riskBizInfoVo.setWarningObjectType("equip");
-            riskBizInfoVo.setWarningTime(DateUtil.now());
+            riskBizInfoVo.setWarningTime(idxBizPvWarningRecord.getRecDate());
             riskBizInfoVo.setBussId(String.valueOf(idxBizPvWarningRecord.getTs()));
             riskBizInfoVo.setWarningObjectLinkUrl(getJumpUrlByInfo(idxBizPvWarningRecord.getKks(), jumpConfigs));
             List<RiskDynamicDetailsVo> detailsVos = new ArrayList<>();
@@ -2781,7 +2781,7 @@ public class HealthStatusIndicatorServiceImpl {
             riskBizInfoVo.setSourceAttribution(stationMap.get(idxBizFanWarningRecord.getGatewayId()).getProjectOrgCode());
             riskBizInfoVo.setSourceAttributionDesc(idxBizFanWarningRecord.getStation());
             riskBizInfoVo.setWarningObjectType("equip");
-            riskBizInfoVo.setWarningTime(DateUtil.now());
+            riskBizInfoVo.setWarningTime(idxBizFanWarningRecord.getRecDate());
             riskBizInfoVo.setWarningObjectLinkUrl(getJumpUrlByInfo(idxBizFanWarningRecord.getKks(), jumpConfigs));
             List<RiskDynamicDetailsVo> detailsVos = new ArrayList<>();
             RiskDynamicDetailsVo dynamicDetailsVo = new RiskDynamicDetailsVo();

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

@@ -74,7 +74,8 @@ mqtt.client.product.id=mqtt
 mqtt.topic=topic_mqtt
 spring.mqtt.completionTimeout=3000
 emqx.max-inflight=1000
-
+emqx.client-user-name=admin
+emqx.client-password=public
 
 tdengine-server:
 driver-class-name: com.taosdata.jdbc.rs.RestfulDriver

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

@@ -74,7 +74,8 @@ mqtt.client.product.id=mqtt
 mqtt.topic=topic_mqtt
 spring.mqtt.completionTimeout=3000
 emqx.max-inflight=1000
-
+emqx.client-user-name=admin
+emqx.client-password=public
 
 tdengine-server:
 driver-class-name: com.taosdata.jdbc.rs.RestfulDriver

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

@@ -24,8 +24,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
 import org.typroject.tyboot.component.emq.EmqKeeper;
 import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
-import org.unbescape.css.CssIdentifierEscapeLevel;
-
 import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.util.*;

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

@@ -438,7 +438,7 @@ public class MonitorFanIdxController extends BaseController {
     @ApiOperation(value = "集电线路图左侧 集电线列表")
     @GetMapping("/jdTree")
     @Scheduled(cron = "0/10 * * * * ? ")
-    public ResponseModel<IPage<Map<String, Object>>> getStatusJDX() {
+    public ResponseModel<Object> getStatusJDX() {
         LambdaQueryWrapper<StationBasic> wrapper = new LambdaQueryWrapper<>();
         List<StationBasic> stationBasics = stationBasicMapper.selectList(wrapper);
         for (StationBasic stationBasic : stationBasics) {
@@ -458,7 +458,7 @@ public class MonitorFanIdxController extends BaseController {
     @ApiOperation(value = "集电线路图右侧 风机列表")
     @GetMapping("/fjList")
     @Scheduled(cron = "0/10 * * * * ? ")
-    public ResponseModel getListByFJ() {
+    public ResponseModel<Object> getListByFJ() {
 
 
         LambdaQueryWrapper<StationBasic> wrapper = new LambdaQueryWrapper<>();
@@ -515,7 +515,7 @@ public class MonitorFanIdxController extends BaseController {
     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
     @ApiOperation(value = "模拟量列表消息")
     @GetMapping("/getAnalogQuantityInfo")
-    public ResponseModel getAnalogQuantityInfo(@RequestParam(value = "stationId") String stationId, @RequestParam(value = "routeName") String routeName) {
+    public ResponseModel<Object> getAnalogQuantityInfo(@RequestParam(value = "stationId") String stationId, @RequestParam(value = "routeName") String routeName) {
         StationBasic stationBasic = stationBasicMapper.selectById(stationId);
         String gatewayId = stationBasic.getBoosterGatewayId();
         monitorFanIndicator.getAnalogQuantityInfo(gatewayId, stationBasic.getSequenceNbr().toString(), routeName);
@@ -526,7 +526,7 @@ public class MonitorFanIdxController extends BaseController {
     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
     @ApiOperation(value = "升压站主屏消息接口")
     @GetMapping("/getMajorAnalogQuantityByPage")
-    public ResponseModel getMajorAnalogQuantityByPage(@RequestParam(required = false) String stationId) {
+    public ResponseModel<Object> getMajorAnalogQuantityByPage(@RequestParam(required = false) String stationId) {
         StationBasic stationBasic = stationBasicMapper.selectById(stationId);
         String gatewayId = stationBasic.getBoosterGatewayId();
         if (stationBasic.getStationName().contains("夏造")) {
@@ -579,7 +579,7 @@ public class MonitorFanIdxController extends BaseController {
     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
     @ApiOperation(value = "开关图片API/消息")
     @GetMapping("/switchUrl")
-    public ResponseModel<Map<String, Object>> getElectricQuantityList(
+    public ResponseModel<Object> getElectricQuantityList(
             @RequestParam(value = "stationId") String stationId
     ) {
 
@@ -596,7 +596,7 @@ public class MonitorFanIdxController extends BaseController {
     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
     @ApiOperation(value = "动态面板页面消息")
     @GetMapping("/pageTopic")
-    public ResponseModel<Map<String, Object>> sendPageTopic(
+    public ResponseModel<Object> sendPageTopic(
             @RequestParam(value = "stationId") String stationId, @RequestParam(value = "equipName") String equipName
     ) {
 
@@ -779,7 +779,7 @@ public class MonitorFanIdxController extends BaseController {
     @ApiOperation(value = "箱变实时开关状态")
     @GetMapping("/equipSwitchStatus")
     @Scheduled(cron = "0/10 * * * * ? ")
-    public ResponseModel<Map<String, Object>> getEquipSwitchStatus() {
+    public ResponseModel<Object> getEquipSwitchStatus() {
 
 
         LambdaQueryWrapper<StationBasic> wrapper = new LambdaQueryWrapper<>();
@@ -853,7 +853,7 @@ public class MonitorFanIdxController extends BaseController {
     @ApiOperation(value = "集电线路图右侧 光伏列表")
     @GetMapping("/gfList")
     @Scheduled(cron = "0/10 * * * * ? ")
-    public ResponseModel getListByNbq() {
+    public ResponseModel<Object> getListByNbq() {
 
 
         LambdaQueryWrapper<StationBasic> wrapper = new LambdaQueryWrapper<>();

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

@@ -82,7 +82,8 @@ mqtt.client.product.id=mqtt
 mqtt.topic=topic_mqtt
 spring.mqtt.completionTimeout=3000
 emqx.max-inflight=1000
-
+emqx.client-user-name=admin
+emqx.client-password=public
 
 ## influxDB
 #spring.influx.url= http://172.16.3.155:8186

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

@@ -83,7 +83,8 @@ mqtt.topic=topic_mqtt
 spring.mqtt.completionTimeout=3000
 emqx.max-inflight=1000
 
-
+emqx.client-user-name=admin
+emqx.client-password=public
 ## influxDB
 #spring.influx.url= http://172.16.3.155:8186
 #spring.influx.password=admin

amos-boot-system-jxiop/pom.xml

@@ -109,7 +109,20 @@
 	      <artifactId>kingbase8</artifactId>
 	      <version>8.6.0</version>
 	   </dependency>
-	   
+	   <dependency>
+		  <groupId>org.typroject</groupId>
+		  <artifactId>tyboot-component-emq</artifactId>
+		  <version>${tyboot-version}</version>
+		</dependency>
+		<dependency>
+		  <groupId>org.elasticsearch</groupId>
+          <artifactId>elasticsearch</artifactId>
+          <version>${elasticsearch.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-data-elasticsearch</artifactId>
+		</dependency>
     </dependencies>
 
 </project>

pom.xml

@@ -26,7 +26,7 @@
 		<springboot.version>2.3.11.RELEASE</springboot.version>
 		<springcloud.version>Hoxton.SR8</springcloud.version>
 		<maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>
-		<tyboot-version>1.1.23-SNAPSHOT</tyboot-version>
+		<tyboot-version>1.1.25-SNAPSHOT</tyboot-version>
 		<amos.version>1.7.10-SNAPSHOT</amos.version>
 		<itext.version>7.1.1</itext.version>
 		<elasticsearch.version>7.15.2</elasticsearch.version>