bug

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

@@ -16,6 +16,7 @@ import com.sckw.slope.detection.model.dos.mysql.KwsDevice;
 import com.sckw.slope.detection.model.dos.mysql.KwsDeviceReference;
 import com.sckw.slope.detection.model.dos.mysql.KwsIntegration;
 import com.sckw.slope.detection.model.dos.mysql.KwsThreshold;
+import com.sckw.slope.detection.model.dos.tdengine.InsTables;
 import com.sckw.slope.detection.model.dos.tdengine.SlopeData;
 import com.sckw.slope.detection.model.dto.DeviceDataDTO;
 import com.sckw.slope.detection.model.dto.HeaderData;
@@ -28,7 +29,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
-
+import com.sckw.slope.detection.dao.tdengine.InsTablesMapper;
 import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.util.*;
@@ -66,12 +67,18 @@ public class BackTrackService {
     @Autowired
     KwsIntegrationMapper integrationMapper;
 
+    @Autowired
+    InsTablesMapper insTablesMapper;
+
 
 
     public HttpResult getParts(String projectId) {
         //首先获取项目中全部设备
         List<DeviceDataDTO> list = deviceMapper.selectDeviceAllNotDeviceRelation(projectId);
         List<String> devicesId = list.stream().map(DeviceDataDTO::getDeviceId).toList();
+        if(devicesId.size() == 0){
+            return HttpResult.ok(Collections.emptyList());
+        }
         //在获取设备的要素
         List<KwsDeviceReference> references = deviceReferenceMapper.selectList(new LambdaQueryWrapper<KwsDeviceReference>()
                 .in(KwsDeviceReference::getDeviceId, devicesId)
@@ -111,7 +118,15 @@ public class BackTrackService {
                 .eq(KwsDevice::getSnCode, snCode));
         String[] arr = parts.split(",");
         if(!DeviceEnum.ALREADY_REFERRED_TO.getStatus().equals(deviceHas.getStatus().toString())){//未基准
-
+            try {
+                InsTables insTables = insTablesMapper.selectTableIsExit("device_" + snCode);
+                if (insTables == null) {
+                    insTablesMapper.createTable("device_" + snCode);
+                    return HttpResult.ok(Collections.emptyList());
+                }
+            } catch (Exception e) {
+                return HttpResult.ok(Collections.emptyList());
+            }
             List<SlopeData> selectedData = slopeDataMapper.selectLineListByArray(snCode, arr, dateStart, dateEnd);
             if (CollectionUtils.isEmpty(selectedData)) {
                return HttpResult.ok(Collections.emptyList());

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

@@ -46,7 +46,9 @@ public class LogService {
         PageHelper.startPage(query.getPage(), query.getPageSize());
         List<KwsLog> kwsLogs = logMapper.selectList(new LambdaQueryWrapper<KwsLog>()
                 .eq(StringUtils.isNotBlank(query.getType()), KwsLog::getType, query.getType())
-                .like(StringUtils.isNotBlank(query.getContent()), KwsLog::getContent, query.getContent()));
+                .like(StringUtils.isNotBlank(query.getContent()), KwsLog::getContent, query.getContent())
+                .orderByDesc(KwsLog::getCreateTime)
+        );
         PageInfo<KwsLog> info = new PageInfo<>(kwsLogs);
         if (CollectionUtils.isEmpty(kwsLogs)) {
             return PageRes.build(info, kwsLogs);

slope-modules/slope-detection/src/main/resources/mapper/mysql/KwsDeviceMapper.xml

@@ -75,6 +75,7 @@
           <if test="deviceQuery.attribute != null and deviceQuery.attribute != ''">
               and attribute = #{deviceQuery.attribute,jdbcType=TINYINT}
           </if>
+      order by d.create_time desc
   </select>
 
     <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">

slope-modules/slope-detection/src/main/resources/mapper/mysql/KwsDeviceModelMapper.xml

@@ -49,6 +49,7 @@
         <if test="deviceModelQuery.status != null and deviceModelQuery.status != ''">
             and status = #{deviceModelQuery.Status,jdbcType=TINYINT}
         </if>
+        order by create_time desc
     </select>
     <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
         <!--@mbg.generated-->