1.模板新增枚举定义

2.pom  maven-install

pom.xml

@@ -409,29 +409,29 @@
                 </plugin>
             </plugins>
         </pluginManagement>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-clean-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-deploy-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-install-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>17</source>
-                    <target>17</target>
-                    <encoding>UTF-8</encoding>
-                </configuration>
-            </plugin>
-        </plugins>
+<!--        <plugins>-->
+<!--            <plugin>-->
+<!--                <groupId>org.apache.maven.plugins</groupId>-->
+<!--                <artifactId>maven-clean-plugin</artifactId>-->
+<!--            </plugin>-->
+<!--            <plugin>-->
+<!--                <groupId>org.apache.maven.plugins</groupId>-->
+<!--                <artifactId>maven-deploy-plugin</artifactId>-->
+<!--            </plugin>-->
+<!--            <plugin>-->
+<!--                <groupId>org.apache.maven.plugins</groupId>-->
+<!--                <artifactId>maven-install-plugin</artifactId>-->
+<!--            </plugin>-->
+<!--            <plugin>-->
+<!--                <groupId>org.apache.maven.plugins</groupId>-->
+<!--                <artifactId>maven-compiler-plugin</artifactId>-->
+<!--                <configuration>-->
+<!--                    <source>17</source>-->
+<!--                    <target>17</target>-->
+<!--                    <encoding>UTF-8</encoding>-->
+<!--                </configuration>-->
+<!--            </plugin>-->
+<!--        </plugins>-->
         <resources>
             <resource>
                 <directory>src/main/resources</directory>

slope-common/slope-common-core/src/main/java/com/sckw/core/model/enums/ReportEnum.java

@@ -1,25 +1,28 @@
 package com.sckw.core.model.enums;
 
+import lombok.Getter;
+
 /**
  * @author lfdc
  * @description 报表枚举
  * @date 2023-10-31 11:10:07
  */
+@Getter
 public enum ReportEnum {
     /**
-     * 未启用
+     * 禁用
      */
-    NOT_ENABLED(1, "1", "未启用"),
+    NOT_ENABLED(2, "2", "禁用"),
 
     /**
      * 启用
      */
-    ENABLED(2, "2", "启用"),
+    ENABLED(0, "0", "启用"),
 
     /**
-     * 禁用
+     * 未启用
      */
-    FORBIDDEN(3, "3", "禁用");
+    FORBIDDEN(1, "1", "未启用");
 
     private final String status;
     private final Integer code;

slope-modules/slope-detection/src/main/java/com/sckw/slope/detection/common/config/MqttConfig.java

@@ -204,8 +204,8 @@ public class MqttConfig {
         return message -> {
             String topic = message.getHeaders().get("mqtt_receivedTopic").toString();
             String payload = message.getPayload().toString();
-            mqttCallbackHandler.handle(topic, payload);
-//            mqttApiHandler.handle(topic, payload);
+//            mqttCallbackHandler.handle(topic, payload);
+            mqttApiHandler.handle(topic, payload);
         };
     }
 }

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

@@ -1,41 +1,28 @@
 package com.sckw.slope.detection.service;
-import cn.hutool.core.date.DateTime;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
+
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
-import com.sckw.core.exception.BusinessException;
 import com.sckw.core.exception.SystemException;
-import com.sckw.core.model.constant.Global;
 import com.sckw.core.model.constant.NumberConstant;
-import com.sckw.core.model.enums.DeviceEnum;
-import com.sckw.core.model.enums.DictEnum;
 import com.sckw.core.model.enums.DictItemEnum;
-import com.sckw.core.model.enums.MessageLogEnum;
 import com.sckw.core.model.page.PageRes;
 import com.sckw.core.utils.IdWorker;
-import com.sckw.core.utils.StringUtils;
 import com.sckw.core.web.constant.HttpStatus;
 import com.sckw.core.web.response.HttpResult;
-import com.sckw.excel.utils.DateUtil;
 import com.sckw.slope.detection.dao.mysql.*;
-import com.sckw.slope.detection.dao.tdengine.InsTablesMapper;
 import com.sckw.slope.detection.dao.tdengine.SlopeDataMapper;
-import com.sckw.slope.detection.model.dos.mysql.*;
-import com.sckw.slope.detection.model.dos.tdengine.InsTables;
+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.SlopeData;
-import com.sckw.slope.detection.model.dto.*;
-import com.sckw.slope.detection.model.param.DeviceAdd;
-import com.sckw.slope.detection.model.param.DeviceQuery;
-import com.sckw.slope.detection.model.param.DeviceReferenceAdd;
+import com.sckw.slope.detection.model.dto.DeviceDataDTO;
+import com.sckw.slope.detection.model.dto.HeaderData;
 import com.sckw.slope.detection.model.param.IntegrationQuery;
-import com.sckw.slope.detection.model.vo.*;
+import com.sckw.slope.detection.model.vo.IntegrationVo;
 import jakarta.servlet.http.HttpServletRequest;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.http.HttpResponse;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -44,9 +31,7 @@ import org.springframework.util.CollectionUtils;
 
 import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
-import java.time.LocalDateTime;
 import java.util.*;
-import java.util.stream.Collectors;
 
 /**
  * @author sky