bug修改

application/src/main/java/org/thingsboard/server/config/ReceiveHandler.java

@@ -171,9 +171,9 @@ public class ReceiveHandler {
                 List<ScadaHistory> scadaHistoryList = new ArrayList<>();
                 if (!CollectionUtils.isEmpty(scadaHistories)) {
                     for (ScadaHistory scadaHistory : scadaHistories) {
-                        if (CollUtil.isNotEmpty(scadaHistoryService.list(new QueryWrapper<ScadaHistory>()
+                        if (scadaHistoryService.count(new QueryWrapper<ScadaHistory>()
                                 .eq("code", scadaHistory.getCode())
-                                .eq("scada_time", scadaHistory.getScadaTime())))) {
+                                .eq("scada_time", scadaHistory.getScadaTime())) > 0) {
                             continue;
                         }
                         scadaHistoryList.add(scadaHistory);

application/src/main/java/org/thingsboard/server/controller/nanxi/NxDisposeFeedbackController.java

@@ -2,6 +2,7 @@ package org.thingsboard.server.controller.nanxi;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springframework.util.Assert;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.multipart.MultipartFile;
 import org.thingsboard.server.anno.CompleteDetailsData;
 import org.thingsboard.server.anno.CompletePageData;
@@ -116,6 +117,9 @@ public class NxDisposeFeedbackController {
     }
 
     private void validFileFormat(List<MultipartFile> fileList){
+        if(CollectionUtils.isEmpty(fileList)){
+            return;
+        }
         int videoType = 0;
         int picType = 0;
         Assert.isTrue(fileList.size() <= 5, "附件最多上传5个");

application/src/main/java/org/thingsboard/server/domain/NxWarningManagement.java

@@ -172,6 +172,8 @@ public class NxWarningManagement extends BaseEntity{
         /**
      * 审核时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date reviewedTime;
     /**
      * 编号

application/src/main/java/org/thingsboard/server/domain/vo/NxEventManagementVO.java

@@ -129,6 +129,8 @@ public class NxEventManagementVO extends BaseEntityAdaptiveOnlyId {
         /**
      * 创建时间
      */
+        @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+        @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date createTime;
         /**
      * 更新用户
@@ -137,6 +139,8 @@ public class NxEventManagementVO extends BaseEntityAdaptiveOnlyId {
         /**
      * 更新时间
      */
+        @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+        @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date updateTime;
         /**
      * 状态

application/src/main/java/org/thingsboard/server/domain/vo/NxWarningManagementVO.java

@@ -38,6 +38,8 @@ public class NxWarningManagementVO extends BaseEntityAdaptiveOnlyId {
         /**
      * 预警时间
      */
+        @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+        @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date warningTime;
         /**
      * 所属区域编码

application/src/main/java/org/thingsboard/server/service/nanxi/impl/NxEventManagementServiceImpl.java

@@ -144,16 +144,6 @@ public class NxEventManagementServiceImpl extends ServiceImpl<NxEventManagementM
         }
         NxEventManagementVO eventManagementVO = getWarningMsgById(id, userId);
 
-        List<NxEventPush> cooperates = eventManagementVO.getCooperates();
-        for (NxEventPush cooperate : cooperates) {
-            QueryWrapper<NxDisposeFeedback> tWrapper = new QueryWrapper<>();
-            tWrapper.lambda().eq(true, NxDisposeFeedback::getPushId, cooperate.getId());
-            List<NxDisposeFeedback> cds = nxDisposeFeedbackService.list(tWrapper);
-            cooperate.setNxDisposeFeedback(cds);
-            basicDataConvertService.pageDataConvert(cds);
-            basicDataConvertService.pageDataConvert(cooperate);
-        }
-
         QueryWrapper<NxEventEmergency> emergencyWrapper = new QueryWrapper<>();
         emergencyWrapper.lambda().eq(true, NxEventEmergency::getEventId, id);
         List<NxEventEmergency> ees = nxEventEmergencyService.list(emergencyWrapper);

application/src/main/resources/bootstrap-test.yml

@@ -29,7 +29,7 @@ spring:
     username: "${SPRING_DATASOURCE_USERNAME:postgres}"
     password: "${SPRING_DATASOURCE_PASSWORD:tofly@028..}"
     hikari:
-      maximumPoolSize: "${SPRING_DATASOURCE_MAXIMUM_POOL_SIZE:16}"
+      maximumPoolSize: "${SPRING_DATASOURCE_MAXIMUM_POOL_SIZE:100}"
 log:
   maxHistory: 30
 

application/src/main/resources/mapper/EventStatisticsMapper.xml

@@ -399,7 +399,7 @@
         select t4.event_level_code, di.item_text event_level_name, case when t4.counts != 0 then round(COALESCE(t5.counts,0)*100/t4.counts, 2) else 0 end event_dispose_rate,
         COALESCE(t4.counts,0) count_counts,COALESCE(t5.counts,0) count_level
         from (select event_level_code,count(*) counts from nx_event_management em
-        WHERE em.is_deleted = '0' and em.event_level_code is not null
+        WHERE em.is_deleted = '0' AND em.status != '0' and em.event_level_code is not null
         <if test="industryId != null and industryId != ''">
             and em.industry_id = #{industryId}
         </if>