rev: 修改基础代码，去除wql

nladmin-system/nlsso-server/src/main/java/org/nl/AppRun.java

@@ -5,7 +5,7 @@ import com.alicp.jetcache.anno.config.EnableCreateCacheAnnotation;
 import com.alicp.jetcache.anno.config.EnableMethodCache;
 import io.swagger.annotations.Api;
 import org.mybatis.spring.annotation.MapperScan;
-import org.nl.modules.wql.util.SpringContextHolder;
+import org.nl.config.SpringContextHolder;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory;

nladmin-system/nlsso-server/src/main/java/org/nl/common/annotation/DataPermission.java

@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.nl.modules.common.annotation;
+package org.nl.common.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

nladmin-system/nlsso-server/src/main/java/org/nl/common/annotation/Limit.java

@@ -13,9 +13,9 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.nl.modules.common.annotation;
+package org.nl.common.annotation;
 
-import org.nl.modules.common.aspect.LimitType;
+import org.nl.common.aspect.LimitType;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

nladmin-system/nlsso-server/src/main/java/org/nl/common/annotation/Query.java

@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.nl.modules.common.annotation;
+package org.nl.common.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

nladmin-system/nlsso-server/src/main/java/org/nl/common/annotation/RateLimiter.java

@@ -1,4 +1,4 @@
-package org.nl.modules.common.annotation;
+package org.nl.common.annotation;
 
 import org.springframework.core.annotation.AliasFor;
 import org.springframework.core.annotation.AnnotationUtils;

nladmin-system/nlsso-server/src/main/java/org/nl/common/aspect/LimitAspect.java

@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.nl.modules.common.aspect;
+package org.nl.common.aspect;
 
 import cn.hutool.core.util.StrUtil;
 import com.google.common.collect.ImmutableList;
@@ -23,10 +23,10 @@ import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.annotation.Pointcut;
 import org.aspectj.lang.reflect.MethodSignature;
-import org.nl.modules.common.annotation.Limit;
-import org.nl.modules.common.exception.BadRequestException;
-import org.nl.modules.common.utils.RequestHolder;
-import org.nl.modules.common.utils.StringUtils;
+import org.nl.common.annotation.Limit;
+import org.nl.common.exception.BadRequestException;
+import org.nl.common.utils.RequestHolder;
+import org.nl.common.utils.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.data.redis.core.RedisTemplate;
@@ -52,7 +52,7 @@ public class LimitAspect {
         this.redisTemplate = redisTemplate;
     }
 
-    @Pointcut("@annotation(org.nl.modules.common.annotation.Limit)")
+    @Pointcut("@annotation(org.nl.common.annotation.Limit)")
     public void pointcut() {
     }
 

nladmin-system/nlsso-server/src/main/java/org/nl/common/aspect/LimitType.java

@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.nl.modules.common.aspect;
+package org.nl.common.aspect;
 
 /**
  * 限流枚举

nladmin-system/nlsso-server/src/main/java/org/nl/common/base/BaseDTO.java

@@ -1,4 +1,4 @@
-package org.nl.modules.common.base;
+package org.nl.common.base;
 
 import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonFormat;

nladmin-system/nlsso-server/src/main/java/org/nl/common/base/BaseMapper.java

@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.nl.modules.common.base;
+package org.nl.common.base;
 
 import java.util.List;
 

nladmin-system/nlsso-server/src/main/java/org/nl/common/base/TableDataInfo.java

@@ -1,4 +1,4 @@
-package org.nl.common;
+package org.nl.common.base;
 
 import cn.hutool.http.HttpStatus;
 import com.baomidou.mybatisplus.core.metadata.IPage;

nladmin-system/nlsso-server/src/main/java/org/nl/common/domain/query/BaseQuery.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.core.toolkit.LambdaUtils;
 import com.baomidou.mybatisplus.core.toolkit.support.ColumnCache;
 import lombok.Data;
 import org.nl.common.enums.QueryTEnum;
-import org.nl.modules.tools.MapOf;
+import org.nl.config.MapOf;
 import sun.reflect.generics.reflectiveObjects.ParameterizedTypeImpl;
 
 import java.lang.reflect.Type;

nladmin-system/nlsso-server/src/main/java/org/nl/common/domain/vo/DeptVo.java

@@ -13,12 +13,12 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.nl.modules.system.domain.vo;
+package org.nl.common.domain.vo;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
-import org.nl.modules.common.base.BaseDTO;
+import org.nl.common.base.BaseDTO;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;

nladmin-system/nlsso-server/src/main/java/org/nl/common/domain/vo/MenuMetaVo.java

@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.nl.modules.system.domain.vo;
+package org.nl.common.domain.vo;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

nladmin-system/nlsso-server/src/main/java/org/nl/common/domain/vo/MenuVo.java

@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.nl.modules.system.domain.vo;
+package org.nl.common.domain.vo;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.Data;

nladmin-system/nlsso-server/src/main/java/org/nl/common/domain/vo/RoleVo.java

@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.nl.modules.system.domain.vo;
+package org.nl.common.domain.vo;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
@@ -21,8 +21,6 @@ import lombok.Setter;
 
 import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
-import java.util.Objects;
-import java.util.Set;
 
 /**
  * 角色

nladmin-system/nlsso-server/src/main/java/org/nl/common/domain/vo/UserPassVo.java

@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.nl.modules.system.domain.vo;
+package org.nl.common.domain.vo;
 
 import lombok.Data;
 

nladmin-system/nlsso-server/src/main/java/org/nl/common/enums/CodeBiEnum.java

@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.nl.modules.common.utils.enums;
+package org.nl.common.enums;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

nladmin-system/nlsso-server/src/main/java/org/nl/common/enums/CodeEnum.java

@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.nl.modules.common.utils.enums;
+package org.nl.common.enums;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

nladmin-system/nlsso-server/src/main/java/org/nl/common/enums/DataScopeEnum.java

@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.nl.modules.common.utils.enums;
+package org.nl.common.enums;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

nladmin-system/nlsso-server/src/main/java/org/nl/common/enums/RequestMethodEnum.java

@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.nl.modules.common.utils.enums;
+package org.nl.common.enums;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

nladmin-system/nlsso-server/src/main/java/org/nl/common/exception/BadConfigurationException.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.nl.modules.common.exception;
+package org.nl.common.exception;
 
 /**
  * 统一关于错误配置信息 异常

nladmin-system/nlsso-server/src/main/java/org/nl/common/exception/BadRequestException.java

@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.nl.modules.common.exception;
+package org.nl.common.exception;
 
 import lombok.Getter;
 import org.springframework.http.HttpStatus;

nladmin-system/nlsso-server/src/main/java/org/nl/common/exception/EntityExistException.java

@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.nl.modules.common.exception;
+package org.nl.common.exception;
 
 import org.springframework.util.StringUtils;
 
@@ -31,4 +31,4 @@ public class EntityExistException extends RuntimeException {
         return StringUtils.capitalize(entity)
                 + " with " + field + " "+ val + " existed";
     }
-}
+}

nladmin-system/nlsso-server/src/main/java/org/nl/common/exception/EntityNotFoundException.java

@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.nl.modules.common.exception;
+package org.nl.common.exception;
 
 import org.springframework.util.StringUtils;
 
@@ -31,4 +31,4 @@ public class EntityNotFoundException extends RuntimeException {
         return StringUtils.capitalize(entity)
                 + " with " + field + " "+ val + " does not exist";
     }
-}
+}

nladmin-system/nlsso-server/src/main/java/org/nl/common/exception/handler/ApiError.java

@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.nl.modules.common.exception.handler;
+package org.nl.common.exception.handler;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;

nladmin-system/nlsso-server/src/main/java/org/nl/common/exception/handler/GlobalExceptionHandler.java

@@ -13,14 +13,14 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.nl.modules.common.exception.handler;
+package org.nl.common.exception.handler;
 
 import cn.dev33.satoken.exception.NotLoginException;
 import lombok.extern.slf4j.Slf4j;
-import org.nl.modules.common.exception.BadRequestException;
-import org.nl.modules.common.exception.EntityExistException;
-import org.nl.modules.common.exception.EntityNotFoundException;
-import org.nl.modules.common.utils.ThrowableUtil;
+import org.nl.common.exception.BadRequestException;
+import org.nl.common.exception.EntityExistException;
+import org.nl.common.exception.EntityNotFoundException;
+import org.nl.common.utils.ThrowableUtil;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.MethodArgumentNotValidException;

nladmin-system/nlsso-server/src/main/java/org/nl/common/logging/annotation/Log.java

@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.nl.modules.logging.annotation;
+package org.nl.common.logging.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

nladmin-system/nlsso-server/src/main/java/org/nl/common/logging/aspect/LogAspect.java

@@ -14,7 +14,7 @@
  *  limitations under the License.
  *//*
 
-package org.nl.modules.logging.aspect;
+package org.nl.common.logging.aspect;
 
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
@@ -26,11 +26,11 @@ import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.annotation.Pointcut;
 import org.aspectj.lang.reflect.MethodSignature;
-import org.nl.modules.common.utils.RequestHolder;
-import org.nl.modules.common.utils.SecurityUtils;
-import org.nl.modules.common.utils.StringUtils;
-import org.nl.modules.common.utils.ThrowableUtil;
-import org.nl.modules.logging.domain.Log;
+import org.nl.common.utils.RequestHolder;
+import org.nl.common.utils.SecurityUtils;
+import org.nl.common.utils.StringUtils;
+import org.nl.common.utils.ThrowableUtil;
+import org.nl.common.logging.domain.Log;
 import org.springframework.stereotype.Component;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -70,7 +70,7 @@ public class LogAspect {
      * 配置切入点
      *//*
 
-    @Pointcut("@annotation(org.nl.modules.logging.annotation.Log)")
+    @Pointcut("@annotation(org.nl.common.logging.annotation.Log)")
     public void logPointcut() {
         // 该方法无方法体,主要为了让同类中其他方法使用此切入点
     }

nladmin-system/nlsso-server/src/main/java/org/nl/common/logging/domain/Log.java

@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.nl.modules.logging.domain;
+package org.nl.common.logging.domain;
 
 import lombok.Getter;
 import lombok.NoArgsConstructor;

nladmin-system/nlsso-server/src/main/java/org/nl/common/mnt/util/DataTypeEnum.java

@@ -17,7 +17,7 @@
  *
  */
 
-package org.nl.modules.mnt.util;
+package org.nl.common.mnt.util;
 import lombok.extern.slf4j.Slf4j;
 
 /**

nladmin-system/nlsso-server/src/main/java/org/nl/common/mnt/util/ExecuteShellUtil.java

@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.nl.modules.mnt.util;
+package org.nl.common.mnt.util;
 
 import cn.hutool.core.io.IoUtil;
 import com.jcraft.jsch.ChannelShell;

nladmin-system/nlsso-server/src/main/java/org/nl/common/mnt/util/ScpClientUtil.java

@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.nl.modules.mnt.util;
+package org.nl.common.mnt.util;
 
 import ch.ethz.ssh2.Connection;
 import ch.ethz.ssh2.SCPClient;

nladmin-system/nlsso-server/src/main/java/org/nl/common/mnt/util/SqlUtils.java

@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.nl.modules.mnt.util;
+package org.nl.common.mnt.util;
 
 import com.alibaba.druid.pool.DruidDataSource;
 import com.alibaba.druid.util.StringUtils;

nladmin-system/nlsso-server/src/main/java/org/nl/common/mnt/util/ZipUtils.java

@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.nl.modules.mnt.util;
+package org.nl.common.mnt.util;
 
 import java.io.*;
 import java.util.Enumeration;

nladmin-system/nlsso-server/src/main/java/org/nl/common/mnt/websocket/MsgType.java

@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.nl.modules.mnt.websocket;
+package org.nl.common.mnt.websocket;
 
 /**
  * @author ZhangHouYing

nladmin-system/nlsso-server/src/main/java/org/nl/common/mnt/websocket/SocketMsg.java

@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.nl.modules.mnt.websocket;
+package org.nl.common.mnt.websocket;
 
 import lombok.Data;
 

nladmin-system/nlsso-server/src/main/java/org/nl/common/mnt/websocket/WebSocketServer.java

@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.nl.modules.mnt.websocket;
+package org.nl.common.mnt.websocket;
 
 import com.alibaba.fastjson.JSONObject;
 import lombok.extern.slf4j.Slf4j;

nladmin-system/nlsso-server/src/main/java/org/nl/common/security/config/ConfigBeanConfiguration.java

@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.nl.modules.security.config;
+package org.nl.common.security.config;
 
-import org.nl.modules.security.config.bean.LoginProperties;
+import org.nl.common.security.config.bean.LoginProperties;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

nladmin-system/nlsso-server/src/main/java/org/nl/common/security/config/bean/LoginCode.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.nl.modules.security.config.bean;
+package org.nl.common.security.config.bean;
 
 import lombok.Data;
 

nladmin-system/nlsso-server/src/main/java/org/nl/common/security/config/bean/LoginCodeEnum.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.nl.modules.security.config.bean;
+package org.nl.common.security.config.bean;
 
 /**
  * 验证码配置枚举

nladmin-system/nlsso-server/src/main/java/org/nl/common/security/config/bean/LoginProperties.java

@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.nl.modules.security.config.bean;
+package org.nl.common.security.config.bean;
 
 import cn.hutool.core.util.StrUtil;
 import com.wf.captcha.*;
 import com.wf.captcha.base.Captcha;
 import lombok.Data;
-import org.nl.modules.common.exception.BadConfigurationException;
+import org.nl.common.exception.BadConfigurationException;
 
 import java.awt.*;
 import java.util.Objects;

nladmin-system/nlsso-server/src/main/java/org/nl/common/security/satoken/RedisListenerConfig.java

@@ -1,4 +1,4 @@
-package org.nl.modules.security.satoken;
+package org.nl.common.security.satoken;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

nladmin-system/nlsso-server/src/main/java/org/nl/common/security/satoken/SaTokenConfigure.java

@@ -1,4 +1,4 @@
-package org.nl.modules.security.satoken;
+package org.nl.common.security.satoken;
 
 import cn.dev33.satoken.interceptor.SaInterceptor;
 import cn.dev33.satoken.jwt.StpLogicJwtForSimple;

nladmin-system/nlsso-server/src/main/java/org/nl/common/security/satoken/SecurityProperties.java

@@ -1,4 +1,4 @@
-package org.nl.modules.security.satoken;
+package org.nl.common.security.satoken;
 
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;

nladmin-system/nlsso-server/src/main/java/org/nl/common/security/satoken/StpInterfaceImpl.java

@@ -1,7 +1,7 @@
-package org.nl.modules.security.satoken;
+package org.nl.common.security.satoken;
 
 import cn.dev33.satoken.stp.StpInterface;
-import org.nl.modules.common.utils.SecurityUtils;
+import org.nl.common.utils.SecurityUtils;
 import org.springframework.stereotype.Component;
 
 import java.util.List;

nladmin-system/nlsso-server/src/main/java/org/nl/common/security/service/UserCacheClean.java

@@ -1,4 +1,4 @@
-package org.nl.modules.security.service;///*
+package org.nl.common.security.service;///*
 // * Copyright 2019-2020 the original author or authors.
 // *
 // * Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,7 +14,7 @@ package org.nl.modules.security.service;///*
 // * limitations under the License.
 // */
 //
-//package org.nl.modules.security.service;
+//package org.nl.common.security.service;
 //
 //import cn.hutool.core.util.StrUtil;
 //import org.springframework.stereotype.Component;

nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/CacheKey.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.nl.modules.common.utils;
+package org.nl.common.utils;
 
 /**
  * @author: liaojinlong

nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/CodeUtil.java

@@ -1,6 +1,6 @@
-package org.nl.modules.system.util;
+package org.nl.common.utils;
 
-import org.nl.modules.wql.util.SpringContextHolder;
+import org.nl.config.SpringContextHolder;
 import org.nl.system.service.coderule.ISysCodeRuleService;
 
 import java.util.*;

nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/ColUtil.java

@@ -1,4 +1,4 @@
-package org.nl.modules.common.utils;
+package org.nl.common.utils;
 
 import org.apache.commons.configuration.Configuration;
 import org.apache.commons.configuration.ConfigurationException;

nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/CopyUtil.java

@@ -1,4 +1,4 @@
-package org.nl.modules.system.util;
+package org.nl.common.utils;
 
 import org.springframework.beans.BeanUtils;
 

nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/DateUtil.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.nl.modules.common.utils;
+package org.nl.common.utils;
 
 import java.time.*;
 import java.time.format.DateTimeFormatter;

nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/ElAdminConstant.java

@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.nl.modules.common.utils;
+package org.nl.common.utils;
 
 /**
  * 常用静态常量

nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/EncryptUtils.java

@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.nl.modules.common.utils;
+package org.nl.common.utils;
 
 import javax.crypto.Cipher;
 import javax.crypto.SecretKey;

nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/FileUtil.java

@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.nl.modules.common.utils;
+package org.nl.common.utils;
 
 import cn.hutool.core.io.IoUtil;
 import cn.hutool.core.util.IdUtil;
@@ -21,7 +21,7 @@ import cn.hutool.poi.excel.BigExcelWriter;
 import cn.hutool.poi.excel.ExcelUtil;
 import org.apache.poi.util.IOUtils;
 import org.apache.poi.xssf.streaming.SXSSFSheet;
-import org.nl.modules.common.exception.BadRequestException;
+import org.nl.common.exception.BadRequestException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.web.multipart.MultipartFile;

nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/GenUtil.java

@@ -1,4 +1,4 @@
-package org.nl.modules.common.utils;
+package org.nl.common.utils;
 
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.extra.template.*;
@@ -17,7 +17,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import static org.nl.modules.common.utils.FileUtil.SYS_TEM_DIR;
+import static org.nl.common.utils.FileUtil.SYS_TEM_DIR;
 
 /**
  * @author: lyd

nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/PageUtil.java

@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.nl.modules.common.utils;
+package org.nl.common.utils;
 
 import org.springframework.data.domain.Page;
 

nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/RedisUtils.java

@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.nl.modules.common.utils;
+package org.nl.common.utils;
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;

nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/RequestHolder.java

@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.nl.modules.common.utils;
+package org.nl.common.utils;
 
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;

nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/RsaUtils.java

@@ -1,4 +1,4 @@
-package org.nl.modules.common.utils;
+package org.nl.common.utils;
 
 import org.apache.commons.codec.binary.Base64;
 

nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/SecurityUtils.java

@@ -1,12 +1,11 @@
-package org.nl.modules.common.utils;
+package org.nl.common.utils;
 
 import cn.dev33.satoken.stp.StpUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.json.JSONArray;
 import cn.hutool.json.JSONObject;
 import lombok.extern.slf4j.Slf4j;
-import org.nl.modules.common.utils.dto.CurrentUser;
-import org.nl.modules.system.service.dto.UserDto;
+import org.nl.common.utils.dto.CurrentUser;
 
 import java.util.List;
 

nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/StringUtils.java

@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.nl.modules.common.utils;
+package org.nl.common.utils;
 
 import cn.hutool.http.HttpUtil;
 import cn.hutool.json.JSONObject;
@@ -23,8 +23,8 @@ import net.dreamlu.mica.ip2region.core.Ip2regionSearcher;
 import net.dreamlu.mica.ip2region.core.IpInfo;
 import nl.basjes.parse.useragent.UserAgent;
 import nl.basjes.parse.useragent.UserAgentAnalyzer;
-import org.nl.modules.common.config.ElAdminProperties;
-import org.nl.modules.wql.util.SpringContextHolder;
+import org.nl.config.ElAdminProperties;
+import org.nl.config.SpringContextHolder;
 
 import javax.servlet.http.HttpServletRequest;
 import java.net.InetAddress;

nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/ThrowableUtil.java

@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.nl.modules.common.utils;
+package org.nl.common.utils;
 
 import java.io.PrintWriter;
 import java.io.StringWriter;

nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/TranslatorUtil.java

@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.nl.modules.common.utils;
+package org.nl.common.utils;
 
 import cn.hutool.json.JSONArray;
 

nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/ValidationUtil.java

@@ -13,11 +13,11 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.nl.modules.common.utils;
+package org.nl.common.utils;
 
 import cn.hutool.core.util.ObjectUtil;
 import org.hibernate.validator.internal.constraintvalidators.hv.EmailValidator;
-import org.nl.modules.common.exception.BadRequestException;
+import org.nl.common.exception.BadRequestException;
 
 /**
  * 验证工具

nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/YamlUtil.java

@@ -1,4 +1,4 @@
-package org.nl.modules.system.util;
+package org.nl.common.utils;
 
 import java.util.Properties;
 

nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/dto/CurrentUser.java

@@ -1,4 +1,4 @@
-package org.nl.modules.common.utils.dto;
+package org.nl.common.utils.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;

nladmin-system/nlsso-server/src/main/java/org/nl/config/AuditorConfig.java

@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.nl.modules.common.config;
+package org.nl.config;
 
 import org.springframework.data.domain.AuditorAware;
 import org.springframework.stereotype.Component;

nladmin-system/nlsso-server/src/main/java/org/nl/config/CallBack.java

@@ -1,4 +1,4 @@
-/*
+package org.nl.config;/*
  * Copyright 2019-2020  the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,8 +14,6 @@
  * limitations under the License.
  */
 
-package org.nl.modules.wql.util;
-
 /**
  * @author: liaojinlong
  * @date: 2020/6/9 17:02

nladmin-system/nlsso-server/src/main/java/org/nl/config/ElAdminProperties.java

@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.nl.modules.common.config;
+package org.nl.config;
 
 import lombok.Data;
 import org.springframework.beans.factory.annotation.Value;

nladmin-system/nlsso-server/src/main/java/org/nl/config/ElPermissionConfig.java

@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.nl.modules.common.config;
+package org.nl.config;
 
 import org.springframework.stereotype.Service;
 

nladmin-system/nlsso-server/src/main/java/org/nl/config/FileProperties.java

@@ -13,10 +13,10 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.nl.modules.common.config;
+package org.nl.config;
 
 import lombok.Data;
-import org.nl.modules.common.utils.ElAdminConstant;
+import org.nl.common.utils.ElAdminConstant;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.annotation.Configuration;
 

nladmin-system/nlsso-server/src/main/java/org/nl/config/IdUtil.java

@@ -1,4 +1,4 @@
-package org.nl.modules.tools;
+package org.nl.config;
 
 public class IdUtil {
     public static Long getLongId() {

nladmin-system/nlsso-server/src/main/java/org/nl/config/MapOf.java

@@ -1,4 +1,4 @@
-package org.nl.modules.tools;
+package org.nl.config;
 
 
 import org.checkerframework.checker.units.qual.K;

nladmin-system/nlsso-server/src/main/java/org/nl/config/MultipartConfig.java

@@ -1,4 +1,4 @@
-package org.nl.modules.tools.config;
+package org.nl.config;
 
 import org.springframework.boot.web.servlet.MultipartConfigFactory;
 import org.springframework.context.annotation.Bean;

nladmin-system/nlsso-server/src/main/java/org/nl/config/RedisConfig.java

@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.nl.modules.common.config;
+package org.nl.config;
 
 import cn.hutool.core.lang.Assert;
 import cn.hutool.core.util.StrUtil;

nladmin-system/nlsso-server/src/main/java/org/nl/config/RsaProperties.java

@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.nl.modules.common.config;
+package org.nl.config;
 
 import lombok.Data;
 import org.springframework.beans.factory.annotation.Value;
@@ -35,4 +35,4 @@ public class RsaProperties {
     public void setPrivateKey(String privateKey) {
         RsaProperties.privateKey = privateKey;
     }
-}
+}

nladmin-system/nlsso-server/src/main/java/org/nl/config/SpringContextHolder.java

@@ -1,4 +1,4 @@
-/*
+package org.nl.config;/*
  *  Copyright 2019-2020 Zheng Jie
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,7 +13,6 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.nl.modules.wql.util;
 
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeansException;
@@ -21,7 +20,6 @@ import org.springframework.beans.factory.DisposableBean;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
 import org.springframework.core.env.Environment;
-
 import java.util.ArrayList;
 import java.util.List;
 

nladmin-system/nlsso-server/src/main/java/org/nl/config/SwaggerConfig.java

@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.nl.modules.common.config;
+package org.nl.config;
 
 import com.fasterxml.classmate.TypeResolver;
 import io.swagger.annotations.ApiModel;

nladmin-system/nlsso-server/src/main/java/org/nl/config/thread/ThreadPoolExecutorUtil.java

@@ -16,7 +16,7 @@
 package org.nl.config.thread;
 
 
-import org.nl.modules.wql.util.SpringContextHolder;
+import org.nl.config.SpringContextHolder;
 
 import java.util.concurrent.ArrayBlockingQueue;
 import java.util.concurrent.ThreadPoolExecutor;

nladmin-system/nlsso-server/src/main/java/org/nl/modules/logicflow/service/StageImageService.java

@@ -1,59 +0,0 @@
-package org.nl.modules.logicflow.service;
-
-import com.alibaba.fastjson.JSONArray;
-import org.nl.modules.logicflow.service.dto.StageImageDto;
-import org.springframework.data.domain.Pageable;
-
-import java.util.Map;
-
-/**
- * @Author: lyd
- * @Description: 舞台图标的服务层
- * @Date: 2022-07-29
- */
-public interface StageImageService {
-    /**
-     * 查询数据分页
-     *
-     * @param whereJson 条件
-     * @param page      分页参数
-     * @return Map<String, Object>
-     */
-    Map<String, Object> queryAll(Map whereJson, Pageable page);
-
-    /**
-     * 创建
-     *
-     * @param dto /
-     */
-    void create(StageImageDto dto);
-
-    /**
-     * 编辑
-     *
-     * @param dto /
-     */
-    void update(StageImageDto dto);
-
-    /**
-     * 根据ID查询
-     *
-     * @param image_uuid ID
-     * @return StageImage
-     */
-    StageImageDto findById(String image_uuid);
-
-    /**
-     * 多选删除
-     *
-     * @param ids /
-     */
-    void deleteAll(String[] ids);
-
-    /**
-     * 前端舞台编辑选择设备图标下拉选列表
-     *
-     * @return
-     */
-    JSONArray selectList();
-}

nladmin-system/nlsso-server/src/main/java/org/nl/modules/logicflow/service/StageService.java

@@ -1,74 +0,0 @@
-package org.nl.modules.logicflow.service;
-
-import com.alibaba.fastjson.JSONArray;
-import org.nl.modules.logicflow.service.dto.StageDto;
-import org.springframework.data.domain.Pageable;
-
-import java.util.Map;
-
-/**
- * @Author: lyd
- * @Description:
- * @Date: 2022-07-29  10:50
- */
-public interface StageService {
-    /**
-     * 查询数据分页
-     *
-     * @param whereJson 条件
-     * @param page      分页参数
-     * @return Map<String, Object>
-     */
-    Map<String, Object> queryAll(Map whereJson, Pageable page);
-
-    /**
-     * 创建
-     *
-     * @param dto /
-     */
-    void create(StageDto dto);
-
-    /**
-     * 编辑
-     *
-     * @param dto /
-     */
-    void update(StageDto dto);
-
-    /**
-     * 根据ID查询
-     *
-     * @param stage_uuid ID
-     * @return Stage
-     */
-    StageDto findById(String stage_uuid);
-
-    /**
-     * 多选删除
-     *
-     * @param ids /
-     */
-    void deleteAll(String[] ids);
-
-    /**
-     * 前端舞台下拉选列表
-     *
-     * @return
-     */
-    JSONArray selectList();
-
-    /**
-     * 新增舞台信息
-     * 将数据保存到remark---保存数据
-     * @param dto
-     */
-    void addNewStage(StageDto dto);
-
-    /**
-     * 根据编码查询
-     *
-     * @param code code
-     * @return Stage
-     */
-    StageDto findByCode(String code);
-}

nladmin-system/nlsso-server/src/main/java/org/nl/modules/logicflow/service/impl/StageImageServiceImpl.java

@@ -1,110 +0,0 @@
-package org.nl.modules.logicflow.service.impl;
-
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.IdUtil;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.nl.modules.common.exception.BadRequestException;
-import org.nl.modules.common.utils.SecurityUtils;
-import org.nl.modules.logicflow.service.StageImageService;
-import org.nl.modules.logicflow.service.dto.StageImageDto;
-import org.nl.modules.wql.core.bean.ResultBean;
-import org.nl.modules.wql.core.bean.WQLObject;
-import org.nl.modules.wql.util.WqlUtil;
-import org.springframework.data.domain.Pageable;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.Map;
-
-/**
- * @Author: lyd
- * @Description: 舞台图标的服务实现
- * @Date: 2022-07-29
- */
-@Service
-@RequiredArgsConstructor
-@Slf4j
-public class StageImageServiceImpl implements StageImageService {
-    @Override
-    public Map<String, Object> queryAll(Map whereJson, Pageable page) {
-        String where = "1=1";
-        if (whereJson.get("device_type") != null) {
-            where = "driver_code_json like ('%" + whereJson.get("device_type") + "%')";
-        }
-        WQLObject wo = WQLObject.getWQLObject("stage_image");
-        ResultBean rb = wo.pagequery(WqlUtil.getHttpContext(page), where, "update_time desc");
-        final JSONObject json = rb.pageResult();
-        return json;
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void create(StageImageDto dto) {
-        String currentUsername = SecurityUtils.getCurrentUsername();
-        String now = DateUtil.now();
-
-        dto.setImage_uuid(IdUtil.simpleUUID());
-        dto.setCreate_by(currentUsername);
-        dto.setUpdate_by(currentUsername);
-        dto.setUpdate_time(now);
-        dto.setCreate_time(now);
-
-        WQLObject wo = WQLObject.getWQLObject("stage_image");
-        JSONObject json = (JSONObject) JSONObject.toJSON(dto);
-
-        wo.insert(json);
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void update(StageImageDto dto) {
-        StageImageDto entity = this.findById(dto.getImage_uuid());
-        if (entity == null) throw new BadRequestException("被删除或无权限，操作失败!");
-
-        String currentUsername = SecurityUtils.getCurrentUsername();
-        String now = DateUtil.now();
-        dto.setUpdate_time(now);
-        dto.setUpdate_by(currentUsername);
-
-        WQLObject wo = WQLObject.getWQLObject("stage_image");
-        JSONObject json = (JSONObject) JSONObject.toJSON(dto);
-
-        wo.update(json);
-    }
-
-    @Override
-    public StageImageDto findById(String image_uuid) {
-        WQLObject wo = WQLObject.getWQLObject("stage_image");
-        JSONObject json = wo.query("image_uuid ='" + image_uuid + "'").uniqueResult(0);
-        final StageImageDto obj = json.toJavaObject(StageImageDto.class);
-        return obj;
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void deleteAll(String[] ids) {
-        WQLObject wo = WQLObject.getWQLObject("stage_image");
-        for (String image_uuid : ids) {
-            wo.delete("image_uuid = '" + image_uuid + "'");
-        }
-    }
-
-    @Override
-    public JSONArray selectList() {
-        //设备基础信息表【acs_stage_image】
-        JSONArray arr = WQLObject.getWQLObject("stage_image").query("is_delete= '0' AND is_active= '1'", "update_time desc").getResultJSONArray(0);
-        JSONArray result = new JSONArray();
-        for (int i = 0; i < arr.size(); i++) {
-            JSONObject obj = arr.getJSONObject(i);
-            JSONObject json = new JSONObject();
-            json.put("image_uuid", obj.getString("image_uuid"));
-            json.put("image_code", obj.getString("image_code"));
-            json.put("image_name", obj.getString("image_code").toString().split("-")[0]);
-            result.add(json);
-        }
-        return result;
-    }
-}

nladmin-system/nlsso-server/src/main/java/org/nl/modules/logicflow/service/impl/StageServiceImpl.java

@@ -1,132 +0,0 @@
-package org.nl.modules.logicflow.service.impl;
-
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.IdUtil;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.nl.modules.common.exception.BadRequestException;
-import org.nl.modules.common.utils.SecurityUtils;
-import org.nl.modules.logicflow.service.StageService;
-import org.nl.modules.logicflow.service.dto.StageDto;
-import org.nl.modules.wql.core.bean.ResultBean;
-import org.nl.modules.wql.core.bean.WQLObject;
-import org.nl.modules.wql.util.WqlUtil;
-import org.springframework.data.domain.Pageable;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.Map;
-
-/**
- * @Author: lyd
- * @Description:
- * @Date: 2022-07-29  10:51
- */
-@Service
-@RequiredArgsConstructor
-@Slf4j
-public class StageServiceImpl implements StageService {
-    @Override
-    public Map<String, Object> queryAll(Map whereJson, Pageable page) {
-        log.info("分页查找");
-        WQLObject wo = WQLObject.getWQLObject("stage");
-        ResultBean rb = wo.pagequery(WqlUtil.getHttpContext(page), "", "update_time desc");
-        final JSONObject json = rb.pageResult();
-        return json;
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void create(StageDto dto) {
-        String currentUsername = SecurityUtils.getCurrentUsername();
-        String now = DateUtil.now();
-
-        dto.setStage_uuid(IdUtil.simpleUUID());
-        dto.setCreate_by(currentUsername);
-        dto.setUpdate_by(currentUsername);
-        dto.setUpdate_time(now);
-        dto.setCreate_time(now);
-
-        WQLObject wo = WQLObject.getWQLObject("stage");
-        JSONObject json = (JSONObject) JSONObject.toJSON(dto);
-
-        wo.insert(json);
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void update(StageDto dto) {
-        StageDto entity = this.findById(dto.getStage_uuid());
-        if (entity == null) throw new BadRequestException("被删除或无权限，操作失败!");
-
-        String currentUsername = SecurityUtils.getCurrentUsername();
-        String now = DateUtil.now();
-        dto.setUpdate_time(now);
-        dto.setUpdate_by(currentUsername);
-
-        WQLObject wo = WQLObject.getWQLObject("stage");
-        JSONObject json = (JSONObject) JSONObject.toJSON(dto);
-
-        wo.update(json);
-    }
-
-    @Override
-    public StageDto findById(String stage_uuid) {
-        WQLObject wo = WQLObject.getWQLObject("stage");
-        JSONObject json = wo.query("stage_uuid ='" + stage_uuid + "'").uniqueResult(0);
-        final StageDto obj = json.toJavaObject(StageDto.class);
-        return obj;
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void deleteAll(String[] ids) {
-        WQLObject wo = WQLObject.getWQLObject("stage");
-        for (String stage_uuid : ids) {
-            wo.delete("stage_uuid = '" + stage_uuid + "'");
-        }
-    }
-
-    @Override
-    public JSONArray selectList() {
-        //设备基础信息表【stage】
-        JSONArray arr = WQLObject.getWQLObject("stage").query("is_delete= '0' AND is_active= '1'").getResultJSONArray(0);
-        JSONArray result = new JSONArray();
-        for (int i = 0; i < arr.size(); i++) {
-            JSONObject obj = arr.getJSONObject(i);
-            JSONObject json = new JSONObject();
-            json.put("stage_id", obj.getString("stage_id"));
-            json.put("stage_code", obj.getString("stage_code"));
-            json.put("stage_name", obj.getString("stage_name"));
-            result.add(json);
-        }
-        return result;
-    }
-
-    @Override
-    public void addNewStage(StageDto dto) {
-        // 根据dto的code找到数据
-        StageDto stageDto = this.findByCode(dto.getStage_code());
-        // 设置内容
-        stageDto.setStage_data(dto.getStage_data());
-        // 获取当前用户与时间
-        String currentUsername = SecurityUtils.getCurrentUsername();
-        String now = DateUtil.now();
-        stageDto.setUpdate_time(now);
-        stageDto.setUpdate_by(currentUsername);
-        System.out.println(stageDto);
-        WQLObject wo = WQLObject.getWQLObject("stage");
-        JSONObject json = (JSONObject) JSONObject.toJSON(stageDto);
-        wo.update(json);
-    }
-
-    @Override
-    public StageDto findByCode(String code) {
-        WQLObject wo = WQLObject.getWQLObject("stage");
-        JSONObject json = wo.query("stage_code ='" + code + "'").uniqueResult(0);
-        final StageDto obj = json.toJavaObject(StageDto.class);
-        return obj;
-    }
-}

nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/domain/Dept.java

@@ -1,60 +0,0 @@
-/*
- *  Copyright 2019-2020 Zheng Jie
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package org.nl.modules.system.domain;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import org.nl.modules.common.base.BaseDTO;
-
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-import java.io.Serializable;
-
-/**
-* @author Zheng Jie
-* @date 2019-03-25
-*/
-@Data
-public class Dept extends BaseDTO implements Serializable {
-
-
-    private String dept_id;
-
-    private String code;
-
-    private String ext_id;
-
-    @ApiModelProperty(value = "排序")
-    private Integer dept_sort;
-
-
-    @NotBlank
-    @ApiModelProperty(value = "部门名称")
-    private String name;
-
-
-
-    @NotNull
-    @ApiModelProperty(value = "是否启用")
-    private String is_used;
-
-    @ApiModelProperty(value = "上级部门")
-    private String pid;
-
-    @ApiModelProperty(value = "子节点数目", hidden = true)
-    private Integer sub_count = 0;
-
-}

nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/domain/Dict.java

@@ -1,65 +0,0 @@
-/*
- *  Copyright 2019-2020 Zheng Jie
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package org.nl.modules.system.domain;
-
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
-* @author Zheng Jie
-* @date 2019-04-10
-*/
-@Data
-public class Dict  implements Serializable {
-
-    @ApiModelProperty(value = "ID", hidden = true)
-    private String id;
-    // 字典标识
-    @JsonSerialize(using= ToStringSerializer.class)
-    private Long dict_id;
-
-    // 编码
-    private String code;
-
-    // 名称
-    private String name;
-
-    // 字典标签
-    private String label;
-
-    // 字典值
-    private String value;
-
-    // 排序号
-    private String dict_sort;
-
-    // 字典类型
-    private String dict_type;
-
-    /**
-     * 参数123
-     */
-    private String para1;
-
-    private String para2;
-
-    private String para3;
-
-}

nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/domain/DictDetail.java

@@ -1,58 +0,0 @@
-/*
- *  Copyright 2019-2020 Zheng Jie
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package org.nl.modules.system.domain;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.io.Serializable;
-
-/**
-* @author Zheng Jie
-* @date 2019-04-10
-*/
-@Getter
-@Setter
-public class DictDetail implements Serializable {
-
-
-    @ApiModelProperty(value = "ID", hidden = true)
-    private String id;
-
-    private Dict dict;
-
-    @ApiModelProperty(value = "字典标签")
-    private String label;
-
-    @ApiModelProperty(value = "字典名称")
-    private String name;
-
-    @ApiModelProperty(value = "字典值")
-    private String value;
-
-    @ApiModelProperty(value = "参数1")
-    private String para1;
-    @ApiModelProperty(value = "参数2")
-    private String para2;
-    @ApiModelProperty(value = "参数3")
-    private String para3;
-
-    @ApiModelProperty(value = "排序")
-    private Integer dictSort = 999;
-
-
-}

nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/domain/Menu.java

@@ -1,100 +0,0 @@
-/*
- *  Copyright 2019-2020 Zheng Jie
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package org.nl.modules.system.domain;
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.io.Serializable;
-import java.util.Objects;
-import java.util.Set;
-
-/**
- * @author Zheng Jie
- * @date 2018-12-17
- */
-@Getter
-@Setter
-public class Menu implements Serializable {
-
-
-    @ApiModelProperty(value = "ID", hidden = true)
-    private String id;
-
-    @JsonIgnore
-    @ApiModelProperty(value = "菜单角色")
-    private Set<Role> roles;
-
-    @ApiModelProperty(value = "菜单标题")
-    private String title;
-
-    @ApiModelProperty(value = "菜单组件名称")
-    private String componentName;
-
-    @ApiModelProperty(value = "排序")
-    private Integer menuSort = 999;
-
-    @ApiModelProperty(value = "组件路径")
-    private String component;
-
-    @ApiModelProperty(value = "路由地址")
-    private String path;
-
-    @ApiModelProperty(value = "菜单类型，目录、菜单、按钮")
-    private Integer type;
-
-    @ApiModelProperty(value = "权限标识")
-    private String permission;
-
-    @ApiModelProperty(value = "菜单图标")
-    private String icon;
-
-    @ApiModelProperty(value = "缓存")
-    private Boolean cache;
-
-
-
-    @ApiModelProperty(value = "是否隐藏")
-    private Boolean hidden;
-
-    @ApiModelProperty(value = "上级菜单")
-    private Long pid;
-
-    @ApiModelProperty(value = "子节点数目", hidden = true)
-    private Integer subCount = 0;
-
-    @ApiModelProperty(value = "外链菜单")
-    private Boolean iFrame;
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        Menu menu = (Menu) o;
-        return Objects.equals(id, menu.id);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(id);
-    }
-}

nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/domain/Role.java

@@ -1,73 +0,0 @@
-/*
- *  Copyright 2019-2020 Zheng Jie
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package org.nl.modules.system.domain;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Getter;
-import lombok.Setter;
-import org.nl.system.service.user.dao.SysUser;
-
-import javax.validation.constraints.NotBlank;
-import java.io.Serializable;
-import java.util.Objects;
-import java.util.Set;
-
-/**
- * 角色
- * @author Zheng Jie
- * @date 2018-11-22
- */
-@Getter
-@Setter
-public class Role  implements Serializable {
-
-
-    @ApiModelProperty(value = "ID", hidden = true)
-    private String id;
-
-    private Set<SysUser> users;
-
-    @ApiModelProperty(value = "菜单", hidden = true)
-    private Set<Menu> menus;
-
-
-    @NotBlank
-    @ApiModelProperty(value = "名称", hidden = true)
-    private String name;
-
-    @ApiModelProperty(value = "级别，数值越小，级别越大")
-    private Integer level = 3;
-
-    @ApiModelProperty(value = "描述")
-    private String remark;
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        Role role = (Role) o;
-        return Objects.equals(id, role.id);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(id);
-    }
-}

nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/rest/DictController2.java

@@ -1,95 +0,0 @@
-/*
- *  Copyright 2019-2020 Zheng Jie
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package org.nl.modules.system.rest;
-
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.RequiredArgsConstructor;
-import org.nl.modules.logging.annotation.Log;
-import org.nl.modules.system.service.DictService2;
-import org.nl.modules.system.service.dto.DictDto;
-import org.nl.modules.system.service.dto.DictQueryCriteria;
-import org.springframework.data.domain.Pageable;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.util.Set;
-
-/**
-* @author Zheng Jie
-* @date 2019-04-10
-*/
-@RestController
-@RequiredArgsConstructor
-@Api(tags = "系统：字典管理")
-//@RequestMapping("/api/dict")
-public class DictController2 {
-
-    private final DictService2 dictService2;
-
-    @ApiOperation("导出字典数据")
-    @GetMapping(value = "/download")
-//    @SaCheckPermission("dict:list")
-    public void download(HttpServletResponse response, DictQueryCriteria criteria) throws IOException {
-        dictService2.download(dictService2.queryAll(criteria), response);
-    }
-
-    @ApiOperation("查询字典")
-    @GetMapping(value = "/all")
-//    @SaCheckPermission("dict:list")
-    public ResponseEntity<Object> queryAll(){
-        return new ResponseEntity<>(dictService2.queryAll(new DictQueryCriteria()),HttpStatus.OK);
-    }
-
-    @ApiOperation("查询字典")
-    @GetMapping
-//    @SaCheckPermission("dict:list")
-    public ResponseEntity<Object> query(DictQueryCriteria resources, Pageable pageable){
-        return new ResponseEntity<>(dictService2.queryAll(resources,pageable),HttpStatus.OK);
-    }
-
-    @Log("新增字典")
-    @ApiOperation("新增字典")
-    @PostMapping
-//    @SaCheckPermission("dict:add")
-    public ResponseEntity<Object> create(@RequestBody DictDto resources){
-        dictService2.create(resources);
-        return new ResponseEntity<>(HttpStatus.CREATED);
-    }
-
-    @PutMapping
-    @Log("修改字典")
-    @ApiOperation("修改字典")
-    //@SaCheckPermission("@el.check('dict:edit')")
-    public ResponseEntity<Object> update(@Validated @RequestBody DictDto dto){
-        dictService2.update(dto);
-        return new ResponseEntity<>(HttpStatus.NO_CONTENT);
-    }
-
-    @Log("删除字典")
-    @ApiOperation("删除字典")
-    @DeleteMapping
-//    @SaCheckPermission("dict:del")
-    public ResponseEntity<Object> delete(@RequestBody Set<String> ids){
-        dictService2.delete(ids);
-        return new ResponseEntity<>(HttpStatus.OK);
-    }
-
-}

nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/rest/DictDetailController.java

@@ -1,91 +0,0 @@
-/*
- *  Copyright 2019-2020 Zheng Jie
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package org.nl.modules.system.rest;
-
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.RequiredArgsConstructor;
-import org.nl.modules.logging.annotation.Log;
-import org.nl.modules.system.service.DictDetailService;
-import org.nl.modules.system.service.dto.DictDetailQueryCriteria;
-import org.nl.modules.system.service.dto.DictDto;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.domain.Sort;
-import org.springframework.data.web.PageableDefault;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @author Zheng Jie
- * @date 2019-04-10
- */
-@RestController
-@RequiredArgsConstructor
-@Api(tags = "系统：字典详情管理")
-@RequestMapping("/api/dictDetail2")
-public class DictDetailController {
-    private final DictDetailService dictDetailService;
-
-    @ApiOperation("查询字典详情")
-    @GetMapping
-    public ResponseEntity<Object> query(DictDetailQueryCriteria criteria,
-                                        @PageableDefault(sort = {"dictSort"}, direction = Sort.Direction.ASC) Pageable pageable){
-        return new ResponseEntity<>(dictDetailService.queryAll(criteria,pageable),HttpStatus.OK);
-    }
-
-    @ApiOperation("查询多个字典详情")
-    @GetMapping(value = "/map")
-    public ResponseEntity<Object> getDictDetailMaps(@RequestParam String dictName){
-        String[] names = dictName.split("[,，]");
-        Map<String, List<DictDto>> dictMap = new HashMap<>(16);
-        for (String name : names) {
-            dictMap.put(name, dictDetailService.getDictByName(name));
-        }
-        return new ResponseEntity<>(dictMap, HttpStatus.OK);
-    }
-
-    @Log("新增字典详情")
-    @ApiOperation("新增字典详情")
-    @PostMapping
-//    @SaCheckPermission("dict:add")
-    public ResponseEntity<Object> create( @RequestBody DictDto resources){
-        dictDetailService.create(resources);
-        return new ResponseEntity<>(HttpStatus.CREATED);
-    }
-
-    @Log("修改字典详情")
-    @ApiOperation("修改字典详情")
-    @PutMapping
-//    @SaCheckPermission("dict:edit")
-    public ResponseEntity<Object> update(@RequestBody DictDto resources){
-        dictDetailService.update(resources);
-        return new ResponseEntity<>(HttpStatus.NO_CONTENT);
-    }
-
-    @Log("删除字典详情")
-    @ApiOperation("删除字典详情")
-    @DeleteMapping(value = "/{id}")
-//    @SaCheckPermission("dict:del")
-    public ResponseEntity<Object> delete(@PathVariable String id){
-        dictDetailService.delete(id);
-        return new ResponseEntity<>(HttpStatus.OK);
-    }
-}

nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/rest/GridController.java

@@ -1,68 +0,0 @@
-package org.nl.modules.system.rest;
-
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.nl.modules.logging.annotation.Log;
-import org.nl.modules.system.service.GridService;
-import org.nl.modules.system.service.dto.GridDto;
-import org.springframework.data.domain.Pageable;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.Map;
-
-/**
- * @Author: lyd
- * @Description: 系统表格管理
- * @Date: 2022-08-01
- */
-@RestController
-@RequiredArgsConstructor
-@Api(tags = "系统表格管理")
-@RequestMapping("/api/grid")
-@Slf4j
-public class GridController {
-    private final GridService gridService;
-
-    @GetMapping
-    @Log("查询系统表格")
-    @ApiOperation("查询系统表格")
-    public ResponseEntity<Object> query(@RequestParam Map whereJson, Pageable page){
-        return new ResponseEntity<>(gridService.queryAll(whereJson,page),HttpStatus.OK);
-    }
-
-    @PostMapping
-    @Log("新增系统表格")
-    @ApiOperation("新增系统表格")
-    public ResponseEntity<Object> create(@Validated @RequestBody GridDto dto){
-        gridService.create(dto);
-        return new ResponseEntity<>(HttpStatus.CREATED);
-    }
-
-    @PutMapping
-    @Log("修改系统表格")
-    @ApiOperation("修改系统表格")
-    public ResponseEntity<Object> update(@Validated @RequestBody GridDto dto){
-        gridService.update(dto);
-        return new ResponseEntity<>(HttpStatus.NO_CONTENT);
-    }
-
-    @Log("删除系统表格")
-    @ApiOperation("删除系统表格")
-    @DeleteMapping
-    public ResponseEntity<Object> delete(@RequestBody String[] ids) {
-        gridService.deleteAll(ids);
-        return new ResponseEntity<>(HttpStatus.OK);
-    }
-
-    @GetMapping("/selectList")
-    @Log("下拉框获取表格数据")
-    @ApiOperation("下拉框获取表格数据")
-    public ResponseEntity<Object> getGridList(){
-        return new ResponseEntity<>(gridService.getGridList(),HttpStatus.OK);
-    }
-}

nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/rest/GridFieldController.java

@@ -1,87 +0,0 @@
-package org.nl.modules.system.rest;
-
-import com.alibaba.fastjson.JSONObject;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.nl.modules.logging.annotation.Log;
-import org.nl.modules.system.service.GridFieldService;
-import org.nl.modules.system.service.dto.GridFieldDto;
-import org.springframework.data.domain.Pageable;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.Map;
-
-/**
- * @Author: lyd
- * @Description: 系统表格字段管理
- * @Date: 2022-08-01
- */
-@RestController
-@RequiredArgsConstructor
-@Api(tags = "系统表格字段管理")
-@RequestMapping("/api/gridField")
-@Slf4j
-public class GridFieldController {
-    private final GridFieldService gridFieldService;
-
-    @GetMapping
-    @Log("查询系统表格")
-    @ApiOperation("查询系统表格")
-    public ResponseEntity<Object> query(@RequestParam Map whereJson, Pageable page){
-        return new ResponseEntity<>(gridFieldService.queryAll(whereJson,page),HttpStatus.OK);
-    }
-
-    @PostMapping
-    @Log("单个新增表格字段")
-    @ApiOperation("单个新增表格字段")
-    public ResponseEntity<Object> create(@Validated @RequestBody GridFieldDto dto){
-        gridFieldService.create(dto);
-        return new ResponseEntity<>(HttpStatus.CREATED);
-    }
-
-    @PutMapping
-    @Log("修改表格字段")
-    @ApiOperation("修改表格字段")
-    public ResponseEntity<Object> update(@Validated @RequestBody GridFieldDto dto){
-        gridFieldService.update(dto);
-        return new ResponseEntity<>(HttpStatus.NO_CONTENT);
-    }
-
-    @Log("删除表格字段")
-    @ApiOperation("删除表格字段")
-    @DeleteMapping
-    public ResponseEntity<Object> delete(@RequestBody String[] ids) {
-        gridFieldService.deleteAll(ids);
-        return new ResponseEntity<>(HttpStatus.OK);
-    }
-
-    @PostMapping("/batchAdd")
-    @Log("批量新增表格字段")
-    @ApiOperation("批量新增表格字段")
-    public ResponseEntity<Object> batchAdd(@RequestBody JSONObject json){
-//        log.info("json{}",json);
-        gridFieldService.batchAdd(json);
-        return new ResponseEntity<>(HttpStatus.CREATED);
-    }
-
-    @PostMapping("/getGridFields")
-    @Log("根据gridId获取所有字段")
-    @ApiOperation("根据gridId获取所有字段")
-    public ResponseEntity<Object> getGridFieldsById(@RequestBody String id){
-        log.info("dto:{}",id);
-        return new ResponseEntity<>(gridFieldService.getGridFieldsById(id),HttpStatus.CREATED);
-    }
-
-    @PostMapping("/getGridFieldsByCode")
-    @Log("根据gridCode获取所有字段")
-    @ApiOperation("根据gridCode获取所有字段")
-    public ResponseEntity<Object> getGridFieldsByCode(@RequestBody String grid_code){
-        log.info("dto:{}",grid_code);
-        return new ResponseEntity<>(gridFieldService.getGridFieldsByCode(grid_code),HttpStatus.CREATED);
-    }
-}

nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/rest/LimitController.java

@@ -1,47 +0,0 @@
-/*
- *  Copyright 2019-2020 Zheng Jie
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package org.nl.modules.system.rest;
-
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.nl.modules.common.annotation.Limit;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.concurrent.atomic.AtomicInteger;
-
-/**
- * @author /
- * 接口限流测试类
- */
-@RestController
-@RequestMapping("/api/limit")
-@Api(tags = "系统：限流测试管理")
-public class LimitController {
-
-    private static final AtomicInteger ATOMIC_INTEGER = new AtomicInteger();
-
-    /**
-     * 测试限流注解，下面配置说明该接口 60秒内最多只能访问 10次，保存到redis的键名为 limit_test，
-     */
-    @GetMapping
-    @ApiOperation("测试")
-    @Limit(key = "test", period = 60, count = 10, name = "testLimit", prefix = "limit")
-    public int test() {
-        return ATOMIC_INTEGER.incrementAndGet();
-    }
-}

nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/rest/MenuController.java

@@ -1,142 +0,0 @@
-/*
- *  Copyright 2019-2020 Zheng Jie
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package org.nl.modules.system.rest;
-
-import cn.dev33.satoken.annotation.SaCheckPermission;
-import cn.dev33.satoken.annotation.SaMode;
-import cn.hutool.core.util.StrUtil;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.RequiredArgsConstructor;
-import org.nl.modules.common.utils.SecurityUtils;
-import org.nl.modules.logging.annotation.Log;
-import org.nl.modules.system.service.MenuService;
-import org.nl.system.service.menu.dto.MenuDto;
-import org.springframework.data.domain.Pageable;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.*;
-
-/**
- * @author ludj
- * @date 2022-12-30
- */
-
-@RestController
-@RequiredArgsConstructor
-@Api(tags = "系统：菜单管理")
-@RequestMapping("/api/menus2")
-public class MenuController {
-
-    private final MenuService menuService;
-
-    @GetMapping(value = "/build")
-    @ApiOperation("根据用户获取菜单")
-    public ResponseEntity<Object> buildMenus() {
-        List<MenuDto> menuDtoList = menuService.findByUser(String.valueOf(SecurityUtils.getCurrentUserId()));
-        List<MenuDto> menuDtos = menuService.buildTree(menuDtoList);
-        return new ResponseEntity<>(menuService.buildMenus(menuDtos),HttpStatus.OK);
-    }
-
-    @ApiOperation("返回全部的菜单")
-    @GetMapping(value = "/lazy")
-    @SaCheckPermission(value = {"menu:list", "roles:list"}, mode = SaMode.AND)
-    public ResponseEntity<Object> query(@RequestParam String pid) {
-        return new ResponseEntity<>(menuService.getMenus(pid), HttpStatus.OK);
-    }
-    @ApiOperation("获取菜单列表")
-    @PostMapping(value = "/getMenusByRole")
-    @SaCheckPermission(value = {"menu:list", "roles:list"}, mode = SaMode.AND)
-    public ResponseEntity<Object> getMenusByRole(@RequestBody JSONObject json) {
-        String role_id = json.getString("role_id");
-        String system_type = json.getString("system_type");
-        String category = json.getString("category");
-        return new ResponseEntity<>(menuService.getMenusByRole(role_id, system_type, category), HttpStatus.OK);
-    }
-
-    @ApiOperation("根据菜单ID返回所有子节点ID，包含自身ID")
-    @GetMapping(value = "/child")
-    @SaCheckPermission(value = {"menu:list", "roles:list"}, mode = SaMode.AND)
-    public ResponseEntity<Object> child(@RequestParam String id) {
-        Set<MenuDto> menuSet = new HashSet<>();
-        List<MenuDto> menuList = menuService.getMenus(id);
-        menuSet.add(menuService.findById(id));
-        menuSet = menuService.getChildMenus(menuList, menuSet);
-//        Set<String> ids = menuSet.stream().map(MenuDto::getMenuId).collect(Collectors.toSet());
-        return new ResponseEntity<>(null, HttpStatus.OK);
-    }
-
-    @GetMapping
-    @ApiOperation("查询菜单")
-    @SaCheckPermission("menu:list")
-    public ResponseEntity<Object> pageQuery(@RequestParam Map whereJson, Pageable page) throws Exception {
-        JSONObject param = JSONObject.parseObject(JSON.toJSONString(whereJson));
-        JSONObject menuDtoList = menuService.queryAll(param, page);
-        return new ResponseEntity<>(menuDtoList, HttpStatus.OK);
-    }
-
-    @ApiOperation("查询菜单:根据ID获取同级与上级数据")
-    @PostMapping("/superior")
-    @SaCheckPermission("menu:list")
-    public ResponseEntity<Object> getSuperior(@RequestBody JSONObject param) {
-        Set<MenuDto> menuDtos = new LinkedHashSet<>();
-        String id=param.getString("ids");
-        if (StrUtil.isNotEmpty(id)) {
-                MenuDto menuDto = menuService.findById(id);
-                menuDtos.addAll(menuService.getSuperior(menuDto, new ArrayList<>()));
-            return new ResponseEntity<>(menuService.buildTree(new ArrayList<>(menuDtos)), HttpStatus.OK);
-        }
-        return new ResponseEntity<>(menuService.getMenus(null), HttpStatus.OK);
-    }
-
-    @Log("新增菜单")
-    @ApiOperation("新增菜单")
-    @PostMapping
-    @SaCheckPermission("menu:add")
-    public ResponseEntity<Object> create(@Validated @RequestBody JSONObject form) {
-        menuService.create(form);
-        return new ResponseEntity<>(HttpStatus.CREATED);
-    }
-
-    @Log("修改菜单")
-    @ApiOperation("修改菜单")
-    @PutMapping
-    @SaCheckPermission("menu:edit")
-    public ResponseEntity<Object> update( @RequestBody JSONObject form) {
-        menuService.update(form);
-        return new ResponseEntity<>(HttpStatus.NO_CONTENT);
-    }
-
-    @Log("删除菜单")
-    @ApiOperation("删除菜单")
-    @DeleteMapping
-    @SaCheckPermission("menu:del")
-    public ResponseEntity<Object> delete(@RequestBody Set<String> ids) {
-        Set<MenuDto> menuSet = new HashSet<>();
-        for (String id : ids) {
-             List<MenuDto> menuList = menuService.getMenus(id);
-            menuSet.add(menuService.findById(id));
-            menuSet = menuService.getChildMenus(menuList, menuSet);
-        }
-        menuService.delete(menuSet);
-        return new ResponseEntity<>(HttpStatus.OK);
-    }
-}

nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/rest/ParamController.java

@@ -1,82 +0,0 @@
-package org.nl.modules.system.rest;
-
-
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.nl.modules.logging.annotation.Log;
-import org.nl.modules.system.service.ParamService;
-import org.nl.modules.system.service.dto.ParamDto;
-import org.springframework.data.domain.Pageable;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.util.Map;
-
-/**
- * @author ldjun
- * @date 2021-01-14
- **/
-@RestController
-@RequiredArgsConstructor
-@Api(tags = "系统参数管理")
-@RequestMapping("/ssss")
-@Slf4j
-public class ParamController {
-
-    private final ParamService paramService;
-
-    @GetMapping
-    @Log("查询系统参数")
-    @ApiOperation("查询系统参数")
-    //@SaCheckPermission("param:list")
-    public ResponseEntity<Object> query(@RequestParam Map whereJson, Pageable page){
-        return new ResponseEntity<>(paramService.queryAll(whereJson,page),HttpStatus.OK);
-    }
-    @PostMapping
-    @Log("新增系统参数")
-    @ApiOperation("新增系统参数")
-    //@SaCheckPermission("param:add")
-    public ResponseEntity<Object> create(@Validated @RequestBody ParamDto dto){
-        paramService.create(dto);
-        return new ResponseEntity<>(HttpStatus.CREATED);
-    }
-
-    @PutMapping
-    @Log("修改系统参数")
-    @ApiOperation("修改系统参数")
-    //@SaCheckPermission("param:edit")
-    public ResponseEntity<Object> update(@Validated @RequestBody ParamDto dto){
-        paramService.update(dto);
-        return new ResponseEntity<>(HttpStatus.NO_CONTENT);
-    }
-
-    @Log("删除系统参数")
-    @ApiOperation("删除系统参数")
-    //@SaCheckPermission("param:del")
-    @DeleteMapping
-    public ResponseEntity<Object> delete(@RequestBody String[] ids) {
-        paramService.deleteAll(ids);
-        return new ResponseEntity<>(HttpStatus.OK);
-    }
-
-    @Log("导出系统参数")
-    @ApiOperation("导出系统参数")
-    @GetMapping(value = "/download")
-    //@SaCheckPermission("param:list")
-    public void download(HttpServletResponse response, Map whereJson) throws IOException {
-        paramService.download(paramService.queryAll(whereJson), response);
-    }
-
-    @PostMapping("/getValueByCode")
-    @Log("根据编码获取值")
-    @ApiOperation("根据编码获取值")
-    public ResponseEntity<Object> getValueByCode(@RequestBody String code) {
-        return new ResponseEntity<>(paramService.findByCode(code), HttpStatus.CREATED);
-    }
-}

nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/rest/RoleController.java

@@ -1,87 +0,0 @@
-package org.nl.modules.system.rest;
-
-import cn.dev33.satoken.annotation.SaCheckPermission;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.RequiredArgsConstructor;
-import org.nl.modules.logging.annotation.Log;
-import org.nl.modules.system.service.RoleService;
-import org.nl.modules.wql.core.bean.WQLObject;
-import org.springframework.data.domain.Pageable;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.Map;
-import java.util.Set;
-
-/**
- * @author ludj
- * @date 2022-12-05
- */
-@RestController
-@RequiredArgsConstructor
-@Api(tags = "系统：角色管理")
-@RequestMapping("/api/roles")
-public class RoleController {
-
-    private final RoleService roleService;
-
-
-    @ApiOperation("查询角色")
-    @GetMapping
-    @SaCheckPermission("roles:list")
-    public ResponseEntity<Object> query(Map criteria, Pageable pageable) {
-        return new ResponseEntity<>(roleService.queryAll(criteria, pageable), HttpStatus.OK);
-    }
-
-
-    @Log("新增角色")
-    @ApiOperation("新增角色")
-    @PostMapping
-//    @SaCheckPermission("roles:add")
-    public ResponseEntity<Object> create(@RequestBody JSONObject param) {
-        roleService.create(param);
-        return new ResponseEntity<>(HttpStatus.CREATED);
-    }
-
-    @Log("修改角色")
-    @ApiOperation("修改角色")
-    @PutMapping
-//    @SaCheckPermission("roles:edit")
-    public ResponseEntity<Object> update(@RequestBody JSONObject param) {
-        roleService.update(param);
-        return new ResponseEntity<>(HttpStatus.NO_CONTENT);
-    }
-
-    @Log("修改角色菜单")
-    @ApiOperation("修改角色菜单")
-    @PutMapping(value = "/menu")
-//    @SaCheckPermission("roles:edit")
-    public ResponseEntity<Object> updateMenu(@RequestBody JSONObject form) {
-        String role_id = form.getString("role_id");
-        JSONArray menus = form.getJSONArray("menus");
-        WQLObject rmTab = WQLObject.getWQLObject("sys_roles_menus");
-        rmTab.delete("role_id = " + role_id + "");
-
-        for (int i = 0; i < menus.size(); i++) {
-            JSONObject json = menus.getJSONObject(i);
-            JSONObject param = new JSONObject();
-            param.put("role_id", role_id);
-            param.put("menu_id", json.getString("menu_id"));
-            rmTab.insert(param);
-        }
-        return new ResponseEntity<>(HttpStatus.NO_CONTENT);
-    }
-
-    @Log("删除角色")
-    @ApiOperation("删除角色")
-    @DeleteMapping
-    @SaCheckPermission("roles:del")
-    public ResponseEntity<Object> delete(@RequestBody Set<String> ids) {
-        roleService.delete(ids);
-        return new ResponseEntity<>(HttpStatus.OK);
-    }
-}

nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/service/DataService.java

@@ -1,36 +0,0 @@
-/*
- *  Copyright 2019-2020 Zheng Jie
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package org.nl.modules.system.service;
-
-import org.nl.modules.system.service.dto.UserDto;
-import org.nl.system.service.user.dao.SysUser;
-
-import java.util.List;
-
-/**
- * 数据权限服务类
- * @author Zheng Jie
- * @date 2020-05-07
- */
-public interface DataService {
-
-    /**
-     * 获取数据权限
-     * @param user /
-     * @return /
-     */
-    List<Long> getDeptIds(SysUser user);
-}

nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/service/DeptService.java

@@ -1,159 +0,0 @@
-/*
- *  Copyright 2019-2020 Zheng Jie
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package org.nl.modules.system.service;
-
-import org.nl.modules.system.domain.Dept;
-import org.nl.modules.system.service.dto.DeptQueryCriteria;
-import org.nl.modules.system.service.dto.DeptTree;
-
-import java.util.List;
-import java.util.Set;
-
-/**
- * @author Zheng Jie
- * @date 2019-03-25
- */
-public interface DeptService {
-
-    /**
-     * 查询所有数据
-     *
-     * @param criteria 条件
-     * @param isQuery  /
-     * @return /
-     * @throws Exception /
-     */
-    List<Dept> queryAll(DeptQueryCriteria criteria, Boolean isQuery) throws Exception;
-
-    /**
-     * 获取
-     *
-     * @param deptList
-     * @return
-     */
-    List<String> getDeptChildren(List<Dept> deptList);
-
-    /**
-     * 根据ID查询
-     *
-     * @param id /
-     * @return /
-     */
-    Dept findById(String id);
-
-    List<Dept> findByPid(String pid);
-
-    /**
-     * 创建
-     *
-     * @param resources /
-     */
-    void create(Dept resources);
-
-    /**
-     * 编辑
-     *
-     * @param resources /
-     */
-    void update(Dept resources);
-
-    /**
-     * 查询pid所有子集
-     *
-     */
-    Set<String> findPidChild(String pid);
-
-    /**
-     * 删除
-     *
-     * @param deptDtos /
-     */
-    void delete(Set<String> deptDtos);
-
-    /**
-     * 根据PID查询
-     *
-     * @return /
-     */
-    <T> T findById(String id, Class<T> tagert);
-
-
-
-    /**
-     * 获取待删除的部门
-     *
-     * @param deptList /
-     * @return /
-     */
-    Set<Dept> getDeleteDepts(List<Dept> deptList, Set<Dept> depts);
-
-    /**
-     * 根据ID获取同级与上级数据
-     *
-     * @param deptDto /
-     * @param depts   /
-     * @return /
-     */
-    List<DeptTree> getSuperior(DeptTree deptDto, List<DeptTree> depts);
-
-    /**
-     * 构建树形数据
-     *
-     * @param deptDtos /
-     * @return /
-     */
-    Object buildTree(List<DeptTree> deptDtos);
-
-
-    /**
-     * 验证是否被角色或用户关联
-     *
-     * @param deptDtos /
-     */
-    void verification(Set<String> deptDtos);
-
-    /**
-     * 获取当前节点的所有子类节点集合数据
-     *
-     * @param dept_id
-     * @return
-     */
-    Set<String> getChildIdSet(String dept_id);
-
-    /**
-     * 获取查询条件的所有子节点集合
-     *
-     * @param dept_idStr
-     * @return
-     */
-    Set<String> getAllChildIdSet(String dept_idStr);
-
-    /**
-     * 获取当前节点的所有子类节点集合串,用于拼接SQL（in）
-     *
-     * @param dept_id
-     * @return
-     */
-    String getChildIdStr(String dept_id);
-
-    /**
-     * 获取所有节点的子节点的ID串
-     *
-     * @param dept_idStr
-     * @return
-     */
-    String getAllChildIdStr(String dept_idStr);
-}