Mqtt的发送和监听

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

@@ -21,9 +21,9 @@ public class SysPasswordService {
     @Autowired
     private RedisService redisService;
 
-    private int maxRetryCount = CacheConstants.PASSWORD_MAX_RETRY_COUNT;
+    private final int maxRetryCount = CacheConstants.PASSWORD_MAX_RETRY_COUNT;
 
-    private Long lockTime = CacheConstants.PASSWORD_LOCK_TIME;
+    private final 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: four
+  namespace: lgy
 # 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中排序
      */
-    public int sort () default Integer.MAX_VALUE;
+    int sort() default Integer.MAX_VALUE;
 
     /**
      * 导出到Excel中的名字.
      */
-    public String name () default "";
+    String name() default "";
 
     /**
      * 日期格式, 如: yyyy-MM-dd
      */
-    public String dateFormat () default "";
+    String dateFormat() default "";
 
     /**
      * 读取内容转表达式 (如: 0=男,1=女,2=未知)
      */
-    public String readConverterExp () default "";
+    String readConverterExp() default "";
 
     /**
      * 分隔符，读取字符串组内容
      */
-    public String separator () default ",";
+    String separator() default ",";
 
     /**
      * BigDecimal 精度 默认:-1(默认不开启BigDecimal格式化)
      */
-    public int scale () default -1;
+    int scale() default -1;
 
     /**
      * BigDecimal 舍入规则 默认:BigDecimal.ROUND_HALF_EVEN
      */
-    public int roundingMode () default BigDecimal.ROUND_HALF_EVEN;
+    int roundingMode() default BigDecimal.ROUND_HALF_EVEN;
 
     /**
      * 导出时在excel中每个列的高度
      */
-    public double height () default 14;
+    double height() default 14;
 
     /**
      * 导出时在excel中每个列的宽度
      */
-    public double width () default 16;
+    double width() default 16;
 
     /**
      * 文字后缀,如% 90 变成90%
      */
-    public String suffix () default "";
+    String suffix() default "";
 
     /**
      * 当值为空时,字段的默认值
      */
-    public String defaultValue () default "";
+    String defaultValue() default "";
 
     /**
      * 提示信息
      */
-    public String prompt () default "";
+    String prompt() default "";
 
     /**
      * 设置只能选择不能输入的列内容.
      */
-    public String[] combo () default {};
+    String[] combo() default {};
 
     /**
      * 是否需要纵向合并单元格,应对需求:含有list集合单元格)
      */
-    public boolean needMerge () default false;
+    boolean needMerge() default false;
 
     /**
      * 是否导出数据,应对需求:有时我们需要导出一份模板,这是标题需要但内容需要用户手工填写.
      */
-    public boolean isExport () default true;
+    boolean isExport() default true;
 
     /**
      * 另一个类中的属性名称,支持多级获取,以小数点隔开
      */
-    public String targetAttr () default "";
+    String targetAttr() default "";
 
     /**
      * 是否自动统计数据,在最后追加一行统计数据总和
      */
-    public boolean isStatistics () default false;
+    boolean isStatistics() default false;
 
     /**
      * 导出类型（0数字 1字符串）
      */
-    public ColumnType cellType () default ColumnType.STRING;
+    ColumnType cellType() default ColumnType.STRING;
 
     /**
      * 导出列头背景颜色
      */
-    public IndexedColors headerBackgroundColor () default IndexedColors.GREY_50_PERCENT;
+    IndexedColors headerBackgroundColor() default IndexedColors.GREY_50_PERCENT;
 
     /**
      * 导出列头字体颜色
      */
-    public IndexedColors headerColor () default IndexedColors.WHITE;
+    IndexedColors headerColor() default IndexedColors.WHITE;
 
     /**
      * 导出单元格背景颜色
      */
-    public IndexedColors backgroundColor () default IndexedColors.WHITE;
+    IndexedColors backgroundColor() default IndexedColors.WHITE;
 
     /**
      * 导出单元格字体颜色
      */
-    public IndexedColors color () default IndexedColors.BLACK;
+    IndexedColors color() default IndexedColors.BLACK;
 
     /**
      * 导出字段对齐方式
      */
-    public HorizontalAlignment align () default HorizontalAlignment.CENTER;
+    HorizontalAlignment align() default HorizontalAlignment.CENTER;
 
     /**
      * 自定义数据处理器
      */
-    public Class<?> handler () default ExcelHandlerAdapter.class;
+    Class<?> handler() default ExcelHandlerAdapter.class;
 
     /**
      * 自定义数据处理器参数
      */
-    public String[] args () default {};
+    String[] args() default {};
 
     /**
      * 字段类型（0：导出导入；1：仅导出；2：仅导入）
      */
     Type type () default Type.ALL;
 
-    public enum Type {
+    enum Type {
         ALL(0), EXPORT(1), IMPORT(2);
         private final int value;
 
@@ -161,7 +161,7 @@ public @interface Excel {
         }
     }
 
-    public enum ColumnType {
+    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 String value;
+        private final String value;
 
-        private Status (String value) {
+        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 String module;
+    private final String module;
 
     /**
      * 错误码
      */
-    private String code;
+    private final String code;
 
     /**
      * 错误码对应的参数
      */
-    private Object[] args;
+    private final Object[] args;
 
     /**
      * 错误消息
      */
-    private String defaultMessage;
+    private final 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 String[] allowedExtension;
-    private String extension;
-    private String filename;
+    private final String[] allowedExtension;
+    private final String extension;
+    private final 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 Code code;
+    private final 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 = Charset.forName(ISO_8859_1);
+    public static final Charset CHARSET_ISO_8859_1 = StandardCharsets.ISO_8859_1;
     /**
      * UTF-8
      */
-    public static final Charset CHARSET_UTF_8 = Charset.forName(UTF_8);
+    public static final Charset CHARSET_UTF_8 = StandardCharsets.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 String[] parsePatterns = {
+    private static final 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,11 +211,7 @@ public class ServletUtils {
      * @return 编码后的内容
      */
     public static String urlEncode (String str) {
-        try {
-            return URLEncoder.encode(str, Constants.UTF8);
-        } catch (UnsupportedEncodingException e) {
-            return StringUtils.EMPTY;
-        }
+        return URLEncoder.encode(str, StandardCharsets.UTF_8);
     }
 
     /**

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 = (T) beanFactory.getBean(clz);
+        T result = 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, "utf-8");
+            filename = URLEncoder.encode(filename, StandardCharsets.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, "utf-8");
+            filename = URLEncoder.encode(filename, StandardCharsets.UTF_8);
         } else {
             // 其它浏览器
-            filename = URLEncoder.encode(filename, "utf-8");
+            filename = URLEncoder.encode(filename, StandardCharsets.UTF_8);
         }
         return filename;
     }
@@ -197,15 +197,14 @@ public class FileUtils {
     public static void setAttachmentResponseHeader (HttpServletResponse response, String realFileName) throws UnsupportedEncodingException {
         String percentEncodedFileName = percentEncode(realFileName);
 
-        StringBuilder contentDispositionValue = new StringBuilder();
-        contentDispositionValue.append("attachment; filename=")
-                .append(percentEncodedFileName)
-                .append(";")
-                .append("filename*=")
-                .append("utf-8''")
-                .append(percentEncodedFileName);
+        String contentDispositionValue = "attachment; filename=" +
+                percentEncodedFileName +
+                ";" +
+                "filename*=" +
+                "utf-8''" +
+                percentEncodedFileName;
 
-        response.setHeader("Content-disposition", contentDispositionValue.toString());
+        response.setHeader("Content-disposition", contentDispositionValue);
         response.setHeader("download-filename", percentEncodedFileName);
     }
 
@@ -217,7 +216,7 @@ public class FileUtils {
      * @return 百分号编码后的字符串
      */
     public static String percentEncode (String s) throws UnsupportedEncodingException {
-        String encode = URLEncoder.encode(s, StandardCharsets.UTF_8.toString());
+        String encode = URLEncoder.encode(s, StandardCharsets.UTF_8);
         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.substring(lastPos, pos));
+                    tmp.append(content, 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 (false == isUnknown(subIp)) {
+                if (!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 Map<Integer, Double> statistics = new HashMap<Integer, Double>();
+    private final 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 = (T) list.get(i);
+            T vo = 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", new Class[]{Object.class, String[].class, Cell.class, Workbook.class});
+            Method formatMethod = excel.handler().getMethod("format", 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, new Object[]{});
+            value = subMethod.invoke(obj);
         } 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(), new Class[]{});
+            method = pojoClass.getMethod(getMethodName.toString());
         } 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 Logger logger = LoggerFactory.getLogger(ReflectUtils.class);
+    private static final 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] = (char) '+';
-        lookUpBase64Alphabet[63] = (char) '/';
+        lookUpBase64Alphabet[62] = '+';
+        lookUpBase64Alphabet[63] = '/';
     }
 
     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 AtomicInteger commSeq = new AtomicInteger(1);
+    private static final AtomicInteger commSeq = new AtomicInteger(1);
     // 上传接口序列数
-    private static AtomicInteger uploadSeq = new AtomicInteger(1);
+    private static final 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 (false == isSimple) {
+        if (!isSimple) {
             builder.append('-');
         }
         // time_mid
         builder.append(digits(mostSigBits >> 16, 4));
-        if (false == isSimple) {
+        if (!isSimple) {
             builder.append('-');
         }
         // time_high_and_version
         builder.append(digits(mostSigBits, 4));
-        if (false == isSimple) {
+        if (!isSimple) {
             builder.append('-');
         }
         // variant_and_sequence
         builder.append(digits(leastSigBits >> 48, 4));
-        if (false == isSimple) {
+        if (!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 {
     /**
      * 部门表的别名
      */
-    public String deptAlias () default "";
+    String deptAlias() default "";
 
     /**
      * 用户表的别名
      */
-    public String userAlias () default "";
+    String userAlias() default "";
 
     /**
      * 权限字符（用于多个角色匹配符合要求的权限）默认根据权限注解@RequiresPermissions获取，多个权限用逗号分隔开来
      */
-    public String permission () default "";
+    String permission() default "";
 }

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

@@ -109,8 +109,7 @@ public class DataScopeAspect {
 
         if (StringUtils.isNotBlank(sqlString.toString())) {
             Object params = joinPoint.getArgs()[0];
-            if (StringUtils.isNotNull(params) && params instanceof BaseEntity) {
-                BaseEntity baseEntity = (BaseEntity) params;
+            if (StringUtils.isNotNull(params) && params instanceof BaseEntity baseEntity) {
                 baseEntity.getParams().put(DATA_SCOPE, " AND (" + sqlString.substring(4) + ")");
             }
         }
@@ -141,8 +140,7 @@ public class DataScopeAspect {
      */
     private void clearDataScope (final JoinPoint joinPoint) {
         Object params = joinPoint.getArgs()[0];
-        if (StringUtils.isNotNull(params) && params instanceof BaseEntity) {
-            BaseEntity baseEntity = (BaseEntity) params;
+        if (StringUtils.isNotNull(params) && params instanceof BaseEntity baseEntity) {
             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 {
     /**
      * 模块
      */
-    public String title () default "";
+    String title() default "";
 
     /**
      * 功能
      */
-    public BusinessType businessType () default BusinessType.OTHER;
+    BusinessType businessType() default BusinessType.OTHER;
 
     /**
      * 操作人类别
      */
-    public OperatorType operatorType () default OperatorType.MANAGE;
+    OperatorType operatorType() default OperatorType.MANAGE;
 
     /**
      * 是否保存请求的参数
      */
-    public boolean isSaveRequestData () default true;
+    boolean isSaveRequestData() default true;
 
     /**
      * 是否保存响应的参数
      */
-    public boolean isSaveResponseData () default true;
+    boolean isSaveResponseData() default true;
 
     /**
      * 排除指定的请求参数
      */
-    public String[] excludeParamNames () default {};
+    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 && paramsArray.length > 0) {
+        if (paramsArray != null) {
             for (Object o : paramsArray) {
                 if (StringUtils.isNotNull(o) && !isFilterObject(o)) {
                     try {
                         String jsonObj = JSON.toJSONString(o, excludePropertyPreFilter(excludeParamNames));
-                        params += jsonObj.toString() + " ";
+                        params += jsonObj + " ";
                     } 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 Class<T> clazz;
+    private final Class<T> clazz;
 
     public FastJson2JsonRedisSerializer (Class<T> clazz) {
         super();

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)
-    public Result<SysFile> upload (@RequestPart(value = "file") MultipartFile file);
+    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")
-    public Result<Boolean> saveLog (@RequestBody SysOperLog sysOperLog, @RequestHeader(SecurityConstants.FROM_SOURCE) String source) throws Exception;
+    Result<Boolean> saveLog(@RequestBody SysOperLog sysOperLog, @RequestHeader(SecurityConstants.FROM_SOURCE) String source) throws Exception;
 
     /**
      * 保存访问记录
@@ -38,5 +38,5 @@ public interface RemoteLogService {
      * @return 结果
      */
     @PostMapping("/logininfor")
-    public Result<Boolean> saveLogininfor (@RequestBody SysLogininfor sysLogininfor, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+    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")
-    public Result<List<Datasource>> findDatabaseList();
+    Result<List<Datasource>> findDatabaseList();
 
 
 

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

@@ -4,7 +4,6 @@ import com.muyu.common.core.constant.SecurityConstants;
 import com.muyu.common.core.constant.ServiceNameConstants;
 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.domain.SysUser;
 import com.muyu.common.system.remote.factory.RemoteUserFallbackFactory;
@@ -24,13 +23,13 @@ public interface RemoteUserService {
     /**
      * 通过用户名查询用户信息
      *
-     * @param
+     * @param username 用户名
      * @param source   请求来源
      *
      * @return 结果
      */
-    @PostMapping("/user/info")
-    public Result<LoginUser> getUserInfo (@RequestBody Firm firm, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+    @GetMapping("/user/info/{username}")
+    Result<LoginUser> getUserInfo(@PathVariable("username") String username, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
 
     /**
      * 注册用户信息
@@ -41,8 +40,8 @@ public interface RemoteUserService {
      * @return 结果
      */
     @PostMapping("/user/register")
-    public Result<Boolean> registerUserInfo (@RequestBody SysUser sysUser, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+    Result<Boolean> registerUserInfo(@RequestBody SysUser sysUser, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
 
     @GetMapping("/user/companyList")
-    public Result<List<SysUser>> companyList ();
+    Result<List<SysUser>> companyList();
 }

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 List<Pattern> blacklistUrlPattern = new ArrayList<>();
+        private final 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,8 +34,7 @@ public class GatewayExceptionHandler implements ErrorWebExceptionHandler {
 
         if (ex instanceof NotFoundException) {
             msg = "服务未找到";
-        } else if (ex instanceof ResponseStatusException) {
-            ResponseStatusException responseStatusException = (ResponseStatusException) ex;
+        } else if (ex instanceof ResponseStatusException responseStatusException) {
             msg = responseStatusException.getMessage();
         } else {
             msg = "内部服务器错误";

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

@@ -14,10 +14,10 @@ public interface ValidateCodeService {
     /**
      * 生成验证码
      */
-    public Result createCaptcha () throws IOException, CaptchaException;
+    Result createCaptcha() throws IOException, CaptchaException;
 
     /**
      * 校验验证码
      */
-    public void checkCaptcha (String key, String value) throws CaptchaException;
+    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: four
+  namespace: lgy
 
 # Spring
 spring:

cloud-modules/cloud-data/pom.xml

@@ -105,16 +105,7 @@
         </dependency>
 
 
-        <dependency>
-            <groupId>org.apache.iotdb</groupId>
-            <artifactId>iotdb-session</artifactId>
-            <version>1.3.2</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.iotdb</groupId>
-            <artifactId>node-commons</artifactId>
-            <version>1.3.2</version>
-        </dependency>
+
 
     </dependencies>
 

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

@@ -1,29 +0,0 @@
-package com.muyu.data.util;
-
-import org.apache.iotdb.isession.util.Version;
-import org.apache.iotdb.rpc.IoTDBConnectionException;
-import org.apache.iotdb.session.Session;
-
-public class Iotdb {
-    public static void main(String[] args) throws IoTDBConnectionException {
-
-        System.out.println("测试数据库开始~~~~~");
-
-        // 初始化与连接
-        Session session = new Session.Builder()
-                .host("47.101.53.251")
-                .port(6667)
-                .username("root")
-                .password("root")
-                .version(Version.V_1_0)
-                .build();
-
-        // 开启session Rpc不压缩
-        session.open(false);
-
-        //
-
-
-    }
-
-}

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

@@ -1,53 +1,43 @@
 package com.muyu.data.util;
 
-import org.eclipse.paho.client.mqttv3.*;
+
+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) {
-        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();
-        }
+    public static void start(String clientId){
+        //初始化连接设置对象
+        mqttConnectOptions = new MqttConnectOptions();
+        //设置是否情
 
 
     }
 
 
 
+
+
+
+
+
+
+
+
+
+
+
 }

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

@@ -0,0 +1,53 @@
+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-modules-breakdown/src/main/java/com/muyu/breakdown/controller/SysCarFaultController.java

@@ -42,6 +42,8 @@ public class SysCarFaultController extends BaseController
         return getDataTable(list);
     }
 
+
+
     /**
      * 导出车辆故障管理列表
      */
@@ -72,9 +74,13 @@ public class SysCarFaultController extends BaseController
     public Result<Integer> add(
             @Validated @RequestBody SysCarFault sysCarFault)
     {
-        if (sysCarFaultService.checkIdUnique(sysCarFault)) {
-            return error("新增 车辆故障管理 ,失败，车辆故障码已存在");
+        //判断故障码是否重复
+        SysCarFault selectFaultByFaultCode = sysCarFaultService.selectFaultByFaultCode(sysCarFault.getFaultCode());
+        if (selectFaultByFaultCode!=null){
+            return error("新增车辆故障 ,故障码已存在");
         }
+
+
         sysCarFault.setCreateBy(SecurityUtils.getUsername());
         return toAjax(sysCarFaultService.save(sysCarFault));
     }
@@ -88,9 +94,7 @@ 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,14 +1,13 @@
 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.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
@@ -25,6 +24,10 @@ public class SysCarFaultMessageController extends BaseController {
     @Autowired
     private SysCarFaultMessageService service;
 
+    /**
+     * 查询所有故障信息
+     * @return
+     */
     @GetMapping("/list")
     public Result<TableDataInfo<SysCarFaultMessage>> list(){
         startPage();
@@ -32,6 +35,11 @@ public class SysCarFaultMessageController extends BaseController {
         return getDataTable(list);
     }
 
+    /**
+     * 查询状态为1的故障信息
+     * @return
+     */
+
     @GetMapping("/listStatusOne")
     public Result<TableDataInfo<SysCarFaultMessage>>listStatusOne(){
         startPage();
@@ -39,10 +47,27 @@ 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,13 +1,18 @@
 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;
 
 /**
@@ -59,4 +64,28 @@ 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,6 +83,10 @@ 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,6 +3,7 @@ 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;
@@ -28,19 +29,28 @@ 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

@@ -0,0 +1,58 @@
+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")
-    public List<SysCarFaultLog> listIsReadAlready( );
+    List<SysCarFaultLog> listIsReadAlready();
     @Select("select * from sys_car_fault_log where is_read=2")
-    public List<SysCarFaultLog>listISReadNotYet( );
+    List<SysCarFaultLog>listISReadNotYet();
 }

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

@@ -3,6 +3,9 @@ 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接口
@@ -13,4 +16,18 @@ import org.apache.ibatis.annotations.Mapper;
 @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")
-    public List<SysCarFaultMessage>listStatusOnt( );
+    List<SysCarFaultMessage>listStatusOnt();
     @Select("select * from sys_car_fault_message where status=2")
-    public List<SysCarFaultMessage>listStatusTwo( );
+    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> {
 
-    public List<SysCarFaultLog>selectSysCarFaultLogList(SysCarFaultLog sysCarFaultLog);
+    List<SysCarFaultLog>selectSysCarFaultLogList(SysCarFaultLog sysCarFaultLog);
 
-    public List<SysCarFaultLog> listStatusIgnore(SysCarFaultLog sysCarFaultLog);
-    public List<SysCarFaultLog>listStatusProcess(SysCarFaultLog sysCarFaultLog );
+    List<SysCarFaultLog> listStatusIgnore(SysCarFaultLog sysCarFaultLog);
+    List<SysCarFaultLog>listStatusProcess(SysCarFaultLog sysCarFaultLog);
 
-    public List<SysCarFaultLog>listStatusSolve(SysCarFaultLog sysCarFaultLog);
+    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> {
-    public List<SysCarFaultMessage> selectSysCarFaultMessageList(SysCarFaultMessage sysCarFaultMessage);
+    List<SysCarFaultMessage> selectSysCarFaultMessageList(SysCarFaultMessage sysCarFaultMessage);
 
-    public List<SysCarFaultMessage>listStatusOnt( );
-    public List<SysCarFaultMessage>listStatusTwo( );
+    List<SysCarFaultMessage>listStatusOnt();
+    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 车辆故障管理
      */
-    public SysCarFault selectSysCarFaultById(Long id);
+    SysCarFault selectSysCarFaultById(Long id);
 
     /**
      * 查询车辆故障管理列表
@@ -26,14 +26,16 @@ public interface SysCarFaultService extends IService<SysCarFault> {
      * @param sysCarFault 车辆故障管理
      * @return 车辆故障管理集合
      */
-    public List<SysCarFault> selectSysCarFaultList(SysCarFault sysCarFault);
+    List<SysCarFault> selectSysCarFaultList(SysCarFault sysCarFault);
+
 
     /**
-     * 判断 车辆故障管理 id是否唯一
-     * @param sysCarFault 车辆故障管理
+     * 判断 车辆故障管理 faultCode(故障码)是否唯一
+     * @param faultCode 车辆故障管理
      * @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,17 +20,30 @@ 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,6 +6,7 @@ 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;
 
@@ -22,6 +23,9 @@ public class SysCarFaultServiceImpl
         extends ServiceImpl<SysCarFaultMapper, SysCarFault>
         implements SysCarFaultService {
 
+    @Autowired
+    private SysCarFaultMapper mapper;
+
     /**
      * 精确查询车辆故障管理
      *
@@ -57,25 +61,29 @@ 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 sysCarFault 车辆故障管理
+     * @param faultCode 车辆故障管理
      * @return 车辆故障管理
      */
+
     @Override
-    public Boolean checkIdUnique(SysCarFault sysCarFault) {
-        LambdaQueryWrapper<SysCarFault> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(SysCarFault::getId, sysCarFault.getId());
-        queryWrapper.eq(SysCarFault::getFaultCode,sysCarFault.getFaultCode());
-        return this.count(queryWrapper) == 0;
+    public SysCarFault selectFaultByFaultCode(String faultCode) {
+        return mapper.selectFaultByFaultCode(faultCode);
     }
 
 
-
 }

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

@@ -3,6 +3,7 @@ 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;
@@ -26,17 +27,13 @@ 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<>();
-        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);
+
+        return sysCarFaultLogMapper.selectSysCarFaultLogList(sysCarFaultLog);
     }
 
     /**
@@ -46,12 +43,8 @@ public class sysCarFaultLogServiceImpl extends ServiceImpl<SysCarFaultLogMapper,
      */
     @Override
     public List<SysCarFaultLog> listStatusIgnore(SysCarFaultLog sysCarFaultLog) {
-        LambdaQueryWrapper<SysCarFaultLog> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(SysCarFaultLog::getStatus,3);
-        if (StringUtils.isNotEmpty(sysCarFaultLog.getVin())){
-            wrapper.eq(SysCarFaultLog::getVin,sysCarFaultLog.getVin());
-        }
-        return this.list(wrapper);
+
+        return sysCarFaultLogMapper.listStatusIgnore(sysCarFaultLog);
     }
 
     /**
@@ -61,24 +54,16 @@ public class sysCarFaultLogServiceImpl extends ServiceImpl<SysCarFaultLogMapper,
      */
     @Override
     public List<SysCarFaultLog> listStatusProcess(SysCarFaultLog sysCarFaultLog) {
-        LambdaQueryWrapper<SysCarFaultLog> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(SysCarFaultLog::getStatus,2);
-        if (StringUtils.isNotEmpty(sysCarFaultLog.getVin())){
-            wrapper.eq(SysCarFaultLog::getVin,sysCarFaultLog.getVin());
-        }
-        return this.list(wrapper);
+
+        return sysCarFaultLogMapper.listStatusProcess(sysCarFaultLog);
     }
 
     //只展示已解决的数据
     @Override
     public List<SysCarFaultLog> listStatusSolve(SysCarFaultLog 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);
+        return sysCarFaultLogMapper.listStatusSolve(sysCarFaultLog);
     }
 
 
+
 }

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

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

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

@@ -0,0 +1,66 @@
+<?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,10 +23,11 @@
         <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 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,car_type_id from sys_car_fault
     </sql>
 
     <select id="selectSysCarFaultList" parameterType="com.muyu.breakdown.domain.SysCarFault" resultMap="SysCarFaultResult">
@@ -42,6 +43,13 @@
         <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
@@ -63,6 +71,7 @@
             <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>
@@ -82,6 +91,7 @@
             <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>
 
@@ -105,6 +115,7 @@
             <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/src/main/java/com/muyu/domain/SysCar.java

@@ -25,5 +25,6 @@ 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

@@ -17,6 +17,8 @@ public class SysCarVo extends SysCar {
     private String typeName;
     @Excel(name = "策略名称")
     private String strategyName;
+    @Excel(name = "围栏组名称")
+    private String groupName;
 
 
 

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: four
+  namespace: yzl
 
 # Spring
 spring:

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

@@ -6,9 +6,9 @@
     <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`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`)
+          `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},#{createBy}, #{createTime}, #{updateBy}, #{updateTime}, #{remark})
+                #{carBatteryManufacturer}, #{carBatteryModel}, #{strategyId},#{groupId},#{createBy}, #{createTime}, #{updateBy}, #{updateTime}, #{remark})
     </insert>
     <update id="updSysCarById">
         UPDATE `four`.`sys_car`
@@ -20,6 +20,7 @@
             `car_battery_manufacturer` = #{carBatteryManufacturer},
             `car_battery_model` = #{carBatteryModel},
             `strategy_id` = #{strategyId},
+            `group_id`=#{groupId}
             `create_by` = #{createBy},
             `create_time` = #{createTime},
             `update_by` = #{updateBy},
@@ -27,10 +28,11 @@
             `remark` = #{remark} WHERE `id` = #{id}
     </update>
     <select id="selectSysCarVoList" resultType="com.muyu.domain.resp.SysCarVo">
-        SELECT * ,car_type.type_name,warn_strategy.strategy_name
+        SELECT * ,car_type.type_name,warn_strategy.strategy_name,electronic_fence_group.group_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}
@@ -55,10 +57,11 @@
 
 
     <select id="selectSysCarVoById" resultType="com.muyu.domain.resp.SysCarVo">
-        SELECT * ,car_type.type_name,warn_strategy.strategy_name
+        SELECT * ,car_type.type_name,warn_strategy.strategy_name,electronic_fence_group.group_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

@@ -0,0 +1,102 @@
+<?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

@@ -0,0 +1,18 @@
+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,10 +17,6 @@
     </description>
 
     <dependencies>
-        <dependency>
-            <groupId>com.muyu</groupId>
-            <artifactId>cloud-common-saas</artifactId>
-        </dependency>
 
         <!-- SpringCloud Alibaba Nacos -->
         <dependency>

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

@@ -13,4 +13,5 @@ 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: four
+  namespace: yzl
 # SPRING_AMQP_DESERIALIZATION_TRUST_ALL=true spring.amqp.deserialization.trust.all
 # Spring
 spring:

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

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

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

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

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

@@ -20,7 +20,7 @@ public interface GenTableColumnMapper
      * @param dbName
      * @return 列信息
      */
-    public List<GenTableColumn> selectDbTableColumnsByName(@Param("tableName") String tableName, @Param("dbName") String dbName);
+    List<GenTableColumn> selectDbTableColumnsByName(@Param("tableName") String tableName, @Param("dbName") String dbName);
 
     /**
      * 查询业务字段列表
@@ -28,7 +28,7 @@ public interface GenTableColumnMapper
      * @param tableId 业务字段编号
      * @return 业务字段集合
      */
-    public List<GenTableColumn> selectGenTableColumnListByTableId(@Param("tableId") Long tableId);
+    List<GenTableColumn> selectGenTableColumnListByTableId(@Param("tableId") Long tableId);
 
     /**
      * 新增业务字段
@@ -36,7 +36,7 @@ public interface GenTableColumnMapper
      * @param genTableColumn 业务字段信息
      * @return 结果
      */
-    public int insertGenTableColumn(GenTableColumn genTableColumn);
+    int insertGenTableColumn(GenTableColumn genTableColumn);
 
     /**
      * 修改业务字段
@@ -44,7 +44,7 @@ public interface GenTableColumnMapper
      * @param genTableColumn 业务字段信息
      * @return 结果
      */
-    public int updateGenTableColumn(GenTableColumn genTableColumn);
+    int updateGenTableColumn(GenTableColumn genTableColumn);
 
     /**
      * 删除业务字段
@@ -52,7 +52,7 @@ public interface GenTableColumnMapper
      * @param genTableColumns 列数据
      * @return 结果
      */
-    public int deleteGenTableColumns(@Param("genTableColumns") List<GenTableColumn> genTableColumns);
+    int deleteGenTableColumns(@Param("genTableColumns") List<GenTableColumn> genTableColumns);
 
     /**
      * 批量删除业务字段
@@ -60,5 +60,5 @@ public interface GenTableColumnMapper
      * @param ids 需要删除的数据ID
      * @return 结果
      */
-    public int deleteGenTableColumnByIds(@Param("ids") Long[] ids);
+    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 业务集合
      */
-    public List<GenTable> selectGenTableList(GenTable genTable);
+    List<GenTable> selectGenTableList(GenTable genTable);
 
     /**
      * 查询据库列表
@@ -27,7 +27,7 @@ public interface GenTableMapper
      * @param genTable 业务信息
      * @return 数据库表集合
      */
-    public List<GenTable> selectDbTableList(GenTable genTable);
+    List<GenTable> selectDbTableList(GenTable genTable);
 
     /**
      * 查询据库列表
@@ -36,14 +36,14 @@ public interface GenTableMapper
      * @param dbName
      * @return 数据库表集合
      */
-    public List<GenTable> selectDbTableListByNames(@Param("tableNames") String[] tableNames, @Param("dbName") String dbName);
+    List<GenTable> selectDbTableListByNames(@Param("tableNames") String[] tableNames, @Param("dbName") String dbName);
 
     /**
      * 查询所有表信息
      *
      * @return 表信息集合
      */
-    public List<GenTable> selectGenTableAll();
+    List<GenTable> selectGenTableAll();
 
     /**
      * 查询表ID业务信息
@@ -51,7 +51,7 @@ public interface GenTableMapper
      * @param id 业务ID
      * @return 业务信息
      */
-    public GenTable selectGenTableById(@Param("id") Long id);
+    GenTable selectGenTableById(@Param("id") Long id);
 
     /**
      * 查询表名称业务信息
@@ -59,7 +59,7 @@ public interface GenTableMapper
      * @param tableName 表名称
      * @return 业务信息
      */
-    public GenTable selectGenTableByName(@Param("tableName") String tableName);
+    GenTable selectGenTableByName(@Param("tableName") String tableName);
 
     /**
      * 新增业务
@@ -67,7 +67,7 @@ public interface GenTableMapper
      * @param genTable 业务信息
      * @return 结果
      */
-    public int insertGenTable(GenTable genTable);
+    int insertGenTable(GenTable genTable);
 
     /**
      * 修改业务
@@ -75,7 +75,7 @@ public interface GenTableMapper
      * @param genTable 业务信息
      * @return 结果
      */
-    public int updateGenTable(GenTable genTable);
+    int updateGenTable(GenTable genTable);
 
     /**
      * 批量删除业务
@@ -83,7 +83,7 @@ public interface GenTableMapper
      * @param ids 需要删除的数据ID
      * @return 结果
      */
-    public int deleteGenTableByIds(@Param("ids") Long[] ids);
+    int deleteGenTableByIds(@Param("ids") Long[] ids);
 
     List<String> selDbNameAll();
 

cloud-modules/cloud-modules-gen/src/main/java/com/muyu/gen/service/IGenTableColumnService.java

@@ -17,7 +17,7 @@ public interface IGenTableColumnService
      * @param tableId 业务字段编号
      * @return 业务字段集合
      */
-    public List<GenTableColumn> selectGenTableColumnListByTableId(Long tableId);
+    List<GenTableColumn> selectGenTableColumnListByTableId(Long tableId);
 
     /**
      * 新增业务字段
@@ -25,7 +25,7 @@ public interface IGenTableColumnService
      * @param genTableColumn 业务字段信息
      * @return 结果
      */
-    public int insertGenTableColumn(GenTableColumn genTableColumn);
+    int insertGenTableColumn(GenTableColumn genTableColumn);
 
     /**
      * 修改业务字段
@@ -33,7 +33,7 @@ public interface IGenTableColumnService
      * @param genTableColumn 业务字段信息
      * @return 结果
      */
-    public int updateGenTableColumn(GenTableColumn genTableColumn);
+    int updateGenTableColumn(GenTableColumn genTableColumn);
 
     /**
      * 删除业务字段信息
@@ -41,7 +41,7 @@ public interface IGenTableColumnService
      * @param ids 需要删除的数据ID
      * @return 结果
      */
-    public int deleteGenTableColumnByIds(String ids);
+    int deleteGenTableColumnByIds(String ids);
 
     List<GenTableColumn> selectDbTableColumnsByName(String table, String dbName);
 }

cloud-modules/cloud-modules-gen/src/main/java/com/muyu/gen/service/IGenTableService.java

@@ -19,7 +19,7 @@ public interface IGenTableService
      * @param genTable 业务信息
      * @return 业务集合
      */
-    public List<GenTable> selectGenTableList(GenTable genTable);
+    List<GenTable> selectGenTableList(GenTable genTable);
 
     /**
      * 查询据库列表
@@ -27,7 +27,7 @@ public interface IGenTableService
      * @param genTable 业务信息
      * @return 数据库表集合
      */
-    public List<GenTable> selectDbTableList(GenTable genTable);
+    List<GenTable> selectDbTableList(GenTable genTable);
 
     /**
      * 查询据库列表
@@ -36,14 +36,14 @@ public interface IGenTableService
      * @param dbName
      * @return 数据库表集合
      */
-    public List<GenTable> selectDbTableListByNames(String[] tableNames, String dbName);
+    List<GenTable> selectDbTableListByNames(String[] tableNames, String dbName);
 
     /**
      * 查询所有表信息
      *
      * @return 表信息集合
      */
-    public List<GenTable> selectGenTableAll();
+    List<GenTable> selectGenTableAll();
 
     /**
      * 查询业务信息
@@ -51,7 +51,7 @@ public interface IGenTableService
      * @param id 业务ID
      * @return 业务信息
      */
-    public GenTable selectGenTableById(Long id);
+    GenTable selectGenTableById(Long id);
 
     /**
      * 修改业务
@@ -59,7 +59,7 @@ public interface IGenTableService
      * @param genTable 业务信息
      * @return 结果
      */
-    public void updateGenTable(GenTable genTable);
+    void updateGenTable(GenTable genTable);
 
     /**
      * 删除业务信息
@@ -67,14 +67,14 @@ public interface IGenTableService
      * @param tableIds 需要删除的表数据ID
      * @return 结果
      */
-    public void deleteGenTableByIds(Long[] tableIds);
+    void deleteGenTableByIds(Long[] tableIds);
 
     /**
      * 导入表结构
      *
      * @param tableList 导入表列表
      */
-    public void importGenTable(List<GenTable> tableList);
+    void importGenTable(List<GenTable> tableList);
 
     /**
      * 预览代码
@@ -82,7 +82,7 @@ public interface IGenTableService
      * @param tableId 表编号
      * @return 预览数据列表
      */
-    public Map<String, String> previewCode(Long tableId);
+    Map<String, String> previewCode(Long tableId);
 
     /**
      * 生成代码（下载方式）
@@ -90,7 +90,7 @@ public interface IGenTableService
      * @param tableName 表名称
      * @return 数据
      */
-    public byte[] downloadCode(String tableName);
+    byte[] downloadCode(String tableName);
 
     /**
      * 生成代码（自定义路径）
@@ -98,7 +98,7 @@ public interface IGenTableService
      * @param tableName 表名称
      * @return 数据
      */
-    public void generatorCode(String tableName);
+    void generatorCode(String tableName);
 
     /**
      * 同步数据库
@@ -106,7 +106,7 @@ public interface IGenTableService
      * @param tableName 表名称
      * @param dbName
      */
-    public void synchDb(String tableName, String dbName);
+    void synchDb(String tableName, String dbName);
 
     /**
      * 批量生成代码（下载方式）
@@ -114,14 +114,14 @@ public interface IGenTableService
      * @param tableNames 表数组
      * @return 数据
      */
-    public byte[] downloadCode(String[] tableNames);
+    byte[] downloadCode(String[] tableNames);
 
     /**
      * 修改保存参数校验
      *
      * @param genTable 业务信息
      */
-    public void validateEdit(GenTable genTable);
+    void validateEdit(GenTable genTable);
 
     List<String> selDbNameAll();
 

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

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

cloud-modules/cloud-modules-gen/src/main/resources/vm/java/service.java.vm

@@ -17,7 +17,7 @@ public interface I${ClassName}Service extends IService<${ClassName}> {
      * @param ${pkColumn.javaField} ${functionName}主键
      * @return ${functionName}
      */
-    public ${ClassName} select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField});
+        ${ClassName} select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField});
 
     /**
      * 查询${functionName}列表
@@ -25,7 +25,7 @@ public interface I${ClassName}Service extends IService<${ClassName}> {
      * @param ${className} ${functionName}
      * @return ${functionName}集合
      */
-    public List<${ClassName}> select${ClassName}List(${ClassName} ${className});
+    List<${ClassName}> select${ClassName}List(${ClassName} ${className});
 
     /**
      * 判断 ${functionName} id是否唯一

cloud-modules/cloud-modules-gen/src/main/resources/vm/vue/index-tree.vue.vm

@@ -494,7 +494,7 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       this.#[[$modal]]#.confirm('是否确认删除${functionName}编号为"' + row.${pkColumn.javaField} + '"的数据项？').then(function() {
-        return del${BusinessName}(row.${pkColumn.javaField});
+        return del${BusinessName}(row.${pkColumn.javaField})
       }).then(() => {
         this.getList();
         this.#[[$modal]]#.msgSuccess("删除成功");

cloud-modules/cloud-modules-gen/src/main/resources/vm/vue/index.vue.vm

@@ -580,7 +580,7 @@ export default {
         this.#[[$modal]]#.msgError("请先选择要删除的${subTable.functionName}数据");
       } else {
         const ${subclassName}List = this.${subclassName}List;
-        const checked${subClassName} = this.checked${subClassName};
+        const checked${subClassName} = this.checked${subClassName}
         this.${subclassName}List = ${subclassName}List.filter(function(item) {
           return checked${subClassName}.indexOf(item.index) == -1
         });
@@ -598,5 +598,5 @@ export default {
       }, `${businessName}_#[[${new Date().getTime()}]]#.xlsx`)
     }
   }
-};
+}
 </script>

cloud-modules/cloud-modules-gen/src/main/resources/vm/vue/v3/index-tree.vue.vm

@@ -463,7 +463,7 @@ function submitForm() {
 /** 删除按钮操作 */
 function handleDelete(row) {
   proxy.#[[$modal]]#.confirm('是否确认删除${functionName}编号为"' + row.${pkColumn.javaField} + '"的数据项？').then(function() {
-    return del${BusinessName}(row.${pkColumn.javaField});
+    return del${BusinessName}(row.${pkColumn.javaField})
   }).then(() => {
     getList();
     proxy.#[[$modal]]#.msgSuccess("删除成功");

cloud-modules/cloud-modules-gen/src/main/resources/vm/vue/v3/index.vue.vm

@@ -535,7 +535,7 @@ function submitForm() {
 function handleDelete(row) {
   const _${pkColumn.javaField}s = row.${pkColumn.javaField} || ids.value;
   proxy.#[[$modal]]#.confirm('是否确认删除${functionName}编号为"' + _${pkColumn.javaField}s + '"的数据项？').then(function() {
-    return del${BusinessName}(_${pkColumn.javaField}s);
+    return del${BusinessName}(_${pkColumn.javaField}s)
   }).then(() => {
     getList();
     proxy.#[[$modal]]#.msgSuccess("删除成功");

cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysDeptMapper.java

@@ -19,7 +19,7 @@ public interface SysDeptMapper extends BaseMapper<SysDept> {
      *
      * @return 部门信息集合
      */
-    public List<SysDept> selectDeptList (SysDept dept);
+    List<SysDept> selectDeptList(SysDept dept);
 
     /**
      * 根据角色ID查询部门树信息
@@ -29,7 +29,7 @@ public interface SysDeptMapper extends BaseMapper<SysDept> {
      *
      * @return 选中部门列表
      */
-    public List<Long> selectDeptListByRoleId (@Param("roleId") Long roleId, @Param("deptCheckStrictly") boolean deptCheckStrictly);
+    List<Long> selectDeptListByRoleId(@Param("roleId") Long roleId, @Param("deptCheckStrictly") boolean deptCheckStrictly);
 
     /**
      * 根据部门ID查询信息
@@ -38,7 +38,7 @@ public interface SysDeptMapper extends BaseMapper<SysDept> {
      *
      * @return 部门信息
      */
-    public SysDept selectDeptById (Long deptId);
+    SysDept selectDeptById(Long deptId);
 
     /**
      * 根据ID查询所有子部门
@@ -47,7 +47,7 @@ public interface SysDeptMapper extends BaseMapper<SysDept> {
      *
      * @return 部门列表
      */
-    public List<SysDept> selectChildrenDeptById (Long deptId);
+    List<SysDept> selectChildrenDeptById(Long deptId);
 
     /**
      * 根据ID查询所有子部门（正常状态）
@@ -56,7 +56,7 @@ public interface SysDeptMapper extends BaseMapper<SysDept> {
      *
      * @return 子部门数
      */
-    public int selectNormalChildrenDeptById (Long deptId);
+    int selectNormalChildrenDeptById(Long deptId);
 
     /**
      * 是否存在子节点
@@ -65,7 +65,7 @@ public interface SysDeptMapper extends BaseMapper<SysDept> {
      *
      * @return 结果
      */
-    public int hasChildByDeptId (Long deptId);
+    int hasChildByDeptId(Long deptId);
 
     /**
      * 查询部门是否存在用户
@@ -74,7 +74,7 @@ public interface SysDeptMapper extends BaseMapper<SysDept> {
      *
      * @return 结果
      */
-    public int checkDeptExistUser (Long deptId);
+    int checkDeptExistUser(Long deptId);
 
     /**
      * 校验部门名称是否唯一
@@ -84,7 +84,7 @@ public interface SysDeptMapper extends BaseMapper<SysDept> {
      *
      * @return 结果
      */
-    public SysDept checkDeptNameUnique (@Param("deptName") String deptName, @Param("parentId") Long parentId);
+    SysDept checkDeptNameUnique(@Param("deptName") String deptName, @Param("parentId") Long parentId);
 
     /**
      * 新增部门信息
@@ -93,7 +93,7 @@ public interface SysDeptMapper extends BaseMapper<SysDept> {
      *
      * @return 结果
      */
-    public int insertDept (SysDept dept);
+    int insertDept(SysDept dept);
 
     /**
      * 修改部门信息
@@ -102,14 +102,14 @@ public interface SysDeptMapper extends BaseMapper<SysDept> {
      *
      * @return 结果
      */
-    public int updateDept (SysDept dept);
+    int updateDept(SysDept dept);
 
     /**
      * 修改所在部门正常状态
      *
      * @param deptIds 部门ID组
      */
-    public void updateDeptStatusNormal (Long[] deptIds);
+    void updateDeptStatusNormal(Long[] deptIds);
 
     /**
      * 修改子元素关系
@@ -118,7 +118,7 @@ public interface SysDeptMapper extends BaseMapper<SysDept> {
      *
      * @return 结果
      */
-    public int updateDeptChildren (@Param("depts") List<SysDept> depts);
+    int updateDeptChildren(@Param("depts") List<SysDept> depts);
 
     /**
      * 删除部门管理信息
@@ -127,5 +127,5 @@ public interface SysDeptMapper extends BaseMapper<SysDept> {
      *
      * @return 结果
      */
-    public int deleteDeptById (Long deptId);
+    int deleteDeptById(Long deptId);
 }

cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysDictDataMapper.java

@@ -19,7 +19,7 @@ public interface SysDictDataMapper  extends BaseMapper<SysDictData> {
      *
      * @return 字典数据集合信息
      */
-    public List<SysDictData> selectDictDataList (SysDictData dictData);
+    List<SysDictData> selectDictDataList(SysDictData dictData);
 
     /**
      * 根据字典类型查询字典数据
@@ -28,7 +28,7 @@ public interface SysDictDataMapper  extends BaseMapper<SysDictData> {
      *
      * @return 字典数据集合信息
      */
-    public List<SysDictData> selectDictDataByType (String dictType);
+    List<SysDictData> selectDictDataByType(String dictType);
 
     /**
      * 根据字典类型和字典键值查询字典数据信息
@@ -38,7 +38,7 @@ public interface SysDictDataMapper  extends BaseMapper<SysDictData> {
      *
      * @return 字典标签
      */
-    public String selectDictLabel (@Param("dictType") String dictType, @Param("dictValue") String dictValue);
+    String selectDictLabel(@Param("dictType") String dictType, @Param("dictValue") String dictValue);
 
     /**
      * 根据字典数据ID查询信息
@@ -47,7 +47,7 @@ public interface SysDictDataMapper  extends BaseMapper<SysDictData> {
      *
      * @return 字典数据
      */
-    public SysDictData selectDictDataById (Long dictCode);
+    SysDictData selectDictDataById(Long dictCode);
 
     /**
      * 查询字典数据
@@ -56,7 +56,7 @@ public interface SysDictDataMapper  extends BaseMapper<SysDictData> {
      *
      * @return 字典数据
      */
-    public int countDictDataByType (String dictType);
+    int countDictDataByType(String dictType);
 
     /**
      * 通过字典ID删除字典数据信息
@@ -65,7 +65,7 @@ public interface SysDictDataMapper  extends BaseMapper<SysDictData> {
      *
      * @return 结果
      */
-    public int deleteDictDataById (Long dictCode);
+    int deleteDictDataById(Long dictCode);
 
     /**
      * 批量删除字典数据信息
@@ -74,7 +74,7 @@ public interface SysDictDataMapper  extends BaseMapper<SysDictData> {
      *
      * @return 结果
      */
-    public int deleteDictDataByIds (Long[] dictCodes);
+    int deleteDictDataByIds(Long[] dictCodes);
 
     /**
      * 新增字典数据信息
@@ -83,7 +83,7 @@ public interface SysDictDataMapper  extends BaseMapper<SysDictData> {
      *
      * @return 结果
      */
-    public int insertDictData (SysDictData dictData);
+    int insertDictData(SysDictData dictData);
 
     /**
      * 修改字典数据信息
@@ -92,7 +92,7 @@ public interface SysDictDataMapper  extends BaseMapper<SysDictData> {
      *
      * @return 结果
      */
-    public int updateDictData (SysDictData dictData);
+    int updateDictData(SysDictData dictData);
 
     /**
      * 同步修改字典类型
@@ -102,5 +102,5 @@ public interface SysDictDataMapper  extends BaseMapper<SysDictData> {
      *
      * @return 结果
      */
-    public int updateDictDataType (@Param("oldDictType") String oldDictType, @Param("newDictType") String newDictType);
+    int updateDictDataType(@Param("oldDictType") String oldDictType, @Param("newDictType") String newDictType);
 }

cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysDictTypeMapper.java

@@ -18,15 +18,14 @@ public interface SysDictTypeMapper extends BaseMapper<SysDictType> {
      *
      * @return 字典类型集合信息
      */
-
-    public List<SysDictType> selectDictTypeList (SysDictType dictType);
+    List<SysDictType> selectDictTypeList(SysDictType dictType);
 
     /**
      * 根据所有字典类型
      *
      * @return 字典类型集合信息
      */
-    public List<SysDictType> selectDictTypeAll ();
+    List<SysDictType> selectDictTypeAll();
 
     /**
      * 根据字典类型ID查询信息
@@ -35,7 +34,7 @@ public interface SysDictTypeMapper extends BaseMapper<SysDictType> {
      *
      * @return 字典类型
      */
-    public SysDictType selectDictTypeById (Long dictId);
+    SysDictType selectDictTypeById(Long dictId);
 
     /**
      * 根据字典类型查询信息
@@ -44,7 +43,7 @@ public interface SysDictTypeMapper extends BaseMapper<SysDictType> {
      *
      * @return 字典类型
      */
-    public SysDictType selectDictTypeByType (String dictType);
+    SysDictType selectDictTypeByType(String dictType);
 
     /**
      * 通过字典ID删除字典信息
@@ -53,7 +52,7 @@ public interface SysDictTypeMapper extends BaseMapper<SysDictType> {
      *
      * @return 结果
      */
-    public int deleteDictTypeById (Long dictId);
+    int deleteDictTypeById(Long dictId);
 
     /**
      * 批量删除字典类型信息
@@ -62,7 +61,7 @@ public interface SysDictTypeMapper extends BaseMapper<SysDictType> {
      *
      * @return 结果
      */
-    public int deleteDictTypeByIds (Long[] dictIds);
+    int deleteDictTypeByIds(Long[] dictIds);
 
     /**
      * 新增字典类型信息
@@ -71,7 +70,7 @@ public interface SysDictTypeMapper extends BaseMapper<SysDictType> {
      *
      * @return 结果
      */
-    public int insertDictType (SysDictType dictType);
+    int insertDictType(SysDictType dictType);
 
     /**
      * 修改字典类型信息
@@ -80,7 +79,7 @@ public interface SysDictTypeMapper extends BaseMapper<SysDictType> {
      *
      * @return 结果
      */
-    public int updateDictType (SysDictType dictType);
+    int updateDictType(SysDictType dictType);
 
     /**
      * 校验字典类型称是否唯一
@@ -89,5 +88,5 @@ public interface SysDictTypeMapper extends BaseMapper<SysDictType> {
      *
      * @return 结果
      */
-    public SysDictType checkDictTypeUnique (String dictType);
+    SysDictType checkDictTypeUnique(String dictType);
 }

cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysLogininforMapper.java

@@ -16,7 +16,7 @@ public interface SysLogininforMapper extends BaseMapper<SysLogininfor> {
      *
      * @param logininfor 访问日志对象
      */
-    public int insertLogininfor (SysLogininfor logininfor);
+    int insertLogininfor(SysLogininfor logininfor);
 
     /**
      * 查询系统登录日志集合
@@ -25,7 +25,7 @@ public interface SysLogininforMapper extends BaseMapper<SysLogininfor> {
      *
      * @return 登录记录集合
      */
-    public List<SysLogininfor> selectLogininforList (SysLogininfor logininfor);
+    List<SysLogininfor> selectLogininforList(SysLogininfor logininfor);
 
     /**
      * 批量删除系统登录日志
@@ -34,12 +34,12 @@ public interface SysLogininforMapper extends BaseMapper<SysLogininfor> {
      *
      * @return 结果
      */
-    public int deleteLogininforByIds (Long[] infoIds);
+    int deleteLogininforByIds(Long[] infoIds);
 
     /**
      * 清空系统登录日志
      *
      * @return 结果
      */
-    public int cleanLogininfor ();
+    int cleanLogininfor();
 }

cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysMenuMapper.java

@@ -19,14 +19,14 @@ public interface SysMenuMapper extends BaseMapper<SysMenu> {
      *
      * @return 菜单列表
      */
-    public List<SysMenu> selectMenuList (SysMenu menu);
+    List<SysMenu> selectMenuList(SysMenu menu);
 
     /**
      * 根据用户所有权限
      *
      * @return 权限列表
      */
-    public List<String> selectMenuPerms ();
+    List<String> selectMenuPerms();
 
     /**
      * 根据用户查询系统菜单列表
@@ -35,7 +35,7 @@ public interface SysMenuMapper extends BaseMapper<SysMenu> {
      *
      * @return 菜单列表
      */
-    public List<SysMenu> selectMenuListByUserId (SysMenu menu);
+    List<SysMenu> selectMenuListByUserId(SysMenu menu);
 
     /**
      * 根据角色ID查询权限
@@ -44,7 +44,7 @@ public interface SysMenuMapper extends BaseMapper<SysMenu> {
      *
      * @return 权限列表
      */
-    public List<String> selectMenuPermsByRoleId (Long roleId);
+    List<String> selectMenuPermsByRoleId(Long roleId);
 
     /**
      * 根据用户ID查询权限
@@ -53,14 +53,14 @@ public interface SysMenuMapper extends BaseMapper<SysMenu> {
      *
      * @return 权限列表
      */
-    public List<String> selectMenuPermsByUserId (Long userId);
+    List<String> selectMenuPermsByUserId(Long userId);
 
     /**
      * 根据用户ID查询菜单
      *
      * @return 菜单列表
      */
-    public List<SysMenu> selectMenuTreeAll ();
+    List<SysMenu> selectMenuTreeAll();
 
     /**
      * 根据用户ID查询菜单
@@ -69,7 +69,7 @@ public interface SysMenuMapper extends BaseMapper<SysMenu> {
      *
      * @return 菜单列表
      */
-    public List<SysMenu> selectMenuTreeByUserId (Long userId);
+    List<SysMenu> selectMenuTreeByUserId(Long userId);
 
     /**
      * 根据角色ID查询菜单树信息
@@ -79,7 +79,7 @@ public interface SysMenuMapper extends BaseMapper<SysMenu> {
      *
      * @return 选中菜单列表
      */
-    public List<Long> selectMenuListByRoleId (@Param("roleId") Long roleId, @Param("menuCheckStrictly") boolean menuCheckStrictly);
+    List<Long> selectMenuListByRoleId(@Param("roleId") Long roleId, @Param("menuCheckStrictly") boolean menuCheckStrictly);
 
     /**
      * 根据菜单ID查询信息
@@ -88,7 +88,7 @@ public interface SysMenuMapper extends BaseMapper<SysMenu> {
      *
      * @return 菜单信息
      */
-    public SysMenu selectMenuById (Long menuId);
+    SysMenu selectMenuById(Long menuId);
 
     /**
      * 是否存在菜单子节点
@@ -97,7 +97,7 @@ public interface SysMenuMapper extends BaseMapper<SysMenu> {
      *
      * @return 结果
      */
-    public int hasChildByMenuId (Long menuId);
+    int hasChildByMenuId(Long menuId);
 
     /**
      * 新增菜单信息
@@ -106,7 +106,7 @@ public interface SysMenuMapper extends BaseMapper<SysMenu> {
      *
      * @return 结果
      */
-    public int insertMenu (SysMenu menu);
+    int insertMenu(SysMenu menu);
 
     /**
      * 修改菜单信息
@@ -115,7 +115,7 @@ public interface SysMenuMapper extends BaseMapper<SysMenu> {
      *
      * @return 结果
      */
-    public int updateMenu (SysMenu menu);
+    int updateMenu(SysMenu menu);
 
     /**
      * 删除菜单管理信息
@@ -124,7 +124,7 @@ public interface SysMenuMapper extends BaseMapper<SysMenu> {
      *
      * @return 结果
      */
-    public int deleteMenuById (Long menuId);
+    int deleteMenuById(Long menuId);
 
     /**
      * 校验菜单名称是否唯一
@@ -134,5 +134,5 @@ public interface SysMenuMapper extends BaseMapper<SysMenu> {
      *
      * @return 结果
      */
-    public SysMenu checkMenuNameUnique (@Param("menuName") String menuName, @Param("parentId") Long parentId);
+    SysMenu checkMenuNameUnique(@Param("menuName") String menuName, @Param("parentId") Long parentId);
 }

cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysNoticeMapper.java

@@ -18,7 +18,7 @@ public interface SysNoticeMapper extends BaseMapper<SysNotice> {
      *
      * @return 公告信息
      */
-    public SysNotice selectNoticeById (Long noticeId);
+    SysNotice selectNoticeById(Long noticeId);
 
     /**
      * 查询公告列表
@@ -27,7 +27,7 @@ public interface SysNoticeMapper extends BaseMapper<SysNotice> {
      *
      * @return 公告集合
      */
-    public List<SysNotice> selectNoticeList (SysNotice notice);
+    List<SysNotice> selectNoticeList(SysNotice notice);
 
     /**
      * 新增公告
@@ -36,7 +36,7 @@ public interface SysNoticeMapper extends BaseMapper<SysNotice> {
      *
      * @return 结果
      */
-    public int insertNotice (SysNotice notice);
+    int insertNotice(SysNotice notice);
 
     /**
      * 修改公告
@@ -45,7 +45,7 @@ public interface SysNoticeMapper extends BaseMapper<SysNotice> {
      *
      * @return 结果
      */
-    public int updateNotice (SysNotice notice);
+    int updateNotice(SysNotice notice);
 
     /**
      * 批量删除公告
@@ -54,7 +54,7 @@ public interface SysNoticeMapper extends BaseMapper<SysNotice> {
      *
      * @return 结果
      */
-    public int deleteNoticeById (Long noticeId);
+    int deleteNoticeById(Long noticeId);
 
     /**
      * 批量删除公告信息
@@ -63,5 +63,5 @@ public interface SysNoticeMapper extends BaseMapper<SysNotice> {
      *
      * @return 结果
      */
-    public int deleteNoticeByIds (Long[] noticeIds);
+    int deleteNoticeByIds(Long[] noticeIds);
 }

cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysOperLogMapper.java

@@ -16,7 +16,7 @@ public interface SysOperLogMapper extends BaseMapper<SysOperLog> {
      *
      * @param operLog 操作日志对象
      */
-    public int insertOperlog (SysOperLog operLog);
+    int insertOperlog(SysOperLog operLog);
 
     /**
      * 查询系统操作日志集合
@@ -25,7 +25,7 @@ public interface SysOperLogMapper extends BaseMapper<SysOperLog> {
      *
      * @return 操作日志集合
      */
-    public List<SysOperLog> selectOperLogList (SysOperLog operLog);
+    List<SysOperLog> selectOperLogList(SysOperLog operLog);
 
     /**
      * 批量删除系统操作日志
@@ -34,7 +34,7 @@ public interface SysOperLogMapper extends BaseMapper<SysOperLog> {
      *
      * @return 结果
      */
-    public int deleteOperLogByIds (Long[] operIds);
+    int deleteOperLogByIds(Long[] operIds);
 
     /**
      * 查询操作日志详细
@@ -43,10 +43,10 @@ public interface SysOperLogMapper extends BaseMapper<SysOperLog> {
      *
      * @return 操作日志对象
      */
-    public SysOperLog selectOperLogById (Long operId);
+    SysOperLog selectOperLogById(Long operId);
 
     /**
      * 清空操作日志
      */
-    public void cleanOperLog ();
+    void cleanOperLog();
 }

cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysPostMapper.java

@@ -18,14 +18,14 @@ public interface SysPostMapper extends BaseMapper<SysPost> {
      *
      * @return 岗位数据集合
      */
-    public List<SysPost> selectPostList (SysPost post);
+    List<SysPost> selectPostList(SysPost post);
 
     /**
      * 查询所有岗位
      *
      * @return 岗位列表
      */
-    public List<SysPost> selectPostAll ();
+    List<SysPost> selectPostAll();
 
     /**
      * 通过岗位ID查询岗位信息
@@ -34,7 +34,7 @@ public interface SysPostMapper extends BaseMapper<SysPost> {
      *
      * @return 角色对象信息
      */
-    public SysPost selectPostById (Long postId);
+    SysPost selectPostById(Long postId);
 
     /**
      * 根据用户ID获取岗位选择框列表
@@ -43,7 +43,7 @@ public interface SysPostMapper extends BaseMapper<SysPost> {
      *
      * @return 选中岗位ID列表
      */
-    public List<Long> selectPostListByUserId (Long userId);
+    List<Long> selectPostListByUserId(Long userId);
 
     /**
      * 查询用户所属岗位组
@@ -52,7 +52,7 @@ public interface SysPostMapper extends BaseMapper<SysPost> {
      *
      * @return 结果
      */
-    public List<SysPost> selectPostsByUserName (String userName);
+    List<SysPost> selectPostsByUserName(String userName);
 
     /**
      * 删除岗位信息
@@ -61,7 +61,7 @@ public interface SysPostMapper extends BaseMapper<SysPost> {
      *
      * @return 结果
      */
-    public int deletePostById (Long postId);
+    int deletePostById(Long postId);
 
     /**
      * 批量删除岗位信息
@@ -70,7 +70,7 @@ public interface SysPostMapper extends BaseMapper<SysPost> {
      *
      * @return 结果
      */
-    public int deletePostByIds (Long[] postIds);
+    int deletePostByIds(Long[] postIds);
 
     /**
      * 修改岗位信息
@@ -79,7 +79,7 @@ public interface SysPostMapper extends BaseMapper<SysPost> {
      *
      * @return 结果
      */
-    public int updatePost (SysPost post);
+    int updatePost(SysPost post);
 
     /**
      * 新增岗位信息
@@ -88,7 +88,7 @@ public interface SysPostMapper extends BaseMapper<SysPost> {
      *
      * @return 结果
      */
-    public int insertPost (SysPost post);
+    int insertPost(SysPost post);
 
     /**
      * 校验岗位名称
@@ -97,7 +97,7 @@ public interface SysPostMapper extends BaseMapper<SysPost> {
      *
      * @return 结果
      */
-    public SysPost checkPostNameUnique (String postName);
+    SysPost checkPostNameUnique(String postName);
 
     /**
      * 校验岗位编码
@@ -106,5 +106,5 @@ public interface SysPostMapper extends BaseMapper<SysPost> {
      *
      * @return 结果
      */
-    public SysPost checkPostCodeUnique (String postCode);
+    SysPost checkPostCodeUnique(String postCode);
 }

cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysRoleDeptMapper.java

@@ -19,7 +19,7 @@ public interface SysRoleDeptMapper extends BaseMapper<SysRoleDept> {
      *
      * @return 结果
      */
-    public int deleteRoleDeptByRoleId (Long roleId);
+    int deleteRoleDeptByRoleId(Long roleId);
 
     /**
      * 批量删除角色部门关联信息
@@ -28,7 +28,7 @@ public interface SysRoleDeptMapper extends BaseMapper<SysRoleDept> {
      *
      * @return 结果
      */
-    public int deleteRoleDept (Long[] ids);
+    int deleteRoleDept(Long[] ids);
 
     /**
      * 查询部门使用数量
@@ -37,7 +37,7 @@ public interface SysRoleDeptMapper extends BaseMapper<SysRoleDept> {
      *
      * @return 结果
      */
-    public int selectCountRoleDeptByDeptId (Long deptId);
+    int selectCountRoleDeptByDeptId(Long deptId);
 
     /**
      * 批量新增角色部门信息
@@ -46,5 +46,5 @@ public interface SysRoleDeptMapper extends BaseMapper<SysRoleDept> {
      *
      * @return 结果
      */
-    public int batchRoleDept (List<SysRoleDept> roleDeptList);
+    int batchRoleDept(List<SysRoleDept> roleDeptList);
 }

cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysRoleMapper.java

@@ -18,7 +18,7 @@ public interface SysRoleMapper extends BaseMapper<SysRole> {
      *
      * @return 角色数据集合信息
      */
-    public List<SysRole> selectRoleList (SysRole role);
+    List<SysRole> selectRoleList(SysRole role);
 
     /**
      * 根据用户ID查询角色
@@ -27,14 +27,14 @@ public interface SysRoleMapper extends BaseMapper<SysRole> {
      *
      * @return 角色列表
      */
-    public List<SysRole> selectRolePermissionByUserId (Long userId);
+    List<SysRole> selectRolePermissionByUserId(Long userId);
 
     /**
      * 查询所有角色
      *
      * @return 角色列表
      */
-    public List<SysRole> selectRoleAll ();
+    List<SysRole> selectRoleAll();
 
     /**
      * 根据用户ID获取角色选择框列表
@@ -43,7 +43,7 @@ public interface SysRoleMapper extends BaseMapper<SysRole> {
      *
      * @return 选中角色ID列表
      */
-    public List<Long> selectRoleListByUserId (Long userId);
+    List<Long> selectRoleListByUserId(Long userId);
 
     /**
      * 通过角色ID查询角色
@@ -52,7 +52,7 @@ public interface SysRoleMapper extends BaseMapper<SysRole> {
      *
      * @return 角色对象信息
      */
-    public SysRole selectRoleById (Long roleId);
+    SysRole selectRoleById(Long roleId);
 
     /**
      * 根据用户ID查询角色
@@ -61,7 +61,7 @@ public interface SysRoleMapper extends BaseMapper<SysRole> {
      *
      * @return 角色列表
      */
-    public List<SysRole> selectRolesByUserName (String userName);
+    List<SysRole> selectRolesByUserName(String userName);
 
     /**
      * 校验角色名称是否唯一
@@ -70,7 +70,7 @@ public interface SysRoleMapper extends BaseMapper<SysRole> {
      *
      * @return 角色信息
      */
-    public SysRole checkRoleNameUnique (String roleName);
+    SysRole checkRoleNameUnique(String roleName);
 
     /**
      * 校验角色权限是否唯一
@@ -79,7 +79,7 @@ public interface SysRoleMapper extends BaseMapper<SysRole> {
      *
      * @return 角色信息
      */
-    public SysRole checkRoleKeyUnique (String roleKey);
+    SysRole checkRoleKeyUnique(String roleKey);
 
     /**
      * 修改角色信息
@@ -88,7 +88,7 @@ public interface SysRoleMapper extends BaseMapper<SysRole> {
      *
      * @return 结果
      */
-    public int updateRole (SysRole role);
+    int updateRole(SysRole role);
 
     /**
      * 新增角色信息
@@ -97,7 +97,7 @@ public interface SysRoleMapper extends BaseMapper<SysRole> {
      *
      * @return 结果
      */
-    public int insertRole (SysRole role);
+    int insertRole(SysRole role);
 
     /**
      * 通过角色ID删除角色
@@ -106,7 +106,7 @@ public interface SysRoleMapper extends BaseMapper<SysRole> {
      *
      * @return 结果
      */
-    public int deleteRoleById (Long roleId);
+    int deleteRoleById(Long roleId);
 
     /**
      * 批量删除角色信息
@@ -115,5 +115,5 @@ public interface SysRoleMapper extends BaseMapper<SysRole> {
      *
      * @return 结果
      */
-    public int deleteRoleByIds (Long[] roleIds);
+    int deleteRoleByIds(Long[] roleIds);
 }

cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysRoleMenuMapper.java

@@ -19,7 +19,7 @@ public interface SysRoleMenuMapper extends BaseMapper<SysRoleMenu> {
      *
      * @return 结果
      */
-    public int checkMenuExistRole (Long menuId);
+    int checkMenuExistRole(Long menuId);
 
     /**
      * 通过角色ID删除角色和菜单关联
@@ -28,7 +28,7 @@ public interface SysRoleMenuMapper extends BaseMapper<SysRoleMenu> {
      *
      * @return 结果
      */
-    public int deleteRoleMenuByRoleId (Long roleId);
+    int deleteRoleMenuByRoleId(Long roleId);
 
     /**
      * 批量删除角色菜单关联信息
@@ -37,7 +37,7 @@ public interface SysRoleMenuMapper extends BaseMapper<SysRoleMenu> {
      *
      * @return 结果
      */
-    public int deleteRoleMenu (Long[] ids);
+    int deleteRoleMenu(Long[] ids);
 
     /**
      * 批量新增角色菜单信息
@@ -46,5 +46,5 @@ public interface SysRoleMenuMapper extends BaseMapper<SysRoleMenu> {
      *
      * @return 结果
      */
-    public int batchRoleMenu (List<SysRoleMenu> roleMenuList);
+    int batchRoleMenu(List<SysRoleMenu> roleMenuList);
 }

cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysUserMapper.java

@@ -19,7 +19,7 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
      *
      * @return 用户信息集合信息
      */
-    public List<SysUser> selectUserList (SysUser sysUser);
+    List<SysUser> selectUserList(SysUser sysUser);
 
     /**
      * 根据条件分页查询已配用户角色列表
@@ -28,7 +28,7 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
      *
      * @return 用户信息集合信息
      */
-    public List<SysUser> selectAllocatedList (SysUser user);
+    List<SysUser> selectAllocatedList(SysUser user);
 
     /**
      * 根据条件分页查询未分配用户角色列表
@@ -37,7 +37,7 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
      *
      * @return 用户信息集合信息
      */
-    public List<SysUser> selectUnallocatedList (SysUser user);
+    List<SysUser> selectUnallocatedList(SysUser user);
 
     /**
      * 通过用户名查询用户
@@ -46,7 +46,7 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
      *
      * @return 用户对象信息
      */
-    public SysUser selectUserByUserName (@Param("userName") String userName);
+    SysUser selectUserByUserName(String userName);
 
     /**
      * 通过用户ID查询用户
@@ -55,7 +55,7 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
      *
      * @return 用户对象信息
      */
-    public SysUser selectUserById (Long userId);
+    SysUser selectUserById(Long userId);
 
     /**
      * 新增用户信息
@@ -64,7 +64,7 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
      *
      * @return 结果
      */
-    public int insertUser (SysUser user);
+    int insertUser(SysUser user);
 
     /**
      * 修改用户信息
@@ -73,7 +73,7 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
      *
      * @return 结果
      */
-    public int updateUser (SysUser user);
+    int updateUser(SysUser user);
 
     /**
      * 修改用户头像
@@ -83,7 +83,7 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
      *
      * @return 结果
      */
-    public int updateUserAvatar (@Param("userName") String userName, @Param("avatar") String avatar);
+    int updateUserAvatar(@Param("userName") String userName, @Param("avatar") String avatar);
 
     /**
      * 重置用户密码
@@ -93,7 +93,7 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
      *
      * @return 结果
      */
-    public int resetUserPwd (@Param("userName") String userName, @Param("password") String password);
+    int resetUserPwd(@Param("userName") String userName, @Param("password") String password);
 
     /**
      * 通过用户ID删除用户
@@ -102,7 +102,7 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
      *
      * @return 结果
      */
-    public int deleteUserById (Long userId);
+    int deleteUserById(Long userId);
 
     /**
      * 批量删除用户信息
@@ -111,7 +111,7 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
      *
      * @return 结果
      */
-    public int deleteUserByIds (Long[] userIds);
+    int deleteUserByIds(Long[] userIds);
 
     /**
      * 校验用户名称是否唯一
@@ -120,7 +120,7 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
      *
      * @return 结果
      */
-    public SysUser checkUserNameUnique (String userName);
+    SysUser checkUserNameUnique(String userName);
 
     /**
      * 校验手机号码是否唯一
@@ -129,7 +129,7 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
      *
      * @return 结果
      */
-    public SysUser checkPhoneUnique (String phonenumber);
+    SysUser checkPhoneUnique(String phonenumber);
 
     /**
      * 校验email是否唯一
@@ -138,7 +138,7 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
      *
      * @return 结果
      */
-    public SysUser checkEmailUnique (String email);
+    SysUser checkEmailUnique(String email);
 
     List<SysUser> selectCompanyList();
 

cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysUserPostMapper.java

@@ -18,7 +18,7 @@ public interface SysUserPostMapper extends BaseMapper<SysUserPost> {
      *
      * @return 结果
      */
-    public int deleteUserPostByUserId (Long userId);
+    int deleteUserPostByUserId(Long userId);
 
     /**
      * 通过岗位ID查询岗位使用数量
@@ -27,7 +27,7 @@ public interface SysUserPostMapper extends BaseMapper<SysUserPost> {
      *
      * @return 结果
      */
-    public int countUserPostById (Long postId);
+    int countUserPostById(Long postId);
 
     /**
      * 批量删除用户和岗位关联
@@ -36,7 +36,7 @@ public interface SysUserPostMapper extends BaseMapper<SysUserPost> {
      *
      * @return 结果
      */
-    public int deleteUserPost (Long[] ids);
+    int deleteUserPost(Long[] ids);
 
     /**
      * 批量新增用户岗位信息
@@ -45,5 +45,5 @@ public interface SysUserPostMapper extends BaseMapper<SysUserPost> {
      *
      * @return 结果
      */
-    public int batchUserPost (List<SysUserPost> userPostList);
+    int batchUserPost(List<SysUserPost> userPostList);
 }

cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysUserRoleMapper.java

@@ -19,7 +19,7 @@ public interface SysUserRoleMapper extends BaseMapper<SysUserRole> {
      *
      * @return 结果
      */
-    public int deleteUserRoleByUserId (Long userId);
+    int deleteUserRoleByUserId(Long userId);
 
     /**
      * 批量删除用户和角色关联
@@ -28,7 +28,7 @@ public interface SysUserRoleMapper extends BaseMapper<SysUserRole> {
      *
      * @return 结果
      */
-    public int deleteUserRole (Long[] ids);
+    int deleteUserRole(Long[] ids);
 
     /**
      * 通过角色ID查询角色使用数量
@@ -37,7 +37,7 @@ public interface SysUserRoleMapper extends BaseMapper<SysUserRole> {
      *
      * @return 结果
      */
-    public int countUserRoleByRoleId (Long roleId);
+    int countUserRoleByRoleId(Long roleId);
 
     /**
      * 批量新增用户角色信息
@@ -46,7 +46,7 @@ public interface SysUserRoleMapper extends BaseMapper<SysUserRole> {
      *
      * @return 结果
      */
-    public int batchUserRole (List<SysUserRole> userRoleList);
+    int batchUserRole(List<SysUserRole> userRoleList);
 
     /**
      * 删除用户和角色关联信息
@@ -55,7 +55,7 @@ public interface SysUserRoleMapper extends BaseMapper<SysUserRole> {
      *
      * @return 结果
      */
-    public int deleteUserRoleInfo (SysUserRole userRole);
+    int deleteUserRoleInfo(SysUserRole userRole);
 
     /**
      * 批量取消授权用户角色
@@ -65,5 +65,5 @@ public interface SysUserRoleMapper extends BaseMapper<SysUserRole> {
      *
      * @return 结果
      */
-    public int deleteUserRoleInfos (@Param("roleId") Long roleId, @Param("userIds") Long[] userIds);
+    int deleteUserRoleInfos(@Param("roleId") Long roleId, @Param("userIds") Long[] userIds);
 }

cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysConfigService.java

@@ -35,10 +35,10 @@ public interface SysConfigService extends IService<SysConfig> {
     /**
      * 清空参数缓存数据
      */
-    public void clearConfigCache ();
+    void clearConfigCache();
 
     /**
      * 加载参数缓存数据
      */
-    public void loadingConfigCache ();
+    void loadingConfigCache();
 }

cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysDeptService.java

@@ -19,7 +19,7 @@ public interface SysDeptService extends IService<SysDept> {
      *
      * @return 部门信息集合
      */
-    public List<SysDept> selectDeptList (SysDept dept);
+    List<SysDept> selectDeptList(SysDept dept);
 
     /**
      * 查询部门树结构信息
@@ -28,7 +28,7 @@ public interface SysDeptService extends IService<SysDept> {
      *
      * @return 部门树信息集合
      */
-    public List<TreeSelect> selectDeptTreeList (SysDept dept);
+    List<TreeSelect> selectDeptTreeList(SysDept dept);
 
     /**
      * 构建前端所需要树结构
@@ -37,7 +37,7 @@ public interface SysDeptService extends IService<SysDept> {
      *
      * @return 树结构列表
      */
-    public List<SysDept> buildDeptTree (List<SysDept> depts);
+    List<SysDept> buildDeptTree(List<SysDept> depts);
 
     /**
      * 构建前端所需要下拉树结构
@@ -46,7 +46,7 @@ public interface SysDeptService extends IService<SysDept> {
      *
      * @return 下拉树结构列表
      */
-    public List<TreeSelect> buildDeptTreeSelect (List<SysDept> depts);
+    List<TreeSelect> buildDeptTreeSelect(List<SysDept> depts);
 
     /**
      * 根据角色ID查询部门树信息
@@ -55,7 +55,7 @@ public interface SysDeptService extends IService<SysDept> {
      *
      * @return 选中部门列表
      */
-    public List<Long> selectDeptListByRoleId (Long roleId);
+    List<Long> selectDeptListByRoleId(Long roleId);
 
     /**
      * 根据部门ID查询信息
@@ -64,7 +64,7 @@ public interface SysDeptService extends IService<SysDept> {
      *
      * @return 部门信息
      */
-    public SysDept selectDeptById (Long deptId);
+    SysDept selectDeptById(Long deptId);
 
     /**
      * 根据ID查询所有子部门（正常状态）
@@ -73,7 +73,7 @@ public interface SysDeptService extends IService<SysDept> {
      *
      * @return 子部门数
      */
-    public int selectNormalChildrenDeptById (Long deptId);
+    int selectNormalChildrenDeptById(Long deptId);
 
     /**
      * 是否存在部门子节点
@@ -82,7 +82,7 @@ public interface SysDeptService extends IService<SysDept> {
      *
      * @return 结果
      */
-    public boolean hasChildByDeptId (Long deptId);
+    boolean hasChildByDeptId(Long deptId);
 
     /**
      * 查询部门是否存在用户
@@ -91,7 +91,7 @@ public interface SysDeptService extends IService<SysDept> {
      *
      * @return 结果 true 存在 false 不存在
      */
-    public boolean checkDeptExistUser (Long deptId);
+    boolean checkDeptExistUser(Long deptId);
 
     /**
      * 校验部门名称是否唯一
@@ -100,14 +100,14 @@ public interface SysDeptService extends IService<SysDept> {
      *
      * @return 结果
      */
-    public boolean checkDeptNameUnique (SysDept dept);
+    boolean checkDeptNameUnique(SysDept dept);
 
     /**
      * 校验部门是否有数据权限
      *
      * @param deptId 部门id
      */
-    public void checkDeptDataScope (Long deptId);
+    void checkDeptDataScope(Long deptId);
 
     /**
      * 新增保存部门信息
@@ -116,7 +116,7 @@ public interface SysDeptService extends IService<SysDept> {
      *
      * @return 结果
      */
-    public int insertDept (SysDept dept);
+    int insertDept(SysDept dept);
 
     /**
      * 修改保存部门信息
@@ -125,7 +125,7 @@ public interface SysDeptService extends IService<SysDept> {
      *
      * @return 结果
      */
-    public int updateDept (SysDept dept);
+    int updateDept(SysDept dept);
 
     /**
      * 删除部门管理信息
@@ -134,5 +134,5 @@ public interface SysDeptService extends IService<SysDept> {
      *
      * @return 结果
      */
-    public int deleteDeptById (Long deptId);
+    int deleteDeptById(Long deptId);
 }

cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysDictDataService.java

@@ -18,7 +18,7 @@ public interface SysDictDataService extends IService<SysDictData> {
      *
      * @return 字典数据集合信息
      */
-    public List<SysDictData> selectDictDataList (SysDictData dictData);
+    List<SysDictData> selectDictDataList(SysDictData dictData);
 
     /**
      * 根据字典类型和字典键值查询字典数据信息
@@ -28,7 +28,7 @@ public interface SysDictDataService extends IService<SysDictData> {
      *
      * @return 字典标签
      */
-    public String selectDictLabel (String dictType, String dictValue);
+    String selectDictLabel(String dictType, String dictValue);
 
     /**
      * 根据字典数据ID查询信息
@@ -37,14 +37,14 @@ public interface SysDictDataService extends IService<SysDictData> {
      *
      * @return 字典数据
      */
-    public SysDictData selectDictDataById (Long dictCode);
+    SysDictData selectDictDataById(Long dictCode);
 
     /**
      * 批量删除字典数据信息
      *
      * @param dictCodes 需要删除的字典数据ID
      */
-    public void deleteDictDataByIds (Long[] dictCodes);
+    void deleteDictDataByIds(Long[] dictCodes);
 
     /**
      * 新增保存字典数据信息
@@ -53,7 +53,7 @@ public interface SysDictDataService extends IService<SysDictData> {
      *
      * @return 结果
      */
-    public int insertDictData (SysDictData dictData);
+    int insertDictData(SysDictData dictData);
 
     /**
      * 修改保存字典数据信息
@@ -62,5 +62,5 @@ public interface SysDictDataService extends IService<SysDictData> {
      *
      * @return 结果
      */
-    public int updateDictData (SysDictData dictData);
+    int updateDictData(SysDictData dictData);
 }

cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysDictTypeService.java

@@ -19,14 +19,14 @@ public interface SysDictTypeService extends IService<SysDictType> {
      *
      * @return 字典类型集合信息
      */
-    public List<SysDictType> selectDictTypeList (SysDictType dictType);
+    List<SysDictType> selectDictTypeList(SysDictType dictType);
 
     /**
      * 根据所有字典类型
      *
      * @return 字典类型集合信息
      */
-    public List<SysDictType> selectDictTypeAll ();
+    List<SysDictType> selectDictTypeAll();
 
     /**
      * 根据字典类型查询字典数据
@@ -35,7 +35,7 @@ public interface SysDictTypeService extends IService<SysDictType> {
      *
      * @return 字典数据集合信息
      */
-    public List<SysDictData> selectDictDataByType (String dictType);
+    List<SysDictData> selectDictDataByType(String dictType);
 
     /**
      * 根据字典类型ID查询信息
@@ -44,7 +44,7 @@ public interface SysDictTypeService extends IService<SysDictType> {
      *
      * @return 字典类型
      */
-    public SysDictType selectDictTypeById (Long dictId);
+    SysDictType selectDictTypeById(Long dictId);
 
     /**
      * 根据字典类型查询信息
@@ -53,29 +53,29 @@ public interface SysDictTypeService extends IService<SysDictType> {
      *
      * @return 字典类型
      */
-    public SysDictType selectDictTypeByType (String dictType);
+    SysDictType selectDictTypeByType(String dictType);
 
     /**
      * 批量删除字典信息
      *
      * @param dictIds 需要删除的字典ID
      */
-    public void deleteDictTypeByIds (Long[] dictIds);
+    void deleteDictTypeByIds(Long[] dictIds);
 
     /**
      * 加载字典缓存数据
      */
-    public void loadingDictCache ();
+    void loadingDictCache();
 
     /**
      * 清空字典缓存数据
      */
-    public void clearDictCache ();
+    void clearDictCache();
 
     /**
      * 重置字典缓存数据
      */
-    public void resetDictCache ();
+    void resetDictCache();
 
     /**
      * 新增保存字典类型信息
@@ -84,7 +84,7 @@ public interface SysDictTypeService extends IService<SysDictType> {
      *
      * @return 结果
      */
-    public int insertDictType (SysDictType dictType);
+    int insertDictType(SysDictType dictType);
 
     /**
      * 修改保存字典类型信息
@@ -93,7 +93,7 @@ public interface SysDictTypeService extends IService<SysDictType> {
      *
      * @return 结果
      */
-    public int updateDictType (SysDictType dictType);
+    int updateDictType(SysDictType dictType);
 
     /**
      * 校验字典类型称是否唯一
@@ -102,5 +102,5 @@ public interface SysDictTypeService extends IService<SysDictType> {
      *
      * @return 结果
      */
-    public boolean checkDictTypeUnique (SysDictType dictType);
+    boolean checkDictTypeUnique(SysDictType dictType);
 }

cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysLogininforService.java

@@ -16,7 +16,7 @@ public interface SysLogininforService extends IService<SysLogininfor> {
      *
      * @param logininfor 访问日志对象
      */
-    public int insertLogininfor (SysLogininfor logininfor);
+    int insertLogininfor(SysLogininfor logininfor);
 
     /**
      * 查询系统登录日志集合
@@ -25,7 +25,7 @@ public interface SysLogininforService extends IService<SysLogininfor> {
      *
      * @return 登录记录集合
      */
-    public List<SysLogininfor> selectLogininforList (SysLogininfor logininfor);
+    List<SysLogininfor> selectLogininforList(SysLogininfor logininfor);
 
     /**
      * 批量删除系统登录日志
@@ -34,10 +34,10 @@ public interface SysLogininforService extends IService<SysLogininfor> {
      *
      * @return 结果
      */
-    public int deleteLogininforByIds (Long[] infoIds);
+    int deleteLogininforByIds(Long[] infoIds);
 
     /**
      * 清空系统登录日志
      */
-    public void cleanLogininfor ();
+    void cleanLogininfor();
 }

cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysMenuService.java

@@ -21,7 +21,7 @@ public interface SysMenuService extends IService<SysMenu> {
      *
      * @return 菜单列表
      */
-    public List<SysMenu> selectMenuList (Long userId);
+    List<SysMenu> selectMenuList(Long userId);
 
     /**
      * 根据用户查询系统菜单列表
@@ -31,7 +31,7 @@ public interface SysMenuService extends IService<SysMenu> {
      *
      * @return 菜单列表
      */
-    public List<SysMenu> selectMenuList (SysMenu menu, Long userId);
+    List<SysMenu> selectMenuList(SysMenu menu, Long userId);
 
     /**
      * 根据用户ID查询权限
@@ -40,7 +40,7 @@ public interface SysMenuService extends IService<SysMenu> {
      *
      * @return 权限列表
      */
-    public Set<String> selectMenuPermsByUserId (Long userId);
+    Set<String> selectMenuPermsByUserId(Long userId);
 
     /**
      * 根据角色ID查询权限
@@ -49,7 +49,7 @@ public interface SysMenuService extends IService<SysMenu> {
      *
      * @return 权限列表
      */
-    public Set<String> selectMenuPermsByRoleId (Long roleId);
+    Set<String> selectMenuPermsByRoleId(Long roleId);
 
     /**
      * 根据用户ID查询菜单树信息
@@ -58,7 +58,7 @@ public interface SysMenuService extends IService<SysMenu> {
      *
      * @return 菜单列表
      */
-    public List<SysMenu> selectMenuTreeByUserId (Long userId);
+    List<SysMenu> selectMenuTreeByUserId(Long userId);
 
     /**
      * 根据角色ID查询菜单树信息
@@ -67,7 +67,7 @@ public interface SysMenuService extends IService<SysMenu> {
      *
      * @return 选中菜单列表
      */
-    public List<Long> selectMenuListByRoleId (Long roleId);
+    List<Long> selectMenuListByRoleId(Long roleId);
 
     /**
      * 构建前端路由所需要的菜单
@@ -76,7 +76,7 @@ public interface SysMenuService extends IService<SysMenu> {
      *
      * @return 路由列表
      */
-    public List<RouterVo> buildMenus (List<SysMenu> menus);
+    List<RouterVo> buildMenus(List<SysMenu> menus);
 
     /**
      * 构建前端所需要树结构
@@ -85,7 +85,7 @@ public interface SysMenuService extends IService<SysMenu> {
      *
      * @return 树结构列表
      */
-    public List<SysMenu> buildMenuTree (List<SysMenu> menus);
+    List<SysMenu> buildMenuTree(List<SysMenu> menus);
 
     /**
      * 构建前端所需要下拉树结构
@@ -94,7 +94,7 @@ public interface SysMenuService extends IService<SysMenu> {
      *
      * @return 下拉树结构列表
      */
-    public List<TreeSelect> buildMenuTreeSelect (List<SysMenu> menus);
+    List<TreeSelect> buildMenuTreeSelect(List<SysMenu> menus);
 
     /**
      * 根据菜单ID查询信息
@@ -103,7 +103,7 @@ public interface SysMenuService extends IService<SysMenu> {
      *
      * @return 菜单信息
      */
-    public SysMenu selectMenuById (Long menuId);
+    SysMenu selectMenuById(Long menuId);
 
     /**
      * 是否存在菜单子节点
@@ -112,7 +112,7 @@ public interface SysMenuService extends IService<SysMenu> {
      *
      * @return 结果 true 存在 false 不存在
      */
-    public boolean hasChildByMenuId (Long menuId);
+    boolean hasChildByMenuId(Long menuId);
 
     /**
      * 查询菜单是否存在角色
@@ -121,7 +121,7 @@ public interface SysMenuService extends IService<SysMenu> {
      *
      * @return 结果 true 存在 false 不存在
      */
-    public boolean checkMenuExistRole (Long menuId);
+    boolean checkMenuExistRole(Long menuId);
 
     /**
      * 新增保存菜单信息
@@ -130,7 +130,7 @@ public interface SysMenuService extends IService<SysMenu> {
      *
      * @return 结果
      */
-    public int insertMenu (SysMenu menu);
+    int insertMenu(SysMenu menu);
 
     /**
      * 修改保存菜单信息
@@ -139,7 +139,7 @@ public interface SysMenuService extends IService<SysMenu> {
      *
      * @return 结果
      */
-    public int updateMenu (SysMenu menu);
+    int updateMenu(SysMenu menu);
 
     /**
      * 删除菜单管理信息
@@ -148,7 +148,7 @@ public interface SysMenuService extends IService<SysMenu> {
      *
      * @return 结果
      */
-    public int deleteMenuById (Long menuId);
+    int deleteMenuById(Long menuId);
 
     /**
      * 校验菜单名称是否唯一
@@ -157,5 +157,5 @@ public interface SysMenuService extends IService<SysMenu> {
      *
      * @return 结果
      */
-    public boolean checkMenuNameUnique (SysMenu menu);
+    boolean checkMenuNameUnique(SysMenu menu);
 }

cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysNoticeService.java

@@ -18,7 +18,7 @@ public interface SysNoticeService extends IService<SysNotice> {
      *
      * @return 公告信息
      */
-    public SysNotice selectNoticeById (Long noticeId);
+    SysNotice selectNoticeById(Long noticeId);
 
     /**
      * 查询公告列表
@@ -27,7 +27,7 @@ public interface SysNoticeService extends IService<SysNotice> {
      *
      * @return 公告集合
      */
-    public List<SysNotice> selectNoticeList (SysNotice notice);
+    List<SysNotice> selectNoticeList(SysNotice notice);
 
     /**
      * 新增公告
@@ -36,7 +36,7 @@ public interface SysNoticeService extends IService<SysNotice> {
      *
      * @return 结果
      */
-    public int insertNotice (SysNotice notice);
+    int insertNotice(SysNotice notice);
 
     /**
      * 修改公告
@@ -45,7 +45,7 @@ public interface SysNoticeService extends IService<SysNotice> {
      *
      * @return 结果
      */
-    public int updateNotice (SysNotice notice);
+    int updateNotice(SysNotice notice);
 
     /**
      * 删除公告信息
@@ -54,7 +54,7 @@ public interface SysNoticeService extends IService<SysNotice> {
      *
      * @return 结果
      */
-    public int deleteNoticeById (Long noticeId);
+    int deleteNoticeById(Long noticeId);
 
     /**
      * 批量删除公告信息
@@ -63,5 +63,5 @@ public interface SysNoticeService extends IService<SysNotice> {
      *
      * @return 结果
      */
-    public int deleteNoticeByIds (Long[] noticeIds);
+    int deleteNoticeByIds(Long[] noticeIds);
 }

cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysOperLogService.java

@@ -18,7 +18,7 @@ public interface SysOperLogService extends IService<SysOperLog> {
      *
      * @return 结果
      */
-    public int insertOperlog (SysOperLog operLog);
+    int insertOperlog(SysOperLog operLog);
 
     /**
      * 查询系统操作日志集合
@@ -27,7 +27,7 @@ public interface SysOperLogService extends IService<SysOperLog> {
      *
      * @return 操作日志集合
      */
-    public List<SysOperLog> selectOperLogList (SysOperLog operLog);
+    List<SysOperLog> selectOperLogList(SysOperLog operLog);
 
     /**
      * 批量删除系统操作日志
@@ -36,7 +36,7 @@ public interface SysOperLogService extends IService<SysOperLog> {
      *
      * @return 结果
      */
-    public int deleteOperLogByIds (Long[] operIds);
+    int deleteOperLogByIds(Long[] operIds);
 
     /**
      * 查询操作日志详细
@@ -45,10 +45,10 @@ public interface SysOperLogService extends IService<SysOperLog> {
      *
      * @return 操作日志对象
      */
-    public SysOperLog selectOperLogById (Long operId);
+    SysOperLog selectOperLogById(Long operId);
 
     /**
      * 清空操作日志
      */
-    public void cleanOperLog ();
+    void cleanOperLog();
 }

cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysPermissionService.java

@@ -17,7 +17,7 @@ public interface SysPermissionService {
      *
      * @return 角色权限信息
      */
-    public Set<String> getRolePermission (SysUser user);
+    Set<String> getRolePermission(SysUser user);
 
     /**
      * 获取菜单数据权限
@@ -26,5 +26,5 @@ public interface SysPermissionService {
      *
      * @return 菜单权限信息
      */
-    public Set<String> getMenuPermission (SysUser user);
+    Set<String> getMenuPermission(SysUser user);
 }

cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysPostService.java

@@ -18,14 +18,14 @@ public interface SysPostService extends IService<SysPost> {
      *
      * @return 岗位列表
      */
-    public List<SysPost> selectPostList (SysPost post);
+    List<SysPost> selectPostList(SysPost post);
 
     /**
      * 查询所有岗位
      *
      * @return 岗位列表
      */
-    public List<SysPost> selectPostAll ();
+    List<SysPost> selectPostAll();
 
     /**
      * 通过岗位ID查询岗位信息
@@ -34,7 +34,7 @@ public interface SysPostService extends IService<SysPost> {
      *
      * @return 角色对象信息
      */
-    public SysPost selectPostById (Long postId);
+    SysPost selectPostById(Long postId);
 
     /**
      * 根据用户ID获取岗位选择框列表
@@ -43,7 +43,7 @@ public interface SysPostService extends IService<SysPost> {
      *
      * @return 选中岗位ID列表
      */
-    public List<Long> selectPostListByUserId (Long userId);
+    List<Long> selectPostListByUserId(Long userId);
 
     /**
      * 校验岗位名称
@@ -52,7 +52,7 @@ public interface SysPostService extends IService<SysPost> {
      *
      * @return 结果
      */
-    public boolean checkPostNameUnique (SysPost post);
+    boolean checkPostNameUnique(SysPost post);
 
     /**
      * 校验岗位编码
@@ -61,7 +61,7 @@ public interface SysPostService extends IService<SysPost> {
      *
      * @return 结果
      */
-    public boolean checkPostCodeUnique (SysPost post);
+    boolean checkPostCodeUnique(SysPost post);
 
     /**
      * 通过岗位ID查询岗位使用数量
@@ -70,7 +70,7 @@ public interface SysPostService extends IService<SysPost> {
      *
      * @return 结果
      */
-    public int countUserPostById (Long postId);
+    int countUserPostById(Long postId);
 
     /**
      * 删除岗位信息
@@ -79,7 +79,7 @@ public interface SysPostService extends IService<SysPost> {
      *
      * @return 结果
      */
-    public int deletePostById (Long postId);
+    int deletePostById(Long postId);
 
     /**
      * 批量删除岗位信息
@@ -88,7 +88,7 @@ public interface SysPostService extends IService<SysPost> {
      *
      * @return 结果
      */
-    public int deletePostByIds (Long[] postIds);
+    int deletePostByIds(Long[] postIds);
 
     /**
      * 新增保存岗位信息
@@ -97,7 +97,7 @@ public interface SysPostService extends IService<SysPost> {
      *
      * @return 结果
      */
-    public int insertPost (SysPost post);
+    int insertPost(SysPost post);
 
     /**
      * 修改保存岗位信息
@@ -106,5 +106,5 @@ public interface SysPostService extends IService<SysPost> {
      *
      * @return 结果
      */
-    public int updatePost (SysPost post);
+    int updatePost(SysPost post);
 }

cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysRoleService.java

@@ -20,7 +20,7 @@ public interface SysRoleService extends IService<SysRole> {
      *
      * @return 角色数据集合信息
      */
-    public List<SysRole> selectRoleList (SysRole role);
+    List<SysRole> selectRoleList(SysRole role);
 
     /**
      * 根据用户ID查询角色列表
@@ -29,7 +29,7 @@ public interface SysRoleService extends IService<SysRole> {
      *
      * @return 角色列表
      */
-    public List<SysRole> selectRolesByUserId (Long userId);
+    List<SysRole> selectRolesByUserId(Long userId);
 
     /**
      * 根据用户ID查询角色权限
@@ -38,14 +38,14 @@ public interface SysRoleService extends IService<SysRole> {
      *
      * @return 权限列表
      */
-    public Set<String> selectRolePermissionByUserId (Long userId);
+    Set<String> selectRolePermissionByUserId(Long userId);
 
     /**
      * 查询所有角色
      *
      * @return 角色列表
      */
-    public List<SysRole> selectRoleAll ();
+    List<SysRole> selectRoleAll();
 
     /**
      * 根据用户ID获取角色选择框列表
@@ -54,7 +54,7 @@ public interface SysRoleService extends IService<SysRole> {
      *
      * @return 选中角色ID列表
      */
-    public List<Long> selectRoleListByUserId (Long userId);
+    List<Long> selectRoleListByUserId(Long userId);
 
     /**
      * 通过角色ID查询角色
@@ -63,7 +63,7 @@ public interface SysRoleService extends IService<SysRole> {
      *
      * @return 角色对象信息
      */
-    public SysRole selectRoleById (Long roleId);
+    SysRole selectRoleById(Long roleId);
 
     /**
      * 校验角色名称是否唯一
@@ -72,7 +72,7 @@ public interface SysRoleService extends IService<SysRole> {
      *
      * @return 结果
      */
-    public boolean checkRoleNameUnique (SysRole role);
+    boolean checkRoleNameUnique(SysRole role);
 
     /**
      * 校验角色权限是否唯一
@@ -81,21 +81,21 @@ public interface SysRoleService extends IService<SysRole> {
      *
      * @return 结果
      */
-    public boolean checkRoleKeyUnique (SysRole role);
+    boolean checkRoleKeyUnique(SysRole role);
 
     /**
      * 校验角色是否允许操作
      *
      * @param role 角色信息
      */
-    public void checkRoleAllowed (SysRole role);
+    void checkRoleAllowed(SysRole role);
 
     /**
      * 校验角色是否有数据权限
      *
      * @param roleId 角色id
      */
-    public void checkRoleDataScope (Long roleId);
+    void checkRoleDataScope(Long roleId);
 
     /**
      * 通过角色ID查询角色使用数量
@@ -104,7 +104,7 @@ public interface SysRoleService extends IService<SysRole> {
      *
      * @return 结果
      */
-    public int countUserRoleByRoleId (Long roleId);
+    int countUserRoleByRoleId(Long roleId);
 
     /**
      * 新增保存角色信息
@@ -113,7 +113,7 @@ public interface SysRoleService extends IService<SysRole> {
      *
      * @return 结果
      */
-    public int insertRole (SysRole role);
+    int insertRole(SysRole role);
 
     /**
      * 修改保存角色信息
@@ -122,7 +122,7 @@ public interface SysRoleService extends IService<SysRole> {
      *
      * @return 结果
      */
-    public int updateRole (SysRole role);
+    int updateRole(SysRole role);
 
     /**
      * 修改角色状态
@@ -131,7 +131,7 @@ public interface SysRoleService extends IService<SysRole> {
      *
      * @return 结果
      */
-    public int updateRoleStatus (SysRole role);
+    int updateRoleStatus(SysRole role);
 
     /**
      * 修改数据权限信息
@@ -140,7 +140,7 @@ public interface SysRoleService extends IService<SysRole> {
      *
      * @return 结果
      */
-    public int authDataScope (SysRole role);
+    int authDataScope(SysRole role);
 
     /**
      * 通过角色ID删除角色
@@ -149,7 +149,7 @@ public interface SysRoleService extends IService<SysRole> {
      *
      * @return 结果
      */
-    public int deleteRoleById (Long roleId);
+    int deleteRoleById(Long roleId);
 
     /**
      * 批量删除角色信息
@@ -158,7 +158,7 @@ public interface SysRoleService extends IService<SysRole> {
      *
      * @return 结果
      */
-    public int deleteRoleByIds (Long[] roleIds);
+    int deleteRoleByIds(Long[] roleIds);
 
     /**
      * 取消授权用户角色
@@ -167,7 +167,7 @@ public interface SysRoleService extends IService<SysRole> {
      *
      * @return 结果
      */
-    public int deleteAuthUser (SysUserRole userRole);
+    int deleteAuthUser(SysUserRole userRole);
 
     /**
      * 批量取消授权用户角色
@@ -177,7 +177,7 @@ public interface SysRoleService extends IService<SysRole> {
      *
      * @return 结果
      */
-    public int deleteAuthUsers (Long roleId, Long[] userIds);
+    int deleteAuthUsers(Long roleId, Long[] userIds);
 
     /**
      * 批量选择授权用户角色
@@ -187,5 +187,5 @@ public interface SysRoleService extends IService<SysRole> {
      *
      * @return 结果
      */
-    public int insertAuthUsers (Long roleId, Long[] userIds);
+    int insertAuthUsers(Long roleId, Long[] userIds);
 }