解决冲突

amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/service/impl/GoLangDataAcquisitionServiceImpl.java

@@ -461,7 +461,7 @@ public class GoLangDataAcquisitionServiceImpl implements GoLangDataAcquisitionSe
                 if (ObjectUtils.isEmpty(jpInverter)) {
                     jpInverter = new JpInverter();
                 }
-                jpInverter.setName(inverterDetailDto.getStationName());
+                jpInverter.setName(null == inverterDetailDto.getStationName()?null: inverterDetailDto.getStationName());
                 jpInverter.setSnCode(inverterDetailDto.getSn().trim());
                 jpInverter.setState(golangRequestUtil.getInverterState(inverterDetailDto.getCurrentState(), inverterDetailDto.getDataTimestamp()));
                 jpInverter.setCollectorId(String.valueOf(inverterDetailDto.getCollectorId()));
@@ -681,7 +681,7 @@ public class GoLangDataAcquisitionServiceImpl implements GoLangDataAcquisitionSe
                     tdHYGFInverterTotalGenerate = new TdHYGFInverterTotalGenerate();
                 }
                 tdHYGFInverterTotalGenerate.setThirdStationId(jpInverter.getThirdStationId());
-                tdHYGFInverterTotalGenerate.setName(jpInverter.getName());
+                tdHYGFInverterTotalGenerate.setName(null == jpInverter.getName()? null :jpInverter.getName());
                 tdHYGFInverterTotalGenerate.setSnCode(jpInverter.getSnCode().trim());
                 tdHYGFInverterTotalGenerate.setYearTime(DateUtil.format(today1, "yyyy"));
                 tdHYGFInverterTotalGenerate.setYear(DateUtil.format(today1, "yyyy"));

amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/service/impl/KsolarDataAcquisitionServiceImpl.java

@@ -713,9 +713,9 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe
                                             like("sn_code", ksolarStationCollectData.getInverterId().trim())
                                             .isNotNull("sn_code")
                                             .orderByDesc("update_time"));
-                                    JpInverter jpInverter = new JpInverter();
-                                    if (!ObjectUtils.isEmpty(jpInverterList)) {
-                                        jpInverter =jpInverterList.get(0);
+                                    JpInverter jpInverter =jpInverterList.get(0);
+                                    if (ObjectUtils.isEmpty(jpInverter)) {
+                                        jpInverter = new JpInverter();
                                     }
 
                                     // 品牌

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

@@ -157,6 +157,10 @@ public class JpInverterServiceImpl extends BaseService<JpInverterDto, JpInverter
         tdHYGFInverterDayGeneratePage.setSize(size);
         tdHYGFInverterDayGeneratePage.setCurrent(current);
         tdHYGFInverterDayGenerates = tdHYGFInverterDayGenerates.stream().filter(tdHYGFInverterDayGenerate -> StringUtils.isNotBlank(tdHYGFInverterDayGenerate.getSnCode().trim())).collect(Collectors.toList());
+        int total = tdHYGFInverterDayGenerates.size();
+        if (total  < (current * size)){
+            current = 1;
+        }
         tdHYGFInverterDayGenerates = tdHYGFInverterDayGenerates.subList((current - 1) * size, current * size > tdHYGFInverterDayGenerates.size() ? tdHYGFInverterDayGenerates.size() : current * size);
         tdHYGFInverterDayGenerates.forEach(tdHYGFInverterDayGenerate -> {
             Date date1 = new Date(tdHYGFInverterDayGenerate.getCreatedTime());
@@ -202,6 +206,10 @@ public class JpInverterServiceImpl extends BaseService<JpInverterDto, JpInverter
         tdHYGFInverterMonthGeneratePage.setSize(size);
         tdHYGFInverterMonthGeneratePage.setCurrent(current);
         tdHYGFInverterMonthGenerates = tdHYGFInverterMonthGenerates.stream().filter(tdHYGFInverterMonthGenerate -> StringUtils.isNotBlank(tdHYGFInverterMonthGenerate.getSnCode().trim())).collect(Collectors.toList());
+        int total = tdHYGFInverterMonthGenerates.size();
+        if (total  < (current * size)){
+            current = 1;
+        }
         tdHYGFInverterMonthGenerates = tdHYGFInverterMonthGenerates.subList((current - 1) * size, current * size > tdHYGFInverterMonthGenerates.size() ? tdHYGFInverterMonthGenerates.size() : current * size);
         tdHYGFInverterMonthGenerates.forEach(tdHYGFInverterMonthGenerate -> tdHYGFInverterMonthGenerate.setFullhour(Double.valueOf(String.format("%.2f",tdHYGFInverterMonthGenerate.getFullhour()))));
         tdHYGFInverterMonthGeneratePage.setRecords(tdHYGFInverterMonthGenerates);
@@ -236,6 +244,10 @@ public class JpInverterServiceImpl extends BaseService<JpInverterDto, JpInverter
         tdHYGFInverterYearGeneratePage.setSize(size);
         tdHYGFInverterYearGeneratePage.setCurrent(current);
         tdHYGFInverterYearGenerates = tdHYGFInverterYearGenerates.stream().filter(tdHYGFInverterYearGenerate -> StringUtils.isNotBlank(tdHYGFInverterYearGenerate.getSnCode().trim())).collect(Collectors.toList());
+        int total = tdHYGFInverterYearGenerates.size();
+        if (total  < (current * size)){
+            current = 1;
+        }
         tdHYGFInverterYearGenerates = tdHYGFInverterYearGenerates.subList((current - 1) * size, current * size > tdHYGFInverterYearGenerates.size() ? tdHYGFInverterYearGenerates.size() : current * size);
         tdHYGFInverterYearGenerates.forEach(tdHYGFInverterYearGenerate -> tdHYGFInverterYearGenerate.setFullhour(Double.valueOf(String.format("%.2f",tdHYGFInverterYearGenerate.getFullhour()))));
         tdHYGFInverterYearGeneratePage.setRecords(tdHYGFInverterYearGenerates);

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/dto/BizMessage.java

@@ -23,5 +23,4 @@ public class BizMessage {
      */
     String dataSource;
     private String traceId2;
-    private String extAttr2;
 }

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/dto/CustomizeItems.java

+package com.yeejoin.amos.boot.module.jxiop.api.dto;
+
+import lombok.Data;
+
+/**
+ * @author Administrator
+ * 自定义扩展内容项
+ */
+@Data
+public class CustomizeItems {
+    /**
+     * 自定义的问题名称
+     */
+    private String questionName;
+    /**
+     * 自定义的问题内容
+     */
+    private String questionContent;
+
+    /**
+     * 自定义的预警内容 content
+     */
+    private String warningContent;
+}

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/dto/RiskBizInfoVo.java

@@ -21,4 +21,5 @@ public class RiskBizInfoVo {
     private String type;
     private List<RiskDynamicDetailsVo> dynamicDetails;
     private String warningObjectType;
+    private CustomizeItems customizeItems;
 }

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

@@ -1437,7 +1437,7 @@ public class MonitorFanIdxController extends BaseController {
         map.put("total", list.size());
         map.put("num", sum);
         try {
-            emqKeeper.getMqttClient().publish("/accessSituation/topic", JSON.toJSONString(map).getBytes(), 0, false);
+            emqKeeper.getMqttClient().publish("/accessSituation/topic", JSON.toJSONString(map).getBytes(), 0, true);
         } catch (MqttException e) {
 
         }

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

@@ -195,7 +195,7 @@ public class LargeScreenImpl {
         ybfbn = new BigDecimal(ybfbn).setScale(4, BigDecimal.ROUND_HALF_UP).doubleValue();
         mapdta.put("NJHWC", ybfbn);
         try {
-            emqKeeper.getMqttClient().publish("qg/yxzb", JSON.toJSONString(mapdta).getBytes(),0,false);
+            emqKeeper.getMqttClient().publish("qg/yxzb", JSON.toJSONString(mapdta).getBytes(),0,true);
         } catch (MqttException e) {
             e.printStackTrace();
         }

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

@@ -149,7 +149,7 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto, PersonBa
     }
 
 
-    public RiskBizInfoVo fetchData(PersonBasic personBasic, PersonAccount personAccount) {
+    public RiskBizInfoVo fetchData(PersonBasic personBasic, PersonAccount personAccount, String content) {
         RiskBizInfoVo riskBizInfoVo = new RiskBizInfoVo();
         riskBizInfoVo.setWarningObjectName(personAccount.getProjectName() + personBasic.getPostName() + personAccount.getName());
         riskBizInfoVo.setWarningObjectCode(String.valueOf(personBasic.getSequenceNbr()));
@@ -161,6 +161,9 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto, PersonBa
         dynamicDetailsVo.setTabName("预警详情");
         detailsVos.add(dynamicDetailsVo);
         riskBizInfoVo.setDynamicDetails(detailsVos);
+        CustomizeItems customizeItems = new CustomizeItems();
+        customizeItems.setWarningContent(content);
+        riskBizInfoVo.setCustomizeItems(customizeItems);
         return riskBizInfoVo;
     }
 
@@ -232,12 +235,18 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto, PersonBa
         List<String> strings = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(overCertificateList)) {
             strings.add("过期证书：" + String.join("，" , overCertificateList));
+        } else {
+            strings.add("过期证书：无");
         }
         if (CollectionUtils.isNotEmpty(inMonthCertificateList)) {
             strings.add("临期证书：" + String.join("，" , inMonthCertificateList));
+        } else {
+            strings.add("临期证书：无");
         }
         if (CollectionUtils.isNotEmpty(noCertificateList)) {
             strings.add("缺少证书：" + String.join("，" , noCertificateList));
+        } else {
+            strings.add("缺少证书：无");
         }
         String join = "";
         if (CollectionUtils.isNotEmpty(strings)) {
@@ -279,10 +288,9 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto, PersonBa
             BizMessage bizMessage = new BizMessage();
             bizMessage.setIndexKey("RYFM");
             bizMessage.setIndexValue(personBasic.getPostName() + personBasic.getQrcodeDesc());
-            RiskBizInfoVo riskBizInfoVo = fetchData(personBasic, personAccount);
+            RiskBizInfoVo riskBizInfoVo = fetchData(personBasic, personAccount, personBasic.getPostName() + personBasic.getQrcodeDesc() + join);
             bizMessage.setBizInfo(riskBizInfoVo);
             bizMessage.setTraceId(String.valueOf(personBasic.getSequenceNbr()));
-            bizMessage.setExtAttr2(join);
             try {
                 emqKeeper.getMqttClient().publish(RYFM_DATA_MQTT_TOPIC, JSON.toJSONString(bizMessage).getBytes(StandardCharsets.UTF_8), 2, false);
             } catch (MqttException e) {
@@ -460,12 +468,18 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto, PersonBa
         List<String> strings = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(overCertificateList)) {
             strings.add("过期证书：" + String.join("，" , overCertificateList));
+        } else {
+            strings.add("过期证书：无");
         }
         if (CollectionUtils.isNotEmpty(inMonthCertificateList)) {
             strings.add("临期证书：" + String.join("，" , inMonthCertificateList));
+        } else {
+            strings.add("临期证书：无");
         }
         if (CollectionUtils.isNotEmpty(noCertificateList)) {
             strings.add("缺少证书：" + String.join("，" , noCertificateList));
+        } else {
+            strings.add("缺少证书：无");
         }
 
         String join = "";
@@ -568,10 +582,9 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto, PersonBa
                 BizMessage bizMessage = new BizMessage();
                 bizMessage.setIndexKey("RYFM");
                 bizMessage.setIndexValue(personBasic.getPostName() + personBasic.getQrcodeDesc());
-                RiskBizInfoVo riskBizInfoVo = fetchData(personBasic, personAccount);
+                RiskBizInfoVo riskBizInfoVo = fetchData(personBasic, personAccount, personBasic.getPostName() + personBasic.getQrcodeDesc() + join);
                 bizMessage.setBizInfo(riskBizInfoVo);
                 bizMessage.setDataSource("人员赋码");
-                bizMessage.setExtAttr2(join);
                 try {
                     emqKeeper.getMqttClient().publish(PersonBasicServiceImpl.RYFM_DATA_MQTT_TOPIC, JSON.toJSONString(bizMessage).getBytes(StandardCharsets.UTF_8), 2, false);
                 } catch (MqttException e) {

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

@@ -318,6 +318,9 @@ public class StationBasicServiceImpl extends BaseService<StationBasicDto, Statio
             stationInfoDto.setPlatformStationId(stationRecordInfo.getPlatformStationId());
             stationInfoDto.setStationName(stationRecordInfo.getStationName());
             stationInfoDto.setType(stationRecordInfo.getStationType());
+            if(stationRecordInfo.getStationType().contains("GFDZ")){
+                stationInfoDto.setType("GFZ");
+            }
             //url 暂时写死
             stationInfoDto.setUrl("https://tse4-mm.cn.bing.net/th/id/OIP-C.ySnewoc464X4Aecg9jl03AAAAA?w=162&h=180&c=7&r=0&o=5&pid=1.7");
             stationInfoDto.setJumpPath(stationRecordInfo.getJumpPath());