feat():新增客户端查询方法调用，解决循环依赖问题

muyu-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;

muyu-common/muyu-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;
 

muyu-common/muyu-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;
         }
 

muyu-common/muyu-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;

muyu-common/muyu-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 final String[] allowedExtension;
-    private String extension;
+    private final String extension;
-    private String filename;
+    private final String filename;
 
     public InvalidExtensionException (String[] allowedExtension, String extension, String filename) {
         super("filename : [" + filename + "], extension : [" + extension + "], allowed extension : [" + Arrays.toString(allowedExtension) + "]");

muyu-common/muyu-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);

muyu-common/muyu-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
      */

muyu-common/muyu-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"};

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

@@ -23,6 +23,7 @@ import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
 import java.util.Collections;
 import java.util.Enumeration;
 import java.util.HashMap;
@@ -212,11 +213,7 @@ public class ServletUtils {
      * @return 编码后的内容
      */
     public static String urlEncode (String str) {
-        try {
+        return URLEncoder.encode(str, StandardCharsets.UTF_8);
-            return URLEncoder.encode(str, Constants.UTF8);
-        } catch (UnsupportedEncodingException e) {
-            return StringUtils.EMPTY;
-        }
     }
 
     /**
@@ -227,11 +224,7 @@ public class ServletUtils {
      * @return 解码后的内容
      */
     public static String urlDecode (String str) {
-        try {
+        return URLDecoder.decode(str, StandardCharsets.UTF_8);
-            return URLDecoder.decode(str, Constants.UTF8);
-        } catch (UnsupportedEncodingException e) {
-            return StringUtils.EMPTY;
-        }
     }
 
     /**

muyu-common/muyu-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;
     }
 

muyu-common/muyu-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();
+        String contentDispositionValue = "attachment; filename=" +
-        contentDispositionValue.append("attachment; filename=")
+                percentEncodedFileName +
-                .append(percentEncodedFileName)
+                ";" +
-                .append(";")
+                "filename*=" +
-                .append("filename*=")
+                "utf-8''" +
-                .append("utf-8''")
+                percentEncodedFileName;
-                .append(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");
     }
 }

muyu-common/muyu-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;
                 }
             }

muyu-common/muyu-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;
                 }

muyu-common/muyu-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());
         }

muyu-common/muyu-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);
         }
     }

muyu-common/muyu-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[62] = '+';
-        lookUpBase64Alphabet[63] = (char) '/';
+        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;
 

muyu-common/muyu-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);
 
     /**
      * 获取通用序列号

muyu-common/muyu-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

muyu-common/muyu-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 "";
 }

muyu-common/muyu-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) {
+            if (StringUtils.isNotNull(params) && params instanceof BaseEntity baseEntity) {
-                BaseEntity baseEntity = (BaseEntity) params;
                 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) {
+        if (StringUtils.isNotNull(params) && params instanceof BaseEntity baseEntity) {
-            BaseEntity baseEntity = (BaseEntity) params;
             baseEntity.getParams().put(DATA_SCOPE, "");
         }
     }

muyu-common/muyu-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 {};
 }

muyu-common/muyu-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) {
                     }
                 }

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

@@ -9,6 +9,7 @@ import org.springframework.data.redis.serializer.RedisSerializer;
 import org.springframework.data.redis.serializer.SerializationException;
 
 import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 
 /**
  * Redis使用FastJson序列化
@@ -16,11 +17,11 @@ import java.nio.charset.Charset;
  * @author muyu
  */
 public class FastJson2JsonRedisSerializer<T> implements RedisSerializer<T> {
-    public static final Charset DEFAULT_CHARSET = Charset.forName("UTF-8");
+    public static final Charset DEFAULT_CHARSET = StandardCharsets.UTF_8;
 
     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();

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

@@ -55,9 +55,9 @@ public class ManyDataSource {
         List<EnterPriseInfo> list = new ArrayList<>();
         list.add(
                 EnterPriseInfo.builder()
-                        .entCode("liu_0604")
+                        .entCode("liu_0608")
                         .ip("192.168.116.129")
-                        .port(3307)
+                        .port(3310)
                         .build()
         );
         return list;

muyu-common/muyu-common-system/pom.xml

@@ -23,11 +23,5 @@
             <groupId>com.muyu</groupId>
             <artifactId>muyu-common-core</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.muyu</groupId>
-            <artifactId>muyu-net-working-common</artifactId>
-            <version>3.6.3</version>
-            <scope>compile</scope>
-        </dependency>
     </dependencies>
 </project>

muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/SysUser.java

@@ -6,7 +6,7 @@ import com.muyu.common.core.annotation.Excel.Type;
 import com.muyu.common.core.annotation.Excels;
 import com.muyu.common.core.web.domain.BaseEntity;
 import com.muyu.common.core.xss.Xss;
-import com.muyu.net.working.domain.Enterprise;
+//import com.muyu.net.working.domain.Enterprise;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;

muyu-common/muyu-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);
 }

muyu-common/muyu-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);
 }

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

@@ -25,7 +25,7 @@ public interface RemoteUserService {
      * @return 结果
      */
     @GetMapping("/user/info/{username}")
-    public Result<LoginUser> getUserInfo (@PathVariable("username") String username, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+    Result<LoginUser> getUserInfo(@PathVariable("username") String username, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
 
     /**
      * 注册用户信息
@@ -36,5 +36,5 @@ 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);
 }

muyu-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());

muyu-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) {
+        } else if (ex instanceof ResponseStatusException responseStatusException) {
-            ResponseStatusException responseStatusException = (ResponseStatusException) ex;
             msg = responseStatusException.getMessage();
         } else {
             msg = "内部服务器错误";

muyu-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;
 }

muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/controller/VehicleController.java

@@ -111,11 +111,11 @@ public class VehicleController extends BaseController {
         return toAjax(vehicleService.removeBatchByIds(ids));
     }
 
-//    @Autowired
+    @Autowired
-//    private VehicleMapper vehicleMapper;
+    private VehicleMapper vehicleMapper;
 
-//    @GetMapping("/list/all")
+    @GetMapping("/list/all")
-//    public Result<List<Vehicle>> findAll () {
+    public Result<List<Vehicle>> findAll () {
-//        return Result.success(vehicleMapper.selectList(new QueryWrapper<>()));
+        return Result.success(vehicleMapper.selectList(new QueryWrapper<>()));
-//    }
+    }
 }

muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/service/FenceService.java

@@ -17,6 +17,6 @@ public interface FenceService extends IService<Fence> {
      * @param fence 电子围栏
      * @return 电子围栏集合
      */
-    public List<Fence> list(Fence fence);
+    List<Fence> list(Fence fence);
 
 }

muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/service/VehicleService.java

@@ -17,6 +17,6 @@ public interface VehicleService extends IService<Vehicle> {
      * @param vehicle 车辆录入
      * @return 车辆录入集合
      */
-    public List<Vehicle> list(Vehicle vehicle);
+    List<Vehicle> list(Vehicle vehicle);
 
 }

muyu-modules/muyu-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;
 }

muyu-modules/muyu-gen/src/main/resources/vm/java/domain.java.vm

@@ -69,7 +69,6 @@ public class ${ClassName} extends ${Entity}
 
     public $column.javaType get${AttrName}()
     {
-        return $column.javaField;
     }
 #end
 #end

muyu-modules/muyu-gen/src/main/resources/vm/java/mapper.java.vm

@@ -8,84 +8,84 @@ import ${packageName}.domain.${subClassName};
 
 /**
  * ${functionName}Mapper接口
- * 
+ *
  * @author ${author}
  * @date ${datetime}
  */
-public interface ${ClassName}Mapper 
+public interface ${ClassName}Mapper
 {
     /**
      * 查询${functionName}
-     * 
+     *
      * @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}列表
-     * 
+     *
      * @param ${className} ${functionName}
      * @return ${functionName}集合
      */
-    public List<${ClassName}> select${ClassName}List(${ClassName} ${className});
+    List<${ClassName}> select${ClassName}List(${ClassName} ${className});
 
     /**
      * 新增${functionName}
-     * 
+     *
      * @param ${className} ${functionName}
      * @return 结果
      */
-    public int insert${ClassName}(${ClassName} ${className});
+    int insert${ClassName}(${ClassName} ${className});
 
     /**
      * 修改${functionName}
-     * 
+     *
      * @param ${className} ${functionName}
      * @return 结果
      */
-    public int update${ClassName}(${ClassName} ${className});
+    int update${ClassName}(${ClassName} ${className});
 
     /**
      * 删除${functionName}
-     * 
+     *
      * @param ${pkColumn.javaField} ${functionName}主键
      * @return 结果
      */
-    public int delete${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField});
+    int delete${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField});
 
     /**
      * 批量删除${functionName}
-     * 
+     *
      * @param ${pkColumn.javaField}s 需要删除的数据主键集合
      * @return 结果
      */
-    public int delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaType}[] ${pkColumn.javaField}s);
+    int delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaType}[] ${pkColumn.javaField}s);
 #if($table.sub)
 
     /**
      * 批量删除${subTable.functionName}
-     * 
+     *
      * @param ${pkColumn.javaField}s 需要删除的数据主键集合
      * @return 结果
      */
-    public int delete${subClassName}By${subTableFkClassName}s(${pkColumn.javaType}[] ${pkColumn.javaField}s);
+    int delete${subClassName}By${subTableFkClassName}s(${pkColumn.javaType}[] ${pkColumn.javaField}s);
-    
+
     /**
      * 批量新增${subTable.functionName}
-     * 
+     *
      * @param ${subclassName}List ${subTable.functionName}列表
      * @return 结果
      */
-    public int batch${subClassName}(List<${subClassName}> ${subclassName}List);
+    int batch${subClassName}(List<${subClassName}> ${subclassName}List);
-    
+
 
     /**
      * 通过${functionName}主键删除${subTable.functionName}信息
-     * 
+     *
      * @param ${pkColumn.javaField} ${functionName}ID
      * @return 结果
      */
-    public int delete${subClassName}By${subTableFkClassName}(${pkColumn.javaType} ${pkColumn.javaField});
+    int delete${subClassName}By${subTableFkClassName}(${pkColumn.javaType} ${pkColumn.javaField});
 #end
 }

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

@@ -5,57 +5,57 @@ import ${packageName}.domain.${ClassName};
 
 /**
  * ${functionName}Service接口
- * 
+ *
  * @author ${author}
  * @date ${datetime}
  */
-public interface I${ClassName}Service 
+public interface I${ClassName}Service
 {
     /**
      * 查询${functionName}
-     * 
+     *
      * @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}列表
-     * 
+     *
      * @param ${className} ${functionName}
      * @return ${functionName}集合
      */
-    public List<${ClassName}> select${ClassName}List(${ClassName} ${className});
+    List<${ClassName}> select${ClassName}List(${ClassName} ${className});
 
     /**
      * 新增${functionName}
-     * 
+     *
      * @param ${className} ${functionName}
      * @return 结果
      */
-    public int insert${ClassName}(${ClassName} ${className});
+    int insert${ClassName}(${ClassName} ${className});
 
     /**
      * 修改${functionName}
-     * 
+     *
      * @param ${className} ${functionName}
      * @return 结果
      */
-    public int update${ClassName}(${ClassName} ${className});
+    int update${ClassName}(${ClassName} ${className});
 
     /**
      * 批量删除${functionName}
-     * 
+     *
      * @param ${pkColumn.javaField}s 需要删除的${functionName}主键集合
      * @return 结果
      */
-    public int delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaType}[] ${pkColumn.javaField}s);
+    int delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaType}[] ${pkColumn.javaField}s);
 
     /**
      * 删除${functionName}信息
-     * 
+     *
      * @param ${pkColumn.javaField} ${functionName}主键
      * @return 结果
      */
-    public int delete${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField});
+    int delete${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField});
 }

muyu-modules/muyu-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("删除成功");

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

@@ -170,7 +170,7 @@
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"
@@ -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>

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

@@ -355,7 +355,7 @@ function getTreeselect() {
     ${businessName}Options.value.push(data);
   });
 }
-	
+
 // 取消按钮
 function cancel() {
   open.value = false;
@@ -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("删除成功");

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

@@ -153,7 +153,7 @@
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"
@@ -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("删除成功");

muyu-modules/muyu-job/src/main/java/com/muyu/job/mapper/SysJobLogMapper.java

@@ -18,14 +18,14 @@ public interface SysJobLogMapper extends BaseMapper<SysJobLog> {
      *
      * @return 调度任务日志集合
      */
-    public List<SysJobLog> selectJobLogList (SysJobLog jobLog);
+    List<SysJobLog> selectJobLogList(SysJobLog jobLog);
 
     /**
      * 查询所有调度任务日志
      *
      * @return 调度任务日志列表
      */
-    public List<SysJobLog> selectJobLogAll ();
+    List<SysJobLog> selectJobLogAll();
 
     /**
      * 通过调度任务日志ID查询调度信息
@@ -34,7 +34,7 @@ public interface SysJobLogMapper extends BaseMapper<SysJobLog> {
      *
      * @return 调度任务日志对象信息
      */
-    public SysJobLog selectJobLogById (Long jobLogId);
+    SysJobLog selectJobLogById(Long jobLogId);
 
     /**
      * 新增任务日志
@@ -43,7 +43,7 @@ public interface SysJobLogMapper extends BaseMapper<SysJobLog> {
      *
      * @return 结果
      */
-    public int insertJobLog (SysJobLog jobLog);
+    int insertJobLog(SysJobLog jobLog);
 
     /**
      * 批量删除调度日志信息
@@ -52,7 +52,7 @@ public interface SysJobLogMapper extends BaseMapper<SysJobLog> {
      *
      * @return 结果
      */
-    public int deleteJobLogByIds (Long[] logIds);
+    int deleteJobLogByIds(Long[] logIds);
 
     /**
      * 删除任务日志
@@ -61,10 +61,10 @@ public interface SysJobLogMapper extends BaseMapper<SysJobLog> {
      *
      * @return 结果
      */
-    public int deleteJobLogById (Long jobId);
+    int deleteJobLogById(Long jobId);
 
     /**
      * 清空任务日志
      */
-    public void cleanJobLog ();
+    void cleanJobLog();
 }

muyu-modules/muyu-job/src/main/java/com/muyu/job/mapper/SysJobMapper.java

@@ -18,14 +18,14 @@ public interface SysJobMapper extends BaseMapper<SysJob> {
      *
      * @return 操作日志集合
      */
-    public List<SysJob> selectJobList (SysJob job);
+    List<SysJob> selectJobList(SysJob job);
 
     /**
      * 查询所有调度任务
      *
      * @return 调度任务列表
      */
-    public List<SysJob> selectJobAll ();
+    List<SysJob> selectJobAll();
 
     /**
      * 通过调度ID查询调度任务信息
@@ -34,7 +34,7 @@ public interface SysJobMapper extends BaseMapper<SysJob> {
      *
      * @return 角色对象信息
      */
-    public SysJob selectJobById (Long jobId);
+    SysJob selectJobById(Long jobId);
 
     /**
      * 通过调度ID删除调度任务信息
@@ -43,7 +43,7 @@ public interface SysJobMapper extends BaseMapper<SysJob> {
      *
      * @return 结果
      */
-    public int deleteJobById (Long jobId);
+    int deleteJobById(Long jobId);
 
     /**
      * 批量删除调度任务信息
@@ -52,7 +52,7 @@ public interface SysJobMapper extends BaseMapper<SysJob> {
      *
      * @return 结果
      */
-    public int deleteJobByIds (Long[] ids);
+    int deleteJobByIds(Long[] ids);
 
     /**
      * 修改调度任务信息
@@ -61,7 +61,7 @@ public interface SysJobMapper extends BaseMapper<SysJob> {
      *
      * @return 结果
      */
-    public int updateJob (SysJob job);
+    int updateJob(SysJob job);
 
     /**
      * 新增调度任务信息
@@ -70,5 +70,5 @@ public interface SysJobMapper extends BaseMapper<SysJob> {
      *
      * @return 结果
      */
-    public int insertJob (SysJob job);
+    int insertJob(SysJob job);
 }

muyu-modules/muyu-job/src/main/java/com/muyu/job/service/ISysJobLogService.java

@@ -17,7 +17,7 @@ public interface ISysJobLogService {
      *
      * @return 调度任务日志集合
      */
-    public List<SysJobLog> selectJobLogList (SysJobLog jobLog);
+    List<SysJobLog> selectJobLogList(SysJobLog jobLog);
 
     /**
      * 通过调度任务日志ID查询调度信息
@@ -26,14 +26,14 @@ public interface ISysJobLogService {
      *
      * @return 调度任务日志对象信息
      */
-    public SysJobLog selectJobLogById (Long jobLogId);
+    SysJobLog selectJobLogById(Long jobLogId);
 
     /**
      * 新增任务日志
      *
      * @param jobLog 调度日志信息
      */
-    public void addJobLog (SysJobLog jobLog);
+    void addJobLog(SysJobLog jobLog);
 
     /**
      * 批量删除调度日志信息
@@ -42,7 +42,7 @@ public interface ISysJobLogService {
      *
      * @return 结果
      */
-    public int deleteJobLogByIds (Long[] logIds);
+    int deleteJobLogByIds(Long[] logIds);
 
     /**
      * 删除任务日志
@@ -51,10 +51,10 @@ public interface ISysJobLogService {
      *
      * @return 结果
      */
-    public int deleteJobLogById (Long jobId);
+    int deleteJobLogById(Long jobId);
 
     /**
      * 清空任务日志
      */
-    public void cleanJobLog ();
+    void cleanJobLog();
 }

muyu-modules/muyu-job/src/main/java/com/muyu/job/service/ISysJobService.java

@@ -19,7 +19,7 @@ public interface ISysJobService {
      *
      * @return 调度任务集合
      */
-    public List<SysJob> selectJobList (SysJob job);
+    List<SysJob> selectJobList(SysJob job);
 
     /**
      * 通过调度任务ID查询调度信息
@@ -28,7 +28,7 @@ public interface ISysJobService {
      *
      * @return 调度任务对象信息
      */
-    public SysJob selectJobById (Long jobId);
+    SysJob selectJobById(Long jobId);
 
     /**
      * 暂停任务
@@ -37,7 +37,7 @@ public interface ISysJobService {
      *
      * @return 结果
      */
-    public int pauseJob (SysJob job) throws SchedulerException;
+    int pauseJob(SysJob job) throws SchedulerException;
 
     /**
      * 恢复任务
@@ -46,7 +46,7 @@ public interface ISysJobService {
      *
      * @return 结果
      */
-    public int resumeJob (SysJob job) throws SchedulerException;
+    int resumeJob(SysJob job) throws SchedulerException;
 
     /**
      * 删除任务后，所对应的trigger也将被删除
@@ -55,7 +55,7 @@ public interface ISysJobService {
      *
      * @return 结果
      */
-    public int deleteJob (SysJob job) throws SchedulerException;
+    int deleteJob(SysJob job) throws SchedulerException;
 
     /**
      * 批量删除调度信息
@@ -64,7 +64,7 @@ public interface ISysJobService {
      *
      * @return 结果
      */
-    public void deleteJobByIds (Long[] jobIds) throws SchedulerException;
+    void deleteJobByIds(Long[] jobIds) throws SchedulerException;
 
     /**
      * 任务调度状态修改
@@ -73,7 +73,7 @@ public interface ISysJobService {
      *
      * @return 结果
      */
-    public int changeStatus (SysJob job) throws SchedulerException;
+    int changeStatus(SysJob job) throws SchedulerException;
 
     /**
      * 立即运行任务
@@ -82,7 +82,7 @@ public interface ISysJobService {
      *
      * @return 结果
      */
-    public boolean run (SysJob job) throws SchedulerException;
+    boolean run(SysJob job) throws SchedulerException;
 
     /**
      * 新增任务
@@ -91,7 +91,7 @@ public interface ISysJobService {
      *
      * @return 结果
      */
-    public int insertJob (SysJob job) throws SchedulerException, TaskException;
+    int insertJob(SysJob job) throws SchedulerException, TaskException;
 
     /**
      * 更新任务
@@ -100,7 +100,7 @@ public interface ISysJobService {
      *
      * @return 结果
      */
-    public int updateJob (SysJob job) throws SchedulerException, TaskException;
+    int updateJob(SysJob job) throws SchedulerException, TaskException;
 
     /**
      * 校验cron表达式是否有效
@@ -109,5 +109,5 @@ public interface ISysJobService {
      *
      * @return 结果
      */
-    public boolean checkCronExpressionIsValid (String cronExpression);
+    boolean checkCronExpressionIsValid(String cronExpression);
 }

muyu-modules/muyu-job/src/main/java/com/muyu/job/util/AbstractQuartzJob.java

@@ -27,7 +27,7 @@ public abstract class AbstractQuartzJob implements Job {
     /**
      * 线程本地变量
      */
-    private static ThreadLocal<Date> threadLocal = new ThreadLocal<>();
+    private static final ThreadLocal<Date> threadLocal = new ThreadLocal<>();
 
     @Override
     public void execute (JobExecutionContext context) throws JobExecutionException {

muyu-modules/muyu-job/src/main/java/com/muyu/job/util/JobInvokeUtil.java

@@ -157,7 +157,7 @@ public class JobInvokeUtil {
         Object[] classs = new Object[methodParams.size()];
         int index = 0;
         for (Object[] os : methodParams) {
-            classs[index] = (Object) os[0];
+            classs[index] = os[0];
             index++;
         }
         return classs;

muyu-modules/muyu-net-working/muyu-net-working-common/pom.xml

@@ -21,6 +21,10 @@
             <groupId>com.muyu</groupId>
             <artifactId>muyu-common-core</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.muyu</groupId>
+            <artifactId>muyu-common-security</artifactId>
+        </dependency>
     </dependencies>
 
 </project>

muyu-modules/muyu-net-working/muyu-net-working-common/src/main/java/com/muyu/net/working/domain/Enterprise.java

@@ -5,6 +5,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.muyu.common.security.utils.SecurityUtils;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
@@ -160,6 +161,8 @@ public class Enterprise extends BaseEntity {
                 .serviceLevel(enterpriseSaveReq.getServiceLevel())
                 .openServerId(enterpriseSaveReq.getOpenServerId())
                 .addServerId(enterpriseSaveReq.getAddServerId())
+                .createBy(SecurityUtils.getUsername())
+                .createTime(new Date())
                 .build();
     }
 
@@ -184,6 +187,8 @@ public class Enterprise extends BaseEntity {
                 .serviceLevel(enterpriseEditReq.getServiceLevel())
                 .openServerId(enterpriseEditReq.getOpenServerId())
                 .addServerId(enterpriseEditReq.getAddServerId())
+                .updateBy(SecurityUtils.getUsername())
+                .updateTime(new Date())
                 .build();
     }
 

muyu-modules/muyu-net-working/muyu-net-working-server/src/main/java/com/muyu/net/working/controller/EnterpriseController.java

@@ -15,14 +15,7 @@ import io.swagger.annotations.*;
 import io.swagger.models.auth.In;
 import lombok.extern.log4j.Log4j2;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 import com.muyu.common.core.domain.Result;
 import com.muyu.common.core.utils.poi.ExcelUtil;
 import com.muyu.common.core.web.controller.BaseController;
@@ -168,6 +161,15 @@ public class EnterpriseController extends BaseController {
         return toAjax(enterpriseService.updateById(Enterprise.editBuild(id,enterpriseEditReq)));
     }
 
+    /**
+     * 查询运营平台列表
+     */
+    @GetMapping("/selectByName")
+    public Result<Enterprise> selectByName() {
+        String name = SecurityUtils.getUsername();
+        Enterprise enterprise = enterpriseService.selectByName(name);
+        return Result.success(enterprise);
+    }
     /**
      * 删除车辆运营平台
      */

muyu-modules/muyu-net-working/muyu-net-working-server/src/main/java/com/muyu/net/working/mapper/EnterpriseMapper.java

@@ -1,8 +1,8 @@
 package com.muyu.net.working.mapper;
 
-import java.util.List;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.muyu.net.working.domain.Enterprise;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 车辆运营平台Mapper接口
@@ -12,4 +12,5 @@ import com.muyu.net.working.domain.Enterprise;
  */
 public interface EnterpriseMapper extends BaseMapper<Enterprise> {
 
+    Enterprise selectByName(@Param("name") String name);
 }

muyu-modules/muyu-net-working/muyu-net-working-server/src/main/java/com/muyu/net/working/service/EnterpriseService.java

@@ -17,6 +17,7 @@ public interface EnterpriseService extends IService<Enterprise> {
      * @param enterprise 车辆运营平台
      * @return 车辆运营平台集合
      */
-    public List<Enterprise> list(Enterprise enterprise);
+    List<Enterprise> list(Enterprise enterprise);
 
+    Enterprise selectByName(String name);
 }

muyu-modules/muyu-net-working/muyu-net-working-server/src/main/java/com/muyu/net/working/service/impl/EnterpriseServiceImpl.java

@@ -4,6 +4,7 @@ import java.util.List;
 
 import com.muyu.common.core.utils.ObjUtils;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.muyu.net.working.mapper.EnterpriseMapper;
 import com.muyu.net.working.domain.Enterprise;
@@ -21,6 +22,8 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 @Service
 public class EnterpriseServiceImpl extends ServiceImpl<EnterpriseMapper, Enterprise>  implements EnterpriseService {
 
+    @Autowired
+    private EnterpriseMapper enterpriseMapper;
     /**
      * 查询车辆运营平台列表
      *
@@ -98,4 +101,9 @@ public class EnterpriseServiceImpl extends ServiceImpl<EnterpriseMapper, Enterpr
 
         return list(queryWrapper);
     }
+
+    @Override
+    public Enterprise selectByName(String name) {
+        return enterpriseMapper.selectByName(name);
+    }
 }

muyu-modules/muyu-net-working/muyu-net-working-server/src/main/resources/mapper/netWorking/EnterpriseMapper.xml

@@ -31,4 +31,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <sql id="selectEnterpriseVo">
         select id, ebterprise_name, legal_person, business_lincense_number, estabiness_date, business_scope, address, contact_phone, email, enterprise_status, registration_date, certification_id, authentication_date, service_level, open_server_id, add_server_id, create_by, create_time, update_by, update_time, remark from enterprise
     </sql>
+    <select id="selectByName" resultType="com.muyu.net.working.domain.Enterprise">
+        select * from enterprise where ebterprise_name = #{name}
+    </select>
 </mapper>

muyu-modules/muyu-system/pom.xml

@@ -77,7 +77,6 @@
             <groupId>com.muyu</groupId>
             <artifactId>muyu-common-swagger</artifactId>
         </dependency>
-
     </dependencies>
 
     <build>

muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/SysUserOnline.java

@@ -1,5 +1,7 @@
 package com.muyu.system.domain;
 
+
+
 /**
  * 当前在线会话
  *

muyu-modules/muyu-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,7 +127,7 @@ public interface SysDeptMapper extends BaseMapper<SysDept> {
      *
      * @return 结果
      */
-    public int deleteDeptById (Long deptId);
+    int deleteDeptById(Long deptId);
 
     SysDept selectDeptByName(@Param("name") String name);
 }

muyu-modules/muyu-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);
 }

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

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

muyu-modules/muyu-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();
 }

muyu-modules/muyu-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);
 }

muyu-modules/muyu-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);
 }

muyu-modules/muyu-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();
 }

muyu-modules/muyu-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);
 }

muyu-modules/muyu-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);
 }

muyu-modules/muyu-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);
 }

muyu-modules/muyu-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);
 }

muyu-modules/muyu-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 (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,5 +138,5 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
      *
      * @return 结果
      */
-    public SysUser checkEmailUnique (String email);
+    SysUser checkEmailUnique(String email);
 }

muyu-modules/muyu-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);
 }

muyu-modules/muyu-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);
 }

muyu-modules/muyu-system/src/main/java/com/muyu/system/remote/RemoteSysDeptService.java

@@ -25,8 +25,8 @@ import org.springframework.web.bind.annotation.RequestParam;
 )
 public interface RemoteSysDeptService {
     @GetMapping("/selectDeptByName")
-    public Result<SysDept> selectDeptByName (@RequestParam("name") String name);
+    Result<SysDept> selectDeptByName(@RequestParam("name") String name);
 
     @PostMapping
-    public Result add (@Validated @RequestBody SysDept dept);
+    Result add(@Validated @RequestBody SysDept dept);
 }

muyu-modules/muyu-system/src/main/java/com/muyu/system/remote/RemoteSysUserService.java

@@ -30,5 +30,5 @@ public interface RemoteSysUserService {
      */
     @RequiresPermissions("system:user:add")
     @PostMapping
-    public Result add (@Validated @RequestBody SysUser user);
+    Result add(@Validated @RequestBody SysUser user);
 }

muyu-modules/muyu-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();
 }

muyu-modules/muyu-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,7 +134,7 @@ public interface SysDeptService extends IService<SysDept> {
      *
      * @return 结果
      */
-    public int deleteDeptById (Long deptId);
+    int deleteDeptById(Long deptId);
 
     SysDept selectDeptByName(String name);
 }

muyu-modules/muyu-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);
 }

muyu-modules/muyu-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);
 }

muyu-modules/muyu-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();
 }

muyu-modules/muyu-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);
 }

muyu-modules/muyu-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);
 }

muyu-modules/muyu-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();
 }

muyu-modules/muyu-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);
 }

muyu-modules/muyu-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);
 }

muyu-modules/muyu-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);
 }

muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysUserOnlineService.java

@@ -18,7 +18,7 @@ public interface SysUserOnlineService {
      *
      * @return 在线用户信息
      */
-    public SysUserOnline selectOnlineByIpaddr (String ipaddr, LoginUser user);
+    SysUserOnline selectOnlineByIpaddr(String ipaddr, LoginUser user);
 
     /**
      * 通过用户名称查询信息
@@ -28,7 +28,7 @@ public interface SysUserOnlineService {
      *
      * @return 在线用户信息
      */
-    public SysUserOnline selectOnlineByUserName (String userName, LoginUser user);
+    SysUserOnline selectOnlineByUserName(String userName, LoginUser user);
 
     /**
      * 通过登录地址/用户名称查询信息
@@ -39,7 +39,7 @@ public interface SysUserOnlineService {
      *
      * @return 在线用户信息
      */
-    public SysUserOnline selectOnlineByInfo (String ipaddr, String userName, LoginUser user);
+    SysUserOnline selectOnlineByInfo(String ipaddr, String userName, LoginUser user);
 
     /**
      * 设置在线用户信息
@@ -48,5 +48,5 @@ public interface SysUserOnlineService {
      *
      * @return 在线用户
      */
-    public SysUserOnline loginUserToUserOnline (LoginUser user);
+    SysUserOnline loginUserToUserOnline(LoginUser user);
 }

muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysUserService.java

@@ -18,7 +18,7 @@ public interface SysUserService extends IService<SysUser> {
      *
      * @return 用户信息集合信息
      */
-    public List<SysUser> selectUserList (SysUser user);
+    List<SysUser> selectUserList(SysUser user);
 
     /**
      * 根据条件分页查询已分配用户角色列表
@@ -27,7 +27,7 @@ public interface SysUserService extends IService<SysUser> {
      *
      * @return 用户信息集合信息
      */
-    public List<SysUser> selectAllocatedList (SysUser user);
+    List<SysUser> selectAllocatedList(SysUser user);
 
     /**
      * 根据条件分页查询未分配用户角色列表
@@ -36,7 +36,7 @@ public interface SysUserService extends IService<SysUser> {
      *
      * @return 用户信息集合信息
      */
-    public List<SysUser> selectUnallocatedList (SysUser user);
+    List<SysUser> selectUnallocatedList(SysUser user);
 
     /**
      * 通过用户名查询用户
@@ -45,7 +45,7 @@ public interface SysUserService extends IService<SysUser> {
      *
      * @return 用户对象信息
      */
-    public SysUser selectUserByUserName (String userName);
+    SysUser selectUserByUserName(String userName);
 
     /**
      * 通过用户ID查询用户
@@ -54,7 +54,7 @@ public interface SysUserService extends IService<SysUser> {
      *
      * @return 用户对象信息
      */
-    public SysUser selectUserById (Long userId);
+    SysUser selectUserById(Long userId);
 
     /**
      * 根据用户ID查询用户所属角色组
@@ -63,7 +63,7 @@ public interface SysUserService extends IService<SysUser> {
      *
      * @return 结果
      */
-    public String selectUserRoleGroup (String userName);
+    String selectUserRoleGroup(String userName);
 
     /**
      * 根据用户ID查询用户所属岗位组
@@ -72,7 +72,7 @@ public interface SysUserService extends IService<SysUser> {
      *
      * @return 结果
      */
-    public String selectUserPostGroup (String userName);
+    String selectUserPostGroup(String userName);
 
     /**
      * 校验用户名称是否唯一
@@ -81,7 +81,7 @@ public interface SysUserService extends IService<SysUser> {
      *
      * @return 结果
      */
-    public boolean checkUserNameUnique (SysUser user);
+    boolean checkUserNameUnique(SysUser user);
 
     /**
      * 校验手机号码是否唯一
@@ -90,7 +90,7 @@ public interface SysUserService extends IService<SysUser> {
      *
      * @return 结果
      */
-    public boolean checkPhoneUnique (SysUser user);
+    boolean checkPhoneUnique(SysUser user);
 
     /**
      * 校验email是否唯一
@@ -99,21 +99,21 @@ public interface SysUserService extends IService<SysUser> {
      *
      * @return 结果
      */
-    public boolean checkEmailUnique (SysUser user);
+    boolean checkEmailUnique(SysUser user);
 
     /**
      * 校验用户是否允许操作
      *
      * @param user 用户信息
      */
-    public void checkUserAllowed (SysUser user);
+    void checkUserAllowed(SysUser user);
 
     /**
      * 校验用户是否有数据权限
      *
      * @param userId 用户id
      */
-    public void checkUserDataScope (Long userId);
+    void checkUserDataScope(Long userId);
 
     /**
      * 新增用户信息
@@ -122,7 +122,7 @@ public interface SysUserService extends IService<SysUser> {
      *
      * @return 结果
      */
-    public int insertUser (SysUser user);
+    int insertUser(SysUser user);
 
     /**
      * 注册用户信息
@@ -131,7 +131,7 @@ public interface SysUserService extends IService<SysUser> {
      *
      * @return 结果
      */
-    public boolean registerUser (SysUser user);
+    boolean registerUser(SysUser user);
 
     /**
      * 修改用户信息
@@ -140,7 +140,7 @@ public interface SysUserService extends IService<SysUser> {
      *
      * @return 结果
      */
-    public int updateUser (SysUser user);
+    int updateUser(SysUser user);
 
     /**
      * 用户授权角色
@@ -148,7 +148,7 @@ public interface SysUserService extends IService<SysUser> {
      * @param userId  用户ID
      * @param roleIds 角色组
      */
-    public void insertUserAuth (Long userId, Long[] roleIds);
+    void insertUserAuth(Long userId, Long[] roleIds);
 
     /**
      * 修改用户状态
@@ -157,7 +157,7 @@ public interface SysUserService extends IService<SysUser> {
      *
      * @return 结果
      */
-    public int updateUserStatus (SysUser user);
+    int updateUserStatus(SysUser user);
 
     /**
      * 修改用户基本信息
@@ -166,7 +166,7 @@ public interface SysUserService extends IService<SysUser> {
      *
      * @return 结果
      */
-    public int updateUserProfile (SysUser user);
+    int updateUserProfile(SysUser user);
 
     /**
      * 修改用户头像
@@ -176,7 +176,7 @@ public interface SysUserService extends IService<SysUser> {
      *
      * @return 结果
      */
-    public boolean updateUserAvatar (String userName, String avatar);
+    boolean updateUserAvatar(String userName, String avatar);
 
     /**
      * 重置用户密码
@@ -185,7 +185,7 @@ public interface SysUserService extends IService<SysUser> {
      *
      * @return 结果
      */
-    public int resetPwd (SysUser user);
+    int resetPwd(SysUser user);
 
     /**
      * 重置用户密码
@@ -195,7 +195,7 @@ public interface SysUserService extends IService<SysUser> {
      *
      * @return 结果
      */
-    public int resetUserPwd (String userName, String password);
+    int resetUserPwd(String userName, String password);
 
     /**
      * 通过用户ID删除用户
@@ -204,7 +204,7 @@ public interface SysUserService extends IService<SysUser> {
      *
      * @return 结果
      */
-    public int deleteUserById (Long userId);
+    int deleteUserById(Long userId);
 
     /**
      * 批量删除用户信息
@@ -213,7 +213,7 @@ public interface SysUserService extends IService<SysUser> {
      *
      * @return 结果
      */
-    public int deleteUserByIds (Long[] userIds);
+    int deleteUserByIds(Long[] userIds);
 
     /**
      * 导入用户数据
@@ -224,5 +224,5 @@ public interface SysUserService extends IService<SysUser> {
      *
      * @return 结果
      */
-    public String importUser (List<SysUser> userList, Boolean isUpdateSupport, String operName);
+    String importUser(List<SysUser> userList, Boolean isUpdateSupport, String operName);
 }

muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysDeptServiceImpl.java

@@ -306,7 +306,7 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
         List<SysDept> tlist = new ArrayList<SysDept>();
         Iterator<SysDept> it = list.iterator();
         while (it.hasNext()) {
-            SysDept n = (SysDept) it.next();
+            SysDept n = it.next();
             if (StringUtils.isNotNull(n.getParentId()) && n.getParentId().longValue() == t.getDeptId().longValue()) {
                 tlist.add(n);
             }
@@ -318,6 +318,6 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
      * 判断是否有子节点
      */
     private boolean hasChild (List<SysDept> list, SysDept t) {
-        return getChildList(list, t).size() > 0 ? true : false;
+        return getChildList(list, t).size() > 0;
     }
 }

muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysMenuServiceImpl.java

@@ -204,7 +204,7 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> impl
         List<SysMenu> returnList = new ArrayList<SysMenu>();
         List<Long> tempList = menus.stream().map(SysMenu::getMenuId).collect(Collectors.toList());
         for (Iterator<SysMenu> iterator = menus.iterator() ; iterator.hasNext() ; ) {
-            SysMenu menu = (SysMenu) iterator.next();
+            SysMenu menu = iterator.next();
             // 如果是顶级节点, 遍历该父节点的所有子节点
             if (!tempList.contains(menu.getParentId())) {
                 recursionFn(menus, menu);
@@ -426,7 +426,7 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> impl
     public List<SysMenu> getChildPerms (List<SysMenu> list, int parentId) {
         List<SysMenu> returnList = new ArrayList<SysMenu>();
         for (Iterator<SysMenu> iterator = list.iterator() ; iterator.hasNext() ; ) {
-            SysMenu t = (SysMenu) iterator.next();
+            SysMenu t = iterator.next();
             // 一、根据传入的某个父节点ID,遍历该父节点的所有子节点
             if (t.getParentId() == parentId) {
                 recursionFn(list, t);
@@ -460,7 +460,7 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> impl
         List<SysMenu> tlist = new ArrayList<SysMenu>();
         Iterator<SysMenu> it = list.iterator();
         while (it.hasNext()) {
-            SysMenu n = (SysMenu) it.next();
+            SysMenu n = it.next();
             if (n.getParentId().longValue() == t.getMenuId().longValue()) {
                 tlist.add(n);
             }