bug修改

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

@@ -114,7 +114,9 @@ public class ReceiveHandler {
             boolean b = deviceDataService.save(scadaDeviceData);
             if (b) {
                 //保存数据到历史表
-                saveScadaHistoryData(s);
+                try{
+                    saveScadaHistoryData(s);
+                }catch (Exception e){}
             }
 
         }
@@ -215,8 +217,10 @@ public class ReceiveHandler {
                             scadaMonitor.setCodeType(d.getCodeType());
                             scadaMonitors.add(scadaMonitor);
                         });
+
                         scadaMonitorService.saveBatch(scadaMonitors);
                     }
+
                     //生成报警数据
                     threadPoolExecutor.execute(() -> {
                         createWarnDatas(scadaHistoryList, jsonObject);

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

@@ -2,6 +2,7 @@ package org.thingsboard.server.controller.nanxi;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DateUtil;
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.fasterxml.jackson.databind.json.JsonMapper;
@@ -70,6 +71,11 @@ public class BridgeController {
             JSONObject xmlJSONObj = XML.toJSONObject(strout);
             JSONObject node1 = xmlJSONObj.getJSONObject("EventNotificationAlert");
             JSONObject node2 = node1.getJSONObject("ANPR");
+            log.info("压电称重报警json1为：{}", JSON.toJSONString(xmlJSONObj));
+            log.info("压电称重报警json12为：{}", JSON.toJSONString(node1));
+            log.info("压电称重报警json13为：{}", JSON.toJSONString(node2));
+            log.info("压电称重报警车牌号为：{}", node2.getString("licensePlate"));
+            Thread.sleep(10000);
             NxMonitorWarnData warnData = monitorWarnDataService.getWarnDataByPlate(node2.getString("licensePlate"));
             if(!Objects.isNull(warnData)){
                 if(CollectionUtils.isEmpty(annexService.queryAnnexByContactId(warnData.getId()))){

application/src/main/java/org/thingsboard/server/converter/DeviceNameConverter.java

@@ -12,7 +12,7 @@ import java.util.List;
 import java.util.Objects;
 
 /**
- * money 转换器
+ * DeviceName 转换器
  */
 @Component
 public class DeviceNameConverter implements Converter {

application/src/main/java/org/thingsboard/server/converter/SiteGroupConverter.java

@@ -11,7 +11,7 @@ import java.util.List;
 import java.util.Objects;
 
 /**
- * money 转换器
+ * SiteGroup 转换器
  */
 @Component
 public class SiteGroupConverter implements Converter {

application/src/main/java/org/thingsboard/server/converter/SiteNameConverter.java

@@ -10,7 +10,7 @@ import org.thingsboard.server.service.nanxi.INxMonitorSiteService;
 import java.util.Objects;
 
 /**
- * money 转换器
+ * site 转换器
  */
 @Component
 public class SiteNameConverter implements Converter {

application/src/main/java/org/thingsboard/server/converter/UserConverter.java

@@ -10,7 +10,7 @@ import java.util.List;
 import java.util.Objects;
 
 /**
- * money 转换器
+ * user 转换器
  */
 @Component
 public class UserConverter implements Converter {

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

@@ -180,7 +180,10 @@
         when w.status = '1' then '在线'
         when w.status = '2' then '报警' end as statusName,
         ms.industry,ms.address,
-        mi.code,mi.name,mi.unit,mi.index_group,case when mwd.id is not null then '是' else '否' end is_warn,di.item_text warn_level_name
+        mi.code,mi.name,mi.unit,mi.index_group,CASE
+        WHEN w.status = '2' THEN
+        '是' ELSE '否'
+        END is_warn,di.item_text warn_level_name
         from nx_device_w w left JOIN nx_device_type dt on w.type_id=dt.id and dt.is_deleted='0'
         left join nx_monitor_site_device sd on w.id = sd.device_id and sd.is_deleted = '0'
         LEFT JOIN nx_monitor_site ms on sd.site_id = ms.id