Merge branch 'sky_v2' into dev

slope-modules/slope-detection/src/main/java/com/sckw/slope/detection/model/param/DeviceAdd.java

@@ -91,7 +91,6 @@ public class DeviceAdd {
     /**
      * 集成ID
      */
-    @NotNull(message = "要素不能为空")
     private String integrationId;
 
 }

slope-modules/slope-detection/src/main/java/com/sckw/slope/detection/model/vo/excel/TaskReportExportVO.java

@@ -38,14 +38,36 @@ public class TaskReportExportVO implements Serializable {
     /**
      * e
      */
-    @ExcelProperty("e")
-    private String e;
+    @ExcelProperty("a")
+    private String a;
 
     /**
      * e
      */
-    @ExcelProperty("n")
-    private String n;
+    @ExcelProperty("b")
+    private String b;
+
+    @ExcelProperty("c")
+    private String c;
+
+    @ExcelProperty("d")
+    private String d;
+
+    @ExcelProperty("e")
+    private String e;
+
+    @ExcelProperty("f")
+    private String f;
+
+    @ExcelProperty("g")
+    private String g;
+
+    @ExcelProperty("h")
+    private String h;
+
+    @ExcelProperty("j")
+    private String j;
+
 
 
     private static final long serialVersionUID = 1L;

slope-modules/slope-detection/src/main/java/com/sckw/slope/detection/service/BackTrackService.java

@@ -46,6 +46,8 @@ public class BackTrackService {
 
     private static final Long equatorial_circumference = 40075020000L;
 
+    private static final Long LATITUDE_REFERENCE = 111000000L;
+
     @Autowired
     CommonService commonService;
 
@@ -121,7 +123,7 @@ public class BackTrackService {
             try {
                 InsTables insTables = insTablesMapper.selectTableIsExit("device_" + snCode);
                 if (insTables == null) {
-                    insTablesMapper.createTable("device_" + snCode);
+                    //insTablesMapper.createTable("device_" + snCode);
                     return HttpResult.ok(Collections.emptyList());
                 }
             } catch (Exception e) {
@@ -178,7 +180,7 @@ public class BackTrackService {
         for(KwsDeviceReference element : references) {
             int index = Arrays.binarySearch(arr,element.getItem());
             if(index<=0){
-                continue;
+                //continue;
             }
 
             BigDecimal currentValue =  new BigDecimal("0.00");
@@ -204,7 +206,7 @@ public class BackTrackService {
                         double doubleValue = subtract.divide(new BigDecimal("360"), 9, BigDecimal.ROUND_HALF_UP).doubleValue();
                         offsetValue = new BigDecimal(equatorial_circumference).multiply(new BigDecimal(cosValue)).multiply(new BigDecimal(doubleValue));
                     }else if (DictItemEnum.LATITUDE_Y.getValue().equals(element.getItem())) {//如果是Y轴
-                        offsetValue = new BigDecimal(equatorial_circumference).multiply(subtract);
+                        offsetValue = new BigDecimal(LATITUDE_REFERENCE).multiply(subtract);
                     } else if (DictItemEnum.ALTITUDE_Z.getValue().equals(element.getItem())) {//如果是z轴
                         offsetValue = new BigDecimal(val1).divide(new BigDecimal(1000), 9, BigDecimal.ROUND_HALF_UP);
                     }else{//如果是其他

slope-modules/slope-detection/src/main/java/com/sckw/slope/detection/service/DeviceService.java

@@ -274,9 +274,9 @@ public class DeviceService {
         );
         String snCode = device.getSnCode();
         InsTables insTables = insTablesMapper.selectTableIsExit("device_" + snCode);
-        if (insTables == null) {
-            insTablesMapper.createTable("device_" + snCode);
-        }
+        //if (insTables == null) {
+            //insTablesMapper.createTable("device_" + snCode);
+        //}
         //获取基础要数
         List<DevicePartModelVo> partData = new ArrayList<>();
         partData = deviceModelPartMapper.selectByModelId(deviceModel.getId());
@@ -290,16 +290,18 @@ public class DeviceService {
                 }
                 references.forEach(re -> {
                     if (part.getPartName().equals(re.getItem())) {
-
-                        SlopeData slopeData = slopeDataMapper.selectListByLine(snCode, re.getItem());//获取到当前测量值
                         part.setPartBaseData(re.getOriginalValue().toString());
                         part.setPartCurrentBaseData(re.getCurrentValue().toString());
-                        if (!Objects.isNull(slopeData)) {
-                            part.setCurrentData(slopeData.getVal());
-                        }
+
                         part.setOffset(re.getOffset().toString());
                     }
                 });
+                if(insTables != null){
+                    SlopeData slopeData = slopeDataMapper.selectListByLine(snCode, part.getPartName());//获取到当前测量值
+                    if (!Objects.isNull(slopeData)) {
+                        part.setCurrentData(slopeData.getVal());
+                    }
+                }
             }
             //获取字典
             Map<String, SystemDict> deviceType = commonService.getDictList(null, new HashMap<>() {{
@@ -318,6 +320,11 @@ public class DeviceService {
             );
             if (!Objects.isNull(projectDevice)) {
                 vo.setProjectId(projectDevice.getProjectId().toString());
+                KwsProject project = projectMapper.selectOne(new LambdaQueryWrapper<KwsProject>()
+                        .eq(KwsProject::getId, projectDevice.getProjectId().toString())
+                        .eq(KwsProject::getDelFlag, NumberConstant.ZERO)
+                );
+                vo.setProjectName(project.getName().toString());
             }
             vo.setPart(partData);
         }
@@ -510,9 +517,9 @@ public class DeviceService {
                 HashMap<String, Object> currentMeasurement = new HashMap<>();
                 String snCode = kwsDevice.getSnCode();
                 InsTables insTables = insTablesMapper.selectTableIsExit("device_" + snCode);
-                if (insTables == null) {
-                    insTablesMapper.createTable("device_" + snCode);
-                }
+                //if (insTables == null) {
+                    //insTablesMapper.createTable("device_" + snCode);
+                //}
                 SlopeData slopeData = null;
                 try {
                     slopeData = slopeDataMapper.selectListByLine(snCode, item);
@@ -744,6 +751,10 @@ public class DeviceService {
             kwsDeviceReference.setUpdateTime(now);
             deviceReferenceMapper.insert(kwsDeviceReference);
         }
+        deviceMapper.update(null, new LambdaUpdateWrapper<KwsDevice>()
+                .eq(KwsDevice::getId, deviceId)
+                .set(KwsDevice::getStatus, NumberConstant.FOUR)
+        );
 
         return HttpResult.ok();
     }

slope-modules/slope-detection/src/main/java/com/sckw/slope/detection/service/task/ReportTemplateTaskService.java

@@ -102,8 +102,7 @@ public class ReportTemplateTaskService {
                                 });
                                 list1.add(listObject);
                             });
-                            //deviceData.put(vo.getName(),list1);
-                            //deviceName.add(list1);
+
                             map1.put(vo.getName(),list1);
                         }
                     }

slope-modules/slope-detection/src/main/resources/bootstrap-lfdc.yml

@@ -100,4 +100,7 @@ aliyun:
     endpoint: oss-cn-chengdu.aliyuncs.com
     accessKeyId: LTAI5tPEbubCGq5Rdwygbz4Q
     secret: 7mQLWMaBJeZPRV1SRGogctYGXwppjQ
-    bucket: kaiwu-saas
+    bucket: kaiwu-saas
+scheduled:
+  template:
+    enable: false