renruixin преди 3 години
родител
ревизия
4413fe9426
променени са 42 файла, в които са добавени 229 реда и са изтрити 89 реда
  1. 1 1
      src/main/java/com/metro/annotation/Excel.java
  2. 1 1
      src/main/java/com/metro/annotation/Excels.java
  3. 1 1
      src/main/java/com/metro/baseRe/AjaxResult.java
  4. 0 2
      src/main/java/com/metro/config/SwaggerConfiguration.java
  5. 19 0
      src/main/java/com/metro/config/WebConfig.java
  6. 2 2
      src/main/java/com/metro/constant/Constants.java
  7. 1 7
      src/main/java/com/metro/controller/AccountController.java
  8. 18 2
      src/main/java/com/metro/controller/BaseController.java
  9. 1 1
      src/main/java/com/metro/exception/FileException.java
  10. 1 1
      src/main/java/com/metro/exception/FileNameLengthLimitExceededException.java
  11. 1 1
      src/main/java/com/metro/exception/FileSizeLimitExceededException.java
  12. 1 1
      src/main/java/com/metro/exception/InvalidExtensionException.java
  13. 61 0
      src/main/java/com/metro/exception/NotLoginException.java
  14. 1 1
      src/main/java/com/metro/exception/UtilException.java
  15. 1 1
      src/main/java/com/metro/exception/base/BaseException.java
  16. 8 10
      src/main/java/com/metro/security/AdminInterceptor.java
  17. 50 0
      src/main/java/com/metro/service/base/BaseService.java
  18. 4 7
      src/main/java/com/metro/service/impl/AccountServiceImpl.java
  19. 32 25
      src/main/java/com/metro/service/impl/PoliceServiceImpl.java
  20. 1 1
      src/main/java/com/metro/utils/CacheUtils.java
  21. 1 1
      src/main/java/com/metro/utils/DateUtils.java
  22. 1 1
      src/main/java/com/metro/utils/DictUtils.java
  23. 1 1
      src/main/java/com/metro/utils/MessageUtils.java
  24. 1 1
      src/main/java/com/metro/utils/ReflectUtils.java
  25. 1 1
      src/main/java/com/metro/utils/StringUtils.java
  26. 1 1
      src/main/java/com/metro/utils/bean/BeanUtils.java
  27. 1 1
      src/main/java/com/metro/utils/bean/BeanValidators.java
  28. 3 3
      src/main/java/com/metro/utils/file/FileTypeUtils.java
  29. 1 1
      src/main/java/com/metro/utils/file/FileUploadUtils.java
  30. 1 1
      src/main/java/com/metro/utils/file/FileUtils.java
  31. 1 1
      src/main/java/com/metro/utils/file/ImageUtils.java
  32. 1 1
      src/main/java/com/metro/utils/file/MimeTypeUtils.java
  33. 1 1
      src/main/java/com/metro/utils/poi/ExcelHandlerAdapter.java
  34. 1 1
      src/main/java/com/metro/utils/poi/ExcelUtil.java
  35. 1 1
      src/main/java/com/metro/utils/spring/SpringUtils.java
  36. 1 1
      src/main/java/com/metro/utils/text/CharsetKit.java
  37. 1 1
      src/main/java/com/metro/utils/text/Convert.java
  38. 1 1
      src/main/java/com/metro/utils/text/StrFormatter.java
  39. 1 1
      src/main/java/com/metro/utils/uuid/IdUtils.java
  40. 1 1
      src/main/java/com/metro/utils/uuid/Seq.java
  41. 1 1
      src/main/java/com/metro/utils/uuid/UUID.java
  42. 1 1
      src/main/resources/application.yml

+ 1 - 1
src/main/java/com/metro/annotation/Excel.java

@@ -12,7 +12,7 @@ import java.math.BigDecimal;
 /**
  * 自定义导出Excel数据注解
  *
- * @author ruoyi
+ * @author lws
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.FIELD)

+ 1 - 1
src/main/java/com/metro/annotation/Excels.java

@@ -8,7 +8,7 @@ import java.lang.annotation.Target;
 /**
  * Excel注解集
  * 
- * @author ruoyi
+ * @author lws
  */
 @Target(ElementType.FIELD)
 @Retention(RetentionPolicy.RUNTIME)

+ 1 - 1
src/main/java/com/metro/baseRe/AjaxResult.java

@@ -7,7 +7,7 @@ import java.util.HashMap;
 /**
  * 操作消息提醒
  *
- * @author ruoyi
+ * @author lws
  */
 public class AjaxResult extends HashMap<String, Object>
 {

+ 0 - 2
src/main/java/com/metro/config/SwaggerConfiguration.java

@@ -11,8 +11,6 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2WebMvc;
 
 @Configuration
 @EnableSwagger2WebMvc
-//@Configuration
-//@EnableSwagger2
 public class SwaggerConfiguration {
 
 

+ 19 - 0
src/main/java/com/metro/config/WebConfig.java

@@ -0,0 +1,19 @@
+package com.metro.config;
+
+import com.metro.security.AdminInterceptor;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
+
+@Configuration
+public class WebConfig extends WebMvcConfigurerAdapter {
+
+    @Override
+    public void addInterceptors(InterceptorRegistry registry) {
+        registry.addInterceptor(new AdminInterceptor())
+                .addPathPatterns("/**")
+                .excludePathPatterns("/swagger-resources/**", "/webjars/**", "/v2/**", "/swagger-ui.html/**","/swagger-ui.html/**");
+
+    }
+
+}

+ 2 - 2
src/main/java/com/metro/constant/Constants.java

@@ -104,11 +104,11 @@ public class Constants {
     /**
      * 定时任务白名单配置(仅允许访问的包名,如其他需要可以自行添加)
      */
-    public static final String[] JOB_WHITELIST_STR = { "com.ruoyi" };
+    public static final String[] JOB_WHITELIST_STR = { "com.lws" };
 
     /**
      * 定时任务违规的字符
      */
     public static final String[] JOB_ERROR_STR = { "java.net.URL", "javax.naming.InitialContext", "org.yaml.snakeyaml",
-            "org.springframework", "org.apache", "com.ruoyi.common.utils.file" };
+            "org.springframework", "org.apache", "com.lws.common.utils.file" };
 }

+ 1 - 7
src/main/java/com/metro/controller/AccountController.java

@@ -24,9 +24,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
-import sun.plugin.javascript.navig4.Window;
 
-import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.awt.*;
@@ -61,6 +59,7 @@ public class AccountController extends BaseController {
     public BaseResponse<LoginAccountResp> doLogin(@Valid @RequestBody LoginAccountReq req) {
         return BaseResponse.ok(service.login(req));
     }
+
     @ApiOperation("后台管理退出登录")
     @Authority(required = false)
     @GetMapping("/doLogout")
@@ -68,7 +67,6 @@ public class AccountController extends BaseController {
         return RestResponse.ok(service.logout());
     }
 
-
     /**
      * 获取用户信息
      *
@@ -80,10 +78,6 @@ public class AccountController extends BaseController {
         return RestResponse.ok(service.getUserInfo(getUserId()));
     }
 
-
-
-
-
     /**
      * 账号列表查询
      *

+ 18 - 2
src/main/java/com/metro/controller/BaseController.java

@@ -1,10 +1,17 @@
 package com.metro.controller;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.metro.constant.UserConstant;
+import com.metro.entity.po.Account;
+import com.metro.exception.BusinessException;
+import com.metro.mapper.AccountsMapper;
 import com.metro.restful.CommonException;
 import com.metro.restful.RestCode;
 import com.metro.security.JWTUtils;
+import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
 
@@ -20,10 +27,13 @@ import javax.servlet.http.HttpServletRequest;
  */
 public class BaseController {
 
+    @Autowired
+    private AccountsMapper accountsMapper;
+
     public Long getUserId() {
         ServletRequestAttributes requestAttributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
         if (requestAttributes == null) {
-            throw new CommonException(RestCode.UNAUTHORIZED);
+            throw new BusinessException(RestCode.UNAUTHORIZED.getMsg());
         }
         HttpServletRequest request = requestAttributes.getRequest();
         return getUserId(request);
@@ -33,9 +43,15 @@ public class BaseController {
         String token = request.getHeader("Authorization");
         token = JWTUtils.getUserId(token);
         if (StringUtils.isEmpty(token)) {
-            throw new CommonException(RestCode.UNAUTHORIZED);
+            throw new BusinessException(RestCode.UNAUTHORIZED.getMsg());
         }
         return Long.valueOf(token);
     }
 
+    public Account getAccountInfo() {
+        Account account = accountsMapper.selectOne(new LambdaQueryWrapper<Account>().eq(Account::getId, getUserId()).eq(Account::getIsDelete, UserConstant.NOT_DELETE));
+        if(ObjectUtils.isEmpty(account)) throw new BusinessException("获取用户信息失败!");
+        return account;
+    }
+
 }

+ 1 - 1
src/main/java/com/metro/exception/FileException.java

@@ -6,7 +6,7 @@ import com.metro.exception.base.BaseException;
 /**
  * 文件信息异常类
  *
- * @author ruoyi
+ * @author lws
  */
 public class FileException extends BaseException {
     private static final long serialVersionUID = 1L;

+ 1 - 1
src/main/java/com/metro/exception/FileNameLengthLimitExceededException.java

@@ -3,7 +3,7 @@ package com.metro.exception;
 /**
  * 文件名称超长限制异常类
  * 
- * @author ruoyi
+ * @author lws
  */
 public class FileNameLengthLimitExceededException extends FileException
 {

+ 1 - 1
src/main/java/com/metro/exception/FileSizeLimitExceededException.java

@@ -3,7 +3,7 @@ package com.metro.exception;
 /**
  * 文件名大小限制异常类
  *
- * @author ruoyi
+ * @author lws
  */
 public class FileSizeLimitExceededException extends FileException {
     private static final long serialVersionUID = 1L;

+ 1 - 1
src/main/java/com/metro/exception/InvalidExtensionException.java

@@ -7,7 +7,7 @@ import java.util.Arrays;
 /**
  * 文件上传 误异常类
  *
- * @author ruoyi
+ * @author lws
  */
 public class InvalidExtensionException extends FileUploadException {
     private static final long serialVersionUID = 1L;

+ 61 - 0
src/main/java/com/metro/exception/NotLoginException.java

@@ -0,0 +1,61 @@
+package com.metro.exception;//
+// Source code recreated from a .class file by IntelliJ IDEA
+// (powered by Fernflower decompiler)
+//
+
+
+import cn.dev33.satoken.exception.SaTokenException;
+
+import java.util.Arrays;
+import java.util.List;
+
+public class NotLoginException extends SaTokenException {
+    private static final long serialVersionUID = 6806129545290130142L;
+    public static final String NOT_TOKEN = "-1";
+    public static final String NOT_TOKEN_MESSAGE = "未提供token";
+    public static final String INVALID_TOKEN = "-2";
+    public static final String INVALID_TOKEN_MESSAGE = "token无效";
+    public static final String TOKEN_TIMEOUT = "-3";
+    public static final String TOKEN_TIMEOUT_MESSAGE = "token已过期";
+    public static final String BE_REPLACED = "-4";
+    public static final String BE_REPLACED_MESSAGE = "token已被顶下线";
+    public static final String KICK_OUT = "-5";
+    public static final String KICK_OUT_MESSAGE = "token已被踢下线";
+    public static final String DEFAULT_MESSAGE = "当前会话未登录";
+    public static final List<String> ABNORMAL_LIST = Arrays.asList("-1", "-2", "-3", "-4", "-5");
+    private String type;
+    private String loginKey;
+
+    public String getType() {
+        return this.type;
+    }
+
+    public String getLoginKey() {
+        return this.loginKey;
+    }
+
+    public NotLoginException(String message, String loginKey, String type) {
+        super(message);
+        this.loginKey = loginKey;
+        this.type = type;
+    }
+
+    public static void newInstance(String loginKey, String type) {
+        String message = null;
+        if ("-1".equals(type)) {
+            message = "未提供token";
+        } else if ("-2".equals(type)) {
+            message = "token无效";
+        } else if ("-3".equals(type)) {
+            message = "token已过期";
+        } else if ("-4".equals(type)) {
+            message = "token已被顶下线";
+        } else if ("-5".equals(type)) {
+            message = "token已被踢下线";
+        } else {
+            message = "当前会话未登录";
+        }
+
+        throw  new BusinessException(message);
+    }
+}

+ 1 - 1
src/main/java/com/metro/exception/UtilException.java

@@ -3,7 +3,7 @@ package com.metro.exception;
 /**
  * 工具类异常
  *
- * @author ruoyi
+ * @author lws
  */
 public class UtilException extends RuntimeException {
     private static final long serialVersionUID = 8247610319171014183L;

+ 1 - 1
src/main/java/com/metro/exception/base/BaseException.java

@@ -6,7 +6,7 @@ import com.metro.utils.StringUtils;
 /**
  * 基础异常
  *
- * @author ruoyi
+ * @author lws
  */
 public class BaseException extends RuntimeException {
     private static final long serialVersionUID = 1L;

+ 8 - 10
src/main/java/com/metro/security/AdminInterceptor.java

@@ -3,6 +3,7 @@ package com.metro.security;
 
 import cn.hutool.core.util.ObjectUtil;
 import com.metro.entity.ro.account.LoginAccountResp;
+import com.metro.exception.BusinessException;
 import com.metro.mapper.AccountsMapper;
 import com.metro.restful.RestCode;
 import com.metro.restful.ServiceException;
@@ -32,11 +33,11 @@ import java.lang.reflect.Method;
 @Slf4j
 public class AdminInterceptor implements HandlerInterceptor {
 
-    private final AccountService accountService;
-
     @Autowired
-    public AdminInterceptor(AccountService adminService) {
-        this.accountService = adminService;
+    private  AccountService accountService;
+
+    public AdminInterceptor() {
+
     }
 
     /**
@@ -70,17 +71,14 @@ public class AdminInterceptor implements HandlerInterceptor {
         //检查有没有需要用户权限的注解
         String token = request.getHeader("Authorization");
         if (StringUtils.isEmpty(token)) {
-            throw new ServiceException(RestCode.UNAUTHORIZED);
+            throw new BusinessException(RestCode.UNAUTHORIZED.getMsg());
         }
         // 执行认证
         String userIdStr = JWTUtils.getUserId(token);
         if (StringUtils.isEmpty(userIdStr)) {
-            throw new ServiceException(RestCode.UNAUTHORIZED);
+            throw new BusinessException(RestCode.UNAUTHORIZED.getMsg());
         }
 
-        LoginAccountResp userInfo = accountService.getUserInfo(Long.parseLong(userIdStr));
-        if (ObjectUtil.isEmpty(userInfo)) throw new ServiceException(RestCode.UNAUTHORIZED);
-        JWTUtils.verify(token, userInfo.getId().toString(), userInfo.getPassWord());
         if (annotation == null) {
             return true;
         }
@@ -91,7 +89,7 @@ public class AdminInterceptor implements HandlerInterceptor {
         if (needAuth[0] == 0) {
             return true;
         }
-        throw new ServiceException(RestCode.UNAUTHORIZED);
+        throw new BusinessException(RestCode.UNAUTHORIZED.getMsg());
 
     }
 

+ 50 - 0
src/main/java/com/metro/service/base/BaseService.java

@@ -0,0 +1,50 @@
+package com.metro.service.base;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.metro.constant.UserConstant;
+import com.metro.entity.po.Account;
+import com.metro.exception.BusinessException;
+import com.metro.mapper.AccountsMapper;
+import com.metro.restful.RestCode;
+import com.metro.security.JWTUtils;
+import org.apache.commons.lang3.ObjectUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * @author :lws
+ * @date2022/3/19 17:58
+ */
+public class BaseService {
+    @Autowired
+    private AccountsMapper accountsMapper;
+
+    public Long getUserId() {
+        ServletRequestAttributes requestAttributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
+        if (requestAttributes == null) {
+            throw new BusinessException(RestCode.UNAUTHORIZED.getMsg());
+        }
+        HttpServletRequest request = requestAttributes.getRequest();
+        return getUserId(request);
+    }
+
+    public Long getUserId(HttpServletRequest request) {
+        String token = request.getHeader("Authorization");
+        token = JWTUtils.getUserId(token);
+        if (StringUtils.isEmpty(token)) {
+            throw new BusinessException(RestCode.UNAUTHORIZED.getMsg());
+        }
+        return Long.valueOf(token);
+    }
+
+    public Account getAccountInfo() {
+        Account account = accountsMapper.selectOne(new LambdaQueryWrapper<Account>().eq(Account::getId, getUserId()).eq(Account::getIsDelete, UserConstant.NOT_DELETE));
+        if(ObjectUtils.isEmpty(account)) throw new BusinessException("获取用户信息失败!");
+        return account;
+    }
+
+}

+ 4 - 7
src/main/java/com/metro/service/impl/AccountServiceImpl.java

@@ -17,18 +17,16 @@ import com.metro.mapper.AreaMapper;
 import com.metro.restful.ServiceException;
 import com.metro.security.JWTUtils;
 import com.metro.service.AccountService;
+import com.metro.service.base.BaseService;
 import com.metro.utils.*;
 import com.metro.utils.bean.BeanValidators;
-import com.sun.java.swing.plaf.windows.resources.windows;
 import io.github.classgraph.utils.Join;
-import jdk.nashorn.internal.parser.Token;
 import lombok.extern.log4j.Log4j2;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.time.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.DigestUtils;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.ServletOutputStream;
@@ -52,7 +50,7 @@ import java.util.stream.Collectors;
  */
 @Service
 @Log4j2
-public class AccountServiceImpl implements AccountService {
+public class AccountServiceImpl extends BaseService implements AccountService {
 
     @Autowired
     private AccountsMapper accountsMapper;
@@ -76,7 +74,6 @@ public class AccountServiceImpl implements AccountService {
         Map<Integer, String> areaMap = areaMapper.selectList(new LambdaQueryWrapper<Area>().in(Area::getId, areaIdSet)).stream().collect(Collectors.toMap(Area::getId, p ->
                 Join.join("-", areaMapper.selectList(new LambdaQueryWrapper<Area>().in(Area::getId, StringUtils.split(p.getDistrictSqe(), ","))).stream().map(Area::getName).collect(Collectors.toList()))
         ));
-        Map<Integer, String> areaSqeMap = areaMapper.selectList(new LambdaQueryWrapper<Area>().in(Area::getId, areaIdSet)).stream().collect(Collectors.toMap(Area::getId, Area::getDistrictSqe, (t1, t2) -> t1));
         return selectPage.convert(p -> MapperManager.mapper(p, SelectAccountPageResp.class, q -> q.setAreaDesc(areaMap.get(p.getAreaId()))));
     }
 
@@ -86,7 +83,7 @@ public class AccountServiceImpl implements AccountService {
         wrapper.like(StringUtils.isNotEmpty(req.getUserName()), Account::getUserName, req.getUserName());
         wrapper.eq(StringUtils.isNotEmpty(req.getPhone()), Account::getPhone, req.getPhone());
         wrapper.eq(Account::getIsDelete, UserConstant.NOT_DELETE);
-        /*wrapper.ge(Account::getType, req.getType());*/
+        wrapper.gt(Account::getType, getAccountInfo().getType());
         return wrapper;
     }
 
@@ -102,7 +99,7 @@ public class AccountServiceImpl implements AccountService {
         if (!StringUtil.isChinese(req.getUserName())) throw new BusinessException(UserConstant.NOT_CHINESE_USERNAME);
         Account account = accountsMapper.selectOne(new LambdaQueryWrapper<Account>().eq(Account::getAccount, req.getAccount()).eq(Account::getIsDelete, UserConstant.NOT_DELETE));
         if (ObjectUtil.isNotEmpty(account)) throw new BusinessException(account.getAccount() + "已经存在!不能注册");
-        return new InsertAccountResp().setCount(accountsMapper.insert(MapperManager.mapper(req, Account.class, p -> p.setPassword(MD5UtilNew.string2MD5(req.getPassword())).setType(3))));
+        return new InsertAccountResp().setCount(accountsMapper.insert(MapperManager.mapper(req, Account.class, p -> p.setPassword(MD5UtilNew.string2MD5(req.getPassword())).setType(getAccountInfo().getType()+1))));
     }
 
 

+ 32 - 25
src/main/java/com/metro/service/impl/PoliceServiceImpl.java

@@ -17,6 +17,7 @@ import com.metro.mapper.AccountsMapper;
 import com.metro.mapper.CompanysMapper;
 import com.metro.mapper.PoliceMapper;
 import com.metro.service.PoliceService;
+import com.metro.service.base.BaseService;
 import com.metro.utils.MD5UtilNew;
 import com.metro.utils.MapperManager;
 import com.metro.utils.StringUtil;
@@ -44,66 +45,72 @@ import static com.metro.service.impl.AccountServiceImpl.getUpdateAccountResp;
  * ...
  */
 @Service
-public class PoliceServiceImpl implements PoliceService{
+public class PoliceServiceImpl extends BaseService implements PoliceService {
     @Autowired
     private PoliceMapper mapper;
     @Autowired
     private CompanysMapper companysMapper;
     @Autowired
     private AccountsMapper accountsMapper;
+
     @Override
     public IPage<SelectPolicePageResp> page(SelectPolicePageReq req) {
         IPage<SelectPolicePageResp> respPage = new Page<>(req.getPageNum(), req.getPageSize());
         IPage<Police> selectPage = mapper.selectPage(new Page<>(req.getPageNum(), req.getPageSize()), pageWrapper(req));
         if (org.springframework.util.CollectionUtils.isEmpty(selectPage.getRecords())) return respPage;
         Set<String> deptSet = selectPage.getRecords().stream().map(Police::getCompanyId).collect(Collectors.toSet());
-        Map<String, String> companysMap = companysMapper.selectList(new LambdaQueryWrapper<Company>().in(Company::getCompanyId,deptSet)).stream().collect(Collectors.toMap(Company::getCompanyId, Company::getCompanyName, (t1, t2) -> t1));
+        Map<String, String> companysMap = companysMapper.selectList(new LambdaQueryWrapper<Company>().in(Company::getCompanyId, deptSet)).stream().collect(Collectors.toMap(Company::getCompanyId, Company::getCompanyName, (t1, t2) -> t1));
         return selectPage.convert(p -> MapperManager.mapper(p, SelectPolicePageResp.class, t -> t.setCompanyName(companysMap.get(p.getCompanyId()))));
     }
 
     /*
-    * 新增
-    * */
+     * 查询条件
+     * */
+    private LambdaQueryWrapper<Police> pageWrapper(SelectPolicePageReq req) {
+        LambdaQueryWrapper<Police> wrapper = new LambdaQueryWrapper<>();
+        wrapper.like(StringUtils.isNotEmpty(req.getUserName()), Police::getUserName, req.getUserName());
+        wrapper.eq(StringUtils.isNotEmpty(req.getPhone()), Police::getPhone, req.getPhone());
+        wrapper.eq(Police::getIsDelete, UserConstant.NOT_DELETE);
+        wrapper.like(StringUtils.isNotEmpty(req.getAddress()), Police::getAddress, req.getAddress());
+        wrapper.eq(StringUtils.isNotEmpty(req.getCompanyId()), Police::getCompanyId, req.getCompanyId());
+        wrapper.gt(Police::getType,getAccountInfo().getType());
+        return wrapper;
+    }
+
+    /*
+     * 新增
+     * */
     @Override
     public InsertPoliceResp add(InsertPoliceReq req) {
         Police account = mapper.selectOne(new LambdaQueryWrapper<Police>().eq(Police::getAccount, req.getAccount()).eq(Police::getIsDelete, UserConstant.NOT_DELETE));
         if (ObjectUtil.isNotEmpty(account)) throw new BusinessException(account.getAccount() + "已经存在!不能注册");
-        return new InsertPoliceResp().setCount(mapper.insert(MapperManager.mapper(req, Police.class, p -> p.setPassword(MD5UtilNew.string2MD5(req.getPassword())).setType(4))));
+        return new InsertPoliceResp().setCount(mapper.insert(MapperManager.mapper(req, Police.class, p -> p.setPassword(MD5UtilNew.string2MD5(req.getPassword())).setType(getAccountInfo().getType() + 1))));
     }
+
     /*
-    * 查看详情
-    * */
+     * 查看详情
+     * */
     @Override
     public DetailPoliceResp detail(DetailPoliceReq req) {
         Police Police = mapper.selectById(req.getId());
-        return MapperManager.mapper(Police,DetailPoliceResp.class);
+        return MapperManager.mapper(Police, DetailPoliceResp.class);
     }
 
     /*
-    * 修改账号
-    * */
+     * 修改账号
+     * */
     @Override
     public UpdateAccountResp update(UpdateAccountReq req) {
-        return getUpdateAccountResp(req, accountsMapper);    }
+        return getUpdateAccountResp(req, accountsMapper);
+    }
+
     /*
-    * 删除账号
-    * */
+     * 删除账号
+     * */
     @Override
     public DeleteAccountResp delete(DeleteAccountReq req) {
         return new DeleteAccountResp().setCount(accountsMapper.updateById(new Account().setId(req.getId())
                 .setIsDelete(UserConstant.DELETE).setUpdateTime(LocalDateTime.now())));
     }
 
-    /*
-    * 查询条件
-    * */
-    private LambdaQueryWrapper<Police> pageWrapper(SelectPolicePageReq req) {
-            LambdaQueryWrapper<Police> wrapper = new LambdaQueryWrapper<>();
-            wrapper.like(StringUtils.isNotEmpty(req.getUserName()), Police::getUserName, req.getUserName());
-            wrapper.eq(StringUtils.isNotEmpty(req.getPhone()), Police::getPhone, req.getPhone());
-            wrapper.eq(Police::getIsDelete, UserConstant.NOT_DELETE);
-            wrapper.like(StringUtils.isNotEmpty(req.getAddress()), Police::getAddress,req.getAddress());
-            wrapper.eq(StringUtils.isNotEmpty(req.getCompanyId()),Police::getCompanyId,req.getCompanyId());
-         return wrapper;
-    }
 }

+ 1 - 1
src/main/java/com/metro/utils/CacheUtils.java

@@ -12,7 +12,7 @@ import java.util.Set;
 /**
  * Cache工具类
  * 
- * @author ruoyi
+ * @author lws
  */
 public class CacheUtils
 {

+ 1 - 1
src/main/java/com/metro/utils/DateUtils.java

@@ -11,7 +11,7 @@ import java.util.Date;
 /**
  * 时间工具类
  *
- * @author ruoyi
+ * @author lws
  */
 public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
     public static String YYYY = "yyyy";

+ 1 - 1
src/main/java/com/metro/utils/DictUtils.java

@@ -8,7 +8,7 @@ import java.util.List;
 /**
  * 字典工具类
  *
- * @author ruoyi
+ * @author lws
  */
 @Component
 public class DictUtils {

+ 1 - 1
src/main/java/com/metro/utils/MessageUtils.java

@@ -7,7 +7,7 @@ import org.springframework.context.i18n.LocaleContextHolder;
 /**
  * 获取i18n资源文件
  *
- * @author ruoyi
+ * @author lws
  */
 public class MessageUtils {
     /**

+ 1 - 1
src/main/java/com/metro/utils/ReflectUtils.java

@@ -13,7 +13,7 @@ import java.util.Date;
 /**
  * 反射工具类. 提供调用getter/setter方法, 访问私有变量, 调用私有方法, 获取泛型类型Class, 被AOP过的真实类等工具函数.
  *
- * @author ruoyi
+ * @author lws
  */
 @SuppressWarnings("rawtypes")
 public class ReflectUtils {

+ 1 - 1
src/main/java/com/metro/utils/StringUtils.java

@@ -9,7 +9,7 @@ import java.util.*;
 /**
  * 字符串工具类
  *
- * @author ruoyi
+ * @author lws
  */
 public class StringUtils extends org.apache.commons.lang3.StringUtils {
     /**

+ 1 - 1
src/main/java/com/metro/utils/bean/BeanUtils.java

@@ -9,7 +9,7 @@ import java.util.regex.Pattern;
 /**
  * Bean 工具类
  * 
- * @author ruoyi
+ * @author lws
  */
 public class BeanUtils extends org.springframework.beans.BeanUtils
 {

+ 1 - 1
src/main/java/com/metro/utils/bean/BeanValidators.java

@@ -8,7 +8,7 @@ import java.util.Set;
 /**
  * bean对象属性验证
  *
- * @author ruoyi
+ * @author lws
  */
 public class BeanValidators {
     public static void validateWithException(Validator validator, Object object, Class<?>... groups)

+ 3 - 3
src/main/java/com/metro/utils/file/FileTypeUtils.java

@@ -7,14 +7,14 @@ import java.io.File;
 /**
  * 文件类型工具类
  *
- * @author ruoyi
+ * @author lws
  */
 public class FileTypeUtils
 {
     /**
      * 获取文件类型
      * <p>
-     * 例如: ruoyi.txt, 返回: txt
+     * 例如: lws.txt, 返回: txt
      * 
      * @param file 文件名
      * @return 后缀(不含".")
@@ -31,7 +31,7 @@ public class FileTypeUtils
     /**
      * 获取文件类型
      * <p>
-     * 例如: ruoyi.txt, 返回: txt
+     * 例如: lws.txt, 返回: txt
      *
      * @param fileName 文件名
      * @return 后缀(不含".")

+ 1 - 1
src/main/java/com/metro/utils/file/FileUploadUtils.java

@@ -18,7 +18,7 @@ import java.util.Objects;
 /**
  * 文件上传工具类
  *
- * @author ruoyi
+ * @author lws
  */
 public class FileUploadUtils {
     /**

+ 1 - 1
src/main/java/com/metro/utils/file/FileUtils.java

@@ -16,7 +16,7 @@ import java.nio.charset.StandardCharsets;
 /**
  * 文件处理工具类
  *
- * @author ruoyi
+ * @author lws
  */
 public class FileUtils {
     public static String FILENAME_PATTERN = "[a-zA-Z0-9_\\-\\|\\.\\u4e00-\\u9fa5]+";

+ 1 - 1
src/main/java/com/metro/utils/file/ImageUtils.java

@@ -17,7 +17,7 @@ import java.util.Arrays;
 /**
  * 图片处理工具类
  *
- * @author ruoyi
+ * @author lws
  */
 public class ImageUtils
 {

+ 1 - 1
src/main/java/com/metro/utils/file/MimeTypeUtils.java

@@ -3,7 +3,7 @@ package com.metro.utils.file;
 /**
  * 媒体类型工具类
  * 
- * @author ruoyi
+ * @author lws
  */
 public class MimeTypeUtils
 {

+ 1 - 1
src/main/java/com/metro/utils/poi/ExcelHandlerAdapter.java

@@ -3,7 +3,7 @@ package com.metro.utils.poi;
 /**
  * Excel数据格式处理适配器
  * 
- * @author ruoyi
+ * @author lws
  */
 public interface ExcelHandlerAdapter
 {

+ 1 - 1
src/main/java/com/metro/utils/poi/ExcelUtil.java

@@ -41,7 +41,7 @@ import java.util.stream.Collectors;
 /**
  * Excel相关处理
  *
- * @author ruoyi
+ * @author lws
  */
 public class ExcelUtil<T> {
     private static final Logger log = LoggerFactory.getLogger(ExcelUtil.class);

+ 1 - 1
src/main/java/com/metro/utils/spring/SpringUtils.java

@@ -13,7 +13,7 @@ import org.springframework.stereotype.Component;
 /**
  * spring工具类 方便在非spring管理环境中获取bean
  *
- * @author ruoyi
+ * @author lws
  */
 @Component
 public final class SpringUtils implements BeanFactoryPostProcessor, ApplicationContextAware {

+ 1 - 1
src/main/java/com/metro/utils/text/CharsetKit.java

@@ -9,7 +9,7 @@ import java.nio.charset.StandardCharsets;
 /**
  * 字符集工具类
  * 
- * @author ruoyi
+ * @author lws
  */
 public class CharsetKit
 {

+ 1 - 1
src/main/java/com/metro/utils/text/Convert.java

@@ -13,7 +13,7 @@ import java.util.Set;
 /**
  * 类型转换器
  * 
- * @author ruoyi
+ * @author lws
  */
 public class Convert
 {

+ 1 - 1
src/main/java/com/metro/utils/text/StrFormatter.java

@@ -6,7 +6,7 @@ import com.metro.utils.StringUtils;
 /**
  * 字符串格式化
  *
- * @author ruoyi
+ * @author lws
  */
 public class StrFormatter {
     public static final String EMPTY_JSON = "{}";

+ 1 - 1
src/main/java/com/metro/utils/uuid/IdUtils.java

@@ -3,7 +3,7 @@ package com.metro.utils.uuid;
 /**
  * ID生成器工具类
  * 
- * @author ruoyi
+ * @author lws
  */
 public class IdUtils
 {

+ 1 - 1
src/main/java/com/metro/utils/uuid/Seq.java

@@ -7,7 +7,7 @@ import com.metro.utils.StringUtils;
 import java.util.concurrent.atomic.AtomicInteger;
 
 /**
- * @author ruoyi 序列生成类
+ * @author lws 序列生成类
  */
 public class Seq {
     // 通用序列类型

+ 1 - 1
src/main/java/com/metro/utils/uuid/UUID.java

@@ -12,7 +12,7 @@ import java.util.concurrent.ThreadLocalRandom;
 /**
  * 提供通用唯一识别码(universally unique identifier)(UUID)实现
  *
- * @author ruoyi
+ * @author lws
  */
 public final class UUID implements java.io.Serializable, Comparable<UUID> {
     private static final long serialVersionUID = -1185015143654744140L;

+ 1 - 1
src/main/resources/application.yml

@@ -7,7 +7,7 @@ metro:
   version: 1.0.0
   # 版权年份
   copyrightYear: 2022
-  # 文件路径 示例( Windows配置D:/ruoyi/uploadPath,Linux配置 /home/ruoyi/uploadPath)
+  # 文件路径 示例( Windows配置D:/lws/uploadPath,Linux配置 /home/lws/uploadPath)
   profile: D:/uploadPath
   # 获取ip地址开关
   addressEnabled: false