15928045575 2 лет назад
Родитель
Сommit
01f63933e0

Разница между файлами не показана из-за своего большого размера
+ 785 - 0
slope-modules/slope-detection/replay_pid26092.log


+ 1 - 1
slope-modules/slope-detection/src/main/java/com/sckw/slope/detection/model/dos/mysql/KwsDevice.java

@@ -37,7 +37,7 @@ public class KwsDevice implements Serializable {
      */
     private String snCode;
 
-    private String snCodeFullName;
+    private String snCodeFullname;
 
     /**
      * 设备型号id

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

@@ -273,6 +273,10 @@ public class DeviceService {
                 .eq(KwsDeviceReference::getDelFlag, NumberConstant.ZERO)
         );
         String snCode = device.getSnCode();
+        InsTables insTables = insTablesMapper.selectTableIsExit("device_" + snCode);
+        if (insTables == null) {
+            insTablesMapper.createTable("device_" + snCode);
+        }
         //获取基础要数
         List<DevicePartModelVo> partData = new ArrayList<>();
         partData = deviceModelPartMapper.selectByModelId(deviceModel.getId());
@@ -286,6 +290,7 @@ 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());
@@ -504,9 +509,9 @@ public class DeviceService {
                 //当前测量值-TD获取
                 HashMap<String, Object> currentMeasurement = new HashMap<>();
                 String snCode = kwsDevice.getSnCode();
-                InsTables insTables = insTablesMapper.selectTableIsExit("devicesv2" + snCode);
+                InsTables insTables = insTablesMapper.selectTableIsExit("device_" + snCode);
                 if (insTables == null) {
-                    insTablesMapper.createTable("devicesv2" + snCode);
+                    insTablesMapper.createTable("device_" + snCode);
                 }
                 SlopeData slopeData = null;
                 try {

+ 1 - 1
slope-modules/slope-detection/src/main/java/com/sckw/slope/detection/service/LogService.java

@@ -64,7 +64,7 @@ public class LogService {
         kwsLogs.forEach(projectLog -> {
             LogSelectVO vo = new LogSelectVO();
             BeanUtils.copyProperties(projectLog, vo);
-            vo.setTypeName(projectLog.getType());
+            vo.setTypeName(MessageLogEnum.getEnumTitleByCode(projectLog.getType()));
             vo.setCreateByName(projectLog.getCreateBy() == null ? null : projectLog.getCreateBy().toString());
             list.add(vo);
         });

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

@@ -8,6 +8,7 @@ import com.sckw.slope.detection.model.dos.mysql.KwsReportTemplate;
 import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 import org.springframework.util.CollectionUtils;
 
@@ -31,7 +32,7 @@ public class ReportTemplateTaskService {
     /**
      * 报表生成定时任务-天
      */
-    //    @Scheduled(cron = "0 0 0 ? * *")
+        // @Scheduled(cron = "* * * * * *")
     public void templateTaskDay() {
         List<KwsReportTemplate> kwsReportTemplates = reportTemplateMapper.selectList(new LambdaQueryWrapper<KwsReportTemplate>()
                 .eq(KwsReportTemplate::getStatus, 0)
@@ -43,7 +44,7 @@ public class ReportTemplateTaskService {
                     LocalDateTime localDateTime = LocalDateTime.now().minusDays(1);
                     LocalDateTime dateEnd = com.sckw.excel.utils.DateUtil.localDateToLocalDateTimeEnd(localDateTime.toLocalDate());
                     LocalDateTime dateStart = com.sckw.excel.utils.DateUtil.localDateToLocalDateTimeStart(localDateTime.toLocalDate());
-
+                    //
                 }
 
             }
@@ -54,7 +55,7 @@ public class ReportTemplateTaskService {
      * 报表生成定时任务-周
      */
     //    @Scheduled(cron = "0 0 0 ? * *")
-    public void templateTaskWeek() {
+    /*public void templateTaskWeek() {
         List<KwsReportTemplate> kwsReportTemplates = reportTemplateMapper.selectList(new LambdaQueryWrapper<KwsReportTemplate>()
                 .eq(KwsReportTemplate::getStatus, 0)
                 .eq(KwsReportTemplate::getDelFlag, 0));
@@ -68,13 +69,13 @@ public class ReportTemplateTaskService {
                 }
             }
         }
-    }
+    }*/
 
     /**
      * 报表生成定时任务-月
      */
     //    @Scheduled(cron = "0 0 0 ? * *")
-    public void templateTaskMonth() {
+    /*public void templateTaskMonth() {
         List<KwsReportTemplate> kwsReportTemplates = reportTemplateMapper.selectList(new LambdaQueryWrapper<KwsReportTemplate>()
                 .eq(KwsReportTemplate::getStatus, 0)
                 .eq(KwsReportTemplate::getDelFlag, 0));
@@ -86,5 +87,5 @@ public class ReportTemplateTaskService {
                 }
             }
         }
-    }
+    }*/
 }

Некоторые файлы не были показаны из-за большого количества измененных файлов