品类添加方法，构建体

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-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-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-file/src/main/java/com/muyu/file/utils/OSSCloudClient.java

@@ -24,7 +24,7 @@ public class OSSCloudClient {
     }
 
     private static class SingletonContainer{
-        private static OSSCloudClient instance = new OSSCloudClient();
+        private static final OSSCloudClient instance = new OSSCloudClient();
     }
 
     public static OSSCloudClient getInstance() {

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

@@ -21,7 +21,7 @@ public interface ${ClassName}Mapper extends BaseMapper<${ClassName}>
      * @param ${pkColumn.javaField} ${functionName}主键
      * @return ${functionName}
      */
-    public ${ClassName} select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField});
+        ${ClassName} select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField});
 
     /**
      * 查询${functionName}列表
@@ -29,7 +29,7 @@ public interface ${ClassName}Mapper extends BaseMapper<${ClassName}>
      * @param ${className} ${functionName}
      * @return ${functionName}集合
      */
-    public List<${ClassName}> select${ClassName}List(${ClassName} ${className});
+    List<${ClassName}> select${ClassName}List(${ClassName} ${className});
 
     /**
      * 新增${functionName}
@@ -37,7 +37,7 @@ public interface ${ClassName}Mapper extends BaseMapper<${ClassName}>
      * @param ${className} ${functionName}
      * @return 结果
      */
-    public int insert${ClassName}(${ClassName} ${className});
+    int insert${ClassName}(${ClassName} ${className});
 
     /**
      * 修改${functionName}
@@ -45,7 +45,7 @@ public interface ${ClassName}Mapper extends BaseMapper<${ClassName}>
      * @param ${className} ${functionName}
      * @return 结果
      */
-    public int update${ClassName}(${ClassName} ${className});
+    int update${ClassName}(${ClassName} ${className});
 
     /**
      * 删除${functionName}
@@ -53,7 +53,7 @@ public interface ${ClassName}Mapper extends BaseMapper<${ClassName}>
      * @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}
@@ -61,7 +61,7 @@ public interface ${ClassName}Mapper extends BaseMapper<${ClassName}>
      * @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)
 
     /**
@@ -70,7 +70,7 @@ public interface ${ClassName}Mapper extends BaseMapper<${ClassName}>
      * @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}
@@ -78,7 +78,7 @@ public interface ${ClassName}Mapper extends BaseMapper<${ClassName}>
      * @param ${subclassName}List ${subTable.functionName}列表
      * @return 结果
      */
-    public int batch${subClassName}(List<${subClassName}> ${subclassName}List);
+    int batch${subClassName}(List<${subClassName}> ${subclassName}List);
 
 
     /**
@@ -87,6 +87,6 @@ public interface ${ClassName}Mapper extends BaseMapper<${ClassName}>
      * @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

@@ -18,7 +18,7 @@ public interface ${ClassName}Service extends IService<${ClassName}>
      * @param ${pkColumn.javaField} ${functionName}主键
      * @return ${functionName}
      */
-    public ${ClassName} select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField});
+        ${ClassName} select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField});
 
     /**
      * 查询${functionName}列表
@@ -26,7 +26,7 @@ public interface ${ClassName}Service extends IService<${ClassName}>
      * @param ${className} ${functionName}
      * @return ${functionName}集合
      */
-    public List<${ClassName}> select${ClassName}List(${ClassName} ${className});
+    List<${ClassName}> select${ClassName}List(${ClassName} ${className});
 
     /**
      * 新增${functionName}
@@ -34,7 +34,7 @@ public interface ${ClassName}Service extends IService<${ClassName}>
      * @param ${className} ${functionName}
      * @return 结果
      */
-    public int insert${ClassName}(${ClassName} ${className});
+    int insert${ClassName}(${ClassName} ${className});
 
     /**
      * 修改${functionName}
@@ -42,7 +42,7 @@ public interface ${ClassName}Service extends IService<${ClassName}>
      * @param ${className} ${functionName}
      * @return 结果
      */
-    public int update${ClassName}(${ClassName} ${className});
+    int update${ClassName}(${ClassName} ${className});
 
     /**
      * 批量删除${functionName}
@@ -50,7 +50,7 @@ public interface ${ClassName}Service extends IService<${ClassName}>
      * @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}信息
@@ -58,5 +58,5 @@ public interface ${ClassName}Service extends IService<${ClassName}>
      * @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

@@ -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

@@ -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

@@ -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-product/muyu-product-common/src/main/java/com/muyu/product/domain/Brand.java

@@ -64,70 +64,6 @@ public class Brand extends BaseEntity {
     @Excel(name = "公司地址")
     private String addressName;
 
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setLogo(String logo) {
-        this.logo = logo;
-    }
-
-    public String getLogo() {
-        return logo;
-    }
-
-    public void setIntroduction(String introduction) {
-        this.introduction = introduction;
-    }
-
-    public String getIntroduction() {
-        return introduction;
-    }
-
-    public void setStatus(String status) {
-        this.status = status;
-    }
-
-    public String getStatus() {
-        return status;
-    }
-
-    public void setAddressName(String addressName) {
-        this.addressName = addressName;
-    }
-
-    public String getAddressName() {
-        return addressName;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
-                .append("id", getId())
-                .append("name", getName())
-                .append("logo", getLogo())
-                .append("introduction", getIntroduction())
-                .append("status", getStatus())
-                .append("addressName", getAddressName())
-                .append("remark", getRemark())
-                .append("createBy", SecurityUtils.getUsername())
-                .append("createTime", getCreateTime())
-                .append("updateBy", SecurityUtils.getUsername())
-                .append("updateTime", getUpdateTime())
-                .toString();
-    }
 
     //添加数据构造体
     public static Brand saveBuilder(BrandReq brandReq) {

muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/BrandCategory.java

@@ -37,45 +37,5 @@ public class BrandCategory extends BaseEntity
     @Excel(name = "品牌编号")
     private Long brandId;
 
-    public void setId(Long id)
-    {
-        this.id = id;
-    }
 
-    public Long getId()
-    {
-        return id;
-    }
-    public void setCategoryId(Long categoryId)
-    {
-        this.categoryId = categoryId;
-    }
-
-    public Long getCategoryId()
-    {
-        return categoryId;
-    }
-    public void setBrandId(Long brandId)
-    {
-        this.brandId = brandId;
-    }
-
-    public Long getBrandId()
-    {
-        return brandId;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("categoryId", getCategoryId())
-            .append("brandId", getBrandId())
-            .append("remark", getRemark())
-            .append("createBy", SecurityUtils.getUsername())
-            .append("createTime", getCreateTime())
-            .append("updateBy", SecurityUtils.getUsername())
-            .append("updateTime", getUpdateTime())
-            .toString();
-    }
 }

muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/CategoryAttribute.java

@@ -37,45 +37,10 @@ public class CategoryAttribute extends BaseEntity
     @Excel(name = "品类编号")
     private Long categoryId;
 
-    public void setId(Long id)
+    public static CategoryAttribute categoryBuilder(Long id, Long attributeId) {
-    {
+        return CategoryAttribute.builder()
-        this.id = id;
+                .categoryId(id)
-    }
+                .attributeId(attributeId)
-
+                .build();
-    public Long getId()
-    {
-        return id;
-    }
-    public void setAttributeId(Long attributeId)
-    {
-        this.attributeId = attributeId;
-    }
-
-    public Long getAttributeId()
-    {
-        return attributeId;
-    }
-    public void setCategoryId(Long categoryId)
-    {
-        this.categoryId = categoryId;
-    }
-
-    public Long getCategoryId()
-    {
-        return categoryId;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("attributeId", getAttributeId())
-            .append("categoryId", getCategoryId())
-            .append("remark", getRemark())
-            .append("createBy", SecurityUtils.getUsername())
-            .append("createTime", getCreateTime())
-            .append("updateBy", SecurityUtils.getUsername())
-            .append("updateTime", getUpdateTime())
-            .toString();
     }
 }

muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/CategoryAttributeGroup.java

@@ -37,45 +37,18 @@ public class CategoryAttributeGroup extends BaseEntity
     @Excel(name = "品类编号")
     private Long categoryId;
 
-    public void setId(Long id)
+    /**
-    {
+     * 品类属性组中间表构建体
-        this.id = id;
+     * 作用：提供数组对象
-    }
+     * @param id
+     * @param groupId
+     * @return
+     */
+    public static CategoryAttributeGroup saveBuilder(Long id, Long groupId) {
+        return CategoryAttributeGroup.builder()
+                .attributeGroupId(groupId)
+                .categoryId(id)
+                .build();
 
-    public Long getId()
-    {
-        return id;
-    }
-    public void setAttributeGroupId(Long attributeGroupId)
-    {
-        this.attributeGroupId = attributeGroupId;
-    }
-
-    public Long getAttributeGroupId()
-    {
-        return attributeGroupId;
-    }
-    public void setCategoryId(Long categoryId)
-    {
-        this.categoryId = categoryId;
-    }
-
-    public Long getCategoryId()
-    {
-        return categoryId;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("attributeGroupId", getAttributeGroupId())
-            .append("categoryId", getCategoryId())
-            .append("remark", getRemark())
-            .append("createBy", SecurityUtils.getUsername())
-            .append("createTime", getCreateTime())
-            .append("updateBy", SecurityUtils.getUsername())
-            .append("updateTime", getUpdateTime())
-            .toString();
     }
 }

muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/CategoryInfo.java

@@ -1,15 +1,14 @@
 package com.muyu.product.domain;
 
-import com.muyu.common.security.utils.SecurityUtils;
 import com.muyu.common.core.annotation.Excel;
 import com.muyu.common.core.web.domain.TreeEntity;
+import com.muyu.product.domain.model.CategoryInfoSaveModel;
+import com.muyu.product.domain.req.CategoryReq;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 
 /**
  * 品类信息对象 category_info
@@ -41,56 +40,30 @@ public class CategoryInfo extends TreeEntity
     @Excel(name = "是否启用")
     private String status;
 
-    public void setId(Long id)
+    /**
-    {
+     * 查询构造器
-        this.id = id;
+     * @param req
+     * @return
+     */
+    public static CategoryInfo queryBuilder(CategoryReq req){
+        return CategoryInfo.builder()
+                .name(req.getName())
+                .image(req.getImage())
+                .status(req.getStatus())
+                .remark(req.getRemark())
+                .build();
     }
 
-    public Long getId()
-    {
-        return id;
-    }
-    public void setName(String name)
-    {
-        this.name = name;
-    }
 
-    public String getName()
+    /** 响应值对象 */
-    {
+    public static CategoryInfo saveCategoryBuilder(CategoryInfoSaveModel req){
-        return name;
+        return CategoryInfo.builder()
-    }
+                .name(req.getName())
-    public void setImage(String image)
+                .status(req.getStatus())
-    {
+                .image(req.getImage())
-        this.image = image;
+                .remark(req.getRemark())
-    }
+                .createBy(req.getCreateBy())
-
+                .createTime(req.getCreateTime())
-    public String getImage()
+                .build();
-    {
-        return image;
-    }
-    public void setStatus(String status)
-    {
-        this.status = status;
-    }
-
-    public String getStatus()
-    {
-        return status;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("name", getName())
-            .append("image", getImage())
-            .append("parentId", getParentId())
-            .append("status", getStatus())
-            .append("remark", getRemark())
-            .append("createBy", SecurityUtils.getUsername())
-            .append("createTime", getCreateTime())
-            .append("updateBy", SecurityUtils.getUsername())
-            .append("updateTime", getUpdateTime())
-            .toString();
     }
 }

muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/model/CategoryInfoSaveModel.java

@@ -0,0 +1,68 @@
+package com.muyu.product.domain.model;
+
+import com.muyu.common.core.web.domain.TreeEntity;
+import com.muyu.product.domain.req.CategoryReq;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+import java.util.Date;
+import java.util.List;
+import java.util.function.Supplier;
+
+/**
+ * @ClassName CategoryInfoSaveModel
+ * @Description 描述
+ * @Author SaiSai.Liu
+ * @Date 2024/3/5/0005 17:17
+ */
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+public class CategoryInfoSaveModel extends TreeEntity {
+    /** 主键 */
+    private Long id;
+
+    /** 品类名称 */
+    private String name;
+
+    /** 图片 */
+    private String image;
+
+    /** 父级品类 */
+    private Long parentId;
+
+    /** 是否启用 */
+    private String status;
+
+    /** 说明 */
+    private String remark;
+    private String createBy;
+    private Date createTime;
+
+    private List<Long> checkedAttributeIds;
+
+    private List<Long> attributeGroupIds;
+
+    private List<Long> brandIds;
+
+    /**
+     * 保存构建体
+     */
+    public static CategoryInfoSaveModel saveBuilder(CategoryReq req, Supplier<String> username){
+        return CategoryInfoSaveModel.builder()
+                .checkedAttributeIds(req.getCheckedAttributeIds())
+                .attributeGroupIds(req.getAttributeGroupIds())
+                .brandIds(req.getBrandIds())
+                .image(req.getImage())
+                .name(req.getName())
+                .parentId(req.getParentId())
+                .createBy(username.get())
+                .createTime(req.getCreateTime())
+                .status(req.getStatus())
+                .remark(req.getRemark())
+                .build();
+    }
+}

muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/CategoryReq.java

@@ -0,0 +1,51 @@
+package com.muyu.product.domain.req;
+
+import com.muyu.common.core.annotation.Excel;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @ClassName CategoryReq
+ * @Description 描述
+ * @Author SaiSai.Liu
+ * @Date 2024/3/5/0005 12:35
+ */
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+public class CategoryReq {
+    /** 主键 */
+    private Long id;
+
+    /** 品类名称 */
+    private String name;
+
+    /** 图片 */
+    private String image;
+
+    /** 父级品类 */
+    private Long parentId;
+
+    /** 是否启用 */
+    private String status;
+
+    /** 说明 */
+    private String remark;
+    private String createBy;
+    private Date createTime;
+
+    private List<Long> checkedAttributeIds;
+
+    private List<Long> attributeGroupIds;
+
+    private List<Long> brandIds;
+
+
+
+}

muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/resp/CategoryResp.java

@@ -0,0 +1,76 @@
+package com.muyu.product.domain.resp;
+
+import com.muyu.common.core.web.domain.TreeEntity;
+import com.muyu.common.security.utils.SecurityUtils;
+import com.muyu.product.domain.req.CategoryReq;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+import java.util.Date;
+
+/**
+ * @ClassName CategoryResp
+ * @Description 描述
+ * @Author SaiSai.Liu
+ * @Date 2024/3/5/0005 12:35
+ */
+
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+public class CategoryResp extends TreeEntity {
+    /** 主键 */
+    private Long id;
+
+    /** 品类名称 */
+    private String name;
+
+    /** 图片 */
+    private String image;
+
+    /** 是否启用 */
+    private String status;
+
+    private String createBy;
+    private String updateBy;
+    private Date createTime;
+    private Date updateTime;
+
+
+    /**
+     * 保存构建体
+     * @param categoryReq
+     * @return
+     */
+    public static CategoryResp saveBuilder(CategoryReq categoryReq){
+        return CategoryResp.builder()
+                .name(categoryReq.getName())
+                .image(categoryReq.getImage())
+                .status(categoryReq.getStatus())
+                .createBy(SecurityUtils.getUsername())
+                .createTime(new Date())
+                .build();
+    }
+
+
+    /**
+     * 修改构建体
+     * @param categoryReq
+     * @return
+     */
+    public static CategoryResp updateBuilder(CategoryReq categoryReq){
+        return CategoryResp.builder()
+                .name(categoryReq.getName())
+                .image(categoryReq.getImage())
+                .status(categoryReq.getStatus())
+                .updateBy(SecurityUtils.getUsername())
+                .updateTime(new Date())
+                .build();
+    }
+
+
+
+}

muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/结构

@@ -0,0 +1,42 @@
+{
+    "categoryInfoId": 1,
+    "states": "y",
+    "categoryName": "节点",
+    "remark": null,
+    "images": null,
+    "req": {
+        "asAttributeCategoryList": [
+
+        ],
+        "asAttributeGroupList": [
+            属性组
+        ],
+        "asBrandCategoryList":[
+            品类品牌
+        ]
+    }
+}
+
+
+
+
+
+{
+    "categoryInfoId": 1,
+    "categoryName": "节点",
+    "remark": null,
+    "req": {
+        "asAttributeCategoryList": [
+            "attributeInfo": {
+                "id": 1
+                "attributeName": null
+            }
+        ],
+        "attributeGroupList": [
+            "attributeInfoGroup": {
+                "id": 1,
+                "attributeInfoList": []
+            }
+        ]
+    }
+}

muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/CategoryInfoController.java

@@ -3,6 +3,11 @@ package com.muyu.product.controller;
 import java.util.List;
 import java.io.IOException;
 import javax.servlet.http.HttpServletResponse;
+
+import com.muyu.common.security.utils.SecurityUtils;
+import com.muyu.product.domain.model.CategoryInfoSaveModel;
+import com.muyu.product.domain.req.CategoryReq;
+import com.muyu.product.domain.resp.CategoryResp;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -74,9 +79,9 @@ public class CategoryInfoController extends BaseController
     @RequiresPermissions("product:category_info:add")
     @Log(title = "品类信息", businessType = BusinessType.INSERT)
     @PostMapping
-    public Result add(@RequestBody CategoryInfo categoryInfo)
+    public Result add(@RequestBody CategoryReq categoryReq)
     {
-        return toAjax(categoryInfoService.insertCategoryInfo(categoryInfo));
+        return toAjax(categoryInfoService.save(CategoryInfoSaveModel.saveBuilder(categoryReq, SecurityUtils::getUsername  )));
     }
 
     /**

muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/AddressMapper.java

@@ -19,7 +19,7 @@ public interface AddressMapper extends BaseMapper<Address>
      * @param id 地区主键
      * @return 地区
      */
-    public Address selectAddressById(Long id);
+    Address selectAddressById(Long id);
 
     /**
      * 查询地区列表
@@ -27,7 +27,7 @@ public interface AddressMapper extends BaseMapper<Address>
      * @param address 地区
      * @return 地区集合
      */
-    public List<Address> selectAddressList(Address address);
+    List<Address> selectAddressList(Address address);
 
     /**
      * 新增地区
@@ -35,7 +35,7 @@ public interface AddressMapper extends BaseMapper<Address>
      * @param address 地区
      * @return 结果
      */
-    public int insertAddress(Address address);
+    int insertAddress(Address address);
 
     /**
      * 修改地区
@@ -43,7 +43,7 @@ public interface AddressMapper extends BaseMapper<Address>
      * @param address 地区
      * @return 结果
      */
-    public int updateAddress(Address address);
+    int updateAddress(Address address);
 
     /**
      * 删除地区
@@ -51,7 +51,7 @@ public interface AddressMapper extends BaseMapper<Address>
      * @param id 地区主键
      * @return 结果
      */
-    public int deleteAddressById(Long id);
+    int deleteAddressById(Long id);
 
     /**
      * 批量删除地区
@@ -59,5 +59,5 @@ public interface AddressMapper extends BaseMapper<Address>
      * @param ids 需要删除的数据主键集合
      * @return 结果
      */
-    public int deleteAddressByIds(Long[] ids);
+    int deleteAddressByIds(Long[] ids);
 }

muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/AsAttributeGroupMapper.java

@@ -19,7 +19,7 @@ public interface AsAttributeGroupMapper extends BaseMapper<AsAttributeGroup>
      * @param id 属性组中间主键
      * @return 属性组中间
      */
-    public AsAttributeGroup selectAsAttributeGroupById(Long id);
+    AsAttributeGroup selectAsAttributeGroupById(Long id);
 
     /**
      * 查询属性组中间列表
@@ -27,7 +27,7 @@ public interface AsAttributeGroupMapper extends BaseMapper<AsAttributeGroup>
      * @param asAttributeGroup 属性组中间
      * @return 属性组中间集合
      */
-    public List<AsAttributeGroup> selectAsAttributeGroupList(AsAttributeGroup asAttributeGroup);
+    List<AsAttributeGroup> selectAsAttributeGroupList(AsAttributeGroup asAttributeGroup);
 
     /**
      * 新增属性组中间
@@ -35,7 +35,7 @@ public interface AsAttributeGroupMapper extends BaseMapper<AsAttributeGroup>
      * @param asAttributeGroup 属性组中间
      * @return 结果
      */
-    public int insertAsAttributeGroup(AsAttributeGroup asAttributeGroup);
+    int insertAsAttributeGroup(AsAttributeGroup asAttributeGroup);
 
     /**
      * 修改属性组中间
@@ -43,7 +43,7 @@ public interface AsAttributeGroupMapper extends BaseMapper<AsAttributeGroup>
      * @param asAttributeGroup 属性组中间
      * @return 结果
      */
-    public int updateAsAttributeGroup(AsAttributeGroup asAttributeGroup);
+    int updateAsAttributeGroup(AsAttributeGroup asAttributeGroup);
 
     /**
      * 删除属性组中间
@@ -51,7 +51,7 @@ public interface AsAttributeGroupMapper extends BaseMapper<AsAttributeGroup>
      * @param id 属性组中间主键
      * @return 结果
      */
-    public int deleteAsAttributeGroupById(Long id);
+    int deleteAsAttributeGroupById(Long id);
 
     /**
      * 批量删除属性组中间
@@ -59,7 +59,7 @@ public interface AsAttributeGroupMapper extends BaseMapper<AsAttributeGroup>
      * @param ids 需要删除的数据主键集合
      * @return 结果
      */
-    public int deleteAsAttributeGroupByIds(Long[] ids);
+    int deleteAsAttributeGroupByIds(Long[] ids);
 
-    public int deleteAsAttributeGroupByGroupId(Long id);
+    int deleteAsAttributeGroupByGroupId(Long id);
 }

muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/AttributeGroupMapper.java

@@ -19,7 +19,7 @@ public interface AttributeGroupMapper extends BaseMapper<AttributeGroup>
      * @param id 属性组主键
      * @return 属性组
      */
-    public AttributeGroup selectAttributeGroupById(Long id);
+    AttributeGroup selectAttributeGroupById(Long id);
 
     /**
      * 查询属性组列表
@@ -27,7 +27,7 @@ public interface AttributeGroupMapper extends BaseMapper<AttributeGroup>
      * @param attributeGroup 属性组
      * @return 属性组集合
      */
-    public List<AttributeGroup> selectAttributeGroupList(AttributeGroup attributeGroup);
+    List<AttributeGroup> selectAttributeGroupList(AttributeGroup attributeGroup);
 
     /**
      * 新增属性组
@@ -35,7 +35,7 @@ public interface AttributeGroupMapper extends BaseMapper<AttributeGroup>
      * @param attributeGroup 属性组
      * @return 结果
      */
-    public int insertAttributeGroup(AttributeGroup attributeGroup);
+    int insertAttributeGroup(AttributeGroup attributeGroup);
 
     /**
      * 修改属性组
@@ -43,7 +43,7 @@ public interface AttributeGroupMapper extends BaseMapper<AttributeGroup>
      * @param attributeGroup 属性组
      * @return 结果
      */
-    public int updateAttributeGroup(AttributeGroup attributeGroup);
+    int updateAttributeGroup(AttributeGroup attributeGroup);
 
     /**
      * 删除属性组
@@ -51,7 +51,7 @@ public interface AttributeGroupMapper extends BaseMapper<AttributeGroup>
      * @param id 属性组主键
      * @return 结果
      */
-    public int deleteAttributeGroupById(Long id);
+    int deleteAttributeGroupById(Long id);
 
     /**
      * 批量删除属性组
@@ -59,5 +59,5 @@ public interface AttributeGroupMapper extends BaseMapper<AttributeGroup>
      * @param ids 需要删除的数据主键集合
      * @return 结果
      */
-    public int deleteAttributeGroupByIds(Long[] ids);
+    int deleteAttributeGroupByIds(Long[] ids);
 }

muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/AttributeMapper.java

@@ -19,7 +19,7 @@ public interface AttributeMapper extends BaseMapper<Attribute>
      * @param id 属性主键
      * @return 属性
      */
-    public Attribute selectAttributeById(Long id);
+    Attribute selectAttributeById(Long id);
 
     /**
      * 查询属性列表
@@ -27,7 +27,7 @@ public interface AttributeMapper extends BaseMapper<Attribute>
      * @param attribute 属性
      * @return 属性集合
      */
-    public List<Attribute> selectAttributeList(Attribute attribute);
+    List<Attribute> selectAttributeList(Attribute attribute);
 
     /**
      * 新增属性
@@ -35,7 +35,7 @@ public interface AttributeMapper extends BaseMapper<Attribute>
      * @param attribute 属性
      * @return 结果
      */
-    public int insertAttribute(Attribute attribute);
+    int insertAttribute(Attribute attribute);
 
     /**
      * 修改属性
@@ -43,7 +43,7 @@ public interface AttributeMapper extends BaseMapper<Attribute>
      * @param attribute 属性
      * @return 结果
      */
-    public int updateAttribute(Attribute attribute);
+    int updateAttribute(Attribute attribute);
 
     /**
      * 删除属性
@@ -51,7 +51,7 @@ public interface AttributeMapper extends BaseMapper<Attribute>
      * @param id 属性主键
      * @return 结果
      */
-    public int deleteAttributeById(Long id);
+    int deleteAttributeById(Long id);
 
     /**
      * 批量删除属性
@@ -59,5 +59,5 @@ public interface AttributeMapper extends BaseMapper<Attribute>
      * @param ids 需要删除的数据主键集合
      * @return 结果
      */
-    public int deleteAttributeByIds(Long[] ids);
+    int deleteAttributeByIds(Long[] ids);
 }

muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/AttributeProductMapper.java

@@ -19,7 +19,7 @@ public interface AttributeProductMapper extends BaseMapper<AttributeProduct>
      * @param id 商品属性中间表主键
      * @return 商品属性中间表
      */
-    public AttributeProduct selectAttributeProductById(Long id);
+    AttributeProduct selectAttributeProductById(Long id);
 
     /**
      * 查询商品属性中间表列表
@@ -27,7 +27,7 @@ public interface AttributeProductMapper extends BaseMapper<AttributeProduct>
      * @param attributeProduct 商品属性中间表
      * @return 商品属性中间表集合
      */
-    public List<AttributeProduct> selectAttributeProductList(AttributeProduct attributeProduct);
+    List<AttributeProduct> selectAttributeProductList(AttributeProduct attributeProduct);
 
     /**
      * 新增商品属性中间表
@@ -35,7 +35,7 @@ public interface AttributeProductMapper extends BaseMapper<AttributeProduct>
      * @param attributeProduct 商品属性中间表
      * @return 结果
      */
-    public int insertAttributeProduct(AttributeProduct attributeProduct);
+    int insertAttributeProduct(AttributeProduct attributeProduct);
 
     /**
      * 修改商品属性中间表
@@ -43,7 +43,7 @@ public interface AttributeProductMapper extends BaseMapper<AttributeProduct>
      * @param attributeProduct 商品属性中间表
      * @return 结果
      */
-    public int updateAttributeProduct(AttributeProduct attributeProduct);
+    int updateAttributeProduct(AttributeProduct attributeProduct);
 
     /**
      * 删除商品属性中间表
@@ -51,7 +51,7 @@ public interface AttributeProductMapper extends BaseMapper<AttributeProduct>
      * @param id 商品属性中间表主键
      * @return 结果
      */
-    public int deleteAttributeProductById(Long id);
+    int deleteAttributeProductById(Long id);
 
     /**
      * 批量删除商品属性中间表
@@ -59,5 +59,5 @@ public interface AttributeProductMapper extends BaseMapper<AttributeProduct>
      * @param ids 需要删除的数据主键集合
      * @return 结果
      */
-    public int deleteAttributeProductByIds(Long[] ids);
+    int deleteAttributeProductByIds(Long[] ids);
 }

muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/BrandCategoryMapper.java

@@ -19,7 +19,7 @@ public interface BrandCategoryMapper extends BaseMapper<BrandCategory>
      * @param id 品牌品类中间主键
      * @return 品牌品类中间
      */
-    public BrandCategory selectBrandCategoryById(Long id);
+    BrandCategory selectBrandCategoryById(Long id);
 
     /**
      * 查询品牌品类中间列表
@@ -27,7 +27,7 @@ public interface BrandCategoryMapper extends BaseMapper<BrandCategory>
      * @param brandCategory 品牌品类中间
      * @return 品牌品类中间集合
      */
-    public List<BrandCategory> selectBrandCategoryList(BrandCategory brandCategory);
+    List<BrandCategory> selectBrandCategoryList(BrandCategory brandCategory);
 
     /**
      * 新增品牌品类中间
@@ -35,7 +35,7 @@ public interface BrandCategoryMapper extends BaseMapper<BrandCategory>
      * @param brandCategory 品牌品类中间
      * @return 结果
      */
-    public int insertBrandCategory(BrandCategory brandCategory);
+    int insertBrandCategory(BrandCategory brandCategory);
 
     /**
      * 修改品牌品类中间
@@ -43,7 +43,7 @@ public interface BrandCategoryMapper extends BaseMapper<BrandCategory>
      * @param brandCategory 品牌品类中间
      * @return 结果
      */
-    public int updateBrandCategory(BrandCategory brandCategory);
+    int updateBrandCategory(BrandCategory brandCategory);
 
     /**
      * 删除品牌品类中间
@@ -51,7 +51,7 @@ public interface BrandCategoryMapper extends BaseMapper<BrandCategory>
      * @param id 品牌品类中间主键
      * @return 结果
      */
-    public int deleteBrandCategoryById(Long id);
+    int deleteBrandCategoryById(Long id);
 
     /**
      * 批量删除品牌品类中间
@@ -59,5 +59,5 @@ public interface BrandCategoryMapper extends BaseMapper<BrandCategory>
      * @param ids 需要删除的数据主键集合
      * @return 结果
      */
-    public int deleteBrandCategoryByIds(Long[] ids);
+    int deleteBrandCategoryByIds(Long[] ids);
 }

muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/BrandMapper.java

@@ -20,7 +20,7 @@ public interface BrandMapper extends BaseMapper<Brand>
      * @param id 品牌主键
      * @return 品牌
      */
-    public Brand selectBrandById(Long id);
+    Brand selectBrandById(Long id);
 
     /**
      * 查询品牌列表
@@ -28,7 +28,7 @@ public interface BrandMapper extends BaseMapper<Brand>
      * @param brand 品牌
      * @return 品牌集合
      */
-    public List<Brand> selectBrandList(Brand brand);
+    List<Brand> selectBrandList(Brand brand);
 
     /**
      * 新增品牌
@@ -36,7 +36,7 @@ public interface BrandMapper extends BaseMapper<Brand>
      * @param brand 品牌
      * @return 结果
      */
-    public int insertBrand(Brand brand);
+    int insertBrand(Brand brand);
 
     /**
      * 修改品牌
@@ -44,7 +44,7 @@ public interface BrandMapper extends BaseMapper<Brand>
      * @param brand 品牌
      * @return 结果
      */
-    public int updateBrand(Brand brand);
+    int updateBrand(Brand brand);
 
     /**
      * 删除品牌
@@ -52,7 +52,7 @@ public interface BrandMapper extends BaseMapper<Brand>
      * @param id 品牌主键
      * @return 结果
      */
-    public int deleteBrandById(Long id);
+    int deleteBrandById(Long id);
 
     /**
      * 批量删除品牌
@@ -60,5 +60,5 @@ public interface BrandMapper extends BaseMapper<Brand>
      * @param ids 需要删除的数据主键集合
      * @return 结果
      */
-    public int deleteBrandByIds(Long[] ids);
+    int deleteBrandByIds(Long[] ids);
 }

muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/CategoryAttributeGroupMapper.java

@@ -19,7 +19,7 @@ public interface CategoryAttributeGroupMapper extends BaseMapper<CategoryAttribu
      * @param id 品类属性组中间主键
      * @return 品类属性组中间
      */
-    public CategoryAttributeGroup selectCategoryAttributeGroupById(Long id);
+    CategoryAttributeGroup selectCategoryAttributeGroupById(Long id);
 
     /**
      * 查询品类属性组中间列表
@@ -27,7 +27,7 @@ public interface CategoryAttributeGroupMapper extends BaseMapper<CategoryAttribu
      * @param categoryAttributeGroup 品类属性组中间
      * @return 品类属性组中间集合
      */
-    public List<CategoryAttributeGroup> selectCategoryAttributeGroupList(CategoryAttributeGroup categoryAttributeGroup);
+    List<CategoryAttributeGroup> selectCategoryAttributeGroupList(CategoryAttributeGroup categoryAttributeGroup);
 
     /**
      * 新增品类属性组中间
@@ -35,7 +35,7 @@ public interface CategoryAttributeGroupMapper extends BaseMapper<CategoryAttribu
      * @param categoryAttributeGroup 品类属性组中间
      * @return 结果
      */
-    public int insertCategoryAttributeGroup(CategoryAttributeGroup categoryAttributeGroup);
+    int insertCategoryAttributeGroup(CategoryAttributeGroup categoryAttributeGroup);
 
     /**
      * 修改品类属性组中间
@@ -43,7 +43,7 @@ public interface CategoryAttributeGroupMapper extends BaseMapper<CategoryAttribu
      * @param categoryAttributeGroup 品类属性组中间
      * @return 结果
      */
-    public int updateCategoryAttributeGroup(CategoryAttributeGroup categoryAttributeGroup);
+    int updateCategoryAttributeGroup(CategoryAttributeGroup categoryAttributeGroup);
 
     /**
      * 删除品类属性组中间
@@ -51,7 +51,7 @@ public interface CategoryAttributeGroupMapper extends BaseMapper<CategoryAttribu
      * @param id 品类属性组中间主键
      * @return 结果
      */
-    public int deleteCategoryAttributeGroupById(Long id);
+    int deleteCategoryAttributeGroupById(Long id);
 
     /**
      * 批量删除品类属性组中间
@@ -59,5 +59,5 @@ public interface CategoryAttributeGroupMapper extends BaseMapper<CategoryAttribu
      * @param ids 需要删除的数据主键集合
      * @return 结果
      */
-    public int deleteCategoryAttributeGroupByIds(Long[] ids);
+    int deleteCategoryAttributeGroupByIds(Long[] ids);
 }

muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/CategoryAttributeMapper.java

@@ -19,7 +19,7 @@ public interface CategoryAttributeMapper extends BaseMapper<CategoryAttribute>
      * @param id 品类属性中间主键
      * @return 品类属性中间
      */
-    public CategoryAttribute selectCategoryAttributeById(Long id);
+    CategoryAttribute selectCategoryAttributeById(Long id);
 
     /**
      * 查询品类属性中间列表
@@ -27,7 +27,7 @@ public interface CategoryAttributeMapper extends BaseMapper<CategoryAttribute>
      * @param categoryAttribute 品类属性中间
      * @return 品类属性中间集合
      */
-    public List<CategoryAttribute> selectCategoryAttributeList(CategoryAttribute categoryAttribute);
+    List<CategoryAttribute> selectCategoryAttributeList(CategoryAttribute categoryAttribute);
 
     /**
      * 新增品类属性中间
@@ -35,7 +35,7 @@ public interface CategoryAttributeMapper extends BaseMapper<CategoryAttribute>
      * @param categoryAttribute 品类属性中间
      * @return 结果
      */
-    public int insertCategoryAttribute(CategoryAttribute categoryAttribute);
+    int insertCategoryAttribute(CategoryAttribute categoryAttribute);
 
     /**
      * 修改品类属性中间
@@ -43,7 +43,7 @@ public interface CategoryAttributeMapper extends BaseMapper<CategoryAttribute>
      * @param categoryAttribute 品类属性中间
      * @return 结果
      */
-    public int updateCategoryAttribute(CategoryAttribute categoryAttribute);
+    int updateCategoryAttribute(CategoryAttribute categoryAttribute);
 
     /**
      * 删除品类属性中间
@@ -51,7 +51,7 @@ public interface CategoryAttributeMapper extends BaseMapper<CategoryAttribute>
      * @param id 品类属性中间主键
      * @return 结果
      */
-    public int deleteCategoryAttributeById(Long id);
+    int deleteCategoryAttributeById(Long id);
 
     /**
      * 批量删除品类属性中间
@@ -59,5 +59,5 @@ public interface CategoryAttributeMapper extends BaseMapper<CategoryAttribute>
      * @param ids 需要删除的数据主键集合
      * @return 结果
      */
-    public int deleteCategoryAttributeByIds(Long[] ids);
+    int deleteCategoryAttributeByIds(Long[] ids);
 }

muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/CategoryInfoMapper.java

@@ -19,7 +19,7 @@ public interface CategoryInfoMapper extends BaseMapper<CategoryInfo>
      * @param id 品类信息主键
      * @return 品类信息
      */
-    public CategoryInfo selectCategoryInfoById(Long id);
+    CategoryInfo selectCategoryInfoById(Long id);
 
     /**
      * 查询品类信息列表
@@ -27,7 +27,7 @@ public interface CategoryInfoMapper extends BaseMapper<CategoryInfo>
      * @param categoryInfo 品类信息
      * @return 品类信息集合
      */
-    public List<CategoryInfo> selectCategoryInfoList(CategoryInfo categoryInfo);
+    List<CategoryInfo> selectCategoryInfoList(CategoryInfo categoryInfo);
 
     /**
      * 新增品类信息
@@ -35,7 +35,7 @@ public interface CategoryInfoMapper extends BaseMapper<CategoryInfo>
      * @param categoryInfo 品类信息
      * @return 结果
      */
-    public int insertCategoryInfo(CategoryInfo categoryInfo);
+    int insertCategoryInfo(CategoryInfo categoryInfo);
 
     /**
      * 修改品类信息
@@ -43,7 +43,7 @@ public interface CategoryInfoMapper extends BaseMapper<CategoryInfo>
      * @param categoryInfo 品类信息
      * @return 结果
      */
-    public int updateCategoryInfo(CategoryInfo categoryInfo);
+    int updateCategoryInfo(CategoryInfo categoryInfo);
 
     /**
      * 删除品类信息
@@ -51,7 +51,7 @@ public interface CategoryInfoMapper extends BaseMapper<CategoryInfo>
      * @param id 品类信息主键
      * @return 结果
      */
-    public int deleteCategoryInfoById(Long id);
+    int deleteCategoryInfoById(Long id);
 
     /**
      * 批量删除品类信息
@@ -59,5 +59,5 @@ public interface CategoryInfoMapper extends BaseMapper<CategoryInfo>
      * @param ids 需要删除的数据主键集合
      * @return 结果
      */
-    public int deleteCategoryInfoByIds(Long[] ids);
+    int deleteCategoryInfoByIds(Long[] ids);
 }

muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/ProductCategoryMapper.java

@@ -19,7 +19,7 @@ public interface ProductCategoryMapper extends BaseMapper<ProductCategory>
      * @param id 品类商品中间主键
      * @return 品类商品中间
      */
-    public ProductCategory selectProductCategoryById(Long id);
+    ProductCategory selectProductCategoryById(Long id);
 
     /**
      * 查询品类商品中间列表
@@ -27,7 +27,7 @@ public interface ProductCategoryMapper extends BaseMapper<ProductCategory>
      * @param productCategory 品类商品中间
      * @return 品类商品中间集合
      */
-    public List<ProductCategory> selectProductCategoryList(ProductCategory productCategory);
+    List<ProductCategory> selectProductCategoryList(ProductCategory productCategory);
 
     /**
      * 新增品类商品中间
@@ -35,7 +35,7 @@ public interface ProductCategoryMapper extends BaseMapper<ProductCategory>
      * @param productCategory 品类商品中间
      * @return 结果
      */
-    public int insertProductCategory(ProductCategory productCategory);
+    int insertProductCategory(ProductCategory productCategory);
 
     /**
      * 修改品类商品中间
@@ -43,7 +43,7 @@ public interface ProductCategoryMapper extends BaseMapper<ProductCategory>
      * @param productCategory 品类商品中间
      * @return 结果
      */
-    public int updateProductCategory(ProductCategory productCategory);
+    int updateProductCategory(ProductCategory productCategory);
 
     /**
      * 删除品类商品中间
@@ -51,7 +51,7 @@ public interface ProductCategoryMapper extends BaseMapper<ProductCategory>
      * @param id 品类商品中间主键
      * @return 结果
      */
-    public int deleteProductCategoryById(Long id);
+    int deleteProductCategoryById(Long id);
 
     /**
      * 批量删除品类商品中间
@@ -59,5 +59,5 @@ public interface ProductCategoryMapper extends BaseMapper<ProductCategory>
      * @param ids 需要删除的数据主键集合
      * @return 结果
      */
-    public int deleteProductCategoryByIds(Long[] ids);
+    int deleteProductCategoryByIds(Long[] ids);
 }

muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/ProductInfoMapper.java

@@ -19,7 +19,7 @@ public interface ProductInfoMapper extends BaseMapper<ProductInfo>
      * @param id 商品;主键
      * @return 商品;
      */
-    public ProductInfo selectProductInfoById(Long id);
+    ProductInfo selectProductInfoById(Long id);
 
     /**
      * 查询商品;列表
@@ -27,7 +27,7 @@ public interface ProductInfoMapper extends BaseMapper<ProductInfo>
      * @param productInfo 商品;
      * @return 商品;集合
      */
-    public List<ProductInfo> selectProductInfoList(ProductInfo productInfo);
+    List<ProductInfo> selectProductInfoList(ProductInfo productInfo);
 
     /**
      * 新增商品;
@@ -35,7 +35,7 @@ public interface ProductInfoMapper extends BaseMapper<ProductInfo>
      * @param productInfo 商品;
      * @return 结果
      */
-    public int insertProductInfo(ProductInfo productInfo);
+    int insertProductInfo(ProductInfo productInfo);
 
     /**
      * 修改商品;
@@ -43,7 +43,7 @@ public interface ProductInfoMapper extends BaseMapper<ProductInfo>
      * @param productInfo 商品;
      * @return 结果
      */
-    public int updateProductInfo(ProductInfo productInfo);
+    int updateProductInfo(ProductInfo productInfo);
 
     /**
      * 删除商品;
@@ -51,7 +51,7 @@ public interface ProductInfoMapper extends BaseMapper<ProductInfo>
      * @param id 商品;主键
      * @return 结果
      */
-    public int deleteProductInfoById(Long id);
+    int deleteProductInfoById(Long id);
 
     /**
      * 批量删除商品;
@@ -59,5 +59,5 @@ public interface ProductInfoMapper extends BaseMapper<ProductInfo>
      * @param ids 需要删除的数据主键集合
      * @return 结果
      */
-    public int deleteProductInfoByIds(Long[] ids);
+    int deleteProductInfoByIds(Long[] ids);
 }

muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/RuleMapper.java

@@ -19,7 +19,7 @@ public interface RuleMapper extends BaseMapper<Rule>
      * @param id 规格主键
      * @return 规格
      */
-    public Rule selectRuleById(Long id);
+    Rule selectRuleById(Long id);
 
     /**
      * 查询规格列表
@@ -27,7 +27,7 @@ public interface RuleMapper extends BaseMapper<Rule>
      * @param rule 规格
      * @return 规格集合
      */
-    public List<Rule> selectRuleList(Rule rule);
+    List<Rule> selectRuleList(Rule rule);
 
     /**
      * 新增规格
@@ -35,7 +35,7 @@ public interface RuleMapper extends BaseMapper<Rule>
      * @param rule 规格
      * @return 结果
      */
-    public int insertRule(Rule rule);
+    int insertRule(Rule rule);
 
     /**
      * 修改规格
@@ -43,7 +43,7 @@ public interface RuleMapper extends BaseMapper<Rule>
      * @param rule 规格
      * @return 结果
      */
-    public int updateRule(Rule rule);
+    int updateRule(Rule rule);
 
     /**
      * 删除规格
@@ -51,7 +51,7 @@ public interface RuleMapper extends BaseMapper<Rule>
      * @param id 规格主键
      * @return 结果
      */
-    public int deleteRuleById(Long id);
+    int deleteRuleById(Long id);
 
     /**
      * 批量删除规格
@@ -59,5 +59,5 @@ public interface RuleMapper extends BaseMapper<Rule>
      * @param ids 需要删除的数据主键集合
      * @return 结果
      */
-    public int deleteRuleByIds(Long[] ids);
+    int deleteRuleByIds(Long[] ids);
 }

muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/RuleProductMapper.java

@@ -19,7 +19,7 @@ public interface RuleProductMapper extends BaseMapper<RuleProduct>
      * @param id 规格商品中间主键
      * @return 规格商品中间
      */
-    public RuleProduct selectRuleProductById(Long id);
+    RuleProduct selectRuleProductById(Long id);
 
     /**
      * 查询规格商品中间列表
@@ -27,7 +27,7 @@ public interface RuleProductMapper extends BaseMapper<RuleProduct>
      * @param ruleProduct 规格商品中间
      * @return 规格商品中间集合
      */
-    public List<RuleProduct> selectRuleProductList(RuleProduct ruleProduct);
+    List<RuleProduct> selectRuleProductList(RuleProduct ruleProduct);
 
     /**
      * 新增规格商品中间
@@ -35,7 +35,7 @@ public interface RuleProductMapper extends BaseMapper<RuleProduct>
      * @param ruleProduct 规格商品中间
      * @return 结果
      */
-    public int insertRuleProduct(RuleProduct ruleProduct);
+    int insertRuleProduct(RuleProduct ruleProduct);
 
     /**
      * 修改规格商品中间
@@ -43,7 +43,7 @@ public interface RuleProductMapper extends BaseMapper<RuleProduct>
      * @param ruleProduct 规格商品中间
      * @return 结果
      */
-    public int updateRuleProduct(RuleProduct ruleProduct);
+    int updateRuleProduct(RuleProduct ruleProduct);
 
     /**
      * 删除规格商品中间
@@ -51,7 +51,7 @@ public interface RuleProductMapper extends BaseMapper<RuleProduct>
      * @param id 规格商品中间主键
      * @return 结果
      */
-    public int deleteRuleProductById(Long id);
+    int deleteRuleProductById(Long id);
 
     /**
      * 批量删除规格商品中间
@@ -59,5 +59,5 @@ public interface RuleProductMapper extends BaseMapper<RuleProduct>
      * @param ids 需要删除的数据主键集合
      * @return 结果
      */
-    public int deleteRuleProductByIds(Long[] ids);
+    int deleteRuleProductByIds(Long[] ids);
 }

muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/IAddressService.java

@@ -20,7 +20,7 @@ public interface IAddressService extends IService<Address>
      * @param id 地区主键
      * @return 地区
      */
-    public Address selectAddressById(Long id);
+    Address selectAddressById(Long id);
 
     /**
      * 查询地区列表
@@ -28,7 +28,7 @@ public interface IAddressService extends IService<Address>
      * @param address 地区
      * @return 地区集合
      */
-    public List<Address> selectAddressList(Address address);
+    List<Address> selectAddressList(Address address);
 
     /**
      * 新增地区
@@ -36,7 +36,7 @@ public interface IAddressService extends IService<Address>
      * @param address 地区
      * @return 结果
      */
-    public int insertAddress(Address address);
+    int insertAddress(Address address);
 
     /**
      * 修改地区
@@ -44,7 +44,7 @@ public interface IAddressService extends IService<Address>
      * @param address 地区
      * @return 结果
      */
-    public int updateAddress(Address address);
+    int updateAddress(Address address);
 
     /**
      * 批量删除地区
@@ -52,7 +52,7 @@ public interface IAddressService extends IService<Address>
      * @param ids 需要删除的地区主键集合
      * @return 结果
      */
-    public int deleteAddressByIds(Long[] ids);
+    int deleteAddressByIds(Long[] ids);
 
     /**
      * 删除地区信息
@@ -60,5 +60,5 @@ public interface IAddressService extends IService<Address>
      * @param id 地区主键
      * @return 结果
      */
-    public int deleteAddressById(Long id);
+    int deleteAddressById(Long id);
 }

muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/IAsAttributeGroupService.java

@@ -19,7 +19,7 @@ public interface IAsAttributeGroupService extends IService<AsAttributeGroup>
      * @param id 属性组中间主键
      * @return 属性组中间
      */
-    public AsAttributeGroup selectAsAttributeGroupById(Long id);
+    AsAttributeGroup selectAsAttributeGroupById(Long id);
 
     /**
      * 查询属性组中间列表
@@ -27,7 +27,7 @@ public interface IAsAttributeGroupService extends IService<AsAttributeGroup>
      * @param asAttributeGroup 属性组中间
      * @return 属性组中间集合
      */
-    public List<AsAttributeGroup> selectAsAttributeGroupList(AsAttributeGroup asAttributeGroup);
+    List<AsAttributeGroup> selectAsAttributeGroupList(AsAttributeGroup asAttributeGroup);
 
     /**
      * 新增属性组中间
@@ -35,7 +35,7 @@ public interface IAsAttributeGroupService extends IService<AsAttributeGroup>
      * @param asAttributeGroup 属性组中间
      * @return 结果
      */
-    public int insertAsAttributeGroup(AsAttributeGroup asAttributeGroup);
+    int insertAsAttributeGroup(AsAttributeGroup asAttributeGroup);
 
     /**
      * 修改属性组中间
@@ -43,7 +43,7 @@ public interface IAsAttributeGroupService extends IService<AsAttributeGroup>
      * @param asAttributeGroup 属性组中间
      * @return 结果
      */
-    public int updateAsAttributeGroup(AsAttributeGroup asAttributeGroup);
+    int updateAsAttributeGroup(AsAttributeGroup asAttributeGroup);
 
     /**
      * 批量删除属性组中间
@@ -51,7 +51,7 @@ public interface IAsAttributeGroupService extends IService<AsAttributeGroup>
      * @param ids 需要删除的属性组中间主键集合
      * @return 结果
      */
-    public int deleteAsAttributeGroupByIds(Long[] ids);
+    int deleteAsAttributeGroupByIds(Long[] ids);
 
     /**
      * 删除属性组中间信息
@@ -59,7 +59,7 @@ public interface IAsAttributeGroupService extends IService<AsAttributeGroup>
      * @param id 属性组中间主键
      * @return 结果
      */
-    public int deleteAsAttributeGroupById(Long id);
+    int deleteAsAttributeGroupById(Long id);
 
-    public int deleteAsAttributeGroupByGroupId(Long id);
+    int deleteAsAttributeGroupByGroupId(Long id);
 }

muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/IAttributeGroupService.java

@@ -21,7 +21,7 @@ public interface IAttributeGroupService extends IService<AttributeGroup>
      * @param id 属性组主键
      * @return 属性组
      */
-    public AttributeGroup selectAttributeGroupById(Long id);
+    AttributeGroup selectAttributeGroupById(Long id);
 
     /**
      * 查询属性组列表
@@ -29,7 +29,7 @@ public interface IAttributeGroupService extends IService<AttributeGroup>
      * @param attributeGroup 属性组
      * @return 属性组集合
      */
-    public List<AttributeGroup> selectAttributeGroupList(AttributeGroup attributeGroup);
+    List<AttributeGroup> selectAttributeGroupList(AttributeGroup attributeGroup);
 
     /**
      * 新增属性组
@@ -37,7 +37,7 @@ public interface IAttributeGroupService extends IService<AttributeGroup>
      * @param attributeGroupReq 属性组
      * @return 结果
      */
-    public int insertAttributeGroup(AttributeGroupReq attributeGroupReq);
+    int insertAttributeGroup(AttributeGroupReq attributeGroupReq);
 
     /**
      * 修改属性组
@@ -45,7 +45,7 @@ public interface IAttributeGroupService extends IService<AttributeGroup>
      * @param attributeGroupReq 属性组
      * @return 结果
      */
-    public int updateAttributeGroup(AttributeGroupReq attributeGroupReq);
+    int updateAttributeGroup(AttributeGroupReq attributeGroupReq);
 
     /**
      * 批量删除属性组
@@ -53,7 +53,7 @@ public interface IAttributeGroupService extends IService<AttributeGroup>
      * @param ids 需要删除的属性组主键集合
      * @return 结果
      */
-    public int deleteAttributeGroupByIds(Long[] ids);
+    int deleteAttributeGroupByIds(Long[] ids);
 
     /**
      * 删除属性组信息
@@ -61,5 +61,5 @@ public interface IAttributeGroupService extends IService<AttributeGroup>
      * @param id 属性组主键
      * @return 结果
      */
-    public int deleteAttributeGroupById(Long id);
+    int deleteAttributeGroupById(Long id);
 }

muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/IAttributeProductService.java

@@ -20,7 +20,7 @@ public interface IAttributeProductService extends IService<AttributeProduct>
      * @param id 商品属性中间表主键
      * @return 商品属性中间表
      */
-    public AttributeProduct selectAttributeProductById(Long id);
+    AttributeProduct selectAttributeProductById(Long id);
 
     /**
      * 查询商品属性中间表列表
@@ -28,7 +28,7 @@ public interface IAttributeProductService extends IService<AttributeProduct>
      * @param attributeProduct 商品属性中间表
      * @return 商品属性中间表集合
      */
-    public List<AttributeProduct> selectAttributeProductList(AttributeProduct attributeProduct);
+    List<AttributeProduct> selectAttributeProductList(AttributeProduct attributeProduct);
 
     /**
      * 新增商品属性中间表
@@ -36,7 +36,7 @@ public interface IAttributeProductService extends IService<AttributeProduct>
      * @param attributeProduct 商品属性中间表
      * @return 结果
      */
-    public int insertAttributeProduct(AttributeProduct attributeProduct);
+    int insertAttributeProduct(AttributeProduct attributeProduct);
 
     /**
      * 修改商品属性中间表
@@ -44,7 +44,7 @@ public interface IAttributeProductService extends IService<AttributeProduct>
      * @param attributeProduct 商品属性中间表
      * @return 结果
      */
-    public int updateAttributeProduct(AttributeProduct attributeProduct);
+    int updateAttributeProduct(AttributeProduct attributeProduct);
 
     /**
      * 批量删除商品属性中间表
@@ -52,7 +52,7 @@ public interface IAttributeProductService extends IService<AttributeProduct>
      * @param ids 需要删除的商品属性中间表主键集合
      * @return 结果
      */
-    public int deleteAttributeProductByIds(Long[] ids);
+    int deleteAttributeProductByIds(Long[] ids);
 
     /**
      * 删除商品属性中间表信息
@@ -60,5 +60,5 @@ public interface IAttributeProductService extends IService<AttributeProduct>
      * @param id 商品属性中间表主键
      * @return 结果
      */
-    public int deleteAttributeProductById(Long id);
+    int deleteAttributeProductById(Long id);
 }

muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/IAttributeService.java

@@ -20,7 +20,7 @@ public interface IAttributeService extends IService<Attribute>
      * @param id 属性主键
      * @return 属性
      */
-    public Attribute selectAttributeById(Long id);
+    Attribute selectAttributeById(Long id);
 
     /**
      * 查询属性列表
@@ -28,7 +28,7 @@ public interface IAttributeService extends IService<Attribute>
      * @param attribute 属性
      * @return 属性集合
      */
-    public List<Attribute> selectAttributeList(Attribute attribute);
+    List<Attribute> selectAttributeList(Attribute attribute);
 
     /**
      * 新增属性
@@ -36,7 +36,7 @@ public interface IAttributeService extends IService<Attribute>
      * @param attribute 属性
      * @return 结果
      */
-    public int insertAttribute(Attribute attribute);
+    int insertAttribute(Attribute attribute);
 
     /**
      * 修改属性
@@ -44,7 +44,7 @@ public interface IAttributeService extends IService<Attribute>
      * @param attribute 属性
      * @return 结果
      */
-    public int updateAttribute(Attribute attribute);
+    int updateAttribute(Attribute attribute);
 
     /**
      * 批量删除属性
@@ -52,7 +52,7 @@ public interface IAttributeService extends IService<Attribute>
      * @param ids 需要删除的属性主键集合
      * @return 结果
      */
-    public int deleteAttributeByIds(Long[] ids);
+    int deleteAttributeByIds(Long[] ids);
 
     /**
      * 删除属性信息
@@ -60,5 +60,5 @@ public interface IAttributeService extends IService<Attribute>
      * @param id 属性主键
      * @return 结果
      */
-    public int deleteAttributeById(Long id);
+    int deleteAttributeById(Long id);
 }

muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/IBrandCategoryService.java

@@ -20,7 +20,7 @@ public interface IBrandCategoryService extends IService<BrandCategory>
      * @param id 品牌品类中间主键
      * @return 品牌品类中间
      */
-    public BrandCategory selectBrandCategoryById(Long id);
+    BrandCategory selectBrandCategoryById(Long id);
 
     /**
      * 查询品牌品类中间列表
@@ -28,7 +28,7 @@ public interface IBrandCategoryService extends IService<BrandCategory>
      * @param brandCategory 品牌品类中间
      * @return 品牌品类中间集合
      */
-    public List<BrandCategory> selectBrandCategoryList(BrandCategory brandCategory);
+    List<BrandCategory> selectBrandCategoryList(BrandCategory brandCategory);
 
     /**
      * 新增品牌品类中间
@@ -36,7 +36,7 @@ public interface IBrandCategoryService extends IService<BrandCategory>
      * @param brandCategory 品牌品类中间
      * @return 结果
      */
-    public int insertBrandCategory(BrandCategory brandCategory);
+    int insertBrandCategory(BrandCategory brandCategory);
 
     /**
      * 修改品牌品类中间
@@ -44,7 +44,7 @@ public interface IBrandCategoryService extends IService<BrandCategory>
      * @param brandCategory 品牌品类中间
      * @return 结果
      */
-    public int updateBrandCategory(BrandCategory brandCategory);
+    int updateBrandCategory(BrandCategory brandCategory);
 
     /**
      * 批量删除品牌品类中间
@@ -52,7 +52,7 @@ public interface IBrandCategoryService extends IService<BrandCategory>
      * @param ids 需要删除的品牌品类中间主键集合
      * @return 结果
      */
-    public int deleteBrandCategoryByIds(Long[] ids);
+    int deleteBrandCategoryByIds(Long[] ids);
 
     /**
      * 删除品牌品类中间信息
@@ -60,5 +60,5 @@ public interface IBrandCategoryService extends IService<BrandCategory>
      * @param id 品牌品类中间主键
      * @return 结果
      */
-    public int deleteBrandCategoryById(Long id);
+    int deleteBrandCategoryById(Long id);
 }

muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/IBrandService.java

@@ -21,7 +21,7 @@ public interface IBrandService extends IService<Brand>
      * @param id 品牌主键
      * @return 品牌
      */
-    public Brand selectBrandById(Long id);
+    Brand selectBrandById(Long id);
 
     /**
      * 查询品牌列表
@@ -29,7 +29,7 @@ public interface IBrandService extends IService<Brand>
      * @param brand 品牌
      * @return 品牌集合
      */
-    public List<Brand> selectBrandList(Brand brand);
+    List<Brand> selectBrandList(Brand brand);
 
     /**
      * 新增品牌
@@ -37,7 +37,7 @@ public interface IBrandService extends IService<Brand>
      * @param brand 品牌
      * @return 结果
      */
-    public int insertBrand(Brand brand);
+    int insertBrand(Brand brand);
 
     /**
      * 修改品牌
@@ -45,7 +45,7 @@ public interface IBrandService extends IService<Brand>
      * @param brand 品牌
      * @return 结果
      */
-    public int updateBrand(Brand brand);
+    int updateBrand(Brand brand);
 
     /**
      * 批量删除品牌
@@ -53,7 +53,7 @@ public interface IBrandService extends IService<Brand>
      * @param ids 需要删除的品牌主键集合
      * @return 结果
      */
-    public int deleteBrandByIds(Long[] ids);
+    int deleteBrandByIds(Long[] ids);
 
     /**
      * 删除品牌信息
@@ -61,5 +61,5 @@ public interface IBrandService extends IService<Brand>
      * @param id 品牌主键
      * @return 结果
      */
-    public int deleteBrandById(Long id);
+    int deleteBrandById(Long id);
 }

muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/ICategoryAttributeGroupService.java

@@ -20,7 +20,7 @@ public interface ICategoryAttributeGroupService extends IService<CategoryAttribu
      * @param id 品类属性组中间主键
      * @return 品类属性组中间
      */
-    public CategoryAttributeGroup selectCategoryAttributeGroupById(Long id);
+    CategoryAttributeGroup selectCategoryAttributeGroupById(Long id);
 
     /**
      * 查询品类属性组中间列表
@@ -28,7 +28,7 @@ public interface ICategoryAttributeGroupService extends IService<CategoryAttribu
      * @param categoryAttributeGroup 品类属性组中间
      * @return 品类属性组中间集合
      */
-    public List<CategoryAttributeGroup> selectCategoryAttributeGroupList(CategoryAttributeGroup categoryAttributeGroup);
+    List<CategoryAttributeGroup> selectCategoryAttributeGroupList(CategoryAttributeGroup categoryAttributeGroup);
 
     /**
      * 新增品类属性组中间
@@ -36,7 +36,7 @@ public interface ICategoryAttributeGroupService extends IService<CategoryAttribu
      * @param categoryAttributeGroup 品类属性组中间
      * @return 结果
      */
-    public int insertCategoryAttributeGroup(CategoryAttributeGroup categoryAttributeGroup);
+    int insertCategoryAttributeGroup(CategoryAttributeGroup categoryAttributeGroup);
 
     /**
      * 修改品类属性组中间
@@ -44,7 +44,7 @@ public interface ICategoryAttributeGroupService extends IService<CategoryAttribu
      * @param categoryAttributeGroup 品类属性组中间
      * @return 结果
      */
-    public int updateCategoryAttributeGroup(CategoryAttributeGroup categoryAttributeGroup);
+    int updateCategoryAttributeGroup(CategoryAttributeGroup categoryAttributeGroup);
 
     /**
      * 批量删除品类属性组中间
@@ -52,7 +52,7 @@ public interface ICategoryAttributeGroupService extends IService<CategoryAttribu
      * @param ids 需要删除的品类属性组中间主键集合
      * @return 结果
      */
-    public int deleteCategoryAttributeGroupByIds(Long[] ids);
+    int deleteCategoryAttributeGroupByIds(Long[] ids);
 
     /**
      * 删除品类属性组中间信息
@@ -60,5 +60,5 @@ public interface ICategoryAttributeGroupService extends IService<CategoryAttribu
      * @param id 品类属性组中间主键
      * @return 结果
      */
-    public int deleteCategoryAttributeGroupById(Long id);
+    int deleteCategoryAttributeGroupById(Long id);
 }

muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/ICategoryAttributeService.java

@@ -19,7 +19,7 @@ public interface ICategoryAttributeService extends IService<CategoryAttribute>
      * @param id 品类属性中间主键
      * @return 品类属性中间
      */
-    public CategoryAttribute selectCategoryAttributeById(Long id);
+    CategoryAttribute selectCategoryAttributeById(Long id);
 
     /**
      * 查询品类属性中间列表
@@ -27,7 +27,7 @@ public interface ICategoryAttributeService extends IService<CategoryAttribute>
      * @param categoryAttribute 品类属性中间
      * @return 品类属性中间集合
      */
-    public List<CategoryAttribute> selectCategoryAttributeList(CategoryAttribute categoryAttribute);
+    List<CategoryAttribute> selectCategoryAttributeList(CategoryAttribute categoryAttribute);
 
     /**
      * 新增品类属性中间
@@ -35,7 +35,7 @@ public interface ICategoryAttributeService extends IService<CategoryAttribute>
      * @param categoryAttribute 品类属性中间
      * @return 结果
      */
-    public int insertCategoryAttribute(CategoryAttribute categoryAttribute);
+    int insertCategoryAttribute(CategoryAttribute categoryAttribute);
 
     /**
      * 修改品类属性中间
@@ -43,7 +43,7 @@ public interface ICategoryAttributeService extends IService<CategoryAttribute>
      * @param categoryAttribute 品类属性中间
      * @return 结果
      */
-    public int updateCategoryAttribute(CategoryAttribute categoryAttribute);
+    int updateCategoryAttribute(CategoryAttribute categoryAttribute);
 
     /**
      * 批量删除品类属性中间
@@ -51,7 +51,7 @@ public interface ICategoryAttributeService extends IService<CategoryAttribute>
      * @param ids 需要删除的品类属性中间主键集合
      * @return 结果
      */
-    public int deleteCategoryAttributeByIds(Long[] ids);
+    int deleteCategoryAttributeByIds(Long[] ids);
 
     /**
      * 删除品类属性中间信息
@@ -59,5 +59,5 @@ public interface ICategoryAttributeService extends IService<CategoryAttribute>
      * @param id 品类属性中间主键
      * @return 结果
      */
-    public int deleteCategoryAttributeById(Long id);
+    int deleteCategoryAttributeById(Long id);
 }

muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/ICategoryInfoService.java

@@ -5,6 +5,7 @@ import java.util.List;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.muyu.product.domain.Address;
 import com.muyu.product.domain.CategoryInfo;
+import com.muyu.product.domain.model.CategoryInfoSaveModel;
 
 /**
  * 品类信息Service接口
@@ -20,7 +21,7 @@ public interface ICategoryInfoService extends IService<CategoryInfo>
      * @param id 品类信息主键
      * @return 品类信息
      */
-    public CategoryInfo selectCategoryInfoById(Long id);
+    CategoryInfo selectCategoryInfoById(Long id);
 
     /**
      * 查询品类信息列表
@@ -28,7 +29,7 @@ public interface ICategoryInfoService extends IService<CategoryInfo>
      * @param categoryInfo 品类信息
      * @return 品类信息集合
      */
-    public List<CategoryInfo> selectCategoryInfoList(CategoryInfo categoryInfo);
+    List<CategoryInfo> selectCategoryInfoList(CategoryInfo categoryInfo);
 
     /**
      * 新增品类信息
@@ -36,7 +37,7 @@ public interface ICategoryInfoService extends IService<CategoryInfo>
      * @param categoryInfo 品类信息
      * @return 结果
      */
-    public int insertCategoryInfo(CategoryInfo categoryInfo);
+    int insertCategoryInfo(CategoryInfo categoryInfo);
 
     /**
      * 修改品类信息
@@ -44,7 +45,7 @@ public interface ICategoryInfoService extends IService<CategoryInfo>
      * @param categoryInfo 品类信息
      * @return 结果
      */
-    public int updateCategoryInfo(CategoryInfo categoryInfo);
+    int updateCategoryInfo(CategoryInfo categoryInfo);
 
     /**
      * 批量删除品类信息
@@ -52,7 +53,7 @@ public interface ICategoryInfoService extends IService<CategoryInfo>
      * @param ids 需要删除的品类信息主键集合
      * @return 结果
      */
-    public int deleteCategoryInfoByIds(Long[] ids);
+    int deleteCategoryInfoByIds(Long[] ids);
 
     /**
      * 删除品类信息信息
@@ -60,5 +61,7 @@ public interface ICategoryInfoService extends IService<CategoryInfo>
      * @param id 品类信息主键
      * @return 结果
      */
-    public int deleteCategoryInfoById(Long id);
+    int deleteCategoryInfoById(Long id);
+
+    boolean save(CategoryInfoSaveModel categoryInfoSaveModel);
 }

muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/IProductCategoryService.java

@@ -20,7 +20,7 @@ public interface IProductCategoryService extends IService<ProductCategory>
      * @param id 品类商品中间主键
      * @return 品类商品中间
      */
-    public ProductCategory selectProductCategoryById(Long id);
+    ProductCategory selectProductCategoryById(Long id);
 
     /**
      * 查询品类商品中间列表
@@ -28,7 +28,7 @@ public interface IProductCategoryService extends IService<ProductCategory>
      * @param productCategory 品类商品中间
      * @return 品类商品中间集合
      */
-    public List<ProductCategory> selectProductCategoryList(ProductCategory productCategory);
+    List<ProductCategory> selectProductCategoryList(ProductCategory productCategory);
 
     /**
      * 新增品类商品中间
@@ -36,7 +36,7 @@ public interface IProductCategoryService extends IService<ProductCategory>
      * @param productCategory 品类商品中间
      * @return 结果
      */
-    public int insertProductCategory(ProductCategory productCategory);
+    int insertProductCategory(ProductCategory productCategory);
 
     /**
      * 修改品类商品中间
@@ -44,7 +44,7 @@ public interface IProductCategoryService extends IService<ProductCategory>
      * @param productCategory 品类商品中间
      * @return 结果
      */
-    public int updateProductCategory(ProductCategory productCategory);
+    int updateProductCategory(ProductCategory productCategory);
 
     /**
      * 批量删除品类商品中间
@@ -52,7 +52,7 @@ public interface IProductCategoryService extends IService<ProductCategory>
      * @param ids 需要删除的品类商品中间主键集合
      * @return 结果
      */
-    public int deleteProductCategoryByIds(Long[] ids);
+    int deleteProductCategoryByIds(Long[] ids);
 
     /**
      * 删除品类商品中间信息
@@ -60,5 +60,5 @@ public interface IProductCategoryService extends IService<ProductCategory>
      * @param id 品类商品中间主键
      * @return 结果
      */
-    public int deleteProductCategoryById(Long id);
+    int deleteProductCategoryById(Long id);
 }

muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/IProductInfoService.java

@@ -20,7 +20,7 @@ public interface IProductInfoService extends IService<ProductInfo>
      * @param id 商品;主键
      * @return 商品;
      */
-    public ProductInfo selectProductInfoById(Long id);
+    ProductInfo selectProductInfoById(Long id);
 
     /**
      * 查询商品;列表
@@ -28,7 +28,7 @@ public interface IProductInfoService extends IService<ProductInfo>
      * @param productInfo 商品;
      * @return 商品;集合
      */
-    public List<ProductInfo> selectProductInfoList(ProductInfo productInfo);
+    List<ProductInfo> selectProductInfoList(ProductInfo productInfo);
 
     /**
      * 新增商品;
@@ -36,7 +36,7 @@ public interface IProductInfoService extends IService<ProductInfo>
      * @param productInfo 商品;
      * @return 结果
      */
-    public int insertProductInfo(ProductInfo productInfo);
+    int insertProductInfo(ProductInfo productInfo);
 
     /**
      * 修改商品;
@@ -44,7 +44,7 @@ public interface IProductInfoService extends IService<ProductInfo>
      * @param productInfo 商品;
      * @return 结果
      */
-    public int updateProductInfo(ProductInfo productInfo);
+    int updateProductInfo(ProductInfo productInfo);
 
     /**
      * 批量删除商品;
@@ -52,7 +52,7 @@ public interface IProductInfoService extends IService<ProductInfo>
      * @param ids 需要删除的商品;主键集合
      * @return 结果
      */
-    public int deleteProductInfoByIds(Long[] ids);
+    int deleteProductInfoByIds(Long[] ids);
 
     /**
      * 删除商品;信息
@@ -60,5 +60,5 @@ public interface IProductInfoService extends IService<ProductInfo>
      * @param id 商品;主键
      * @return 结果
      */
-    public int deleteProductInfoById(Long id);
+    int deleteProductInfoById(Long id);
 }

muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/IRuleProductService.java

@@ -20,7 +20,7 @@ public interface IRuleProductService extends IService<RuleProduct>
      * @param id 规格商品中间主键
      * @return 规格商品中间
      */
-    public RuleProduct selectRuleProductById(Long id);
+    RuleProduct selectRuleProductById(Long id);
 
     /**
      * 查询规格商品中间列表
@@ -28,7 +28,7 @@ public interface IRuleProductService extends IService<RuleProduct>
      * @param ruleProduct 规格商品中间
      * @return 规格商品中间集合
      */
-    public List<RuleProduct> selectRuleProductList(RuleProduct ruleProduct);
+    List<RuleProduct> selectRuleProductList(RuleProduct ruleProduct);
 
     /**
      * 新增规格商品中间
@@ -36,7 +36,7 @@ public interface IRuleProductService extends IService<RuleProduct>
      * @param ruleProduct 规格商品中间
      * @return 结果
      */
-    public int insertRuleProduct(RuleProduct ruleProduct);
+    int insertRuleProduct(RuleProduct ruleProduct);
 
     /**
      * 修改规格商品中间
@@ -44,7 +44,7 @@ public interface IRuleProductService extends IService<RuleProduct>
      * @param ruleProduct 规格商品中间
      * @return 结果
      */
-    public int updateRuleProduct(RuleProduct ruleProduct);
+    int updateRuleProduct(RuleProduct ruleProduct);
 
     /**
      * 批量删除规格商品中间
@@ -52,7 +52,7 @@ public interface IRuleProductService extends IService<RuleProduct>
      * @param ids 需要删除的规格商品中间主键集合
      * @return 结果
      */
-    public int deleteRuleProductByIds(Long[] ids);
+    int deleteRuleProductByIds(Long[] ids);
 
     /**
      * 删除规格商品中间信息
@@ -60,5 +60,5 @@ public interface IRuleProductService extends IService<RuleProduct>
      * @param id 规格商品中间主键
      * @return 结果
      */
-    public int deleteRuleProductById(Long id);
+    int deleteRuleProductById(Long id);
 }

muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/IRuleService.java

@@ -20,7 +20,7 @@ public interface IRuleService extends IService<Rule>
      * @param id 规格主键
      * @return 规格
      */
-    public Rule selectRuleById(Long id);
+    Rule selectRuleById(Long id);
 
     /**
      * 查询规格列表
@@ -28,7 +28,7 @@ public interface IRuleService extends IService<Rule>
      * @param rule 规格
      * @return 规格集合
      */
-    public List<Rule> selectRuleList(Rule rule);
+    List<Rule> selectRuleList(Rule rule);
 
     /**
      * 新增规格
@@ -36,7 +36,7 @@ public interface IRuleService extends IService<Rule>
      * @param rule 规格
      * @return 结果
      */
-    public int insertRule(Rule rule);
+    int insertRule(Rule rule);
 
     /**
      * 修改规格
@@ -44,7 +44,7 @@ public interface IRuleService extends IService<Rule>
      * @param rule 规格
      * @return 结果
      */
-    public int updateRule(Rule rule);
+    int updateRule(Rule rule);
 
     /**
      * 批量删除规格
@@ -52,7 +52,7 @@ public interface IRuleService extends IService<Rule>
      * @param ids 需要删除的规格主键集合
      * @return 结果
      */
-    public int deleteRuleByIds(Long[] ids);
+    int deleteRuleByIds(Long[] ids);
 
     /**
      * 删除规格信息
@@ -60,5 +60,5 @@ public interface IRuleService extends IService<Rule>
      * @param id 规格主键
      * @return 结果
      */
-    public int deleteRuleById(Long id);
+    int deleteRuleById(Long id);
 }

muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/CategoryInfoServiceImpl.java

@@ -4,6 +4,10 @@ import java.util.List;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.muyu.common.core.utils.DateUtils;
+import com.muyu.product.domain.CategoryAttribute;
+import com.muyu.product.domain.CategoryAttributeGroup;
+import com.muyu.product.domain.model.CategoryInfoSaveModel;
+import com.muyu.product.service.ICategoryAttributeService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -23,9 +27,11 @@ public class CategoryInfoServiceImpl extends ServiceImpl<CategoryInfoMapper,Cate
 {
     @Autowired
     private CategoryInfoMapper categoryInfoMapper;
+    @Autowired
+    private ICategoryAttributeService categoryAttributeService;
+    @Autowired
+    private CategoryAttributeGroupServiceImpl categoryAttributeGroupService;
 
-//    @Autowired
-//    private ICategoryInfoService categoryInfoService;
     /**
      * 查询品类信息
      *
@@ -99,4 +105,31 @@ public class CategoryInfoServiceImpl extends ServiceImpl<CategoryInfoMapper,Cate
     {
         return categoryInfoMapper.deleteCategoryInfoById(id);
     }
+
+    @Override
+    public boolean save(CategoryInfoSaveModel categoryInfoSaveModel) {
+        //通过品类信息构建体构建品类对象
+        CategoryInfo categoryInfo = CategoryInfo.saveCategoryBuilder(categoryInfoSaveModel);
+        //调用重载方法
+        boolean save = this.save(categoryInfo);
+        //获取当前品类主键
+        Long id = categoryInfo.getId();
+        //获取已选属性主键集
+        List<Long> checkedAttributeIds = categoryInfoSaveModel.getCheckedAttributeIds();
+        //判断已选属性集是否为空
+        if (checkedAttributeIds != null && !checkedAttributeIds.isEmpty()){
+            categoryAttributeService.saveBatch(
+                    checkedAttributeIds.stream()
+                            .map(attributeId -> CategoryAttribute.categoryBuilder(id,attributeId)).toList()
+            );
+        }
+        List<Long> attributeGroupIds = categoryInfoSaveModel.getAttributeGroupIds();
+        if (attributeGroupIds != null && !attributeGroupIds.isEmpty()){
+            categoryAttributeGroupService.saveBatch(
+                    attributeGroupIds.stream().
+                            map(groupId -> CategoryAttributeGroup.saveBuilder(id,groupId)).toList()
+            );
+        }
+        return save;
+    }
 }

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

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

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