Mqtt的发送和监听

.gitignore

@@ -19,6 +19,7 @@ out
 .project
 .settings
 .springBeans
+*.yml
 
 ### IntelliJ IDEA ###
 .idea

cloud-auth/pom.xml

@@ -57,10 +57,6 @@
             <groupId>com.muyu</groupId>
             <artifactId>cloud-common-api-doc</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.mysql</groupId>
-            <artifactId>mysql-connector-j</artifactId>
-        </dependency>
 
     </dependencies>
 

cloud-auth/src/main/java/com/muyu/auth/controller/TokenController.java

@@ -1,9 +1,7 @@
 package com.muyu.auth.controller;
 
-import com.muyu.auth.form.Firm;
 import com.muyu.auth.form.LoginBody;
 import com.muyu.auth.form.RegisterBody;
-import com.muyu.auth.service.SysFirmService;
 import com.muyu.auth.service.SysLoginService;
 import com.muyu.common.core.domain.Result;
 import com.muyu.common.core.utils.JwtUtils;
@@ -32,22 +30,11 @@ public class TokenController {
 
     @Autowired
     private SysLoginService sysLoginService;
-    @Autowired
-    private SysFirmService sysFirmService;
-
 
     @PostMapping("login")
     public Result<?> login (@RequestBody LoginBody form) {
-        //查询用户公司是否存在
-        Firm firm = sysFirmService.findFirmByName(form.getFirmName());
-
-        //不能存在提示
-        if (firm.getDatabaseName()==null){
-            return Result.error(null,"公司不存在");
-        }
-
         // 用户登录
-        LoginUser userInfo = sysLoginService.login(firm.getDatabaseName(),form.getUsername(), form.getPassword());
+        LoginUser userInfo = sysLoginService.login(form.getUsername(), form.getPassword());
         // 获取登录token
         return Result.success(tokenService.createToken(userInfo));
     }

cloud-auth/src/main/java/com/muyu/auth/form/Firm.java

@@ -1,20 +0,0 @@
-package com.muyu.auth.form;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class Firm {
-
-    private Integer id;
-
-    private String firmName;
-
-    private String databaseName;
-
-
-
-}

cloud-auth/src/main/java/com/muyu/auth/form/LoginBody.java

@@ -1,22 +1,11 @@
 package com.muyu.auth.form;
 
-import lombok.Data;
-
 /**
  * 用户登录对象
  *
  * @author muyu
  */
-
-@Data
 public class LoginBody {
-
-    /**
-     * 公司名称
-     */
-    private String firmName;
-
-
     /**
      * 用户名
      */
@@ -28,5 +17,19 @@ public class LoginBody {
     private String password;
 
 
+    public String getUsername () {
+        return username;
+    }
 
+    public void setUsername (String username) {
+        this.username = username;
+    }
+
+    public String getPassword () {
+        return password;
+    }
+
+    public void setPassword (String password) {
+        this.password = password;
+    }
 }

cloud-auth/src/main/java/com/muyu/auth/service/SysFirmService.java

@@ -1,56 +0,0 @@
-package com.muyu.auth.service;
-
-import com.muyu.auth.form.Firm;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.stereotype.Component;
-
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.ResultSet;
-import java.sql.Statement;
-import java.util.List;
-
-
-@Component
-public class SysFirmService {
-
-    static final String USER="root";
-    static final String PASSWORD="Lw030106";
-
-    @Autowired
-    private RedisTemplate redisTemplate;
-
-
-    public Firm findFirmByName(String firmName){
-        Firm firm = new Firm();
-        try {
-//            Class.forName("com.mysql.cj.jdbc.Driver");
-            DriverManager.registerDriver(new com.mysql.cj.jdbc.Driver());
-            Connection connection= DriverManager.getConnection("jdbc:mysql://47.101.53.251:3306/datasource?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT&useSSL=false",USER,PASSWORD);
-            String sql="select * from `datasource` where firm_name = '"+firmName+"'";
-
-            Statement stmt = connection.createStatement();
-            ResultSet rs = stmt.executeQuery(sql);
-
-
-            while (rs.next()){
-                firm.setId(rs.getInt("id"));
-                firm.setFirmName(rs.getString("firm_name"));
-                firm.setDatabaseName(rs.getString("database_name"));
-            }
-
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        }
-
-        //数据源不为空
-        if (firm!=null){
-            redisTemplate.opsForValue().set("datasource",firm.getDatabaseName());
-        }
-        return firm;
-    };
-
-
-
-}

cloud-auth/src/main/java/com/muyu/auth/service/SysLoginService.java

@@ -12,7 +12,6 @@ import com.muyu.common.core.utils.StringUtils;
 import com.muyu.common.core.utils.ip.IpUtils;
 import com.muyu.common.redis.service.RedisService;
 import com.muyu.common.security.utils.SecurityUtils;
-import com.muyu.common.system.domain.Firm;
 import com.muyu.common.system.remote.RemoteUserService;
 import com.muyu.common.system.domain.SysUser;
 import com.muyu.common.system.domain.LoginUser;
@@ -41,7 +40,7 @@ public class SysLoginService {
     /**
      * 登录
      */
-    public LoginUser login (String databaseName,String username, String password) {
+    public LoginUser login (String username, String password) {
         // 用户名或密码为空 错误
         if (StringUtils.isAnyBlank(username, password)) {
             recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, "用户/密码必须填写");
@@ -65,14 +64,8 @@ public class SysLoginService {
             recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, "很遗憾，访问IP已被列入系统黑名单");
             throw new ServiceException("很遗憾，访问IP已被列入系统黑名单");
         }
-
-        Firm firm = new Firm();
-        firm.setDatabaseName(databaseName);
-        firm.setUserName(username);
-
-
         // 查询用户信息
-        Result<LoginUser> userResult = remoteUserService.getUserInfo(firm, SecurityConstants.INNER);
+        Result<LoginUser> userResult = remoteUserService.getUserInfo(username, SecurityConstants.INNER);
 
         if (StringUtils.isNull(userResult) || StringUtils.isNull(userResult.getData())) {
             recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, "登录用户不存在");

cloud-auth/src/main/java/com/muyu/auth/service/SysPasswordService.java

@@ -21,9 +21,9 @@ public class SysPasswordService {
     @Autowired
     private RedisService redisService;
 
-    private final int maxRetryCount = CacheConstants.PASSWORD_MAX_RETRY_COUNT;
+    private int maxRetryCount = CacheConstants.PASSWORD_MAX_RETRY_COUNT;
 
-    private final Long lockTime = CacheConstants.PASSWORD_LOCK_TIME;
+    private Long lockTime = CacheConstants.PASSWORD_LOCK_TIME;
 
     @Autowired
     private SysRecordLogService recordLogService;

cloud-auth/src/main/resources/bootstrap.yml

@@ -7,7 +7,7 @@ nacos:
   addr: 47.101.53.251:8848
   user-name: nacos
   password: nacos
-  namespace: lgy
+  namespace: yzl
 # Spring
 spring:
   application:

cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/annotation/Excel.java

@@ -21,134 +21,134 @@ public @interface Excel {
     /**
      * 导出时在excel中排序
      */
-    int sort() default Integer.MAX_VALUE;
+    public int sort () default Integer.MAX_VALUE;
 
     /**
      * 导出到Excel中的名字.
      */
-    String name() default "";
+    public String name () default "";
 
     /**
      * 日期格式, 如: yyyy-MM-dd
      */
-    String dateFormat() default "";
+    public String dateFormat () default "";
 
     /**
      * 读取内容转表达式 (如: 0=男,1=女,2=未知)
      */
-    String readConverterExp() default "";
+    public String readConverterExp () default "";
 
     /**
      * 分隔符，读取字符串组内容
      */
-    String separator() default ",";
+    public String separator () default ",";
 
     /**
      * BigDecimal 精度 默认:-1(默认不开启BigDecimal格式化)
      */
-    int scale() default -1;
+    public int scale () default -1;
 
     /**
      * BigDecimal 舍入规则 默认:BigDecimal.ROUND_HALF_EVEN
      */
-    int roundingMode() default BigDecimal.ROUND_HALF_EVEN;
+    public int roundingMode () default BigDecimal.ROUND_HALF_EVEN;
 
     /**
      * 导出时在excel中每个列的高度
      */
-    double height() default 14;
+    public double height () default 14;
 
     /**
      * 导出时在excel中每个列的宽度
      */
-    double width() default 16;
+    public double width () default 16;
 
     /**
      * 文字后缀,如% 90 变成90%
      */
-    String suffix() default "";
+    public String suffix () default "";
 
     /**
      * 当值为空时,字段的默认值
      */
-    String defaultValue() default "";
+    public String defaultValue () default "";
 
     /**
      * 提示信息
      */
-    String prompt() default "";
+    public String prompt () default "";
 
     /**
      * 设置只能选择不能输入的列内容.
      */
-    String[] combo() default {};
+    public String[] combo () default {};
 
     /**
      * 是否需要纵向合并单元格,应对需求:含有list集合单元格)
      */
-    boolean needMerge() default false;
+    public boolean needMerge () default false;
 
     /**
      * 是否导出数据,应对需求:有时我们需要导出一份模板,这是标题需要但内容需要用户手工填写.
      */
-    boolean isExport() default true;
+    public boolean isExport () default true;
 
     /**
      * 另一个类中的属性名称,支持多级获取,以小数点隔开
      */
-    String targetAttr() default "";
+    public String targetAttr () default "";
 
     /**
      * 是否自动统计数据,在最后追加一行统计数据总和
      */
-    boolean isStatistics() default false;
+    public boolean isStatistics () default false;
 
     /**
      * 导出类型（0数字 1字符串）
      */
-    ColumnType cellType() default ColumnType.STRING;
+    public ColumnType cellType () default ColumnType.STRING;
 
     /**
      * 导出列头背景颜色
      */
-    IndexedColors headerBackgroundColor() default IndexedColors.GREY_50_PERCENT;
+    public IndexedColors headerBackgroundColor () default IndexedColors.GREY_50_PERCENT;
 
     /**
      * 导出列头字体颜色
      */
-    IndexedColors headerColor() default IndexedColors.WHITE;
+    public IndexedColors headerColor () default IndexedColors.WHITE;
 
     /**
      * 导出单元格背景颜色
      */
-    IndexedColors backgroundColor() default IndexedColors.WHITE;
+    public IndexedColors backgroundColor () default IndexedColors.WHITE;
 
     /**
      * 导出单元格字体颜色
      */
-    IndexedColors color() default IndexedColors.BLACK;
+    public IndexedColors color () default IndexedColors.BLACK;
 
     /**
      * 导出字段对齐方式
      */
-    HorizontalAlignment align() default HorizontalAlignment.CENTER;
+    public HorizontalAlignment align () default HorizontalAlignment.CENTER;
 
     /**
      * 自定义数据处理器
      */
-    Class<?> handler() default ExcelHandlerAdapter.class;
+    public Class<?> handler () default ExcelHandlerAdapter.class;
 
     /**
      * 自定义数据处理器参数
      */
-    String[] args() default {};
+    public String[] args () default {};
 
     /**
      * 字段类型（0：导出导入；1：仅导出；2：仅导入）
      */
     Type type () default Type.ALL;
 
-    enum Type {
+    public enum Type {
         ALL(0), EXPORT(1), IMPORT(2);
         private final int value;
 
@@ -161,7 +161,7 @@ public @interface Excel {
         }
     }
 
-    enum ColumnType {
+    public enum ColumnType {
         NUMERIC(0), STRING(1), IMAGE(2);
         private final int value;
 

cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/constant/ScheduleConstants.java

@@ -43,9 +43,9 @@ public class ScheduleConstants {
          */
         PAUSE("1");
 
-        private final String value;
+        private String value;
 
-        Status(String value) {
+        private Status (String value) {
             this.value = value;
         }
 

cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/exception/base/BaseException.java

@@ -11,22 +11,22 @@ public class BaseException extends RuntimeException {
     /**
      * 所属模块
      */
-    private final String module;
+    private String module;
 
     /**
      * 错误码
      */
-    private final String code;
+    private String code;
 
     /**
      * 错误码对应的参数
      */
-    private final Object[] args;
+    private Object[] args;
 
     /**
      * 错误消息
      */
-    private final String defaultMessage;
+    private String defaultMessage;
 
     public BaseException (String module, String code, Object[] args, String defaultMessage) {
         this.module = module;

cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/exception/file/InvalidExtensionException.java

@@ -10,9 +10,9 @@ import java.util.Arrays;
 public class InvalidExtensionException extends FileUploadException {
     private static final long serialVersionUID = 1L;
 
-    private final String[] allowedExtension;
+    private String[] allowedExtension;
-    private final String extension;
+    private String extension;
-    private final String filename;
+    private String filename;
 
     public InvalidExtensionException (String[] allowedExtension, String extension, String filename) {
         super("filename : [" + filename + "], extension : [" + extension + "], allowed extension : [" + Arrays.toString(allowedExtension) + "]");

cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/exception/job/TaskException.java

@@ -8,7 +8,7 @@ package com.muyu.common.core.exception.job;
 public class TaskException extends Exception {
     private static final long serialVersionUID = 1L;
 
-    private final Code code;
+    private Code code;
 
     public TaskException (String msg, Code code) {
         this(msg, code, null);

cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/text/CharsetKit.java

@@ -27,11 +27,11 @@ public class CharsetKit {
     /**
      * ISO-8859-1
      */
-    public static final Charset CHARSET_ISO_8859_1 = StandardCharsets.ISO_8859_1;
+    public static final Charset CHARSET_ISO_8859_1 = Charset.forName(ISO_8859_1);
     /**
      * UTF-8
      */
-    public static final Charset CHARSET_UTF_8 = StandardCharsets.UTF_8;
+    public static final Charset CHARSET_UTF_8 = Charset.forName(UTF_8);
     /**
      * GBK
      */

cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/utils/DateUtils.java

@@ -24,7 +24,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
 
     public static String YYYY_MM_DD_HH_MM_SS = "yyyy-MM-dd HH:mm:ss";
 
-    private static final String[] parsePatterns = {
+    private static String[] parsePatterns = {
             "yyyy-MM-dd", "yyyy-MM-dd HH:mm:ss", "yyyy-MM-dd HH:mm", "yyyy-MM",
             "yyyy/MM/dd", "yyyy/MM/dd HH:mm:ss", "yyyy/MM/dd HH:mm", "yyyy/MM",
             "yyyy.MM.dd", "yyyy.MM.dd HH:mm:ss", "yyyy.MM.dd HH:mm", "yyyy.MM"};

cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/utils/ServletUtils.java

@@ -211,7 +211,11 @@ public class ServletUtils {
      * @return 编码后的内容
      */
     public static String urlEncode (String str) {
-        return URLEncoder.encode(str, StandardCharsets.UTF_8);
+        try {
+            return URLEncoder.encode(str, Constants.UTF8);
+        } catch (UnsupportedEncodingException e) {
+            return StringUtils.EMPTY;
+        }
     }
 
     /**

cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/utils/SpringUtils.java

@@ -43,7 +43,7 @@ public final class SpringUtils implements BeanFactoryPostProcessor {
      * @throws org.springframework.beans.BeansException
      */
     public static <T> T getBean (Class<T> clz) throws BeansException {
-        T result = beanFactory.getBean(clz);
+        T result = (T) beanFactory.getBean(clz);
         return result;
     }
 

cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/utils/file/FileUtils.java

@@ -125,17 +125,17 @@ public class FileUtils {
         String filename = fileName;
         if (agent.contains("MSIE")) {
             // IE浏览器
-            filename = URLEncoder.encode(filename, StandardCharsets.UTF_8);
+            filename = URLEncoder.encode(filename, "utf-8");
             filename = filename.replace("+", " ");
         } else if (agent.contains("Firefox")) {
             // 火狐浏览器
             filename = new String(fileName.getBytes(), "ISO8859-1");
         } else if (agent.contains("Chrome")) {
             // google浏览器
-            filename = URLEncoder.encode(filename, StandardCharsets.UTF_8);
+            filename = URLEncoder.encode(filename, "utf-8");
         } else {
             // 其它浏览器
-            filename = URLEncoder.encode(filename, StandardCharsets.UTF_8);
+            filename = URLEncoder.encode(filename, "utf-8");
         }
         return filename;
     }
@@ -197,14 +197,15 @@ public class FileUtils {
     public static void setAttachmentResponseHeader (HttpServletResponse response, String realFileName) throws UnsupportedEncodingException {
         String percentEncodedFileName = percentEncode(realFileName);
 
-        String contentDispositionValue = "attachment; filename=" +
+        StringBuilder contentDispositionValue = new StringBuilder();
-                percentEncodedFileName +
+        contentDispositionValue.append("attachment; filename=")
-                ";" +
+                .append(percentEncodedFileName)
-                "filename*=" +
+                .append(";")
-                "utf-8''" +
+                .append("filename*=")
-                percentEncodedFileName;
+                .append("utf-8''")
+                .append(percentEncodedFileName);
 
-        response.setHeader("Content-disposition", contentDispositionValue);
+        response.setHeader("Content-disposition", contentDispositionValue.toString());
         response.setHeader("download-filename", percentEncodedFileName);
     }
 
@@ -216,7 +217,7 @@ public class FileUtils {
      * @return 百分号编码后的字符串
      */
     public static String percentEncode (String s) throws UnsupportedEncodingException {
-        String encode = URLEncoder.encode(s, StandardCharsets.UTF_8);
+        String encode = URLEncoder.encode(s, StandardCharsets.UTF_8.toString());
         return encode.replaceAll("\\+", "%20");
     }
 }

cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/utils/html/EscapeUtil.java

@@ -124,7 +124,7 @@ public class EscapeUtil {
                     tmp.append(content.substring(lastPos));
                     lastPos = content.length();
                 } else {
-                    tmp.append(content, lastPos, pos);
+                    tmp.append(content.substring(lastPos, pos));
                     lastPos = pos;
                 }
             }

cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/utils/ip/IpUtils.java

@@ -225,7 +225,7 @@ public class IpUtils {
         if (ip != null && ip.indexOf(",") > 0) {
             final String[] ips = ip.trim().split(",");
             for (String subIp : ips) {
-                if (!isUnknown(subIp)) {
+                if (false == isUnknown(subIp)) {
                     ip = subIp;
                     break;
                 }

cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/utils/poi/ExcelUtil.java

@@ -121,7 +121,7 @@ public class ExcelUtil<T> {
     /**
      * 统计列表
      */
-    private final Map<Integer, Double> statistics = new HashMap<Integer, Double>();
+    private Map<Integer, Double> statistics = new HashMap<Integer, Double>();
 
     public ExcelUtil (Class<T> clazz) {
         this.clazz = clazz;
@@ -531,7 +531,7 @@ public class ExcelUtil<T> {
             rowNo = isSubList() ? (i > 1 ? rowNo + 1 : rowNo + i) : i + 1 + rownum - startNo;
             row = sheet.createRow(rowNo);
             // 得到导出对象.
-            T vo = list.get(i);
+            T vo = (T) list.get(i);
             Collection<?> subList = null;
             if (isSubList()) {
                 if (isSubListValue(vo)) {
@@ -913,7 +913,7 @@ public class ExcelUtil<T> {
     public String dataFormatHandlerAdapter (Object value, Excel excel, Cell cell) {
         try {
             Object instance = excel.handler().newInstance();
-            Method formatMethod = excel.handler().getMethod("format", Object.class, String[].class, Cell.class, Workbook.class);
+            Method formatMethod = excel.handler().getMethod("format", new Class[]{Object.class, String[].class, Cell.class, Workbook.class});
             value = formatMethod.invoke(instance, value, excel.args(), cell, this.wb);
         } catch (Exception e) {
             log.error("不能格式化数据 " + excel.handler(), e.getMessage());
@@ -1200,7 +1200,7 @@ public class ExcelUtil<T> {
     public Collection<?> getListCellValue (Object obj) {
         Object value;
         try {
-            value = subMethod.invoke(obj);
+            value = subMethod.invoke(obj, new Object[]{});
         } catch (Exception e) {
             return new ArrayList<Object>();
         }
@@ -1221,7 +1221,7 @@ public class ExcelUtil<T> {
         getMethodName.append(name.substring(1));
         Method method = null;
         try {
-            method = pojoClass.getMethod(getMethodName.toString());
+            method = pojoClass.getMethod(getMethodName.toString(), new Class[]{});
         } catch (Exception e) {
             log.error("获取对象异常{}", e.getMessage());
         }

cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/utils/reflect/ReflectUtils.java

@@ -24,7 +24,7 @@ public class ReflectUtils {
 
     private static final String CGLIB_CLASS_SEPARATOR = "$$";
 
-    private static final Logger logger = LoggerFactory.getLogger(ReflectUtils.class);
+    private static Logger logger = LoggerFactory.getLogger(ReflectUtils.class);
 
     /**
      * 调用Getter方法.
@@ -113,7 +113,7 @@ public class ReflectUtils {
         try {
             return (E) method.invoke(obj, args);
         } catch (Exception e) {
-            String msg = "method: " + method + ", obj: " + obj + ", args: " + args;
+            String msg = "method: " + method + ", obj: " + obj + ", args: " + args + "";
             throw convertReflectionExceptionToUnchecked(msg, e);
         }
     }
@@ -162,7 +162,7 @@ public class ReflectUtils {
             }
             return (E) method.invoke(obj, args);
         } catch (Exception e) {
-            String msg = "method: " + method + ", obj: " + obj + ", args: " + args;
+            String msg = "method: " + method + ", obj: " + obj + ", args: " + args + "";
             throw convertReflectionExceptionToUnchecked(msg, e);
         }
     }

cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/utils/sign/Base64.java

@@ -46,8 +46,8 @@ public final class Base64 {
         for (int i = 52, j = 0 ; i <= 61 ; i++, j++) {
             lookUpBase64Alphabet[i] = (char) ('0' + j);
         }
-        lookUpBase64Alphabet[62] = '+';
+        lookUpBase64Alphabet[62] = (char) '+';
-        lookUpBase64Alphabet[63] = '/';
+        lookUpBase64Alphabet[63] = (char) '/';
     }
 
     private static boolean isWhiteSpace (char octect) {
@@ -82,7 +82,7 @@ public final class Base64 {
         int fewerThan24bits = lengthDataBits % TWENTYFOURBITGROUP;
         int numberTriplets = lengthDataBits / TWENTYFOURBITGROUP;
         int numberQuartet = fewerThan24bits != 0 ? numberTriplets + 1 : numberTriplets;
-        char[] encodedData = null;
+        char encodedData[] = null;
 
         encodedData = new char[numberQuartet * 4];
 
@@ -161,7 +161,7 @@ public final class Base64 {
             return new byte[0];
         }
 
-        byte[] decodedData = null;
+        byte decodedData[] = null;
         byte b1 = 0, b2 = 0, b3 = 0, b4 = 0;
         char d1 = 0, d2 = 0, d3 = 0, d4 = 0;
 

cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/utils/uuid/Seq.java

@@ -17,9 +17,9 @@ public class Seq {
     // 机器标识
     private static final String machineCode = "A";
     // 通用接口序列数
-    private static final AtomicInteger commSeq = new AtomicInteger(1);
+    private static AtomicInteger commSeq = new AtomicInteger(1);
     // 上传接口序列数
-    private static final AtomicInteger uploadSeq = new AtomicInteger(1);
+    private static AtomicInteger uploadSeq = new AtomicInteger(1);
 
     /**
      * 获取通用序列号

cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/utils/uuid/UUID.java

@@ -353,22 +353,22 @@ public final class UUID implements java.io.Serializable, Comparable<UUID> {
         final StringBuilder builder = new StringBuilder(isSimple ? 32 : 36);
         // time_low
         builder.append(digits(mostSigBits >> 32, 8));
-        if (!isSimple) {
+        if (false == isSimple) {
             builder.append('-');
         }
         // time_mid
         builder.append(digits(mostSigBits >> 16, 4));
-        if (!isSimple) {
+        if (false == isSimple) {
             builder.append('-');
         }
         // time_high_and_version
         builder.append(digits(mostSigBits, 4));
-        if (!isSimple) {
+        if (false == isSimple) {
             builder.append('-');
         }
         // variant_and_sequence
         builder.append(digits(leastSigBits >> 48, 4));
-        if (!isSimple) {
+        if (false == isSimple) {
             builder.append('-');
         }
         // node

cloud-common/cloud-common-datascope/src/main/java/com/muyu/common/datascope/annotation/DataScope.java

@@ -14,15 +14,15 @@ public @interface DataScope {
     /**
      * 部门表的别名
      */
-    String deptAlias() default "";
+    public String deptAlias () default "";
 
     /**
      * 用户表的别名
      */
-    String userAlias() default "";
+    public String userAlias () default "";
 
     /**
      * 权限字符（用于多个角色匹配符合要求的权限）默认根据权限注解@RequiresPermissions获取，多个权限用逗号分隔开来
      */
-    String permission() default "";
+    public String permission () default "";
 }

cloud-common/cloud-common-datascope/src/main/java/com/muyu/common/datascope/aspect/DataScopeAspect.java

@@ -109,7 +109,8 @@ public class DataScopeAspect {
 
         if (StringUtils.isNotBlank(sqlString.toString())) {
             Object params = joinPoint.getArgs()[0];
-            if (StringUtils.isNotNull(params) && params instanceof BaseEntity baseEntity) {
+            if (StringUtils.isNotNull(params) && params instanceof BaseEntity) {
+                BaseEntity baseEntity = (BaseEntity) params;
                 baseEntity.getParams().put(DATA_SCOPE, " AND (" + sqlString.substring(4) + ")");
             }
         }
@@ -140,7 +141,8 @@ public class DataScopeAspect {
      */
     private void clearDataScope (final JoinPoint joinPoint) {
         Object params = joinPoint.getArgs()[0];
-        if (StringUtils.isNotNull(params) && params instanceof BaseEntity baseEntity) {
+        if (StringUtils.isNotNull(params) && params instanceof BaseEntity) {
+            BaseEntity baseEntity = (BaseEntity) params;
             baseEntity.getParams().put(DATA_SCOPE, "");
         }
     }

cloud-common/cloud-common-log/src/main/java/com/muyu/common/log/annotation/Log.java

@@ -17,30 +17,30 @@ public @interface Log {
     /**
      * 模块
      */
-    String title() default "";
+    public String title () default "";
 
     /**
      * 功能
      */
-    BusinessType businessType() default BusinessType.OTHER;
+    public BusinessType businessType () default BusinessType.OTHER;
 
     /**
      * 操作人类别
      */
-    OperatorType operatorType() default OperatorType.MANAGE;
+    public OperatorType operatorType () default OperatorType.MANAGE;
 
     /**
      * 是否保存请求的参数
      */
-    boolean isSaveRequestData() default true;
+    public boolean isSaveRequestData () default true;
 
     /**
      * 是否保存响应的参数
      */
-    boolean isSaveResponseData() default true;
+    public boolean isSaveResponseData () default true;
 
     /**
      * 排除指定的请求参数
      */
-    String[] excludeParamNames() default {};
+    public String[] excludeParamNames () default {};
 }

cloud-common/cloud-common-log/src/main/java/com/muyu/common/log/aspect/LogAspect.java

@@ -169,12 +169,12 @@ public class LogAspect {
      */
     private String argsArrayToString (Object[] paramsArray, String[] excludeParamNames) {
         String params = "";
-        if (paramsArray != null) {
+        if (paramsArray != null && paramsArray.length > 0) {
             for (Object o : paramsArray) {
                 if (StringUtils.isNotNull(o) && !isFilterObject(o)) {
                     try {
                         String jsonObj = JSON.toJSONString(o, excludePropertyPreFilter(excludeParamNames));
-                        params += jsonObj + " ";
+                        params += jsonObj.toString() + " ";
                     } catch (Exception e) {
                     }
                 }

cloud-common/cloud-common-redis/src/main/java/com/muyu/common/redis/configure/FastJson2JsonRedisSerializer.java

@@ -22,7 +22,7 @@ public class FastJson2JsonRedisSerializer<T> implements RedisSerializer<T> {
 
     static final Filter AUTO_TYPE_FILTER = JSONReader.autoTypeFilter(Constants.JSON_WHITELIST_STR);
 
-    private final Class<T> clazz;
+    private Class<T> clazz;
 
     public FastJson2JsonRedisSerializer (Class<T> clazz) {
         super();

cloud-common/cloud-common-saas/pom.xml

@@ -29,10 +29,8 @@
             <groupId>com.muyu</groupId>
             <artifactId>cloud-common-security</artifactId>
         </dependency>
-        <dependency>
+
-            <groupId>com.mysql</groupId>
+
-            <artifactId>mysql-connector-j</artifactId>
-        </dependency>
 
 
     </dependencies>

cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/many/datasource/ManyDataSource.java

@@ -6,20 +6,17 @@ import com.baomidou.mybatisplus.autoconfigure.MybatisPlusAutoConfiguration;
 import com.muyu.cloud.common.many.datasource.constents.DatasourceContent;
 import com.muyu.cloud.common.many.datasource.domain.model.DataSourceInfo;
 import com.muyu.cloud.common.many.datasource.factory.DruidDataSourceFactory;
-import com.muyu.cloud.common.many.datasource.init.InitDataSource;
 import com.muyu.cloud.common.many.datasource.role.DynamicDataSource;
-import com.muyu.cloud.common.saas.domain.Datasource;
 import com.muyu.cloud.common.saas.domain.model.EntInfo;
 import com.muyu.cloud.common.saas.exception.SaaSException;
 import com.muyu.common.core.domain.Result;
 import com.muyu.common.core.utils.SpringUtils;
-
+import com.muyu.common.system.domain.Datasource;
 import com.muyu.common.system.domain.SysUser;
 import com.muyu.common.system.remote.RemoteSaaSService;
-
+import com.muyu.common.system.remote.RemoteUserService;
 import lombok.extern.log4j.Log4j2;
 import org.mybatis.spring.boot.autoconfigure.MybatisAutoConfiguration;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.ApplicationArguments;
 import org.springframework.boot.ApplicationRunner;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
@@ -41,14 +38,9 @@ import java.util.Map;
 @Component
 @AutoConfiguration(before = {MybatisPlusAutoConfiguration.class, MybatisAutoConfiguration.class})
 public class ManyDataSource implements ApplicationRunner{
-
-    @Autowired
-    private InitDataSource initDataSource;
-
-
     private List<EntInfo> dataSourceInfoList(){
         RemoteSaaSService remoteSaaSService = SpringUtils.getBean(RemoteSaaSService.class);
-        Result<List<Datasource>> tableDataInfoResult = initDataSource.initDatasource();
+Result<List<Datasource>> tableDataInfoResult = remoteSaaSService.findDatabaseList();
         if (tableDataInfoResult==null){
             throw new SaaSException("saas远调数据源错误");
         }

cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/many/datasource/init/InitDataSource.java

@@ -1,59 +0,0 @@
-package com.muyu.cloud.common.many.datasource.init;
-
-
-import com.muyu.cloud.common.saas.domain.Datasource;
-import com.muyu.common.core.domain.Result;
-import com.muyu.common.system.domain.Firm;
-import lombok.extern.log4j.Log4j2;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Primary;
-import org.springframework.stereotype.Component;
-
-import java.sql.*;
-import java.util.ArrayList;
-import java.util.List;
-
-@Component
-@Log4j2
-public class InitDataSource {
-
-    public static final String USER="root";
-    public static final String PASSWORD="Lw030106";
-
-    @Bean
-    @Primary
-    public Result<List<Datasource>> initDatasource(){
-        ArrayList<Datasource> list = new ArrayList<>();
-
-        try {
-            DriverManager.registerDriver(new com.mysql.cj.jdbc.Driver());
-            Connection connection= DriverManager.getConnection("jdbc:mysql://47.101.53.251:3306/datasource?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT&useSSL=false",USER,PASSWORD);
-            String sql="select * from `datasource` ";
-
-            Statement stmt = connection.createStatement();
-            ResultSet rs = stmt.executeQuery(sql);
-
-            while (rs.next()){
-                Datasource datasource = new Datasource();
-                datasource.setId(rs.getInt("id"));
-                datasource.setFirmName(rs.getString("firm_name"));
-                datasource.setDatabaseName(rs.getString("database_name"));
-                list.add(datasource);
-            }
-
-        } catch (SQLException e) {
-            throw new RuntimeException(e);
-        }
-        return Result.success(list);
-    };
-
-
-
-
-
-
-
-
-
-
-}

cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/Firm.java

@@ -1,22 +0,0 @@
-package com.muyu.common.system.domain;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class Firm {
-
-    private Integer id;
-
-    private String firmName;
-
-    private String databaseName;
-
-    private String userName;
-
-
-
-}

cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/remote/RemoteFileService.java

@@ -25,5 +25,5 @@ public interface RemoteFileService {
      * @return 结果
      */
     @PostMapping(value = "/upload", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
-    Result<SysFile> upload(@RequestPart(value = "file") MultipartFile file);
+    public Result<SysFile> upload (@RequestPart(value = "file") MultipartFile file);
 }

cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/remote/RemoteLogService.java

@@ -27,7 +27,7 @@ public interface RemoteLogService {
      * @return 结果
      */
     @PostMapping("/operlog")
-    Result<Boolean> saveLog(@RequestBody SysOperLog sysOperLog, @RequestHeader(SecurityConstants.FROM_SOURCE) String source) throws Exception;
+    public Result<Boolean> saveLog (@RequestBody SysOperLog sysOperLog, @RequestHeader(SecurityConstants.FROM_SOURCE) String source) throws Exception;
 
     /**
      * 保存访问记录
@@ -38,5 +38,5 @@ public interface RemoteLogService {
      * @return 结果
      */
     @PostMapping("/logininfor")
-    Result<Boolean> saveLogininfor(@RequestBody SysLogininfor sysLogininfor, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+    public Result<Boolean> saveLogininfor (@RequestBody SysLogininfor sysLogininfor, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
 }

cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/remote/RemoteSaaSService.java

@@ -22,7 +22,7 @@ import java.util.List;
 public interface RemoteSaaSService {
 
     @GetMapping("/saas/findDatabaseList")
-    Result<List<Datasource>> findDatabaseList();
+    public Result<List<Datasource>> findDatabaseList();
 
 
 

cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/remote/RemoteUserService.java

@@ -29,7 +29,7 @@ public interface RemoteUserService {
      * @return 结果
      */
     @GetMapping("/user/info/{username}")
-    Result<LoginUser> getUserInfo(@PathVariable("username") String username, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+    public Result<LoginUser> getUserInfo (@PathVariable("username") String username, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
 
     /**
      * 注册用户信息
@@ -40,8 +40,8 @@ public interface RemoteUserService {
      * @return 结果
      */
     @PostMapping("/user/register")
-    Result<Boolean> registerUserInfo(@RequestBody SysUser sysUser, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+    public Result<Boolean> registerUserInfo (@RequestBody SysUser sysUser, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
 
     @GetMapping("/user/companyList")
-    Result<List<SysUser>> companyList();
+    public Result<List<SysUser>> companyList ();
 }

cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/remote/factory/RemoteUserFallbackFactory.java

@@ -2,7 +2,6 @@ package com.muyu.common.system.remote.factory;
 
 import com.muyu.common.core.domain.Result;
 import com.muyu.common.core.web.page.TableDataInfo;
-import com.muyu.common.system.domain.Firm;
 import com.muyu.common.system.domain.SysFirmUser;
 import com.muyu.common.system.remote.RemoteUserService;
 import com.muyu.common.system.domain.SysUser;
@@ -27,10 +26,8 @@ public class RemoteUserFallbackFactory implements FallbackFactory<RemoteUserServ
     public RemoteUserService create (Throwable throwable) {
         log.error("用户服务调用失败:{}", throwable.getMessage());
         return new RemoteUserService() {
-
-
             @Override
-            public Result<LoginUser> getUserInfo(Firm firm, String source) {
+            public Result<LoginUser> getUserInfo (String username, String source) {
                 return Result.error("获取用户失败:" + throwable.getMessage());
             }
 

cloud-gateway/src/main/java/com/muyu/gateway/filter/BlackListUrlFilter.java

@@ -36,7 +36,7 @@ public class BlackListUrlFilter extends AbstractGatewayFilterFactory<BlackListUr
     public static class Config {
         private List<String> blacklistUrl;
 
-        private final List<Pattern> blacklistUrlPattern = new ArrayList<>();
+        private List<Pattern> blacklistUrlPattern = new ArrayList<>();
 
         public boolean matchBlacklist (String url) {
             return !blacklistUrlPattern.isEmpty() && blacklistUrlPattern.stream().anyMatch(p -> p.matcher(url).find());

cloud-gateway/src/main/java/com/muyu/gateway/handler/GatewayExceptionHandler.java

@@ -34,7 +34,8 @@ public class GatewayExceptionHandler implements ErrorWebExceptionHandler {
 
         if (ex instanceof NotFoundException) {
             msg = "服务未找到";
-        } else if (ex instanceof ResponseStatusException responseStatusException) {
+        } else if (ex instanceof ResponseStatusException) {
+            ResponseStatusException responseStatusException = (ResponseStatusException) ex;
             msg = responseStatusException.getMessage();
         } else {
             msg = "内部服务器错误";

cloud-gateway/src/main/java/com/muyu/gateway/service/ValidateCodeService.java

@@ -14,10 +14,10 @@ public interface ValidateCodeService {
     /**
      * 生成验证码
      */
-    Result createCaptcha() throws IOException, CaptchaException;
+    public Result createCaptcha () throws IOException, CaptchaException;
 
     /**
      * 校验验证码
      */
-    void checkCaptcha(String key, String value) throws CaptchaException;
+    public void checkCaptcha (String key, String value) throws CaptchaException;
 }

cloud-gateway/src/main/resources/bootstrap.yml

@@ -7,7 +7,7 @@ nacos:
   addr: 47.101.53.251:8848
   user-name: nacos
   password: nacos
-  namespace: lgy
+  namespace: yzl
 
 # Spring
 spring:

cloud-modules/cloud-data/pom.xml

@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>com.muyu</groupId>
-        <artifactId>cloud-modules</artifactId>
-        <version>3.6.3</version>
-    </parent>
-
-    <artifactId>cloud-data</artifactId>
-
-    <properties>
-        <maven.compiler.source>17</maven.compiler.source>
-        <maven.compiler.target>17</maven.compiler.target>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    </properties>
-
-    <dependencies>
-
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-bootstrap</artifactId>
-            <version>4.1.2</version>
-        </dependency>
-
-
-        <!-- SpringCloud Alibaba Nacos -->
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
-        </dependency>
-
-        <!-- SpringCloud Alibaba Nacos Config -->
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
-        </dependency>
-
-        <!-- SpringCloud Alibaba Sentinel -->
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
-        </dependency>
-
-        <!-- SpringBoot Actuator -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-actuator</artifactId>
-        </dependency>
-
-
-            <dependency>
-                <groupId>org.springframework.kafka</groupId>
-                <artifactId>spring-kafka</artifactId>
-            </dependency>
-
-
-        <!-- Mysql Connector -->
-        <dependency>
-            <groupId>com.mysql</groupId>
-            <artifactId>mysql-connector-j</artifactId>
-        </dependency>
-
-        <!-- MuYu Common DataSource -->
-        <dependency>
-            <groupId>com.muyu</groupId>
-            <artifactId>cloud-common-datasource</artifactId>
-        </dependency>
-
-        <!-- MuYu Common DataScope -->
-        <dependency>
-            <groupId>com.muyu</groupId>
-            <artifactId>cloud-common-datascope</artifactId>
-        </dependency>
-
-        <!-- MuYu Common Log -->
-        <dependency>
-            <groupId>com.muyu</groupId>
-            <artifactId>cloud-common-log</artifactId>
-        </dependency>
-
-        <!-- 接口模块 -->
-        <dependency>
-            <groupId>com.muyu</groupId>
-            <artifactId>cloud-common-api-doc</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.muyu</groupId>
-            <artifactId>cloud-modules-car</artifactId>
-            <version>3.6.3</version>
-        </dependency>
-        <dependency>
-            <groupId>com.muyu</groupId>
-            <artifactId>cloud-modules-fence</artifactId>
-            <version>3.6.3</version>
-            <scope>compile</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.eclipse.paho</groupId>
-            <artifactId>org.eclipse.paho.client.mqttv3</artifactId>
-            <version>1.1.0</version>
-        </dependency>
-
-
-
-
-    </dependencies>
-
-    <build>
-        <finalName>${project.artifactId}</finalName>
-        <plugins>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>repackage</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>

cloud-modules/cloud-data/src/main/java/com/muyu/data/DataApplication.java

@@ -1,15 +0,0 @@
-package com.muyu.data;
-
-import com.muyu.common.security.annotation.EnableMyFeignClients;
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.cloud.openfeign.EnableFeignClients;
-
-@SpringBootApplication
-@EnableMyFeignClients
-@EnableFeignClients
-public class DataApplication {
-    public static void main(String[] args) {
-        SpringApplication.run(DataApplication.class,args);
-    }
-}

cloud-modules/cloud-data/src/main/java/com/muyu/data/config/KafkaConsumerConfig.java

@@ -1,129 +0,0 @@
-package com.muyu.data.config;
-
-
-import org.apache.kafka.clients.consumer.ConsumerConfig;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.SpringBootConfiguration;
-import org.springframework.context.annotation.Bean;
-import org.springframework.kafka.config.ConcurrentKafkaListenerContainerFactory;
-import org.springframework.kafka.config.KafkaListenerContainerFactory;
-import org.springframework.kafka.core.ConsumerFactory;
-import org.springframework.kafka.core.DefaultKafkaConsumerFactory;
-import org.springframework.kafka.listener.ConcurrentMessageListenerContainer;
-import org.springframework.kafka.listener.ContainerProperties;
-import org.springframework.kafka.support.serializer.JsonDeserializer;
-
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * @author 徐一杰
- * @date 2022/10/31 18:05
- * kafka配置，也可以写在yml，这个文件会覆盖yml
- */
-@SpringBootConfiguration
-public class KafkaConsumerConfig {
-
-    /**
-     * 配置 Kafka的 主机地址
-     */
-    @Value("${spring.kafka.consumer.bootstrap-servers}")
-    private String bootstrapServers;
-    /**
-     * 配置分分组
-     */
-    @Value("${spring.kafka.consumer.group-id}")
-    private String groupId;
-    /**
-     * 是否自动提交 偏移量
-     */
-    @Value("${spring.kafka.consumer.enable-auto-commit}")
-    private boolean enableAutoCommit;
-    /**
-     * 消费者与Kafka的心跳续约的会话超时时间
-     */
-    @Value("${spring.kafka.properties.session.timeout.ms}")
-    private String sessionTimeout;
-    /**
-     * 两次poll之间的最大间隔，默认值为5分钟。如果超过这个间隔会触发reBalance
-     */
-    @Value("${spring.kafka.properties.max.poll.interval.ms}")
-    private String maxPollIntervalTime;
-
-    @Value("${spring.kafka.consumer.max-poll-records}")
-    private String maxPollRecords;
-
-    @Value("${spring.kafka.consumer.auto-offset-reset}")
-    private String autoOffsetReset;
-
-    @Value("${spring.kafka.listener.concurrency}")
-    private Integer concurrency;
-
-    @Value("${spring.kafka.listener.missing-topics-fatal}")
-    private boolean missingTopicsFatal;
-
-    @Value("${spring.kafka.listener.poll-timeout}")
-    private long pollTimeout;
-
-    @Bean
-    public Map<String, Object> consumerConfigs() {
-        Map<String, Object> propsMap = new HashMap<>(16);
-        propsMap.put(ConsumerConfig.BOOTSTRAP_SERVERS_CONFIG, bootstrapServers);
-        propsMap.put(ConsumerConfig.GROUP_ID_CONFIG, groupId);
-        //是否自动提交偏移量，默认值是true，为了避免出现重复数据和数据丢失，可以把它设置为false，然后手动提交偏移量
-        propsMap.put(ConsumerConfig.ENABLE_AUTO_COMMIT_CONFIG, enableAutoCommit);
-        //自动提交的时间间隔，自动提交开启时生效
-        propsMap.put(ConsumerConfig.AUTO_COMMIT_INTERVAL_MS_CONFIG, "2000");
-        //该属性指定了消费者在读取一个没有偏移量的分区或者偏移量无效的情况下该作何处理：
-        //earliest：当各分区下有已提交的offset时，从提交的offset开始消费；无提交的offset时，从头开始消费分区的记录
-        //latest：当各分区下有已提交的offset时，从提交的offset开始消费；无提交的offset时，消费新产生的该分区下的数据（在消费者启动之后生成的记录）
-        //none：当各分区都存在已提交的offset时，从提交的offset开始消费；只要有一个分区不存在已提交的offset，则抛出异常
-        propsMap.put(ConsumerConfig.AUTO_OFFSET_RESET_CONFIG, autoOffsetReset);
-        //两次poll之间的最大间隔，默认值为5分钟。如果超过这个间隔会触发reBalance
-        propsMap.put(ConsumerConfig.MAX_POLL_INTERVAL_MS_CONFIG, maxPollIntervalTime);
-        //这个参数定义了poll方法最多可以拉取多少条消息，默认值为500。如果在拉取消息的时候新消息不足500条，那有多少返回多少；如果超过500条，每次只返回500。
-        //这个默认值在有些场景下太大，有些场景很难保证能够在5min内处理完500条消息，
-        //如果消费者无法在5分钟内处理完500条消息的话就会触发reBalance,
-        //然后这批消息会被分配到另一个消费者中，还是会处理不完，这样这批消息就永远也处理不完。
-        //要避免出现上述问题，提前评估好处理一条消息最长需要多少时间，然后覆盖默认的max.poll.records参数
-        //注：需要开启BatchListener批量监听才会生效，如果不开启BatchListener则不会出现reBalance情况
-        propsMap.put(ConsumerConfig.MAX_POLL_RECORDS_CONFIG, maxPollRecords);
-        //当broker多久没有收到consumer的心跳请求后就触发reBalance，默认值是10s
-        propsMap.put(ConsumerConfig.SESSION_TIMEOUT_MS_CONFIG, sessionTimeout);
-        //序列化（建议使用Json，这种序列化方式可以无需额外配置传输实体类）
-        propsMap.put(ConsumerConfig.KEY_DESERIALIZER_CLASS_CONFIG, JsonDeserializer.class);
-        propsMap.put(ConsumerConfig.VALUE_DESERIALIZER_CLASS_CONFIG, JsonDeserializer.class);
-        return propsMap;
-    }
-
-    @Bean
-    public ConsumerFactory<Object, Object> consumerFactory() {
-        // 配置消费者的 Json 反序列化的可信赖包，反序列化实体类需要
-        try (JsonDeserializer<Object> deserializer = new JsonDeserializer<>()) {
-            deserializer.trustedPackages("*");
-            return new DefaultKafkaConsumerFactory<>(consumerConfigs(), new JsonDeserializer<>(), deserializer);
-        }
-    }
-
-    /**
-     * kafka监听容器工厂  负责 从 Kafka的主题中 取出消息进行消费  可以设置消费者的配置
-     * @return
-     */
-    @Bean
-    public KafkaListenerContainerFactory<ConcurrentMessageListenerContainer<Object, Object>> kafkaListenerContainerFactory() {
-        ConcurrentKafkaListenerContainerFactory<Object, Object> factory = new ConcurrentKafkaListenerContainerFactory<>();
-        factory.setConsumerFactory(consumerFactory());
-        //在侦听器容器中运行的线程数，一般设置为 机器数*分区数
-        factory.setConcurrency(concurrency);
-        // 消费监听接口监听的主题不存在时，默认会报错，所以设置为false忽略错误
-        factory.setMissingTopicsFatal(missingTopicsFatal);
-        // 自动提交关闭，需要设置手动消息确认
-        factory.getContainerProperties().setAckMode(ContainerProperties.AckMode.MANUAL_IMMEDIATE);
-        factory.getContainerProperties().setPollTimeout(pollTimeout);
-        // 设置为批量监听，需要用List接收
-        // factory.setBatchListener(true);
-        return factory;
-    }
-
-}

cloud-modules/cloud-data/src/main/java/com/muyu/data/config/KafkaProviderConfig.java

@@ -1,127 +0,0 @@
-package com.muyu.data.config;
-
-import org.apache.kafka.clients.producer.ProducerConfig;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.kafka.core.DefaultKafkaProducerFactory;
-import org.springframework.kafka.core.KafkaTemplate;
-import org.springframework.kafka.core.ProducerFactory;
-import org.springframework.kafka.transaction.KafkaTransactionManager;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * 主题生产者的配置类
- */
-@Configuration
-public class KafkaProviderConfig {
-
-    /**
-     * kafka 的主机地址
-     */
-    @Value("${spring.kafka.producer.bootstrap-servers}")
-    private String bootstrapServers;
-    /**
-     * 配置 Kafka的事务
-     */
-    @Value("${spring.kafka.producer.transaction-id-prefix}")
-    private String transactionIdPrefix;
-    /**
-     * 发送确认机制
-     */
-    @Value("${spring.kafka.producer.acks}")
-    private String acks;
-    /**
-     * 发送重试
-     */
-    @Value("${spring.kafka.producer.retries}")
-    private String retries;
-    /**
-     * 发送消息的批次大小
-     */
-    @Value("${spring.kafka.producer.batch-size}")
-    private String batchSize;
-    /**
-     * 消息的缓冲区内存大小
-     */
-    @Value("${spring.kafka.producer.buffer-memory}")
-    private String bufferMemory;
-
-    /**
-     * 设置 健的序列化方式
-     */
-    @Value("${spring.kafka.producer.key-serializer}")
-    private String keySerializer;
-
-    /**
-     * 设置 值的序列化方式
-     */
-    @Value("${spring.kafka.producer.value-serializer}")
-    private String valueSerializer;
-
-    /**
-     * 构建 map 配置消息生产者对象的配置
-     * @return
-     */
-    @Bean
-    public Map<String, Object> producerConfigs() {
-        Map<String, Object> props = new HashMap<>(16);
-        props.put(ProducerConfig.BOOTSTRAP_SERVERS_CONFIG, bootstrapServers);
-        //acks=0 ： 生产者在成功写入消息之前不会等待任何来自服务器的响应。
-        //acks=1 ： 只要集群的首领节点收到消息，生产者就会收到一个来自服务器成功响应。
-        //acks=all ：只有当所有参与复制的节点全部收到消息时，生产者才会收到一个来自服务器的成功响应。
-        //开启事务必须设为all
-        props.put(ProducerConfig.ACKS_CONFIG, acks);
-        //发生错误后，消息重发的次数，开启事务必须大于0
-        props.put(ProducerConfig.RETRIES_CONFIG, retries);
-        //当多个消息发送到相同分区时,生产者会将消息打包到一起,以减少请求交互. 而不是一条条发送
-        //批次的大小可以通过batch.size 参数设置.默认是16KB
-        //较小的批次大小有可能降低吞吐量（批次大小为0则完全禁用批处理）。
-        //比如说，kafka里的消息5秒钟Batch才凑满了16KB，才能发送出去。那这些消息的延迟就是5秒钟
-        //实测batchSize这个参数没有用
-        props.put(ProducerConfig.BATCH_SIZE_CONFIG, batchSize);
-        //有的时刻消息比较少,过了很久,比如5min也没有凑够16KB,这样延时就很大,所以需要一个参数. 再设置一个时间,到了这个时间,
-        //即使数据没达到16KB,也将这个批次发送出去
-        props.put(ProducerConfig.LINGER_MS_CONFIG, "5000");
-        //生产者内存缓冲区的大小
-        props.put(ProducerConfig.BUFFER_MEMORY_CONFIG, bufferMemory);
-        //反序列化，和生产者的序列化方式对应
-        props.put(ProducerConfig.KEY_SERIALIZER_CLASS_CONFIG, keySerializer);
-        props.put(ProducerConfig.VALUE_SERIALIZER_CLASS_CONFIG, valueSerializer);
-        return props;
-    }
-
-    /**
-     * 构建 主题生产者工厂
-     * @return
-     */
-    @Bean
-    public ProducerFactory<Object, Object> producerFactory() {
-        DefaultKafkaProducerFactory<Object, Object> factory = new DefaultKafkaProducerFactory<>(producerConfigs());
-        //开启事务，会导致 LINGER_MS_CONFIG 配置失效
-        factory.setTransactionIdPrefix(transactionIdPrefix);
-        return factory;
-    }
-
-    /**
-     * 配置 Kafka的事务管理器
-     * @param producerFactory
-     * @return
-     */
-    @Bean
-    public KafkaTransactionManager<Object, Object> kafkaTransactionManager(ProducerFactory<Object, Object> producerFactory) {
-        return new KafkaTransactionManager<>(producerFactory);
-    }
-
-    /**
-     * 构建 KafkaTemplate
-     * @return
-     */
-    @Bean
-    public KafkaTemplate<Object, Object> kafkaTemplate() {
-        return new KafkaTemplate<>(producerFactory());
-    }
-
-}

cloud-modules/cloud-data/src/main/java/com/muyu/data/config/KafkaSendResultHandler.java

@@ -1,65 +0,0 @@
-package com.muyu.data.config;
-
-import jakarta.annotation.Nullable;
-import org.apache.kafka.clients.producer.ProducerRecord;
-import org.apache.kafka.clients.producer.RecordMetadata;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.kafka.core.KafkaTemplate;
-import org.springframework.kafka.support.ProducerListener;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.PostConstruct;
-
-@Component
-public class KafkaSendResultHandler implements ProducerListener<Object,Object> {
-
-    @Autowired
-    private KafkaTemplate<Object,Object> kafkaTemplate;
-
-    /**
-     * bean 初始化方法
-     */
-    @PostConstruct
-    public void init(){
-        this.kafkaTemplate.setProducerListener(this);
-    }
-
-    /**
-     * 消息发送到Kafka成功的回调
-     * @param producerRecord
-     * @param recordMetadata
-     */
-    @Override
-    public void onSuccess(ProducerRecord producerRecord, RecordMetadata recordMetadata){
-        System.out.println("信息发送成功："+ producerRecord.toString());
-    }
-
-    /**
-     * 息发送到 Kafka 失败的回调
-     * @param producerRecord the failed record
-     * @param recordMetadata The metadata for the record that was sent (i.e. the partition
-     * and offset). If an error occurred, metadata will contain only valid topic and maybe
-     * the partition. If the partition is not provided in the ProducerRecord and an error
-     * occurs before partition is assigned, then the partition will be set to
-     * RecordMetadata.UNKNOWN_PARTITION.
-     * @param exception the exception thrown
-     */
-    @Override
-    public void onError(ProducerRecord producerRecord, @Nullable RecordMetadata recordMetadata,
-                        Exception exception){
-        System.out.println("消息发送失败: "+ producerRecord.toString());
-    }
-
-
-
-
-
-
-
-
-
-
-
-
-
-}

cloud-modules/cloud-data/src/main/java/com/muyu/data/config/MyKafkaListenerErrorHandler.java

@@ -1,36 +0,0 @@
-package com.muyu.data.config;
-
-
-import lombok.NonNull;
-import org.apache.kafka.clients.consumer.Consumer;
-import org.springframework.kafka.annotation.KafkaListener;
-import org.springframework.kafka.listener.KafkaListenerErrorHandler;
-import org.springframework.kafka.listener.ListenerExecutionFailedException;
-import org.springframework.kafka.support.Acknowledgment;
-import org.springframework.messaging.Message;
-import org.springframework.stereotype.Component;
-
-@Component
-public class MyKafkaListenerErrorHandler implements KafkaListenerErrorHandler {
-
-    @Override
-    @NonNull
-    public Object handleError(@NonNull Message<?> message,
-                              ListenerExecutionFailedException exception) {
-        return new Object();
-    }
-
-    @Override
-    @NonNull
-    public Object handleError(@NonNull Message<?> message,
-                              @NonNull ListenerExecutionFailedException exception,
-                              Consumer<?, ?> consumer) {
-        System.out.println("消息详情："+ message);
-        System.out.println("异常信息："+ exception);
-        System.out.println("消费者详情：" +consumer.groupMetadata());
-        System.out.println("监听主题："+ consumer.listTopics());
-        return KafkaListenerErrorHandler.super.handleError(message, exception, consumer);
-    }
-
-
-}

cloud-modules/cloud-data/src/main/java/com/muyu/data/controller/DataController.java

@@ -1,30 +0,0 @@
-package com.muyu.data.controller;
-
-import com.muyu.data.service.DataService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-@RestController
-@RequestMapping("data")
-public class DataController {
-
-    @Autowired
-    private DataService dataService;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-}

cloud-modules/cloud-data/src/main/java/com/muyu/data/domian/Event.java

@@ -1,42 +0,0 @@
-package com.muyu.data.domian;
-
-
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.muyu.common.core.annotation.Excel;
-import jakarta.validation.constraints.NotBlank;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.Date;
-
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-@EqualsAndHashCode(callSuper = false)
-@TableName("event")
-public class Event {
-
-    @TableId(value ="event_id" )
-    @Excel(name = "事件id")
-    private Integer eventId;
-
-    @Excel(name = "事件名称")
-    private String eventName;
-
-    @Excel(name = "车辆vin")
-    private String carVin;
-
-    private String createBy;
-
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date createTime;
-
-
-
-}

cloud-modules/cloud-data/src/main/java/com/muyu/data/mapper/DataMapper.java

@@ -1,8 +0,0 @@
-package com.muyu.data.mapper;
-
-import org.apache.ibatis.annotations.Mapper;
-
-@Mapper
-public interface DataMapper {
-
-}

cloud-modules/cloud-data/src/main/java/com/muyu/data/remote/RemoteCarService.java

@@ -1,23 +0,0 @@
-package com.muyu.data.remote;
-
-import com.muyu.common.core.domain.Result;
-import com.muyu.domain.req.SysCarReq;
-import com.muyu.domain.resp.SysCarVo;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-
-import java.util.List;
-
-@FeignClient(name = "cloud-car")
-public interface RemoteCarService {
-
-
-    @PostMapping("/car/selectSysCarVoList")
-    public Result<List<SysCarVo>> selectSysCarVoList(
-            @RequestBody SysCarReq sysCarReq);
-
-
-
-
-}

cloud-modules/cloud-data/src/main/java/com/muyu/data/remote/RemoteFenceService.java

@@ -1,21 +0,0 @@
-package com.muyu.data.remote;
-
-import com.muyu.common.core.domain.Result;
-import com.muyu.fence.domain.req.ElectronicFenceGroupListReq;
-import com.muyu.fence.domain.resp.GroupFenceListresp;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-
-import java.util.List;
-
-@FeignClient(name = "cloud-fence")
-public interface RemoteFenceService {
-
-    @PostMapping("/fence/selectGroupList")
-    public Result<List<GroupFenceListresp>> selectGroupList(
-            @RequestBody ElectronicFenceGroupListReq req);
-
-
-
-}

cloud-modules/cloud-data/src/main/java/com/muyu/data/service/DataService.java

@@ -1,4 +0,0 @@
-package com.muyu.data.service;
-
-public interface DataService {
-}

cloud-modules/cloud-data/src/main/java/com/muyu/data/service/impl/DataServiceImpl.java

@@ -1,9 +0,0 @@
-package com.muyu.data.service.impl;
-
-import org.springframework.stereotype.Service;
-
-@Service
-public class DataServiceImpl {
-
-
-}

cloud-modules/cloud-data/src/main/java/com/muyu/data/util/InitDataRedis.java

@@ -1,57 +0,0 @@
-package com.muyu.data.util;
-
-import com.muyu.common.core.domain.Result;
-import com.muyu.data.remote.RemoteCarService;
-import com.muyu.data.remote.RemoteFenceService;
-import com.muyu.domain.resp.SysCarVo;
-import com.muyu.fence.domain.resp.GroupFenceListresp;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.ApplicationArguments;
-import org.springframework.boot.ApplicationRunner;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-@Component
-public class InitDataRedis implements ApplicationRunner {
-
-
-    @Resource
-    private RedisTemplate redisTemplate;
-    @Autowired
-    private RemoteCarService remoteCarService;
-    @Autowired
-    private RemoteFenceService remoteFenceService;
-
-    @Override
-    public void run(ApplicationArguments args) throws Exception {
-
-        //查询数控库中的车辆列表基本信息
-        Result<List<SysCarVo>> sysCarVoListResult = remoteCarService.selectSysCarVoList(null);
-        List<SysCarVo> sysCarVoList = sysCarVoListResult.getData();
-        //将全部信息存入redis中
-        for (SysCarVo sysCarVo : sysCarVoList) {
-            String carVin = sysCarVo.getCarVin();
-            redisTemplate.opsForValue().set("four:car:"+carVin,sysCarVo);
-        }
-
-        //查询车辆围栏组列表信息
-        Result<List<GroupFenceListresp>> groupListResult = remoteFenceService.selectGroupList(null);
-        List<GroupFenceListresp> groupFenceList = groupListResult.getData();
-        //将去全部信息存入redis中
-        for (GroupFenceListresp groupFenceListresp : groupFenceList) {
-            Long id = groupFenceListresp.getId();
-            redisTemplate.opsForValue().set("four:fenceGroup:"+id,groupFenceListresp);
-        }
-
-
-
-
-
-
-
-
-    }
-}

cloud-modules/cloud-data/src/main/java/com/muyu/data/util/Receive.java

@@ -1,43 +0,0 @@
-package com.muyu.data.util;
-
-
-import org.eclipse.paho.client.mqttv3.MqttClient;
-import org.eclipse.paho.client.mqttv3.MqttConnectOptions;
-import org.eclipse.paho.client.mqttv3.persist.MemoryPersistence;
-
-public class Receive {
-
-    public static MqttClient mqttClient= null;
-    private static MemoryPersistence memoryPersistence=null;
-    private static MqttConnectOptions mqttConnectOptions=null;
-
-    private static String ClientName="";
-
-    private static String IP="";
-
-    public static void main(String[] args) {
-
-    }
-
-    public static void start(String clientId){
-        //初始化连接设置对象
-        mqttConnectOptions = new MqttConnectOptions();
-        //设置是否情
-
-
-    }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-}

cloud-modules/cloud-data/src/main/java/com/muyu/data/util/ReceiveTwo.java

@@ -1,53 +0,0 @@
-package com.muyu.data.util;
-
-import org.eclipse.paho.client.mqttv3.*;
-
-public class ReceiveTwo {
-
-    public static void main(String[] args) {
-        String topic = "vehicle";
-        String broker = "tcp://47.101.53.251:1883";
-        String clientId="lw";
-
-        try {
-            MqttClient mqttClient= new MqttClient(broker,clientId);
-            MqttConnectOptions connectOptions=new MqttConnectOptions();
-            connectOptions.setCleanSession(true);
-            System.out.println("Connecting to broker：" + broker);
-            mqttClient.connect(connectOptions);
-            System.out.println("已连接");
-            mqttClient.setCallback(new MqttCallback(){
-
-                @Override
-                public void connectionLost(Throwable throwable) {
-                    System.out.println("Connect lost!");
-                }
-
-                @Override
-                public void messageArrived(String s, MqttMessage mqttMessage) throws Exception {
-                    System.out.println("Message arrived. topic:"+topic);
-                }
-
-                @Override
-                public void deliveryComplete(IMqttDeliveryToken iMqttDeliveryToken) {
-
-                }
-            });
-
-            mqttClient.subscribe(topic);
-            System.out.println("Subscribed to topic " + topic);
-        } catch (MqttException e) {
-            System.out.println("reason "+e.getReasonCode());
-            System.out.println("msg " +e.getMessage());
-            System.out.println("loc " +e.getLocalizedMessage());
-            System.out.println("cause "+e.getCause());
-            System.out.println("excep "+e);
-            e.printStackTrace();
-        }
-
-
-    }
-
-
-
-}

cloud-modules/cloud-data/src/main/resources/bootstrap.yml

@@ -1,59 +0,0 @@
-# Tomcat
-server:
-  port: 10003
-# nacos线上地址
-nacos:
-  addr: 47.101.53.251:8848
-  user-name: nacos
-  password: nacos
-  namespace: four
-# SPRING_AMQP_DESERIALIZATION_TRUST_ALL=true spring.amqp.deserialization.trust.all
-# Spring
-spring:
-  amqp:
-    deserialization:
-      trust:
-        all: true
-  main:
-    allow-bean-definition-overriding: true
-  application:
-    # 应用名称
-    name: cloud-data
-  profiles:
-    # 环境配置
-    active: dev
-  cloud:
-    nacos:
-      discovery:
-        # 服务注册地址
-        server-addr: ${nacos.addr}
-        # nacos用户名
-        username: ${nacos.user-name}
-        # nacos密码
-        password: ${nacos.password}
-        # 命名空间
-        namespace: ${nacos.namespace}
-      config:
-        # 服务注册地址
-        server-addr: ${nacos.addr}
-        # nacos用户名
-        username: ${nacos.user-name}
-        # nacos密码
-        password: ${nacos.password}
-        # 命名空间
-        namespace: ${nacos.namespace}
-        # 配置文件格式
-        file-extension: yml
-        # 共享配置
-        shared-configs:
-          # 系统共享配置
-          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
-          # 系统环境Config共享配置
-          - application-config-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
-          # xxl-job 配置文件
-          - application-xxl-config-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
-          # rabbit 配置文件
-          - application-rabbit-config-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
-logging:
-  level:
-    com.muyu.fence.mapper: DEBUG

cloud-modules/cloud-data/src/main/resources/logback/dev.xml

@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration scan="true" scanPeriod="60 seconds" debug="false">
-    <!-- 日志存放路径 -->
-    <property name="log.path" value="logs/cloud-data"/>
-    <!-- 日志输出格式 -->
-    <property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n"/>
-
-    <!-- 控制台输出 -->
-    <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
-        <encoder>
-            <pattern>${log.pattern}</pattern>
-        </encoder>
-    </appender>
-
-    <!-- 系统日志输出 -->
-    <appender name="file_info" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${log.path}/info.log</file>
-        <!-- 循环政策：基于时间创建日志文件 -->
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <!-- 日志文件名格式 -->
-            <fileNamePattern>${log.path}/info.%d{yyyy-MM-dd}.log</fileNamePattern>
-            <!-- 日志最大的历史 60天 -->
-            <maxHistory>60</maxHistory>
-        </rollingPolicy>
-        <encoder>
-            <pattern>${log.pattern}</pattern>
-        </encoder>
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <!-- 过滤的级别 -->
-            <level>INFO</level>
-            <!-- 匹配时的操作：接收（记录） -->
-            <onMatch>ACCEPT</onMatch>
-            <!-- 不匹配时的操作：拒绝（不记录） -->
-            <onMismatch>DENY</onMismatch>
-        </filter>
-    </appender>
-
-    <appender name="file_error" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${log.path}/error.log</file>
-        <!-- 循环政策：基于时间创建日志文件 -->
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <!-- 日志文件名格式 -->
-            <fileNamePattern>${log.path}/error.%d{yyyy-MM-dd}.log</fileNamePattern>
-            <!-- 日志最大的历史 60天 -->
-            <maxHistory>60</maxHistory>
-        </rollingPolicy>
-        <encoder>
-            <pattern>${log.pattern}</pattern>
-        </encoder>
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <!-- 过滤的级别 -->
-            <level>ERROR</level>
-            <!-- 匹配时的操作：接收（记录） -->
-            <onMatch>ACCEPT</onMatch>
-            <!-- 不匹配时的操作：拒绝（不记录） -->
-            <onMismatch>DENY</onMismatch>
-        </filter>
-    </appender>
-
-    <!-- 系统模块日志级别控制  -->
-    <logger name="com.muyu" level="info"/>
-    <!-- Spring日志级别控制  -->
-    <logger name="org.springframework" level="warn"/>
-
-    <root level="info">
-        <appender-ref ref="console"/>
-    </root>
-
-    <!--系统操作日志-->
-    <root level="info">
-        <appender-ref ref="file_info"/>
-        <appender-ref ref="file_error"/>
-    </root>
-</configuration>

cloud-modules/cloud-data/src/main/resources/logback/prod.xml

@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration scan="true" scanPeriod="60 seconds" debug="false">
-    <!-- 日志存放路径 -->
-    <property name="log.path" value="logs/cloud-data"/>
-    <!-- 日志输出格式 -->
-    <property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n"/>
-    <property name="log.sky.pattern" value="%d{HH:mm:ss.SSS} %yellow([%tid]) [%thread] %-5level %logger{20} - [%method,%line] - %msg%n"/>
-
-    <!-- 控制台输出 -->
-    <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
-        <encoder>
-            <pattern>${log.pattern}</pattern>
-        </encoder>
-    </appender>
-
-    <!-- 系统日志输出 -->
-    <appender name="file_info" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${log.path}/info.log</file>
-        <!-- 循环政策：基于时间创建日志文件 -->
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <!-- 日志文件名格式 -->
-            <fileNamePattern>${log.path}/info.%d{yyyy-MM-dd}.log</fileNamePattern>
-            <!-- 日志最大的历史 60天 -->
-            <maxHistory>60</maxHistory>
-        </rollingPolicy>
-        <encoder>
-            <pattern>${log.pattern}</pattern>
-        </encoder>
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <!-- 过滤的级别 -->
-            <level>INFO</level>
-            <!-- 匹配时的操作：接收（记录） -->
-            <onMatch>ACCEPT</onMatch>
-            <!-- 不匹配时的操作：拒绝（不记录） -->
-            <onMismatch>DENY</onMismatch>
-        </filter>
-    </appender>
-
-    <appender name="file_error" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${log.path}/error.log</file>
-        <!-- 循环政策：基于时间创建日志文件 -->
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <!-- 日志文件名格式 -->
-            <fileNamePattern>${log.path}/error.%d{yyyy-MM-dd}.log</fileNamePattern>
-            <!-- 日志最大的历史 60天 -->
-            <maxHistory>60</maxHistory>
-        </rollingPolicy>
-        <encoder>
-            <pattern>${log.pattern}</pattern>
-        </encoder>
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <!-- 过滤的级别 -->
-            <level>ERROR</level>
-            <!-- 匹配时的操作：接收（记录） -->
-            <onMatch>ACCEPT</onMatch>
-            <!-- 不匹配时的操作：拒绝（不记录） -->
-            <onMismatch>DENY</onMismatch>
-        </filter>
-    </appender>
-
-    <!-- 使用gRpc将日志发送到skywalking服务端 -->
-    <appender name="GRPC_LOG" class="org.apache.skywalking.apm.toolkit.log.logback.v1.x.log.GRPCLogClientAppender">
-        <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-            <layout class="org.apache.skywalking.apm.toolkit.log.logback.v1.x.TraceIdPatternLogbackLayout">
-                <Pattern>${log.sky.pattern}</Pattern>
-            </layout>
-        </encoder>
-    </appender>
-
-    <root level="info">
-        <appender-ref ref="GRPC_LOG"/>
-    </root>
-
-    <!-- 系统模块日志级别控制  -->
-    <logger name="com.muyu" level="info"/>
-    <!-- Spring日志级别控制  -->
-    <logger name="org.springframework" level="warn"/>
-
-    <root level="info">
-        <appender-ref ref="console"/>
-    </root>
-
-    <!--系统操作日志-->
-    <root level="info">
-        <appender-ref ref="file_info"/>
-        <appender-ref ref="file_error"/>
-    </root>
-</configuration>

cloud-modules/cloud-data/src/main/resources/logback/test.xml

@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration scan="true" scanPeriod="60 seconds" debug="false">
-    <!-- 日志存放路径 -->
-    <property name="log.path" value="logs/cloud-data"/>
-    <!-- 日志输出格式 -->
-    <property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n"/>
-    <property name="log.sky.pattern" value="%d{HH:mm:ss.SSS} %yellow([%tid]) [%thread] %-5level %logger{20} - [%method,%line] - %msg%n"/>
-
-    <!-- 控制台输出 -->
-    <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
-        <encoder>
-            <pattern>${log.pattern}</pattern>
-        </encoder>
-    </appender>
-
-    <!-- 系统日志输出 -->
-    <appender name="file_info" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${log.path}/info.log</file>
-        <!-- 循环政策：基于时间创建日志文件 -->
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <!-- 日志文件名格式 -->
-            <fileNamePattern>${log.path}/info.%d{yyyy-MM-dd}.log</fileNamePattern>
-            <!-- 日志最大的历史 60天 -->
-            <maxHistory>60</maxHistory>
-        </rollingPolicy>
-        <encoder>
-            <pattern>${log.pattern}</pattern>
-        </encoder>
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <!-- 过滤的级别 -->
-            <level>INFO</level>
-            <!-- 匹配时的操作：接收（记录） -->
-            <onMatch>ACCEPT</onMatch>
-            <!-- 不匹配时的操作：拒绝（不记录） -->
-            <onMismatch>DENY</onMismatch>
-        </filter>
-    </appender>
-
-    <appender name="file_error" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${log.path}/error.log</file>
-        <!-- 循环政策：基于时间创建日志文件 -->
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <!-- 日志文件名格式 -->
-            <fileNamePattern>${log.path}/error.%d{yyyy-MM-dd}.log</fileNamePattern>
-            <!-- 日志最大的历史 60天 -->
-            <maxHistory>60</maxHistory>
-        </rollingPolicy>
-        <encoder>
-            <pattern>${log.pattern}</pattern>
-        </encoder>
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <!-- 过滤的级别 -->
-            <level>ERROR</level>
-            <!-- 匹配时的操作：接收（记录） -->
-            <onMatch>ACCEPT</onMatch>
-            <!-- 不匹配时的操作：拒绝（不记录） -->
-            <onMismatch>DENY</onMismatch>
-        </filter>
-    </appender>
-
-    <!-- 使用gRpc将日志发送到skywalking服务端 -->
-    <appender name="GRPC_LOG" class="org.apache.skywalking.apm.toolkit.log.logback.v1.x.log.GRPCLogClientAppender">
-        <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-            <layout class="org.apache.skywalking.apm.toolkit.log.logback.v1.x.TraceIdPatternLogbackLayout">
-                <Pattern>${log.sky.pattern}</Pattern>
-            </layout>
-        </encoder>
-    </appender>
-
-    <root level="info">
-        <appender-ref ref="GRPC_LOG"/>
-    </root>
-
-    <!-- 系统模块日志级别控制  -->
-    <logger name="com.muyu" level="info"/>
-    <!-- Spring日志级别控制  -->
-    <logger name="org.springframework" level="warn"/>
-
-    <root level="info">
-        <appender-ref ref="console"/>
-    </root>
-
-    <!--系统操作日志-->
-    <root level="info">
-        <appender-ref ref="file_info"/>
-        <appender-ref ref="file_error"/>
-    </root>
-</configuration>

cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/controller/SysCarFaultController.java

@@ -42,8 +42,6 @@ public class SysCarFaultController extends BaseController
         return getDataTable(list);
     }
 
-
-
     /**
      * 导出车辆故障管理列表
      */
@@ -74,13 +72,9 @@ public class SysCarFaultController extends BaseController
     public Result<Integer> add(
             @Validated @RequestBody SysCarFault sysCarFault)
     {
-        //判断故障码是否重复
+        if (sysCarFaultService.checkIdUnique(sysCarFault)) {
-        SysCarFault selectFaultByFaultCode = sysCarFaultService.selectFaultByFaultCode(sysCarFault.getFaultCode());
+            return error("新增 车辆故障管理 ,失败，车辆故障码已存在");
-        if (selectFaultByFaultCode!=null){
-            return error("新增车辆故障 ,故障码已存在");
         }
-
-
         sysCarFault.setCreateBy(SecurityUtils.getUsername());
         return toAjax(sysCarFaultService.save(sysCarFault));
     }
@@ -94,7 +88,9 @@ public class SysCarFaultController extends BaseController
     public Result<Integer> edit(
             @Validated @RequestBody SysCarFault sysCarFault)
     {
-
+        if (!sysCarFaultService.checkIdUnique(sysCarFault)) {
+            return error("修改 车辆故障管理 '" + sysCarFault + "'失败，车辆故障管理不存在");
+        }
         sysCarFault.setUpdateBy(SecurityUtils.getUsername());
         return toAjax(sysCarFaultService.updateById(sysCarFault));
     }

cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/controller/SysCarFaultMessageController.java

@@ -1,13 +1,14 @@
 package com.muyu.breakdown.controller;
 
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.muyu.breakdown.domain.SysCarFaultMessage;
 import com.muyu.breakdown.service.SysCarFaultMessageService;
 import com.muyu.common.core.domain.Result;
 import com.muyu.common.core.web.controller.BaseController;
 import com.muyu.common.core.web.page.TableDataInfo;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 
@@ -24,10 +25,6 @@ public class SysCarFaultMessageController extends BaseController {
     @Autowired
     private SysCarFaultMessageService service;
 
-    /**
-     * 查询所有故障信息
-     * @return
-     */
     @GetMapping("/list")
     public Result<TableDataInfo<SysCarFaultMessage>> list(){
         startPage();
@@ -35,11 +32,6 @@ public class SysCarFaultMessageController extends BaseController {
         return getDataTable(list);
     }
 
-    /**
-     * 查询状态为1的故障信息
-     * @return
-     */
-
     @GetMapping("/listStatusOne")
     public Result<TableDataInfo<SysCarFaultMessage>>listStatusOne(){
         startPage();
@@ -47,27 +39,10 @@ public class SysCarFaultMessageController extends BaseController {
         return getDataTable(list);
     }
 
-    /**
-     * 查询状态为2的故障信息
-     * @return
-     */
     @GetMapping("/listStatusTwo")
     public Result<TableDataInfo<SysCarFaultMessage>>listStatusTwo(){
         startPage();
         List<SysCarFaultMessage> list = service.listStatusTwo();
         return getDataTable(list);
     }
-    /**
-     * 修改未读站内信息为已读
-     * @param id
-     * @return
-     */
-    @PutMapping("/updateStatusById/{id}")
-    public Result updateStatusById(@PathVariable("id")Long id){
-        UpdateWrapper<SysCarFaultMessage> wrapper = new UpdateWrapper<>();
-        wrapper.eq("id",id);
-        wrapper.set("status",1);
-        boolean update = service.update(wrapper);
-        return Result.success(update);
-    }
 }

cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/controller/sysCarFaultLogController.java

@@ -1,18 +1,13 @@
 package com.muyu.breakdown.controller;
 
-import cn.hutool.http.server.HttpServerResponse;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.muyu.breakdown.domain.SysCarFaultLog;
 import com.muyu.breakdown.service.SysCarFaultLogService;
 import com.muyu.common.core.domain.Result;
-import com.muyu.common.core.utils.poi.ExcelUtil;
 import com.muyu.common.core.web.controller.BaseController;
 import com.muyu.common.core.web.page.TableDataInfo;
-import jakarta.servlet.http.HttpServletResponse;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -64,28 +59,4 @@ public class sysCarFaultLogController extends BaseController {
         return toAjax(service.save(sysCarFaultLog));
     }
 
-    @PostMapping("/export")
-    public void  export(HttpServletResponse response, SysCarFaultLog sysCarFaultLog){
-        List<SysCarFaultLog> list = service.selectSysCarFaultLogList(sysCarFaultLog);
-        ExcelUtil<SysCarFaultLog> util = new ExcelUtil<SysCarFaultLog>(SysCarFaultLog.class);
-        util.exportExcel(response,list,"车辆故障记录数据");
-    }
-
-    /**
-     *  修改为忽略
-     * @param idsStr
-     * @return
-     */
-    @PutMapping("/updateStatusById/{ids}")
-    public Result updateStatusById(@PathVariable("ids")String idsStr){
-        Long[] ids = Arrays.stream(idsStr.split(","))
-                .map(Long::valueOf)
-                .toArray(Long[]::new);
-        UpdateWrapper<SysCarFaultLog> wrapper = new UpdateWrapper<>();
-        wrapper.in("id",ids).set("status",3);
-        boolean update = service.update(null, wrapper);
-        return Result.success(update);
-    }
-
-
 }

cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/domain/SysCarFault.java

@@ -83,10 +83,6 @@ public class SysCarFault extends BaseEntity{
     @Excel(name = "是否警告(0.开启 1.禁止)")
     private Integer warnStatus;
 
-    /**车辆类型 */
-    @Excel(name = "车辆类型")
-    private Integer carTypeId;
-
 
 
     @Override

cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/domain/SysCarFaultLog.java

@@ -3,7 +3,6 @@ package com.muyu.breakdown.domain;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.muyu.common.core.annotation.Excel;
 import com.muyu.common.core.web.domain.BaseEntity;
 import lombok.*;
 import lombok.experimental.SuperBuilder;
@@ -29,28 +28,19 @@ public class SysCarFaultLog extends BaseEntity {
     /** 参数主键 */
     @TableId( type = IdType.AUTO)
     private Long id;
-
     /** 故障码编码 */
-
     private Integer sysCarFaultId;
-    @Excel(name = "故障码编码")
-    private String faultCode;
-
     /**记录时间*/
-    @Excel(name = "记录时间")
     private Date createTime;
 
     /** 结束时间*/
-    @Excel(name = "结束时间")
     private Date updateTime;
 
 
     /** VIN码 */
-    @Excel(name = "VIN码")
     private String vin;
 
     /** 处理状态 1-解决 2-处理中 3-忽略 */
-    @Excel(name = "处理状态 1-解决 2-处理中 3-忽略")
     private Integer status;
 
 

cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/domain/sysCarEnterprise.java

@@ -1,58 +0,0 @@
-package com.muyu.breakdown.domain;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.muyu.common.core.annotation.Excel;
-import com.muyu.common.core.web.domain.BaseEntity;
-import lombok.*;
-
-/**
- * @ClassDescription:
- * @JdkVersion: 1.8
- * @Author: YZL
- * @Created: 2024/9/26 19:54
- */
-
-@Data
-@Setter
-@Getter
-@NoArgsConstructor
-@AllArgsConstructor
-@TableName("sys_car_enterprise")
-public class sysCarEnterprise  extends BaseEntity  {
-    private static final  long serialVersionUID = 1L;
-
-    /** 企业id*/
-    @TableId(type = IdType.AUTO)
-    private Long id;
-
-    /** 企业名称*/
-    @Excel(name = "企业名称")
-    private String enterpriseName;
-    /** 用户姓名 */
-    @Excel(name = "用户姓名")
-    private String name;
-
-    @Excel(name = "用户职位")
-    private String position;
-
-    @Excel(name = "公司所在省")
-    private String province;
-
-    @Excel(name = "公司所在市")
-    private String city;
-
-    @Excel(name = "公司所在县/区")
-    private String county;
-
-    @Excel(name = "公司详细地址")
-    private String address;
-
-    @Excel(name = "统一社会信用代码")
-    private String creditCode;
-
-    @Excel(name = "营业执照")
-    private String businessLicense;
-
-}

cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/mapper/SysCarFaultLogMapper.java

@@ -19,7 +19,7 @@ public interface SysCarFaultLogMapper extends BaseMapper<SysCarFaultLog> {
 
 
     @Select("select * from sys_car_fault_log where is_read=1")
-    List<SysCarFaultLog> listIsReadAlready();
+    public List<SysCarFaultLog> listIsReadAlready( );
     @Select("select * from sys_car_fault_log where is_read=2")
-    List<SysCarFaultLog>listISReadNotYet();
+    public List<SysCarFaultLog>listISReadNotYet( );
 }

cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/mapper/SysCarFaultMapper.java

@@ -3,9 +3,6 @@ package com.muyu.breakdown.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.muyu.breakdown.domain.SysCarFault;
 import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Select;
-
-import java.util.List;
 
 /**
  * @ClassDescription: 车辆故障管理Mapper接口
@@ -16,18 +13,4 @@ import java.util.List;
 @Mapper
 public interface SysCarFaultMapper extends BaseMapper<SysCarFault>{
 
-    //根据添加的故障码进行查询
-    @Select("select fault_code from sys_car_fault where fault_code=#{faultCode}")
-     SysCarFault selectFaultByFaultCode(String faultCode);
-
-    /**
-     *  查询故障码信息
-     * @param ids 故障码信息主键
-     * @return 故障码信息
-     */
-    public List<SysCarFault> selectSysCarFaultIds(String[] ids);
-
-
-
-
 }

cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/mapper/SysCarFaultMessageMapper.java

@@ -17,8 +17,8 @@ import java.util.List;
 public interface SysCarFaultMessageMapper extends BaseMapper<SysCarFaultMessage> {
 
     @Select("select * from sys_car_fault_message where status=1")
-    List<SysCarFaultMessage>listStatusOnt();
+    public List<SysCarFaultMessage>listStatusOnt( );
     @Select("select * from sys_car_fault_message where status=2")
-    List<SysCarFaultMessage>listStatusTwo();
+    public List<SysCarFaultMessage>listStatusTwo( );
 
 }

cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/service/SysCarFaultLogService.java

@@ -15,10 +15,10 @@ import java.util.List;
  */
 public interface SysCarFaultLogService extends IService<SysCarFaultLog> {
 
-    List<SysCarFaultLog>selectSysCarFaultLogList(SysCarFaultLog sysCarFaultLog);
+    public List<SysCarFaultLog>selectSysCarFaultLogList(SysCarFaultLog sysCarFaultLog);
 
-    List<SysCarFaultLog> listStatusIgnore(SysCarFaultLog sysCarFaultLog);
+    public List<SysCarFaultLog> listStatusIgnore(SysCarFaultLog sysCarFaultLog);
-    List<SysCarFaultLog>listStatusProcess(SysCarFaultLog sysCarFaultLog);
+    public List<SysCarFaultLog>listStatusProcess(SysCarFaultLog sysCarFaultLog );
 
-    List<SysCarFaultLog>listStatusSolve(SysCarFaultLog sysCarFaultLog);
+    public List<SysCarFaultLog>listStatusSolve(SysCarFaultLog sysCarFaultLog);
 }

cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/service/SysCarFaultMessageService.java

@@ -14,8 +14,8 @@ import java.util.stream.IntStream;
  * @Created: 2024/9/22 14:35
  */
 public interface SysCarFaultMessageService extends IService<SysCarFaultMessage> {
-    List<SysCarFaultMessage> selectSysCarFaultMessageList(SysCarFaultMessage sysCarFaultMessage);
+    public List<SysCarFaultMessage> selectSysCarFaultMessageList(SysCarFaultMessage sysCarFaultMessage);
 
-    List<SysCarFaultMessage>listStatusOnt();
+    public List<SysCarFaultMessage>listStatusOnt( );
-    List<SysCarFaultMessage>listStatusTwo();
+    public List<SysCarFaultMessage>listStatusTwo( );
 }

cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/service/SysCarFaultService.java

@@ -18,7 +18,7 @@ public interface SysCarFaultService extends IService<SysCarFault> {
      * @param id 车辆故障管理主键
      * @return 车辆故障管理
      */
-    SysCarFault selectSysCarFaultById(Long id);
+    public SysCarFault selectSysCarFaultById(Long id);
 
     /**
      * 查询车辆故障管理列表
@@ -26,16 +26,14 @@ public interface SysCarFaultService extends IService<SysCarFault> {
      * @param sysCarFault 车辆故障管理
      * @return 车辆故障管理集合
      */
-    List<SysCarFault> selectSysCarFaultList(SysCarFault sysCarFault);
+    public List<SysCarFault> selectSysCarFaultList(SysCarFault sysCarFault);
-
 
     /**
-     * 判断 车辆故障管理 faultCode(故障码)是否唯一
+     * 判断 车辆故障管理 id是否唯一
-     * @param faultCode 车辆故障管理
+     * @param sysCarFault 车辆故障管理
      * @return 结果
      */
-
+    Boolean checkIdUnique(SysCarFault sysCarFault);
-    SysCarFault selectFaultByFaultCode(String faultCode);
 
 
 

cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/service/impl/SysCarFaultMessageServiceImpl.java

@@ -20,30 +20,17 @@ import java.util.List;
 @Service
 public class SysCarFaultMessageServiceImpl extends ServiceImpl<SysCarFaultMessageMapper, SysCarFaultMessage> implements SysCarFaultMessageService {
 
-    /**
-     * 查询故障消息列表
-     * @param sysCarFaultMessage
-     * @return
-     */
     @Override
     public List<SysCarFaultMessage> selectSysCarFaultMessageList(SysCarFaultMessage sysCarFaultMessage) {
         LambdaQueryWrapper<SysCarFaultMessage> wrapper = new LambdaQueryWrapper<>();
         return baseMapper.selectList(wrapper);
     }
 
-    /**
-     * 查询故障消息列表中状态为1的故障消息
-     * @return
-     */
     @Override
     public List<SysCarFaultMessage> listStatusOnt( ) {
         return baseMapper.listStatusOnt();
     }
 
-    /**
-     * 查询故障消息列表中状态为2的故障消息
-     * @return
-     */
     @Override
     public List<SysCarFaultMessage> listStatusTwo( ) {
         return baseMapper.listStatusTwo();

cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/service/impl/SysCarFaultServiceImpl.java

@@ -6,7 +6,6 @@ import com.muyu.breakdown.domain.SysCarFault;
 import com.muyu.breakdown.mapper.SysCarFaultMapper;
 import com.muyu.breakdown.service.SysCarFaultService;
 import com.muyu.common.core.utils.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.Assert;
 
@@ -23,9 +22,6 @@ public class SysCarFaultServiceImpl
         extends ServiceImpl<SysCarFaultMapper, SysCarFault>
         implements SysCarFaultService {
 
-    @Autowired
-    private SysCarFaultMapper mapper;
-
     /**
      * 精确查询车辆故障管理
      *
@@ -61,29 +57,25 @@ public class SysCarFaultServiceImpl
         if (sysCarFault.getFaultRank()!=null){
             queryWrapper.eq(SysCarFault::getFaultRank, sysCarFault.getFaultRank());
         }
-        //故障码类型
         if (sysCarFault.getTypeId()!=null){
             queryWrapper.eq(SysCarFault::getTypeId,sysCarFault.getTypeId());
         }
-        //车辆类型查询
-        if (sysCarFault.getCarTypeId()!=null){
-            queryWrapper.eq(SysCarFault::getCarTypeId,sysCarFault.getTypeId());
-        }
         return this.list(queryWrapper);
     }
 
-
-
     /**
      * 唯一 判断
-     * @param faultCode 车辆故障管理
+     * @param sysCarFault 车辆故障管理
      * @return 车辆故障管理
      */
-
     @Override
-    public SysCarFault selectFaultByFaultCode(String faultCode) {
+    public Boolean checkIdUnique(SysCarFault sysCarFault) {
-        return mapper.selectFaultByFaultCode(faultCode);
+        LambdaQueryWrapper<SysCarFault> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(SysCarFault::getId, sysCarFault.getId());
+        queryWrapper.eq(SysCarFault::getFaultCode,sysCarFault.getFaultCode());
+        return this.count(queryWrapper) == 0;
     }
 
 
+
 }

cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/service/impl/sysCarFaultLogServiceImpl.java

@@ -3,7 +3,6 @@ package com.muyu.breakdown.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.muyu.breakdown.domain.SysCarFault;
 import com.muyu.breakdown.domain.SysCarFaultLog;
 import com.muyu.breakdown.domain.SysCarFaultLog;
 import com.muyu.breakdown.mapper.SysCarFaultLogMapper;
@@ -27,13 +26,17 @@ import java.util.List;
 public class sysCarFaultLogServiceImpl extends ServiceImpl<SysCarFaultLogMapper, SysCarFaultLog> implements SysCarFaultLogService {
 
 
-    @Autowired
-    private SysCarFaultLogMapper sysCarFaultLogMapper;
 
     @Override
     public List<SysCarFaultLog> selectSysCarFaultLogList(SysCarFaultLog sysCarFaultLog) {
-
+        LambdaQueryWrapper<SysCarFaultLog> wrapper = new LambdaQueryWrapper<>();
-        return sysCarFaultLogMapper.selectSysCarFaultLogList(sysCarFaultLog);
+        if (StringUtils.isNotEmpty(sysCarFaultLog.getVin())){
+            wrapper.eq(SysCarFaultLog::getVin,sysCarFaultLog.getVin());
+        }
+        if (sysCarFaultLog.getStatus()!=null){
+            wrapper.eq(SysCarFaultLog::getStatus,sysCarFaultLog.getStatus());
+        }
+        return this.list(wrapper);
     }
 
     /**
@@ -43,8 +46,12 @@ public class sysCarFaultLogServiceImpl extends ServiceImpl<SysCarFaultLogMapper,
      */
     @Override
     public List<SysCarFaultLog> listStatusIgnore(SysCarFaultLog sysCarFaultLog) {
-
+        LambdaQueryWrapper<SysCarFaultLog> wrapper = new LambdaQueryWrapper<>();
-        return sysCarFaultLogMapper.listStatusIgnore(sysCarFaultLog);
+        wrapper.eq(SysCarFaultLog::getStatus,3);
+        if (StringUtils.isNotEmpty(sysCarFaultLog.getVin())){
+            wrapper.eq(SysCarFaultLog::getVin,sysCarFaultLog.getVin());
+        }
+        return this.list(wrapper);
     }
 
     /**
@@ -54,16 +61,24 @@ public class sysCarFaultLogServiceImpl extends ServiceImpl<SysCarFaultLogMapper,
      */
     @Override
     public List<SysCarFaultLog> listStatusProcess(SysCarFaultLog sysCarFaultLog) {
-
+        LambdaQueryWrapper<SysCarFaultLog> wrapper = new LambdaQueryWrapper<>();
-        return sysCarFaultLogMapper.listStatusProcess(sysCarFaultLog);
+        wrapper.eq(SysCarFaultLog::getStatus,2);
+        if (StringUtils.isNotEmpty(sysCarFaultLog.getVin())){
+            wrapper.eq(SysCarFaultLog::getVin,sysCarFaultLog.getVin());
+        }
+        return this.list(wrapper);
     }
 
     //只展示已解决的数据
     @Override
     public List<SysCarFaultLog> listStatusSolve(SysCarFaultLog sysCarFaultLog) {
-        return sysCarFaultLogMapper.listStatusSolve(sysCarFaultLog);
+        LambdaQueryWrapper<SysCarFaultLog> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(SysCarFaultLog::getStatus,1);
+        if (StringUtils.isNotEmpty(sysCarFaultLog.getVin())){
+            wrapper.eq(SysCarFaultLog::getVin,sysCarFaultLog.getVin());
+        }
+        return this.list(wrapper);
     }
 
 
-
 }

cloud-modules/cloud-modules-breakdown/src/main/resources/mapper/breakdown/SysCarFaultLogMapper.xml

@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.muyu.breakdown.mapper.SysCarFaultLogMapper">
-
-    <resultMap type="com.muyu.breakdown.domain.SysCarFaultLog" id="SysCarFaultLogResult">
-        <result property="id"    column="id"    />
-        <result property="sysCarFaultId" column="sys_car_fault_id"/>
-        <result property="faultCode" column="fault_code"/>
-        <result property="vin" column="vin"/>
-        <result property="status"    column="status"    />
-        <result property="remark"    column="remark"    />
-        <result property="createBy"    column="create_by"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="updateBy"    column="update_by"    />
-        <result property="updateTime"    column="update_time"    />
-    </resultMap>
-
-    <sql id="selectSysCarFaultLogVo">
-        SELECT fault.fault_code,log.update_time,log.create_time,log.vin,log.status FROM sys_car_fault_log  log LEFT JOIN sys_car_fault fault on log.sys_car_fault_id=fault.id
-    </sql>
-
-    <select id="selectSysCarFaultLogList" parameterType="com.muyu.breakdown.domain.SysCarFaultLog" resultMap="SysCarFaultLogResult">
-        <include refid="selectSysCarFaultLogVo"/>
-        <where>
-            <if test="faultCode != null  and faultCode != ''"> and fault.fault_code = #{faultCode}</if>
-            <if test="vin != null  and vin != ''"> and log.vin = #{vin}</if>
-            <if test="status != null "> and log.status = #{status}</if>
-        </where>
-    </select>
-    <select id="listStatusSolve" resultType="com.muyu.breakdown.domain.SysCarFaultLog" resultMap="SysCarFaultLogResult">
-        <include refid="selectSysCarFaultLogVo" />
-        <where>
-            <if test="faultCode!=null and faultCode!=''">and fault.fault_code=#{faultCode}</if>
-            <if test="vin!=null and vin!=''">and log.vin=#{vin}</if>
-            and log.status=1
-        </where>
-    </select>
-    <select id="listStatusProcess" resultType="com.muyu.breakdown.domain.SysCarFaultLog" resultMap="SysCarFaultLogResult">
-        <include refid="selectSysCarFaultLogVo" />
-        <where>
-            <if test="faultCode!=null and faultCode!=''">and fault.fault_code=#{faultCode}</if>
-            <if test="vin!=null and vin!=''">and log.vin=#{vin}</if>
-            and log.status=2
-        </where>
-    </select>
-    <select id="listStatusIgnore" resultType="com.muyu.breakdown.domain.SysCarFaultLog" resultMap="SysCarFaultLogResult">
-        <include refid="selectSysCarFaultLogVo" />
-        <where>
-            <if test="faultCode!=null and faultCode!=''">and fault.fault_code=#{faultCode}</if>
-            <if test="vin!=null and vin!=''">and log.vin=#{vin}</if>
-            and log.status=3
-        </where>
-    </select>
-
-
-    <delete id="deleteSysCarFaultByIds" parameterType="String">
-        delete from sys_car_fault where id in
-        <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
-
-
-</mapper>

cloud-modules/cloud-modules-breakdown/src/main/resources/mapper/breakdown/SysCarFaultMapper.xml

@@ -23,11 +23,10 @@
         <result property="createTime"    column="create_time"    />
         <result property="updateBy"    column="update_by"    />
         <result property="updateTime"    column="update_time"    />
-        <result property="carTypeId" column="car_type_id"/>
     </resultMap>
 
     <sql id="selectSysCarFaultVo">
-        select id, fault_code, fault_name, type_id, fault_label, fault_bit, fault_value, fault_rank, fault_desc, fault_min_threshold, fault_max_threshold, status, warn_status, remark, create_by, create_time, update_by, update_time,car_type_id from sys_car_fault
+        select id, fault_code, fault_name, type_id, fault_label, fault_bit, fault_value, fault_rank, fault_desc, fault_min_threshold, fault_max_threshold, status, warn_status, remark, create_by, create_time, update_by, update_time from sys_car_fault
     </sql>
 
     <select id="selectSysCarFaultList" parameterType="com.muyu.breakdown.domain.SysCarFault" resultMap="SysCarFaultResult">
@@ -43,13 +42,6 @@
         <include refid="selectSysCarFaultVo"/>
         where id = #{id}
     </select>
-    <select id="selectSysCarFaultIds" resultMap="SysCarFaultResult">
-        <include refid="selectSysCarFaultVo"/>
-            where id in
-            <foreach collection="array" item="id" index="index" open="(" separator="," close=")">
-                #{id}
-            </foreach>
-    </select>
 
     <insert id="insertSysCarFault" parameterType="com.muyu.breakdown.domain.SysCarFault" useGeneratedKeys="true" keyProperty="id">
         insert into sys_car_fault
@@ -71,7 +63,6 @@
             <if test="createTime != null">create_time,</if>
             <if test="updateBy != null">update_by,</if>
             <if test="updateTime != null">update_time,</if>
-            <if test="carTypeId !=null">car_type_id</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="faultCode != null and faultCode != ''">#{faultCode},</if>
@@ -91,7 +82,6 @@
             <if test="createTime != null">#{createTime},</if>
             <if test="updateBy != null">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
-            <if test="carTypeId != null">#{catTypeId}</if>
         </trim>
     </insert>
 
@@ -115,7 +105,6 @@
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="updateBy != null">update_by = #{updateBy},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
-            <if test="carTypeId !=null">car_type_id=#{catTypeId}</if>
         </trim>
         where id = #{id}
     </update>

cloud-modules/cloud-modules-car/pom.xml

@@ -80,11 +80,6 @@
             <artifactId>cloud-common-api-doc</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>com.muyu</groupId>
-            <artifactId>cloud-common-saas</artifactId>
-        </dependency>
-
 
     </dependencies>
 

cloud-modules/cloud-modules-car/src/main/java/com/muyu/domain/SysCar.java

@@ -25,6 +25,5 @@ public class SysCar extends BaseEntity {
     private String carBatteryManufacturer;
     private String carBatteryModel;
     private Long strategyId;
-    private Long groupId;
 
 }

cloud-modules/cloud-modules-car/src/main/java/com/muyu/domain/resp/SysCarVo.java

@@ -16,9 +16,7 @@ public class SysCarVo extends SysCar {
     @Excel(name = "车辆类型名称")
     private String typeName;
     @Excel(name = "策略名称")
-    private String strategyName;
+    private Long strategyName;
-    @Excel(name = "围栏组名称")
-    private String groupName;
 
 
 

cloud-modules/cloud-modules-car/src/main/java/com/muyu/mapper/SysCarMapper.java

@@ -21,10 +21,4 @@ public interface SysCarMapper extends BaseMapper<SysCar> {
 
     List<SysCarFaultLogVo> findFenceByCarVin(@Param("carVin") String carVin);
 
-    //修改车辆
-    Integer updSysCarById(SysCar sysCar);
-
-    //添加车辆信息
-    Integer addSysCar(SysCar sysCar);
-
 }

cloud-modules/cloud-modules-car/src/main/java/com/muyu/service/impl/SysCarServiceImpl.java

@@ -30,7 +30,7 @@ public class SysCarServiceImpl extends ServiceImpl<SysCarMapper,SysCar>  impleme
 
     @Override
     public int addSysCar(SysCar sysCar) {
-        return sysCarMapper.addSysCar(sysCar);
+        return sysCarMapper.insert(sysCar);
     }
 
     @Override
@@ -40,7 +40,7 @@ public class SysCarServiceImpl extends ServiceImpl<SysCarMapper,SysCar>  impleme
 
     @Override
     public int updateSysCar(SysCar sysCar) {
-        return sysCarMapper.updSysCarById(sysCar);
+        return sysCarMapper.updateById(sysCar);
     }
 
     @Override

cloud-modules/cloud-modules-car/src/main/resources/bootstrap.yml

@@ -7,7 +7,7 @@ nacos:
   addr: 47.101.53.251:8848
   user-name: nacos
   password: nacos
-  namespace: yzl
+  namespace: lgy
 
 # Spring
 spring:

cloud-modules/cloud-modules-car/src/main/resources/mapper/SysCarMapper.xml

@@ -3,36 +3,11 @@
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.muyu.mapper.SysCarMapper">
-    <insert id="addSysCar">
-        INSERT INTO `four`.`sys_car`
-        ( `car_vin`, `car_type_id`, `state`, `car_motor_manufacturer`, `car_motor_model`,
-          `car_battery_manufacturer`, `car_battery_model`, `strategy_id`,`group_id`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`,)
-        VALUES (#{carVin}, #{carTypeId}, '1', #{carMotorManufacturer}, #{carMotorModel},
-                #{carBatteryManufacturer}, #{carBatteryModel}, #{strategyId},#{groupId},#{createBy}, #{createTime}, #{updateBy}, #{updateTime}, #{remark})
-    </insert>
-    <update id="updSysCarById">
-        UPDATE `four`.`sys_car`
-        SET `car_vin` = #{carVin},
-            `car_type_id` = #{carTypeId},
-            `state` = #{state},
-            `car_motor_manufacturer` = #{carMotorManufacturer},
-            `car_motor_model` = #{carMotorModel},
-            `car_battery_manufacturer` = #{carBatteryManufacturer},
-            `car_battery_model` = #{carBatteryModel},
-            `strategy_id` = #{strategyId},
-            `group_id`=#{groupId}
-            `create_by` = #{createBy},
-            `create_time` = #{createTime},
-            `update_by` = #{updateBy},
-            `update_time` = #{updateTime},
-            `remark` = #{remark} WHERE `id` = #{id}
-    </update>
     <select id="selectSysCarVoList" resultType="com.muyu.domain.resp.SysCarVo">
-        SELECT * ,car_type.type_name,warn_strategy.strategy_name,electronic_fence_group.group_name
+        SELECT * ,car_type.type_name,warn_strategy.strategy_name
         FROM `sys_car`
         LEFT JOIN car_type ON sys_car.car_type_id=car_type.id
         LEFT JOIN warn_strategy ON sys_car.strategy_id=warn_strategy.id
-        LEFT JOIN electronic_fence_group ON sys_car.group_id=electronic_fence_group.id
         <where>
             <if test="carVin!=null and carVin!=''">
                 sys_car.car_vin=#{carVin}
@@ -57,11 +32,10 @@
 
 
     <select id="selectSysCarVoById" resultType="com.muyu.domain.resp.SysCarVo">
-        SELECT * ,car_type.type_name,warn_strategy.strategy_name,electronic_fence_group.group_name
+        SELECT * ,car_type.type_name,warn_strategy.strategy_name
         FROM `sys_car`
                  LEFT JOIN car_type ON sys_car.car_type_id=car_type.id
                  LEFT JOIN warn_strategy ON sys_car.strategy_id=warn_strategy.id
-                 LEFT JOIN electronic_fence_group ON sys_car.group_id=electronic_fence_group.id
         where sys_car.id=#{id}
     </select>
     <select id="findFenceByCarVin" resultType="com.muyu.domain.resp.SysCarFaultLogVo">

cloud-modules/cloud-modules-data-processing/pom.xml

@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>com.muyu</groupId>
-        <artifactId>cloud-modules</artifactId>
-        <version>3.6.3</version>
-    </parent>
-
-    <groupId>com.muyu.processing</groupId>
-    <artifactId>cloud-modules-data-processing</artifactId>
-
-    <properties>
-        <maven.compiler.source>17</maven.compiler.source>
-        <maven.compiler.target>17</maven.compiler.target>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    </properties>
-
-
-    <dependencies>
-
-        <!-- SpringCloud Alibaba Nacos -->
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
-        </dependency>
-
-        <!-- SpringCloud Alibaba Nacos Config -->
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
-        </dependency>
-
-        <!-- SpringCloud Alibaba Sentinel -->
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
-        </dependency>
-
-        <!-- SpringBoot Actuator -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-actuator</artifactId>
-        </dependency>
-
-        <!-- Mysql Connector -->
-        <dependency>
-            <groupId>com.mysql</groupId>
-            <artifactId>mysql-connector-j</artifactId>
-        </dependency>
-
-        <!-- MuYu Common DataSource -->
-        <dependency>
-            <groupId>com.muyu</groupId>
-            <artifactId>cloud-common-datasource</artifactId>
-        </dependency>
-
-        <!-- MuYu Common DataScope -->
-        <dependency>
-            <groupId>com.muyu</groupId>
-            <artifactId>cloud-common-datascope</artifactId>
-        </dependency>
-
-
-        <!-- 接口模块 -->
-        <dependency>
-            <groupId>com.muyu</groupId>
-            <artifactId>cloud-common-api-doc</artifactId>
-        </dependency>
-
-        <!-- XllJob定时任务 -->
-        <dependency>
-            <groupId>com.muyu</groupId>
-            <artifactId>cloud-common-xxl</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.muyu</groupId>
-            <artifactId>cloud-common-rabbit</artifactId>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <finalName>${project.artifactId}</finalName>
-        <plugins>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>repackage</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>

cloud-modules/cloud-modules-data-processing/src/main/java/com/muyu/processing/ProcessingApplication.java

@@ -1,18 +0,0 @@
-package com.muyu.processing;
-
-import org.mybatis.spring.annotation.MapperScan;
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-
-/**
- * @Author YuPing
- * @Description 数据处理启动类
- * @Version 1.0
- * @Data 2024-09-26 15:03:29
- */
-@SpringBootApplication
-public class ProcessingApplication {
-    public static void main(String[] args) {
-        SpringApplication.run(ProcessingApplication.class, args);
-    }
-}

cloud-modules/cloud-modules-fence/pom.xml

@@ -17,6 +17,10 @@
     </description>
 
     <dependencies>
+        <dependency>
+            <groupId>com.muyu</groupId>
+            <artifactId>cloud-common-saas</artifactId>
+        </dependency>
 
         <!-- SpringCloud Alibaba Nacos -->
         <dependency>
@@ -82,12 +86,6 @@
             <groupId>com.muyu</groupId>
             <artifactId>cloud-common-rabbit</artifactId>
         </dependency>
-
-        <dependency>
-            <groupId>com.muyu</groupId>
-            <artifactId>cloud-common-saas</artifactId>
-        </dependency>
-
     </dependencies>
 
     <build>

cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/CloudElectronicFenceApplication.java

@@ -1,13 +1,9 @@
 package com.muyu.fence;
 
-import com.alibaba.druid.spring.boot3.autoconfigure.DruidDataSourceAutoConfigure;
-import com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DynamicDataSourceAutoConfiguration;
 import com.muyu.common.security.annotation.EnableCustomConfig;
 import com.muyu.common.security.annotation.EnableMyFeignClients;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
-import org.springframework.cloud.openfeign.EnableFeignClients;
 
 /**
  * 系统模块
@@ -17,12 +13,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
 @EnableCustomConfig
 //@EnableCustomSwagger2
 @EnableMyFeignClients
-@SpringBootApplication(exclude = {
+@SpringBootApplication
-        DataSourceAutoConfiguration.class,
-        DruidDataSourceAutoConfigure.class,
-        DynamicDataSourceAutoConfiguration.class
-})
-
 public class  CloudElectronicFenceApplication {
     public static void main (String[] args) {
         SpringApplication.run(CloudElectronicFenceApplication.class, args);

cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/domain/req/ElectroicFenceListReq.java

@@ -20,8 +20,6 @@ import java.util.Date;
 @NoArgsConstructor
 public class ElectroicFenceListReq {
 
-
-
     /**
      * 围栏名称
      */

cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/mapper/ElectronicFenceMapper.java

@@ -13,5 +13,4 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface ElectronicFenceMapper extends BaseMapper<ElectronicFence> {
-
 }

cloud-modules/cloud-modules-fence/src/main/resources/bootstrap.yml

@@ -6,7 +6,7 @@ nacos:
   addr: 47.101.53.251:8848
   user-name: nacos
   password: nacos
-  namespace: yzl
+  namespace: lgy
 # SPRING_AMQP_DESERIALIZATION_TRUST_ALL=true spring.amqp.deserialization.trust.all
 # Spring
 spring:

cloud-modules/cloud-modules-file/pom.xml

@@ -59,18 +59,6 @@
             <groupId>com.muyu</groupId>
             <artifactId>cloud-common-api-doc</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>druid-spring-boot-3-starter</artifactId>
-            <version>1.2.23</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.baomidou</groupId>
-            <artifactId>dynamic-datasource-spring-boot3-starter</artifactId>
-            <version>4.3.0</version>
-            <scope>compile</scope>
-        </dependency>
 
     </dependencies>
 

cloud-modules/cloud-modules-file/src/main/java/com/muyu/file/CloudFileApplication.java

@@ -1,23 +1,15 @@
 package com.muyu.file;
 
-import com.alibaba.druid.spring.boot3.autoconfigure.DruidDataSourceAutoConfigure;
-import com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DynamicDataSourceAutoConfiguration;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
-import org.springframework.cloud.openfeign.EnableFeignClients;
 
 /**
  * 文件服务
  *
  * @author muyu
  */
-@SpringBootApplication(exclude = {
+@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class})
-        DataSourceAutoConfiguration.class,
-        DruidDataSourceAutoConfigure.class,
-        DynamicDataSourceAutoConfiguration.class
-})
-@EnableFeignClients
 public class CloudFileApplication {
     public static void main (String[] args) {
         SpringApplication.run(CloudFileApplication.class, args);

cloud-modules/cloud-modules-file/src/main/java/com/muyu/file/service/ISysFileService.java

@@ -17,5 +17,5 @@ public interface ISysFileService {
      *
      * @throws Exception
      */
-    String uploadFile(MultipartFile file) throws Exception;
+    public String uploadFile (MultipartFile file) throws Exception;
 }

cloud-modules/cloud-modules-gen/src/main/java/com/muyu/gen/mapper/GenTableColumnMapper.java

@@ -20,7 +20,7 @@ public interface GenTableColumnMapper
      * @param dbName
      * @return 列信息
      */
-    List<GenTableColumn> selectDbTableColumnsByName(@Param("tableName") String tableName, @Param("dbName") String dbName);
+    public List<GenTableColumn> selectDbTableColumnsByName(@Param("tableName") String tableName, @Param("dbName") String dbName);
 
     /**
      * 查询业务字段列表
@@ -28,7 +28,7 @@ public interface GenTableColumnMapper
      * @param tableId 业务字段编号
      * @return 业务字段集合
      */
-    List<GenTableColumn> selectGenTableColumnListByTableId(@Param("tableId") Long tableId);
+    public List<GenTableColumn> selectGenTableColumnListByTableId(@Param("tableId") Long tableId);
 
     /**
      * 新增业务字段
@@ -36,7 +36,7 @@ public interface GenTableColumnMapper
      * @param genTableColumn 业务字段信息
      * @return 结果
      */
-    int insertGenTableColumn(GenTableColumn genTableColumn);
+    public int insertGenTableColumn(GenTableColumn genTableColumn);
 
     /**
      * 修改业务字段
@@ -44,7 +44,7 @@ public interface GenTableColumnMapper
      * @param genTableColumn 业务字段信息
      * @return 结果
      */
-    int updateGenTableColumn(GenTableColumn genTableColumn);
+    public int updateGenTableColumn(GenTableColumn genTableColumn);
 
     /**
      * 删除业务字段
@@ -52,7 +52,7 @@ public interface GenTableColumnMapper
      * @param genTableColumns 列数据
      * @return 结果
      */
-    int deleteGenTableColumns(@Param("genTableColumns") List<GenTableColumn> genTableColumns);
+    public int deleteGenTableColumns(@Param("genTableColumns") List<GenTableColumn> genTableColumns);
 
     /**
      * 批量删除业务字段
@@ -60,5 +60,5 @@ public interface GenTableColumnMapper
      * @param ids 需要删除的数据ID
      * @return 结果
      */
-    int deleteGenTableColumnByIds(@Param("ids") Long[] ids);
+    public int deleteGenTableColumnByIds(@Param("ids") Long[] ids);
 }

cloud-modules/cloud-modules-gen/src/main/java/com/muyu/gen/mapper/GenTableMapper.java

@@ -19,7 +19,7 @@ public interface GenTableMapper
      * @param genTable 业务信息
      * @return 业务集合
      */
-    List<GenTable> selectGenTableList(GenTable genTable);
+    public List<GenTable> selectGenTableList(GenTable genTable);
 
     /**
      * 查询据库列表
@@ -27,7 +27,7 @@ public interface GenTableMapper
      * @param genTable 业务信息
      * @return 数据库表集合
      */
-    List<GenTable> selectDbTableList(GenTable genTable);
+    public List<GenTable> selectDbTableList(GenTable genTable);
 
     /**
      * 查询据库列表
@@ -36,14 +36,14 @@ public interface GenTableMapper
      * @param dbName
      * @return 数据库表集合
      */
-    List<GenTable> selectDbTableListByNames(@Param("tableNames") String[] tableNames, @Param("dbName") String dbName);
+    public List<GenTable> selectDbTableListByNames(@Param("tableNames") String[] tableNames, @Param("dbName") String dbName);
 
     /**
      * 查询所有表信息
      *
      * @return 表信息集合
      */
-    List<GenTable> selectGenTableAll();
+    public List<GenTable> selectGenTableAll();
 
     /**
      * 查询表ID业务信息
@@ -51,7 +51,7 @@ public interface GenTableMapper
      * @param id 业务ID
      * @return 业务信息
      */
-    GenTable selectGenTableById(@Param("id") Long id);
+    public GenTable selectGenTableById(@Param("id") Long id);
 
     /**
      * 查询表名称业务信息
@@ -59,7 +59,7 @@ public interface GenTableMapper
      * @param tableName 表名称
      * @return 业务信息
      */
-    GenTable selectGenTableByName(@Param("tableName") String tableName);
+    public GenTable selectGenTableByName(@Param("tableName") String tableName);
 
     /**
      * 新增业务
@@ -67,7 +67,7 @@ public interface GenTableMapper
      * @param genTable 业务信息
      * @return 结果
      */
-    int insertGenTable(GenTable genTable);
+    public int insertGenTable(GenTable genTable);
 
     /**
      * 修改业务
@@ -75,7 +75,7 @@ public interface GenTableMapper
      * @param genTable 业务信息
      * @return 结果
      */
-    int updateGenTable(GenTable genTable);
+    public int updateGenTable(GenTable genTable);
 
     /**
      * 批量删除业务
@@ -83,7 +83,7 @@ public interface GenTableMapper
      * @param ids 需要删除的数据ID
      * @return 结果
      */
-    int deleteGenTableByIds(@Param("ids") Long[] ids);
+    public int deleteGenTableByIds(@Param("ids") Long[] ids);
 
     List<String> selDbNameAll();