Merge remote-tracking branch 'origin/dev' into dev

pom.xml

@@ -69,6 +69,8 @@
         <easy.captcha.version>1.6.2</easy.captcha.version>
         <paho.mqttv5.version>1.2.5</paho.mqttv5.version>
         <liteflow.version>2.11.2</liteflow.version>
+
+        <zxing.version>3.2.1</zxing.version>
     </properties>
 
     <dependencies>
@@ -501,6 +503,17 @@
             <scope>runtime</scope>
         </dependency>
 
+        <!-- 引入用于生成二维码的zxing-->
+        <dependency>
+            <groupId>com.google.zxing</groupId>
+            <artifactId>core</artifactId>
+            <version>${zxing.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.google.zxing</groupId>
+            <artifactId>javase</artifactId>
+            <version>${zxing.version}</version>
+        </dependency>
 
     </dependencies>
 

src/main/java/com/xjrsoft/common/advice/TransResponseBodyAdvice.java

@@ -5,10 +5,8 @@ import cn.hutool.core.lang.TypeReference;
 import cn.hutool.core.util.ClassUtil;
 import cn.hutool.core.util.ReflectUtil;
 import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.toolkit.ArrayUtils;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringPool;
-import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.xjrsoft.common.annotation.Trans;
 import com.xjrsoft.common.constant.GlobalConstant;
 import com.xjrsoft.common.enums.TransType;
@@ -25,11 +23,9 @@ import com.xjrsoft.module.system.service.IAreaService;
 import lombok.AllArgsConstructor;
 import lombok.NonNull;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.collections.ListUtils;
 import org.apache.commons.collections.MapUtils;
 import org.springframework.core.MethodParameter;
 import org.springframework.http.MediaType;
-import org.springframework.http.converter.HttpMessageConverter;
 import org.springframework.http.server.ServerHttpRequest;
 import org.springframework.http.server.ServerHttpResponse;
 import org.springframework.web.bind.annotation.RestControllerAdvice;
@@ -37,7 +33,11 @@ import org.springframework.web.servlet.mvc.method.annotation.ResponseBodyAdvice;
 import org.ssssssss.magicapi.modules.db.model.PageResult;
 
 import java.lang.reflect.Field;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 /**

src/main/java/com/xjrsoft/common/advice/WorkflowResponseBodyAdvice.java

@@ -3,7 +3,11 @@ package com.xjrsoft.common.advice;
 import cn.dev33.satoken.stp.StpUtil;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.convert.Convert;
-import cn.hutool.core.util.*;
+import cn.hutool.core.util.CharsetUtil;
+import cn.hutool.core.util.ClassUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.ReflectUtil;
+import cn.hutool.core.util.StrUtil;
 import cn.hutool.db.Entity;
 import cn.hutool.extra.servlet.ServletUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -24,7 +28,13 @@ import com.xjrsoft.module.workflow.model.WorkflowListResult;
 import com.xjrsoft.module.workflow.service.IWorkflowDraftService;
 import com.xjrsoft.module.workflow.service.IWorkflowFormRelationService;
 import com.xjrsoft.module.workflow.service.IWorkflowSchemaService;
-import javassist.*;
+import javassist.CannotCompileException;
+import javassist.ClassPool;
+import javassist.CtClass;
+import javassist.CtField;
+import javassist.CtMethod;
+import javassist.LoaderClassPath;
+import javassist.NotFoundException;
 import lombok.AllArgsConstructor;
 import lombok.NonNull;
 import lombok.extern.slf4j.Slf4j;
@@ -42,7 +52,12 @@ import org.springframework.web.servlet.mvc.method.annotation.ResponseBodyAdvice;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
 import java.util.stream.Collectors;
 
 /**

src/main/java/com/xjrsoft/common/annotation/DataPermission.java

@@ -1,6 +1,10 @@
 package com.xjrsoft.common.annotation;
 
-import java.lang.annotation.*;
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 
 /**
  * @Author: tzx

src/main/java/com/xjrsoft/common/annotation/Limit.java

@@ -1,6 +1,11 @@
 package com.xjrsoft.common.annotation;
 
-import java.lang.annotation.*;
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 
 /**
  * @Author: tzx

src/main/java/com/xjrsoft/common/annotation/Trans.java

@@ -3,7 +3,11 @@ package com.xjrsoft.common.annotation;
 import com.baomidou.mybatisplus.core.toolkit.StringPool;
 import com.xjrsoft.common.enums.TransType;
 
-import java.lang.annotation.*;
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 
 /**
  * @Author: tzx

src/main/java/com/xjrsoft/common/constant/GlobalConstant.java

@@ -2,8 +2,6 @@ package com.xjrsoft.common.constant;
 
 import cn.hutool.core.collection.ListUtil;
 
-import javax.swing.plaf.ListUI;
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 

src/main/java/com/xjrsoft/common/enums/AttendanceNodeEnum.java

@@ -0,0 +1,34 @@
+package com.xjrsoft.common.enums;
+
+/**
+ * @description：考勤节点
+ * @author： phoenix
+ * @create： 2023/12/19 9:42
+ * @Version 1.0
+ */
+public enum AttendanceNodeEnum {
+    /*
+     *  上班打卡
+     * */
+    STARTWORK("start_work", "上班打卡"),
+    /*
+     *  下班打卡
+     * */
+    ENDWORK("end_work", "下班打卡");
+
+    final String code;
+    final String value;
+
+    public String getCode() {
+        return this.code;
+    }
+
+    public String getValue() {
+        return this.value;
+    }
+
+    AttendanceNodeEnum(final String code, final String message) {
+        this.code = code;
+        this.value = message;
+    }
+}

src/main/java/com/xjrsoft/common/enums/DbFieldsType.java

@@ -1,7 +1,5 @@
 package com.xjrsoft.common.enums;
 
-import com.baomidou.mybatisplus.annotation.DbType;
-
 /**
  * @Author: tzx
  * @Date: 2022/5/5 19:07

src/main/java/com/xjrsoft/common/enums/LeaveReasonEnum.java

@@ -0,0 +1,40 @@
+package com.xjrsoft.common.enums;
+
+/**
+ * @description： 班主任请假事项leave_reason
+ * @author： phoenix
+ * @create： 2023/12/21 11:27
+ * @Version 1.0
+ */
+public enum LeaveReasonEnum {
+    /**
+     * 周五学生放假
+     * */
+    LeaveReason1("leave_reason1", "周五学生放假"),
+
+    /**
+     * 课间操
+     * */
+    LeaveReason2("leave_reason2", "课间操"),
+
+    /**
+     * 周末返校（周末开会）
+     * */
+    LeaveReason3("leave_reason3", "周末返校（周末开会）");
+
+    final String code;
+    final String value;
+
+    public String getCode() {
+        return this.code;
+    }
+
+    public String getValue() {
+        return this.value;
+    }
+
+    LeaveReasonEnum(final String code, final String message) {
+        this.code = code;
+        this.value = message;
+    }
+}

src/main/java/com/xjrsoft/common/exception/GlobalExceptionHandler.java

@@ -13,7 +13,6 @@ import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestControllerAdvice;
 
-import javax.naming.NoPermissionException;
 import java.util.List;
 
 /**

src/main/java/com/xjrsoft/common/handler/ClobTypeHandler.java

@@ -5,7 +5,11 @@ import org.apache.ibatis.type.JdbcType;
 import org.apache.ibatis.type.MappedTypes;
 import org.springframework.stereotype.Component;
 
-import java.sql.*;
+import java.sql.CallableStatement;
+import java.sql.Clob;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
 
 @Component
 @MappedTypes(Clob.class)

src/main/java/com/xjrsoft/common/handler/FormContentStyleStrategy.java

@@ -1,14 +1,11 @@
 package com.xjrsoft.common.handler;
 
-import com.alibaba.excel.annotation.write.style.ContentStyle;
 import com.alibaba.excel.metadata.Head;
 import com.alibaba.excel.metadata.data.DataFormatData;
 import com.alibaba.excel.write.metadata.style.WriteCellStyle;
 import com.alibaba.excel.write.style.AbstractVerticalCellStyleStrategy;
 import lombok.Data;
 
-import java.util.List;
-
 @Data
 public class FormContentStyleStrategy extends AbstractVerticalCellStyleStrategy {
 

src/main/java/com/xjrsoft/common/handler/MyBlobTypeHandler.java

@@ -5,7 +5,11 @@ import org.apache.ibatis.type.JdbcType;
 import org.apache.ibatis.type.MappedTypes;
 import org.springframework.stereotype.Component;
 
-import java.sql.*;
+import java.sql.Blob;
+import java.sql.CallableStatement;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
 
 @MappedTypes(Blob.class)
 @Component

src/main/java/com/xjrsoft/common/handler/MyDataPermissionHandler.java

@@ -2,14 +2,7 @@ package com.xjrsoft.common.handler;
 
 import com.baomidou.mybatisplus.extension.plugins.handler.DataPermissionHandler;
 import com.xjrsoft.common.annotation.DataPermission;
-import com.xjrsoft.module.authority.entity.DataAuth;
-import com.xjrsoft.module.authority.service.IDataAuthService;
 import net.sf.jsqlparser.expression.Expression;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Lazy;
-import org.springframework.stereotype.Component;
-
-import java.lang.reflect.Method;
 
 /**
  * @Description 自定义数据权限处理

src/main/java/com/xjrsoft/common/handler/MyLocalDateTimeTypeHandler.java

@@ -4,7 +4,11 @@ import oracle.sql.TIMESTAMP;
 import org.apache.ibatis.type.JdbcType;
 import org.apache.ibatis.type.LocalDateTimeTypeHandler;
 
-import java.sql.*;
+import java.sql.CallableStatement;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Timestamp;
 import java.time.LocalDateTime;
 
 public class MyLocalDateTimeTypeHandler extends LocalDateTimeTypeHandler {

src/main/java/com/xjrsoft/common/interceptor/DataScopeInnerInterceptor.java

@@ -1,48 +1,31 @@
 package com.xjrsoft.common.interceptor;
 
-import cn.dev33.satoken.session.SaSession;
 import cn.dev33.satoken.stp.StpUtil;
-import cn.hutool.core.collection.ListUtil;
-import cn.hutool.core.lang.TypeReference;
-import cn.hutool.core.util.EnumUtil;
 import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.extra.spring.SpringUtil;
 import com.baomidou.mybatisplus.core.plugins.InterceptorIgnoreHelper;
 import com.baomidou.mybatisplus.core.toolkit.PluginUtils;
 import com.baomidou.mybatisplus.extension.parser.JsqlParserSupport;
 import com.baomidou.mybatisplus.extension.plugins.inner.InnerInterceptor;
-import com.xjrsoft.common.constant.GlobalConstant;
-import com.xjrsoft.common.enums.DataAuthMethodEnum;
-import com.xjrsoft.common.enums.DataAuthScopeEnum;
-import com.xjrsoft.common.enums.DataAuthTypeEnum;
 import com.xjrsoft.common.utils.RedisUtil;
-import com.xjrsoft.config.OSSConfig;
-import com.xjrsoft.module.authority.entity.DataAuth;
-import com.xjrsoft.module.authority.entity.DataAuthRelation;
-import com.xjrsoft.module.authority.entity.DataAuthTableRelation;
 import com.xjrsoft.module.authority.utils.AuthorityUtil;
-import com.xjrsoft.module.organization.entity.Department;
-import com.xjrsoft.module.organization.entity.Post;
-import com.xjrsoft.module.organization.entity.User;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.Setter;
-import lombok.SneakyThrows;
 import net.sf.jsqlparser.expression.Expression;
-import net.sf.jsqlparser.expression.Parenthesis;
 import net.sf.jsqlparser.expression.operators.conditional.AndExpression;
-import net.sf.jsqlparser.expression.operators.conditional.OrExpression;
 import net.sf.jsqlparser.schema.Table;
-import net.sf.jsqlparser.statement.select.*;
+import net.sf.jsqlparser.statement.select.FromItem;
+import net.sf.jsqlparser.statement.select.PlainSelect;
+import net.sf.jsqlparser.statement.select.Select;
+import net.sf.jsqlparser.statement.select.SelectBody;
+import net.sf.jsqlparser.statement.select.SetOperationList;
 import org.apache.ibatis.executor.Executor;
 import org.apache.ibatis.mapping.BoundSql;
 import org.apache.ibatis.mapping.MappedStatement;
 import org.apache.ibatis.session.ResultHandler;
 import org.apache.ibatis.session.RowBounds;
 
-import java.util.ArrayList;
 import java.util.List;
-import java.util.stream.Collectors;
 
 
 /**

src/main/java/com/xjrsoft/common/interceptor/MagicApiRequestInterceptor.java

@@ -1,26 +1,18 @@
 package com.xjrsoft.common.interceptor;
 
-import cn.dev33.satoken.exception.NotPermissionException;
 import cn.dev33.satoken.session.SaSession;
 import cn.dev33.satoken.stp.StpUtil;
 import cn.dev33.satoken.strategy.SaStrategy;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.xjrsoft.common.constant.GlobalConstant;
 import com.xjrsoft.common.enums.ResponseCode;
 import com.xjrsoft.common.model.result.R;
-import com.xjrsoft.module.organization.entity.UserRoleRelation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 import org.ssssssss.magicapi.core.context.RequestEntity;
 import org.ssssssss.magicapi.core.interceptor.RequestInterceptor;
-import org.ssssssss.magicapi.core.model.ApiInfo;
-import org.ssssssss.script.MagicScriptContext;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * magic-api 接口鉴权

src/main/java/com/xjrsoft/common/interceptor/MagicApiWebLoginInterceptor.java

@@ -5,16 +5,11 @@ import cn.hutool.core.net.url.UrlBuilder;
 import cn.hutool.core.util.CharsetUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.toolkit.StringPool;
-import com.xjrsoft.common.enums.ResponseCode;
-import com.xjrsoft.common.exception.MyException;
-import com.xjrsoft.common.model.result.R;
 import org.springframework.stereotype.Component;
 import org.springframework.web.servlet.HandlerInterceptor;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.util.Enumeration;
 
 /**
  * magicapi web页面 使用系统的登录

src/main/java/com/xjrsoft/common/model/datasource/MyTableInfo.java

@@ -2,8 +2,6 @@ package com.xjrsoft.common.model.datasource;
 
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * 表信息
  * @Author: tzx

src/main/java/com/xjrsoft/common/model/result/RT.java

@@ -1,7 +1,6 @@
 package com.xjrsoft.common.model.result;
 
 import com.xjrsoft.common.enums.ResponseCode;
-import org.apache.poi.ss.formula.functions.T;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;

src/main/java/com/xjrsoft/common/mqtt/EmqClient.java

@@ -2,7 +2,6 @@ package com.xjrsoft.common.mqtt;
 
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.extra.spring.SpringUtil;
-import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
 import com.xjrsoft.common.constant.GlobalConstant;
 import com.xjrsoft.common.utils.RedisUtil;
@@ -16,13 +15,10 @@ import org.eclipse.paho.mqttv5.common.MqttException;
 import org.eclipse.paho.mqttv5.common.MqttMessage;
 import org.eclipse.paho.mqttv5.common.MqttSubscription;
 import org.eclipse.paho.mqttv5.common.packet.MqttProperties;
-import org.eclipse.paho.mqttv5.common.packet.UserProperty;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.PostConstruct;
-import java.util.ArrayList;
-import java.util.List;
 import java.util.Map;
 
 /**

src/main/java/com/xjrsoft/common/mqtt/MqttSubscribe.java

@@ -3,7 +3,11 @@ package com.xjrsoft.common.mqtt;
 import org.springframework.core.annotation.AliasFor;
 import org.springframework.stereotype.Component;
 
-import java.lang.annotation.*;
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 
 @Target(ElementType.TYPE)
 @Retention(RetentionPolicy.RUNTIME)

src/main/java/com/xjrsoft/common/page/ListInput.java

@@ -8,9 +8,6 @@ import lombok.Data;
 import lombok.ToString;
 import org.hibernate.validator.constraints.Length;
 
-import javax.validation.constraints.Max;
-import javax.validation.constraints.Min;
-
 /**
  * @Author: tzx
  * @Date: 2022/4/28 15:33

src/main/java/com/xjrsoft/common/page/PageInput.java

@@ -1,6 +1,5 @@
 package com.xjrsoft.common.page;
 
-import cn.hutool.core.util.StrUtil;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -9,7 +8,6 @@ import org.hibernate.validator.constraints.Length;
 
 import javax.validation.constraints.Max;
 import javax.validation.constraints.Min;
-import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
 
 /**

src/main/java/com/xjrsoft/common/page/PageOutput.java

@@ -1,7 +1,5 @@
 package com.xjrsoft.common.page;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 
 import java.io.Serializable;

src/main/java/com/xjrsoft/common/runner/DataAuthRunner.java

@@ -11,10 +11,6 @@ import com.xjrsoft.module.authority.service.IDataAuthConfigService;
 import com.xjrsoft.module.authority.service.IDataAuthRelationService;
 import com.xjrsoft.module.authority.service.IDataAuthService;
 import com.xjrsoft.module.authority.service.IDataAuthTableRelationService;
-import com.xjrsoft.module.system.entity.DictionaryDetail;
-import com.xjrsoft.module.system.entity.DictionaryItem;
-import com.xjrsoft.module.system.service.IDictionarydetailService;
-import com.xjrsoft.module.system.service.IDictionaryitemService;
 import com.xjrsoft.module.workflow.entity.WorkflowSchema;
 import com.xjrsoft.module.workflow.model.WorkflowSchemaConfig;
 import com.xjrsoft.module.workflow.service.IWorkflowSchemaService;

src/main/java/com/xjrsoft/common/runner/OrganizationCacheRunner.java

@@ -2,8 +2,20 @@ package com.xjrsoft.common.runner;
 
 import com.xjrsoft.common.constant.GlobalConstant;
 import com.xjrsoft.common.utils.RedisUtil;
-import com.xjrsoft.module.organization.entity.*;
-import com.xjrsoft.module.organization.service.*;
+import com.xjrsoft.module.organization.entity.Department;
+import com.xjrsoft.module.organization.entity.Post;
+import com.xjrsoft.module.organization.entity.Role;
+import com.xjrsoft.module.organization.entity.User;
+import com.xjrsoft.module.organization.entity.UserDeptRelation;
+import com.xjrsoft.module.organization.entity.UserPostRelation;
+import com.xjrsoft.module.organization.entity.UserRoleRelation;
+import com.xjrsoft.module.organization.service.IDepartmentService;
+import com.xjrsoft.module.organization.service.IPostService;
+import com.xjrsoft.module.organization.service.IRoleService;
+import com.xjrsoft.module.organization.service.IUserDeptRelationService;
+import com.xjrsoft.module.organization.service.IUserPostRelationService;
+import com.xjrsoft.module.organization.service.IUserRoleRelationService;
+import com.xjrsoft.module.organization.service.IUserService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.boot.CommandLineRunner;

src/main/java/com/xjrsoft/common/runner/XjrSqlConnRunner.java

@@ -5,7 +5,6 @@ import cn.hutool.db.Page;
 import cn.hutool.db.PageResult;
 import cn.hutool.db.SqlConnRunner;
 import cn.hutool.db.dialect.Dialect;
-import cn.hutool.db.handler.PageResultHandler;
 import cn.hutool.db.sql.SqlBuilder;
 import com.xjrsoft.common.handler.XjrPageResultHandler;
 

src/main/java/com/xjrsoft/common/sms/SmsCtcc.java

@@ -5,12 +5,10 @@ import cn.hutool.extra.spring.SpringUtil;
 import cn.hutool.http.HttpUtil;
 import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
-import com.baomidou.mybatisplus.core.toolkit.StringPool;
 import com.xjrsoft.common.constant.GlobalConstant;
 import com.xjrsoft.common.exception.MyException;
 import com.xjrsoft.common.utils.RedisUtil;
 import com.xjrsoft.config.CtccSmsConfig;
-import com.xjrsoft.config.MqttConfig;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 

src/main/java/com/xjrsoft/common/sms/SmsSender.java

@@ -3,10 +3,8 @@ package com.xjrsoft.common.sms;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.extra.spring.SpringUtil;
 import com.xjrsoft.common.enums.SmsType;
-import com.xjrsoft.config.GlobalConfig;
 import com.xjrsoft.config.XjrSmsConfig;
 import lombok.AllArgsConstructor;
-import lombok.Data;
 import org.dromara.sms4j.aliyun.config.AlibabaConfig;
 import org.dromara.sms4j.api.entity.SmsResponse;
 import org.dromara.sms4j.core.config.SupplierFactory;

src/main/java/com/xjrsoft/common/ureport/DocumentUreportServlet.java

@@ -1,6 +1,5 @@
 package com.xjrsoft.common.ureport;
 
-import cn.dev33.satoken.basic.SaBasicUtil;
 import cn.dev33.satoken.stp.StpUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
@@ -10,7 +9,6 @@ import com.bstek.ureport.console.UReportServlet;
 import com.xjrsoft.common.constant.GlobalConstant;
 import com.xjrsoft.common.exception.MyException;
 import lombok.extern.slf4j.Slf4j;
-import org.ssssssss.magicapi.modules.db.model.PageResult;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;

src/main/java/com/xjrsoft/common/utils/DateUtils.java

@@ -5,6 +5,7 @@ import org.joda.time.DateTime;
 import org.joda.time.LocalDate;
 import org.joda.time.format.DateTimeFormat;
 import org.joda.time.format.DateTimeFormatter;
+
 import java.text.SimpleDateFormat;
 import java.util.Date;
 /**

src/main/java/com/xjrsoft/common/utils/DingtalkUtil.java

@@ -1,21 +1,11 @@
 package com.xjrsoft.common.utils;
 
 
-import com.aliyun.dingtalkcontact_1_0.Client;
-import com.aliyun.dingtalkcontact_1_0.models.GetUserResponse;
 import com.aliyun.dingtalkoauth2_1_0.models.GetUserTokenRequest;
 import com.aliyun.dingtalkoauth2_1_0.models.GetUserTokenResponse;
-import com.dingtalk.api.DefaultDingTalkClient;
-import com.dingtalk.api.DingTalkClient;
-import com.dingtalk.api.request.OapiGettokenRequest;
-import com.dingtalk.api.response.OapiGettokenResponse;
 import lombok.SneakyThrows;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
-import java.util.ArrayList;
-import java.util.List;
-
 @Component
 public class DingtalkUtil {
 

src/main/java/com/xjrsoft/common/utils/ImageUtil.java

@@ -4,7 +4,13 @@ import javax.imageio.ImageIO;
 import javax.imageio.stream.FileImageOutputStream;
 import java.awt.*;
 import java.awt.image.BufferedImage;
-import java.io.*;
+import java.io.BufferedInputStream;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 import java.util.Base64;

src/main/java/com/xjrsoft/common/utils/JdbcToJavaUtil.java

@@ -3,13 +3,7 @@ package com.xjrsoft.common.utils;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.db.meta.Column;
 import cn.hutool.db.meta.JdbcType;
-import cn.hutool.db.meta.MetaUtil;
 import org.apache.commons.lang3.ObjectUtils;
-import org.apache.commons.lang3.StringUtils;
-
-import java.sql.JDBCType;
-import java.sql.Timestamp;
-import java.util.Date;
 
 /**
  * @Author: tzx

src/main/java/com/xjrsoft/common/utils/LocalDateTimeUtil.java

@@ -6,7 +6,11 @@ import com.baomidou.mybatisplus.core.toolkit.StringPool;
 import oracle.sql.INTERVALDS;
 import org.apache.commons.lang3.StringUtils;
 
-import java.time.*;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.Year;
+import java.time.YearMonth;
 import java.time.format.DateTimeFormatter;
 
 public final class LocalDateTimeUtil {

src/main/java/com/xjrsoft/common/utils/QrCodeUtil.java

@@ -0,0 +1,62 @@
+package com.xjrsoft.common.utils;
+
+import com.google.zxing.BarcodeFormat;
+import com.google.zxing.EncodeHintType;
+import com.google.zxing.MultiFormatWriter;
+import com.google.zxing.client.j2se.MatrixToImageWriter;
+import com.google.zxing.common.BitMatrix;
+
+import javax.imageio.ImageIO;
+import java.awt.image.BufferedImage;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.nio.charset.StandardCharsets;
+import java.util.Base64;
+import java.util.HashMap;
+
+public class QrCodeUtil {
+
+	private static ByteArrayInputStream create(String url, int width, int height, int margin) throws Exception{
+        HashMap<EncodeHintType, Object> hints = new HashMap<>();
+        hints.put(EncodeHintType.CHARACTER_SET, "utf-8");
+		hints.put(EncodeHintType.MARGIN, margin);
+
+        ByteArrayOutputStream stream = new ByteArrayOutputStream();
+        
+        BitMatrix bitMatrix = new MultiFormatWriter().encode(url, BarcodeFormat.QR_CODE, width, height, hints);
+        MatrixToImageWriter.writeToStream(bitMatrix, "png", stream);
+
+		ByteArrayInputStream input = new ByteArrayInputStream(stream.toByteArray());
+        return input;
+	}
+
+	/**
+	 * @param url 链接地址
+	 * @param width 二维码的宽度
+	 * @param height 二维码的高度
+	 * @param margin 边距，只能是整数
+	 * @return 返回png格式的BufferedImage
+	 * @throws Exception
+	 */
+	public static BufferedImage createBufferedImage(String url, int width, int height, int margin) throws Exception{
+		ByteArrayInputStream input = create(url, width, height, margin);
+		return ImageIO.read(input);
+	}
+
+	/**
+	 * @param url 链接地址
+	 * @param width 二维码的宽度
+	 * @param height 二维码的高度
+	 * @param margin 边距，只能是整数
+	 * @return 返回png格式的Base64
+	 * @throws Exception
+	 */
+	public static String createBase64(String url, int width, int height, int margin) throws Exception{
+		ByteArrayInputStream input = create(url, width, height, margin);
+		byte[] bytes = new byte[1024];
+		input.read(bytes);
+		Base64.Encoder encoder = Base64.getEncoder();
+		String QRCodeBase64 = encoder.encodeToString(bytes);
+		return QRCodeBase64;
+	}
+}

src/main/java/com/xjrsoft/common/utils/RSAUtil.java

@@ -5,10 +5,18 @@ import org.springframework.core.io.ClassPathResource;
 import org.springframework.util.ResourceUtils;
 
 import javax.crypto.Cipher;
-import java.io.*;
+import java.io.BufferedWriter;
+import java.io.ByteArrayOutputStream;
+import java.io.FileWriter;
+import java.io.InputStream;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.security.*;
+import java.security.KeyFactory;
+import java.security.KeyPair;
+import java.security.KeyPairGenerator;
+import java.security.PrivateKey;
+import java.security.PublicKey;
+import java.security.Signature;
 import java.security.spec.PKCS8EncodedKeySpec;
 import java.security.spec.X509EncodedKeySpec;
 import java.util.Base64;

src/main/java/com/xjrsoft/common/utils/RedisUtil.java

@@ -5,10 +5,14 @@ import cn.hutool.json.JSONUtil;
 import com.google.gson.Gson;
 import com.xjrsoft.common.exception.MyException;
 import lombok.AllArgsConstructor;
-import org.springframework.data.redis.core.*;
+import org.springframework.data.redis.core.HashOperations;
+import org.springframework.data.redis.core.ListOperations;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.core.SetOperations;
+import org.springframework.data.redis.core.ValueOperations;
+import org.springframework.data.redis.core.ZSetOperations;
 import org.springframework.stereotype.Component;
 
-import java.util.Objects;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 import java.util.regex.Pattern;

src/main/java/com/xjrsoft/common/utils/WeChatUtil.java

@@ -7,7 +7,6 @@ import cn.hutool.http.HttpUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.xjrsoft.common.enums.WeChatType;
-import com.xjrsoft.common.exception.MyException;
 import com.xjrsoft.module.organization.dto.WeChatDepartDto;
 import com.xjrsoft.module.organization.dto.WeChatUserDto;
 import com.xjrsoft.module.system.vo.WeChatUserInfo;
@@ -15,8 +14,13 @@ import lombok.Data;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
+import java.io.UnsupportedEncodingException;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.util.Formatter;
 import java.util.HashMap;
 import java.util.List;
+import java.util.UUID;
 
 @Component
 @Data
@@ -181,4 +185,61 @@ public class WeChatUtil {
         System.out.printf(result);
         return true;
     }
+
+    public String getTicket(String type) {
+        String token = this.getToken(WeChatType.WEWEB);
+        HashMap<String, Object> paramMap = new HashMap<>();
+        paramMap.put("access_token", token);
+        paramMap.put("type", type);
+        String result = HttpUtil.get("https://api.weixin.qq.com/cgi-bin/ticket/getticket", paramMap);
+        JSONObject jsonObject = JSONObject.parseObject(result);
+        if (jsonObject.containsKey("ticket")) {
+            //throw new MyException(result);
+            return jsonObject.get("ticket").toString();
+        } else {
+            return "";
+        }
+    }
+
+    public HashMap<String, Object> SdkSign(String url,String type) throws Exception {
+        String nonceStr = UUID.randomUUID().toString();
+        String timestamp = Long.toString(System.currentTimeMillis() / 1000);
+        String signature = "";
+        String jsapiTicket = getTicket(type);
+
+        String string1 = "jsapi_ticket=" + jsapiTicket +
+                "&noncestr=" + nonceStr +
+                "&timestamp=" + timestamp +
+                "&url=" + url;
+        try {
+            MessageDigest crypt = MessageDigest.getInstance("SHA-1");
+            crypt.reset();
+            crypt.update(string1.getBytes("UTF-8"));
+            signature = byteToHex(crypt.digest());
+
+            HashMap<String, Object> resultMap = new HashMap<>();
+            resultMap.put("url",url);
+//            resultMap.put("jsapi_ticket",jsapiTicket);
+            resultMap.put("nonceStr",nonceStr);
+            resultMap.put("timestamp",timestamp);
+            resultMap.put("signature",signature);
+
+            return  resultMap;
+        } catch (NoSuchAlgorithmException e) {
+            e.printStackTrace();
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    private String byteToHex(final byte[] hash) {
+        Formatter formatter = new Formatter();
+        for (byte b : hash) {
+            formatter.format("%02x", b);
+        }
+        String result = formatter.toString();
+        formatter.close();
+        return result;
+    }
 }

src/main/java/com/xjrsoft/common/xss/HTMLFilter.java

@@ -1,6 +1,10 @@
 package com.xjrsoft.common.xss;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 import java.util.logging.Logger;

src/main/java/com/xjrsoft/common/xss/XssFilter.java

@@ -1,9 +1,12 @@
 
 package com.xjrsoft.common.xss;
 
-import org.apache.catalina.connector.RequestFacade;
-
-import javax.servlet.*;
+import javax.servlet.Filter;
+import javax.servlet.FilterChain;
+import javax.servlet.FilterConfig;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
 import javax.servlet.http.HttpServletRequest;
 import java.io.IOException;
 

src/main/java/com/xjrsoft/common/xss/XssHttpServletRequestWrapper.java

@@ -2,7 +2,6 @@ package com.xjrsoft.common.xss;
 
 import cn.hutool.core.collection.ListUtil;
 import cn.hutool.core.util.StrUtil;
-import org.apache.catalina.connector.RequestFacade;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.http.HttpHeaders;

src/main/java/com/xjrsoft/config/CtccSmsConfig.java

@@ -2,7 +2,6 @@ package com.xjrsoft.config;
 
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.stereotype.Component;
 
 /**

src/main/java/com/xjrsoft/config/LicenseConfig.java

@@ -4,8 +4,6 @@ import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.stereotype.Component;
 
-import java.time.LocalDateTime;
-
 /**
  * @Author: tzx
  * @Date: 2023/7/3 9:47

src/main/java/com/xjrsoft/config/MagicApiConfig.java

@@ -1,19 +1,8 @@
 package com.xjrsoft.config;
 
-import cn.hutool.core.util.StrUtil;
-import cn.hutool.extra.spring.SpringUtil;
-import com.baomidou.dynamic.datasource.DynamicRoutingDataSource;
-import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder;
-import com.xjrsoft.common.constant.GlobalConstant;
-import com.xjrsoft.common.enums.CloudType;
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.ssssssss.magicapi.datasource.model.MagicDynamicDataSource;
-
-import javax.sql.DataSource;
-import java.util.Map;
 
 /**
  * magic-api 配置

src/main/java/com/xjrsoft/config/RedisConfig.java

@@ -1,12 +1,15 @@
 package com.xjrsoft.config;
 
 import lombok.AllArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.data.redis.connection.RedisConnectionFactory;
-import org.springframework.data.redis.core.*;
+import org.springframework.data.redis.core.HashOperations;
+import org.springframework.data.redis.core.ListOperations;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.core.SetOperations;
+import org.springframework.data.redis.core.ValueOperations;
+import org.springframework.data.redis.core.ZSetOperations;
 import org.springframework.data.redis.listener.RedisMessageListenerContainer;
 import org.springframework.data.redis.serializer.StringRedisSerializer;
 

src/main/java/com/xjrsoft/config/SaTokenConfig.java

@@ -16,7 +16,6 @@ import com.xjrsoft.common.constant.GlobalConstant;
 import com.xjrsoft.common.enums.ResponseCode;
 import com.xjrsoft.common.exception.MyException;
 import com.xjrsoft.common.interceptor.MagicApiWebLoginInterceptor;
-import com.xjrsoft.common.model.result.R;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

src/main/java/com/xjrsoft/config/UReportConfig.java

@@ -4,7 +4,6 @@ import com.bstek.ureport.console.UReportServlet;
 import com.bstek.ureport.definition.datasource.BuildinDatasource;
 import com.xjrsoft.common.exception.MyException;
 import com.xjrsoft.common.utils.DatasourceUtil;
-import com.xjrsoft.common.ureport.DocumentUreportServlet;
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.boot.web.servlet.ServletRegistrationBean;

src/main/java/com/xjrsoft/config/XjrSmsConfig.java

@@ -2,12 +2,9 @@ package com.xjrsoft.config;
 
 import com.xjrsoft.common.enums.SmsCloudType;
 import lombok.Data;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.stereotype.Component;
 
-import java.util.List;
-
 @Data
 @Component
 @ConfigurationProperties("xjrsoft.sms")

src/main/java/com/xjrsoft/module/app/controller/AppFuncDesignController.java

@@ -3,40 +3,39 @@ package com.xjrsoft.module.app.controller;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.yulichang.toolkit.MPJWrappers;
-import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import com.xjrsoft.common.annotation.XjrLog;
 import com.xjrsoft.common.constant.GlobalConstant;
 import com.xjrsoft.common.model.result.R;
 import com.xjrsoft.common.page.ConventPage;
 import com.xjrsoft.common.page.PageOutput;
 import com.xjrsoft.common.utils.VoToColumnUtil;
-import com.xjrsoft.module.app.dto.*;
+import com.xjrsoft.module.app.dto.AddFuncDesignDto;
+import com.xjrsoft.module.app.dto.AppFuncDesignPageDto;
+import com.xjrsoft.module.app.dto.DeleteAppPageDesignDto;
+import com.xjrsoft.module.app.dto.UpdateAppFuncDesignDto;
+import com.xjrsoft.module.app.dto.UpdateEnableMarkDto;
 import com.xjrsoft.module.app.entity.AppFuncDesign;
 import com.xjrsoft.module.app.entity.AppMenu;
-import com.xjrsoft.module.app.entity.AppPageDesign;
-import com.xjrsoft.module.app.mapper.AppFuncDesignMapper;
 import com.xjrsoft.module.app.service.IAppFuncDesignService;
 import com.xjrsoft.module.app.service.IAppMenuService;
-import com.xjrsoft.module.app.service.IAppPageDesignService;
 import com.xjrsoft.module.app.vo.AppFuncDesignPageVo;
 import com.xjrsoft.module.app.vo.AppFuncDesignVo;
 import com.xjrsoft.module.app.vo.AppMenuVo;
-import com.xjrsoft.module.app.vo.AppPageDesignVo;
-import com.xjrsoft.module.erpModel.caseErpDevice.vo.CaseErpDeviceWarnVo;
-import com.xjrsoft.module.generator.entity.MenuConfig;
-import com.xjrsoft.module.organization.entity.User;
-import com.xjrsoft.module.organization.vo.UserPageVo;
-import com.xjrsoft.module.system.entity.DictionaryDetail;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 

src/main/java/com/xjrsoft/module/app/controller/AppMenuController.java

@@ -13,21 +13,24 @@ import com.xjrsoft.common.model.result.R;
 import com.xjrsoft.common.page.ConventPage;
 import com.xjrsoft.common.page.PageOutput;
 import com.xjrsoft.common.utils.VoToColumnUtil;
-import com.xjrsoft.module.app.dto.*;
-import com.xjrsoft.module.app.entity.AppFuncDesign;
+import com.xjrsoft.module.app.dto.AddAppMenuDto;
+import com.xjrsoft.module.app.dto.AppMenuListDto;
+import com.xjrsoft.module.app.dto.AppMenuPageDto;
+import com.xjrsoft.module.app.dto.UpdateAppMenuDto;
 import com.xjrsoft.module.app.entity.AppMenu;
 import com.xjrsoft.module.app.service.IAppMenuService;
 import com.xjrsoft.module.app.vo.AppMenuListVo;
 import com.xjrsoft.module.app.vo.AppMenuPageVo;
-import com.xjrsoft.module.organization.entity.Role;
-import com.xjrsoft.module.organization.vo.RoleListVo;
-import com.xjrsoft.module.organization.vo.RolePageVo;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;

src/main/java/com/xjrsoft/module/app/controller/AppPageDesignController.java

@@ -5,14 +5,18 @@ import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.xjrsoft.common.annotation.XjrLog;
 import com.xjrsoft.common.constant.GlobalConstant;
 import com.xjrsoft.common.model.result.R;
 import com.xjrsoft.common.page.ConventPage;
 import com.xjrsoft.common.page.PageOutput;
 import com.xjrsoft.common.utils.VoToColumnUtil;
-import com.xjrsoft.module.app.dto.*;
+import com.xjrsoft.module.app.dto.AddAppPageDesignDto;
+import com.xjrsoft.module.app.dto.AppPageDesignDraftDto;
+import com.xjrsoft.module.app.dto.AppPageDesignDto;
+import com.xjrsoft.module.app.dto.DeleteAppPageDesignDto;
+import com.xjrsoft.module.app.dto.UpdateAppPageDesignDto;
+import com.xjrsoft.module.app.dto.UpdateEnableMarkDto;
 import com.xjrsoft.module.app.entity.AppPageDesign;
 import com.xjrsoft.module.app.service.IAppMenuService;
 import com.xjrsoft.module.app.service.IAppPageDesignService;
@@ -21,7 +25,14 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 

src/main/java/com/xjrsoft/module/app/controller/BaseAppFunctionController.java

@@ -1,36 +1,35 @@
 package com.xjrsoft.module.app.controller;
 
+import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.xjrsoft.common.constant.GlobalConstant;
-import com.baomidou.mybatisplus.core.toolkit.StringPool;
+import com.xjrsoft.common.model.result.RT;
 import com.xjrsoft.common.page.ConventPage;
 import com.xjrsoft.common.page.PageOutput;
-import com.xjrsoft.common.model.result.RT;
 import com.xjrsoft.common.utils.VoToColumnUtil;
 import com.xjrsoft.module.app.dto.AddBaseAppFunctionDto;
+import com.xjrsoft.module.app.dto.BaseAppFunctionListDto;
 import com.xjrsoft.module.app.dto.BaseAppFunctionPageDto;
 import com.xjrsoft.module.app.dto.UpdateBaseAppFunctionDto;
-import cn.dev33.satoken.annotation.SaCheckPermission;
-
-import com.xjrsoft.module.app.dto.BaseAppFunctionListDto;
 import com.xjrsoft.module.app.entity.BaseAppFunction;
 import com.xjrsoft.module.app.service.IBaseAppFunctionService;
 import com.xjrsoft.module.app.vo.BaseAppFunctionListVo;
-
 import com.xjrsoft.module.app.vo.BaseAppFunctionPageVo;
 import com.xjrsoft.module.app.vo.BaseAppFunctionVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
 import java.util.List;
 
 /**

src/main/java/com/xjrsoft/module/app/dto/AddBaseAppFunctionDto.java

@@ -2,14 +2,8 @@ package com.xjrsoft.module.app.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import java.io.Serializable;
-import com.fasterxml.jackson.annotation.JsonFormat;
 
-import java.time.LocalTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
-import java.util.List;
-import java.util.Date;
+import java.io.Serializable;
 
 
 

src/main/java/com/xjrsoft/module/app/dto/AddFuncDesignDto.java

@@ -4,7 +4,6 @@ import com.xjrsoft.module.generator.dto.GeneratorAppDto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 
 /**

src/main/java/com/xjrsoft/module/app/dto/AppMenuListDto.java

@@ -1,7 +1,6 @@
 package com.xjrsoft.module.app.dto;
 
 import com.xjrsoft.common.page.ListInput;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 

src/main/java/com/xjrsoft/module/app/dto/BaseAppFunctionListDto.java

@@ -4,12 +4,6 @@ import com.xjrsoft.common.page.ListInput;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.time.LocalTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
-import java.util.Date;
 
 
 /**

src/main/java/com/xjrsoft/module/app/dto/BaseAppFunctionPageDto.java

@@ -1,15 +1,8 @@
 package com.xjrsoft.module.app.dto;
 
 import com.xjrsoft.common.page.PageInput;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.time.LocalTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
-import java.util.Date;
 
 
 /**

src/main/java/com/xjrsoft/module/app/dto/UpdateAppFuncDesignDto.java

@@ -4,9 +4,6 @@ import com.xjrsoft.module.generator.dto.GeneratorAppDto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-
 /**
  * @Author: tzx
  * @Date: 2023/7/26 9:07

src/main/java/com/xjrsoft/module/app/dto/UpdateBaseAppFunctionDto.java

@@ -2,14 +2,6 @@ package com.xjrsoft.module.app.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import java.io.Serializable;
-
-import java.time.LocalTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import java.util.List;
-import java.util.Date;
 
 
 

src/main/java/com/xjrsoft/module/app/entity/AppFuncDesign.java

@@ -1,16 +1,14 @@
 package com.xjrsoft.module.app.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
 import com.xjrsoft.common.model.base.AuditEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.io.Serializable;
+
 /**
  * <p>
  *

src/main/java/com/xjrsoft/module/app/entity/AppMenu.java

@@ -1,16 +1,14 @@
 package com.xjrsoft.module.app.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
 import com.xjrsoft.common.model.base.AuditEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.io.Serializable;
+
 /**
  * <p>
  *

src/main/java/com/xjrsoft/module/app/entity/AppPageDesign.java

@@ -1,14 +1,14 @@
 package com.xjrsoft.module.app.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-import java.io.Serializable;
-
 import com.xjrsoft.common.model.base.AuditEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.io.Serializable;
+
 /**
  * <p>
  * xjr_app_page_design【app端展示页面设计】

src/main/java/com/xjrsoft/module/app/entity/BaseAppFunction.java

@@ -2,18 +2,14 @@ package com.xjrsoft.module.app.entity;
 
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.github.yulichang.annotation.EntityMapping;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+
 import java.io.Serializable;
-import java.time.LocalTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
-import java.util.List;
 import java.util.Date;
 
 

src/main/java/com/xjrsoft/module/app/mapper/AppFuncDesignMapper.java

@@ -2,7 +2,6 @@ package com.xjrsoft.module.app.mapper;
 
 import com.github.yulichang.base.MPJBaseMapper;
 import com.xjrsoft.module.app.entity.AppFuncDesign;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 
 /**

src/main/java/com/xjrsoft/module/app/mapper/AppMenuMapper.java

@@ -1,7 +1,7 @@
 package com.xjrsoft.module.app.mapper;
 
-import com.xjrsoft.module.app.entity.AppMenu;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.xjrsoft.module.app.entity.AppMenu;
 import org.apache.ibatis.annotations.Mapper;
 
 /**

src/main/java/com/xjrsoft/module/app/mapper/AppPageDesignMapper.java

@@ -1,7 +1,7 @@
 package com.xjrsoft.module.app.mapper;
 
-import com.xjrsoft.module.app.entity.AppPageDesign;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.xjrsoft.module.app.entity.AppPageDesign;
 import org.apache.ibatis.annotations.Mapper;
 
 /**

src/main/java/com/xjrsoft/module/app/mapper/BaseAppFunctionMapper.java

@@ -1,7 +1,6 @@
 package com.xjrsoft.module.app.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.github.yulichang.base.MPJBaseMapper;
 import com.xjrsoft.module.app.entity.BaseAppFunction;
 import org.apache.ibatis.annotations.Mapper;
 

src/main/java/com/xjrsoft/module/app/service/IAppFuncDesignService.java

@@ -1,11 +1,9 @@
 package com.xjrsoft.module.app.service;
 
-import com.github.yulichang.base.MPJBaseMapper;
 import com.github.yulichang.base.MPJBaseService;
 import com.xjrsoft.module.app.dto.AddFuncDesignDto;
 import com.xjrsoft.module.app.dto.UpdateAppFuncDesignDto;
 import com.xjrsoft.module.app.entity.AppFuncDesign;
-import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
  * <p>

src/main/java/com/xjrsoft/module/app/service/IAppMenuService.java

@@ -1,7 +1,7 @@
 package com.xjrsoft.module.app.service;
 
-import com.xjrsoft.module.app.entity.AppMenu;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.xjrsoft.module.app.entity.AppMenu;
 
 /**
  * <p>

src/main/java/com/xjrsoft/module/app/service/IAppPageDesignService.java

@@ -1,9 +1,9 @@
 package com.xjrsoft.module.app.service;
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.xjrsoft.module.app.dto.AddAppPageDesignDto;
 import com.xjrsoft.module.app.dto.UpdateAppPageDesignDto;
 import com.xjrsoft.module.app.entity.AppPageDesign;
-import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
  * <p>

src/main/java/com/xjrsoft/module/app/service/IBaseAppFunctionService.java

@@ -1,10 +1,7 @@
 package com.xjrsoft.module.app.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.github.yulichang.base.MPJBaseService;
 import com.xjrsoft.module.app.entity.BaseAppFunction;
-import lombok.Data;
-import java.util.List;
 
 /**
 * @title: APP端功能模块管理

src/main/java/com/xjrsoft/module/app/service/impl/AppFuncDesignServiceImpl.java

@@ -12,14 +12,11 @@ import cn.hutool.json.JSONArray;
 import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.annotation.DbType;
 import com.baomidou.mybatisplus.core.toolkit.StringPool;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.yulichang.base.MPJBaseServiceImpl;
 import com.xjrsoft.common.constant.GlobalConstant;
 import com.xjrsoft.common.enums.FormTemplateType;
 import com.xjrsoft.common.enums.YesOrNoEnum;
 import com.xjrsoft.common.exception.MyException;
-import com.xjrsoft.common.model.result.R;
 import com.xjrsoft.common.utils.DatasourceUtil;
 import com.xjrsoft.config.GeneratePathConfig;
 import com.xjrsoft.module.app.dto.AddAppMenuDto;
@@ -30,12 +27,7 @@ import com.xjrsoft.module.app.entity.AppMenu;
 import com.xjrsoft.module.app.mapper.AppFuncDesignMapper;
 import com.xjrsoft.module.app.mapper.AppMenuMapper;
 import com.xjrsoft.module.app.service.IAppFuncDesignService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.xjrsoft.module.form.entity.FormDesignConfig;
-import com.xjrsoft.module.form.entity.FormTemplate;
-import com.xjrsoft.module.form.service.IFormTemplateService;
 import com.xjrsoft.module.generator.dto.GeneratorAppDto;
-import com.xjrsoft.module.generator.entity.FrontCode;
 import com.xjrsoft.module.generator.entity.GeneratorConfig;
 import com.xjrsoft.module.generator.entity.OutputConfig;
 import com.xjrsoft.module.generator.entity.TableConfig;
@@ -43,7 +35,6 @@ import com.xjrsoft.module.generator.service.IGeneratorService;
 import com.xjrsoft.module.generator.utils.GeneratorUtil;
 import com.xjrsoft.module.generator.utils.SqlUtil;
 import com.xjrsoft.module.system.service.IDatabaselinkService;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.SneakyThrows;
 import org.apache.commons.lang3.ArrayUtils;
@@ -55,7 +46,11 @@ import javax.sql.DataSource;
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.nio.charset.StandardCharsets;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
 
 /**
  * <p>

src/main/java/com/xjrsoft/module/app/service/impl/AppMenuServiceImpl.java

@@ -1,9 +1,9 @@
 package com.xjrsoft.module.app.service.impl;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.xjrsoft.module.app.entity.AppMenu;
 import com.xjrsoft.module.app.mapper.AppMenuMapper;
 import com.xjrsoft.module.app.service.IAppMenuService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 /**

src/main/java/com/xjrsoft/module/app/service/impl/AppPageDesignServiceImpl.java

@@ -2,14 +2,12 @@ package com.xjrsoft.module.app.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.io.FileUtil;
-import cn.hutool.core.io.IoUtil;
 import cn.hutool.core.lang.TypeReference;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.json.JSON;
 import cn.hutool.json.JSONArray;
 import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
-import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringPool;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -33,10 +31,11 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
 import java.nio.charset.StandardCharsets;
-import java.util.*;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
 
 /**
  * <p>

src/main/java/com/xjrsoft/module/app/service/impl/BaseAppFunctionServiceImpl.java

@@ -1,17 +1,11 @@
 package com.xjrsoft.module.app.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.github.yulichang.base.MPJBaseServiceImpl;
 import com.xjrsoft.module.app.entity.BaseAppFunction;
 import com.xjrsoft.module.app.mapper.BaseAppFunctionMapper;
 import com.xjrsoft.module.app.service.IBaseAppFunctionService;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import java.util.List;
-import java.util.Objects;
-import java.util.stream.Collectors;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 
 /**
 * @title: APP端功能模块管理

src/main/java/com/xjrsoft/module/app/vo/AppFuncDesignPageVo.java

@@ -1,7 +1,5 @@
 package com.xjrsoft.module.app.vo;
 
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 

src/main/java/com/xjrsoft/module/app/vo/AppFuncDesignVo.java

@@ -1,6 +1,5 @@
 package com.xjrsoft.module.app.vo;
 
-import com.xjrsoft.module.app.dto.AddAppMenuDto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 

src/main/java/com/xjrsoft/module/app/vo/BaseAppFunctionListVo.java

@@ -1,16 +1,8 @@
 package com.xjrsoft.module.app.vo;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import com.xjrsoft.common.annotation.Trans;
-import com.xjrsoft.common.enums.TransType;
-import java.time.LocalTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
-import java.util.Date;
-
 /**
 * @title: APP端功能模块管理列表列表入参
 * @Author fanxp

src/main/java/com/xjrsoft/module/app/vo/BaseAppFunctionPageVo.java

@@ -1,14 +1,8 @@
 package com.xjrsoft.module.app.vo;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import com.xjrsoft.common.annotation.Trans;
-import com.xjrsoft.common.enums.TransType;
-import java.time.LocalTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
 import java.util.Date;
 
 /**

src/main/java/com/xjrsoft/module/app/vo/BaseAppFunctionVo.java

@@ -3,12 +3,6 @@ package com.xjrsoft.module.app.vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.time.LocalTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
-import java.util.List;
-import java.util.Date;
-
 /**
 * @title: APP端功能模块管理表单出参
 * @Author fanxp

src/main/java/com/xjrsoft/module/authority/controller/DataAuthConfigController.java

@@ -1,8 +1,8 @@
 package com.xjrsoft.module.authority.controller;
 
 import com.xjrsoft.common.constant.GlobalConstant;
-import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
 
 /**
  * <p>

src/main/java/com/xjrsoft/module/authority/controller/DataAuthController.java

@@ -25,7 +25,14 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;

src/main/java/com/xjrsoft/module/authority/controller/DataAuthRelationController.java

@@ -1,8 +1,8 @@
 package com.xjrsoft.module.authority.controller;
 
 import com.xjrsoft.common.constant.GlobalConstant;
-import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
 
 /**
  * <p>

src/main/java/com/xjrsoft/module/authority/controller/DataAuthTableRelationController.java

@@ -1,7 +1,7 @@
 package com.xjrsoft.module.authority.controller;
 
-import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
 
 /**
  * <p>

src/main/java/com/xjrsoft/module/authority/dto/AddDataAuthDto.java

@@ -1,11 +1,8 @@
 package com.xjrsoft.module.authority.dto;
 
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.xjrsoft.module.authority.entity.DataAuthConfig;
-import com.xjrsoft.module.authority.entity.DataAuthRelation;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.NonNull;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;

src/main/java/com/xjrsoft/module/authority/dto/UpdateDataAuthDto.java

@@ -1,7 +1,6 @@
 package com.xjrsoft.module.authority.dto;
 
 import com.xjrsoft.module.authority.entity.DataAuthConfig;
-import com.xjrsoft.module.authority.entity.DataAuthRelation;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 

src/main/java/com/xjrsoft/module/authority/entity/DataAuth.java

@@ -2,9 +2,6 @@ package com.xjrsoft.module.authority.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-import java.io.Serializable;
-import java.util.List;
-
 import com.github.yulichang.annotation.EntityMapping;
 import com.xjrsoft.common.model.base.AuditEntity;
 import io.swagger.annotations.ApiModel;
@@ -12,6 +9,9 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.io.Serializable;
+import java.util.List;
+
 /**
  * <p>
  * 数据权限表

src/main/java/com/xjrsoft/module/authority/entity/DataAuthConfig.java

@@ -2,11 +2,12 @@ package com.xjrsoft.module.authority.entity;
 
 import com.baomidou.mybatisplus.annotation.OrderBy;
 import com.baomidou.mybatisplus.annotation.TableName;
-import java.io.Serializable;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.io.Serializable;
+
 /**
  * <p>
  * 数据权限自定义配置详情表

src/main/java/com/xjrsoft/module/authority/entity/DataAuthRelation.java

@@ -1,11 +1,12 @@
 package com.xjrsoft.module.authority.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-import java.io.Serializable;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.io.Serializable;
+
 /**
  * <p>
  * 数据权限 对象类型关联表

src/main/java/com/xjrsoft/module/authority/entity/DataAuthTableRelation.java

@@ -1,11 +1,12 @@
 package com.xjrsoft.module.authority.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-import java.io.Serializable;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.io.Serializable;
+
 /**
  * <p>
  * 数据权限 与 表 关联关系表

src/main/java/com/xjrsoft/module/authority/mapper/DataAuthConfigMapper.java

@@ -1,7 +1,7 @@
 package com.xjrsoft.module.authority.mapper;
 
-import com.xjrsoft.module.authority.entity.DataAuthConfig;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.xjrsoft.module.authority.entity.DataAuthConfig;
 import org.apache.ibatis.annotations.Mapper;
 
 /**

src/main/java/com/xjrsoft/module/authority/mapper/DataAuthMapper.java

@@ -2,7 +2,6 @@ package com.xjrsoft.module.authority.mapper;
 
 import com.github.yulichang.base.MPJBaseMapper;
 import com.xjrsoft.module.authority.entity.DataAuth;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 
 /**

src/main/java/com/xjrsoft/module/authority/mapper/DataAuthRelationMapper.java

@@ -1,7 +1,7 @@
 package com.xjrsoft.module.authority.mapper;
 
-import com.xjrsoft.module.authority.entity.DataAuthRelation;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.xjrsoft.module.authority.entity.DataAuthRelation;
 import org.apache.ibatis.annotations.Mapper;
 
 /**

src/main/java/com/xjrsoft/module/authority/mapper/DataAuthTableRelationMapper.java

@@ -1,7 +1,7 @@
 package com.xjrsoft.module.authority.mapper;
 
-import com.xjrsoft.module.authority.entity.DataAuthTableRelation;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.xjrsoft.module.authority.entity.DataAuthTableRelation;
 import org.apache.ibatis.annotations.Mapper;
 
 /**

src/main/java/com/xjrsoft/module/authority/service/IDataAuthConfigService.java

@@ -1,7 +1,7 @@
 package com.xjrsoft.module.authority.service;
 
-import com.xjrsoft.module.authority.entity.DataAuthConfig;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.xjrsoft.module.authority.entity.DataAuthConfig;
 
 /**
  * <p>

src/main/java/com/xjrsoft/module/authority/service/IDataAuthRelationService.java

@@ -1,7 +1,7 @@
 package com.xjrsoft.module.authority.service;
 
-import com.xjrsoft.module.authority.entity.DataAuthRelation;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.xjrsoft.module.authority.entity.DataAuthRelation;
 
 /**
  * <p>

src/main/java/com/xjrsoft/module/authority/service/IDataAuthTableRelationService.java

@@ -1,7 +1,7 @@
 package com.xjrsoft.module.authority.service;
 
-import com.xjrsoft.module.authority.entity.DataAuthTableRelation;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.xjrsoft.module.authority.entity.DataAuthTableRelation;
 
 import java.util.List;