1、创建示例代码demo

2、说明文件增加现有文件结构
3、BaseController 替换

README.md

@@ -48,12 +48,6 @@
 
 
 
-
-
-
-
-
-
 ## 规则说明
 * 版本号：v0.0.1
 ```
@@ -64,3 +58,57 @@
 
 -----
 * 版本号：v0.0.2
+
+
+
+## 文件结构
+### 后端结构
+```
+├─docker
+│      Dockerfile
+│      shell.sh 
+├─src
+   ├─main
+   │  ├─java
+   │  │  └─com
+   │  │      └─ydtech
+   │  │          │  SpringInsApplication.java
+   │  │          │  
+   │  │          ├─aop                  //
+   │  │          ├─components           //组件
+   │  │          ├─config               //全局配置
+   │  │          ├─constants            //通用常量
+   │  │          ├─core                 //核心控制
+   │  │          ├─exception            //通用异常
+   │  │          ├─modules              //项目模块
+   │  │          │  ├─admin
+   │  │          │  ├─base
+   │  │          │  ├─esm
+   │  │          │  ├─fnc
+   │  │          │  ├─ins
+   │  │          │  ├─inv
+   │  │          │  ├─nai
+   │  │          │  ├─order
+   │  │          │  ├─protocol
+   │  │          │  └─report
+   │  │          ├─security             //权限控制
+   │  │          ├─utils                //通用工具
+   │  │          └─validation           //验证控制
+   │  └─resources
+   │      ├─generator                   //
+   │      ├─mapper                      //XML映射文件
+   │      └─template                    //模板
+   └─test                               //测试
+```
+
+
+
+
+## 代码规范
+    示例代码位置：com.ydtech.modules.demo.controller
+    在线文档/doc.html#/示例演示
+    请求参数实体DTO创建位置示例：base/model/dto/
+    响应参数实体VO创建位置示例：base/model/vo/
+
+
+

src/main/java/com/ydtech/components/TokenInterceptor.java

@@ -15,7 +15,8 @@ public class TokenInterceptor {
 
     public static SaInterceptor tokenInterceptor() {
         List<String> notMatchList = new ArrayList<>();
-        notMatchList.add("/favicon.ico");//@TODO 静态资源应该不请求后台  需要确认
+//        notMatchList.add("/favicon.ico");//@TODO 静态资源应该不请求后台  需要确认
+        notMatchList.add("/api/demo/**"); // 演示接口
         notMatchList.add("/captcha.jpg**"); // 验证码
         notMatchList.add("/login");
         notMatchList.add("/sendMsg");

src/main/java/com/ydtech/config/SwaggerConfig.java

@@ -80,6 +80,12 @@ public class SwaggerConfig {
         return buildDocket("protocol");
     }
 
+    @Bean(value = "demoApi")
+    @Order(value = 9)
+    public Docket baseDemoApi() {
+        return buildDocket("demo","示例演示");
+    }
+
 
     private ApiInfo apiInfo() {
         return new ApiInfoBuilder()
@@ -127,7 +133,7 @@ public class SwaggerConfig {
                 .description("认证令牌")
                 .modelRef(new ModelRef("string"))
                 .parameterType("header")
-                .defaultValue("Bearer ")
+                .defaultValue("Bearer cb908125-ecb9-4abd-b4df-fd1d7ed3eb13")
                 .required(false)
                 .build());
 

src/main/java/com/ydtech/core/page/BaseController.java

@@ -1,114 +1,114 @@
-package com.ydtech.core.page;
-
-
-import cn.dev33.satoken.session.SaSession;
-import cn.dev33.satoken.stp.StpUtil;
-import com.ydtech.modules.admin.model.SysUser;
-
-import javax.servlet.http.HttpServletRequest;
-
-public class BaseController {
-
-    public SysUser getUser() {
-//        return (SysUser) SecurityContextHolder.getContext()
-//                .getAuthentication()
-//                .getPrincipal();
-        SaSession saSession = StpUtil.getSessionByLoginId(StpUtil.getLoginId());
-        SysUser sysUser = (SysUser) saSession.get(SaSession.USER);
-        return sysUser;
-    }
-
-    public String getUserName() {
-//        String userName = null;
-//        Object principal = SecurityContextHolder.getContext().getAuthentication().getPrincipal();
+//package com.ydtech.core.page;
+//
+//
+//import cn.dev33.satoken.session.SaSession;
+//import cn.dev33.satoken.stp.StpUtil;
+//import com.ydtech.modules.admin.model.SysUser;
+//
+//import javax.servlet.http.HttpServletRequest;
+//
+//public class BaseController {
+//
+//    public SysUser getUser() {
+////        return (SysUser) SecurityContextHolder.getContext()
+////                .getAuthentication()
+////                .getPrincipal();
+//        SaSession saSession = StpUtil.getSessionByLoginId(StpUtil.getLoginId());
+//        SysUser sysUser = (SysUser) saSession.get(SaSession.USER);
+//        return sysUser;
+//    }
+//
+//    public String getUserName() {
+////        String userName = null;
+////        Object principal = SecurityContextHolder.getContext().getAuthentication().getPrincipal();
+////
+////        if (principal instanceof UserDetails) {
+////            userName = ((UserDetails) principal).getUsername();
+////        } else {
+////            userName = principal.toString();
+////        }
+//        return StpUtil.getLoginId().toString();
+//    }
+//
+//
+////    /**
+////     * 获取过滤字段的值
+////     *
+////     * @param filterName
+////     * @return
+////     */
+////    public String getColumnFilterValue(PageRequest pageRequest, String filterName) {
+////        String value = null;
+////        ColumnFilter columnFilter = pageRequest.getColumnFilter(filterName);
+////        if (columnFilter != null) {
+////            value = columnFilter.getValue();
+////        }
+////        return value;
+////    }
+//
+//    /**
+//     * 获取部门id
+//     *
+//     * @param request
+//     * @return
+//     */
+//    public String getdeptId(HttpServletRequest request) {
+//        SaSession saSession = StpUtil.getSessionByLoginId(StpUtil.getLoginId());
+//        SysUser sysUser = (SysUser) saSession.get(SaSession.USER);
+//        return sysUser.getDeptId();
+////        return JwtTokenUtils.getDeptIdFromRequest(request);
+//    }
+//
 //
-//        if (principal instanceof UserDetails) {
-//            userName = ((UserDetails) principal).getUsername();
-//        } else {
-//            userName = principal.toString();
-//        }
-        return StpUtil.getLoginId().toString();
-    }
-
-
 //    /**
-//     * 获取过滤字段的值
+//     * 获取用户ID
 //     *
-//     * @param filterName
+//     * @param request
 //     * @return
 //     */
-//    public String getColumnFilterValue(PageRequest pageRequest, String filterName) {
-//        String value = null;
-//        ColumnFilter columnFilter = pageRequest.getColumnFilter(filterName);
-//        if (columnFilter != null) {
-//            value = columnFilter.getValue();
-//        }
-//        return value;
+//    public String getUserId(HttpServletRequest request) {
+//        return StpUtil.getLoginId().toString();
+////        return JwtTokenUtils.getUserIdFromRequest(request);
 //    }
-
-    /**
-     * 获取部门id
-     *
-     * @param request
-     * @return
-     */
-    public String getdeptId(HttpServletRequest request) {
-        SaSession saSession = StpUtil.getSessionByLoginId(StpUtil.getLoginId());
-        SysUser sysUser = (SysUser) saSession.get(SaSession.USER);
-        return sysUser.getDeptId();
-//        return JwtTokenUtils.getDeptIdFromRequest(request);
-    }
-
-
-    /**
-     * 获取用户ID
-     *
-     * @param request
-     * @return
-     */
-    public String getUserId(HttpServletRequest request) {
-        return StpUtil.getLoginId().toString();
-//        return JwtTokenUtils.getUserIdFromRequest(request);
-    }
-
-
-    /**
-     * 新加 可用
-     *
-     * @author: lig
-     * @date: 2023年05月18日 0018
-     */
-    public String getUserId2() {
-        return StpUtil.getLoginId().toString();
-//        Authentication authentication = SecurityUtils.getAuthentication();
 //
-//        JwtAuthenticatioToken j = (JwtAuthenticatioToken) authentication;
-//        return JwtTokenUtils.getUserIdFromToken(j.getToken());
-    }
-    /**
-     * 新加 可用
-     *
-     * @author: lig
-     * @date: 2023年05月18日 0018
-     */
-    public String getUserId() {
-        return StpUtil.getLoginId().toString();
-//        Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
+//
+//    /**
+//     * 新加 可用
+//     *
+//     * @author: lig
+//     * @date: 2023年05月18日 0018
+//     */
+//    public String getUserId2() {
+//        return StpUtil.getLoginId().toString();
 ////        Authentication authentication = SecurityUtils.getAuthentication();
+////
+////        JwtAuthenticatioToken j = (JwtAuthenticatioToken) authentication;
+////        return JwtTokenUtils.getUserIdFromToken(j.getToken());
+//    }
+//    /**
+//     * 新加 可用
+//     *
+//     * @author: lig
+//     * @date: 2023年05月18日 0018
+//     */
+//    public String getUserId() {
+//        return StpUtil.getLoginId().toString();
+////        Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
+//////        Authentication authentication = SecurityUtils.getAuthentication();
+////
+////        JwtAuthenticatioToken j = (JwtAuthenticatioToken) authentication;
+////        return JwtTokenUtils.getUserIdFromToken(j.getToken());
+//    }
+//
+//    /**
+//     * 获取用户名
+//     *
+//     * @param request
+//     * @return
+//     */
+//    public String getJwtUserName(HttpServletRequest request) {
+//        return StpUtil.getLoginId().toString();
+////        return JwtTokenUtils.getUsernameFromRequest(request);
+//    }
 //
-//        JwtAuthenticatioToken j = (JwtAuthenticatioToken) authentication;
-//        return JwtTokenUtils.getUserIdFromToken(j.getToken());
-    }
-
-    /**
-     * 获取用户名
-     *
-     * @param request
-     * @return
-     */
-    public String getJwtUserName(HttpServletRequest request) {
-        return StpUtil.getLoginId().toString();
-//        return JwtTokenUtils.getUsernameFromRequest(request);
-    }
-
-}
+//}

src/main/java/com/ydtech/modules/admin/controller/DemoController.java

@@ -1,24 +1,24 @@
-package com.ydtech.modules.admin.controller;
-
-import com.ydtech.modules.admin.model.SysUser;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.List;
-
-
-@RestController
-public class DemoController {
-
-//    @PreAuthorize("hasAuthority('sys:demo:view')")
-    @GetMapping("/hello")
-    public String hello() {
-        return "Hello SpringSecurity!";
-    }
-
-    public static void main(String[] args) {
-        List<SysUser> ls = null;
-        System.out.println(ls.size());
-    }
-}
-
+//package com.ydtech.modules.admin.controller;
+//
+//import com.ydtech.modules.admin.model.SysUser;
+//import org.springframework.web.bind.annotation.GetMapping;
+//import org.springframework.web.bind.annotation.RestController;
+//
+//import java.util.List;
+//
+//
+//@RestController
+//public class DemoController {
+//
+////    @PreAuthorize("hasAuthority('sys:demo:view')")
+//    @GetMapping("/hello")
+//    public String hello() {
+//        return "Hello SpringSecurity!";
+//    }
+//
+//    public static void main(String[] args) {
+//        List<SysUser> ls = null;
+//        System.out.println(ls.size());
+//    }
+//}
+//

src/main/java/com/ydtech/modules/admin/controller/SysDictController.java

@@ -3,7 +3,6 @@ package com.ydtech.modules.admin.controller;
 
 import com.ydtech.config.DictEnumConfig;
 import com.ydtech.constants.enums.dict.DictionaryManagement;
-import com.ydtech.core.page.BaseController;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.core.page.PageRequest;
 import com.ydtech.modules.admin.model.SysAccount;
@@ -15,6 +14,7 @@ import com.ydtech.modules.admin.service.SysDeptService;
 import com.ydtech.modules.admin.service.SysDictService;
 import com.ydtech.modules.admin.service.SysDictTypeService;
 import com.ydtech.modules.admin.model.vo.TreeSysDeptVO;
+import com.ydtech.modules.base.controller.BaseController;
 import com.ydtech.modules.esm.model.EsmInsCompany;
 import com.ydtech.modules.esm.model.EsmProduct;
 import com.ydtech.modules.esm.service.EsmInsCompanyService;

src/main/java/com/ydtech/modules/admin/controller/SysUserController.java

@@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ydtech.constants.SysConstants;
-import com.ydtech.core.page.BaseController;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.core.page.PageRequest;
 import com.ydtech.core.page.PageResult;
@@ -18,6 +17,7 @@ import com.ydtech.modules.admin.service.SysUserService;
 import com.ydtech.modules.admin.model.vo.SysUserBaseVO;
 import com.ydtech.modules.admin.model.vo.SysUserInternalVO;
 import com.ydtech.modules.admin.model.vo.SysUserVO;
+import com.ydtech.modules.base.controller.BaseController;
 import com.ydtech.modules.esm.service.EsmUserInternalService;
 import com.ydtech.security.utils.PasswordUtils;
 import com.ydtech.utils.StringUtils;

src/main/java/com/ydtech/modules/base/controller/BaseController.java

@@ -0,0 +1,110 @@
+package com.ydtech.modules.base.controller;
+
+import cn.dev33.satoken.session.SaSession;
+import cn.dev33.satoken.stp.StpUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ydtech.core.page.PageResult;
+import com.ydtech.modules.admin.model.SysUser;
+import com.ydtech.modules.base.model.dto.BasePageDto;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.poi.ss.formula.functions.T;
+import springfox.documentation.annotations.ApiIgnore;
+
+/**
+ * 基础控制器
+ *
+ * @author: lig
+ * @date: 2023-06-28
+ */
+@Slf4j
+public class BaseController {
+
+    /**
+     *  获取用户
+     *
+     * @author: lig
+     * @date: 2023年06月28日 0028
+     */
+    public SysUser getUser() {
+        SaSession saSession = StpUtil.getSessionByLoginId(StpUtil.getLoginId());
+        SysUser sysUser = (SysUser) saSession.get(SaSession.USER);
+        return sysUser;
+    }
+
+
+    /**
+     *  获取用户ID
+     *
+     * @author: lig
+     * @date: 2023-06-28
+     */
+    public String getUserId() {
+        return StpUtil.getLoginId().toString();
+    }
+
+    /**
+     *  获取用户名   系统用户名与ID相同
+     *
+     * @author: lig
+     * @date: 2023-06-28
+     */
+    public String getUserName() {
+        return StpUtil.getLoginId().toString();
+    }
+
+    /**
+     *  获取部门ID
+     *
+     * @author: lig
+     * @date: 2023年06月28日 0028
+     */
+    public String getDeptId() {
+        SaSession saSession = StpUtil.getSessionByLoginId(StpUtil.getLoginId());
+        SysUser sysUser = (SysUser) saSession.get(SaSession.USER);
+        return sysUser.getDeptId();
+    }
+
+
+
+    /**
+     *  构造分页 请求 数据
+     *
+     * @author: lig
+     * @date: 2023年06月28日 0028
+     */
+    public Page<T> buildPageRequest(BasePageDto basePageDto){
+        int pageNum = basePageDto.getPageNum() < 1?1:basePageDto.getPageNum();
+        int pageSize = basePageDto.getPageSize() <1?1:basePageDto.getPageSize();
+        Page<org.apache.poi.ss.formula.functions.T> p = new Page<>();
+        p.setSize(pageSize);
+        p.setCurrent(pageNum);
+        return p;
+    }
+
+
+    /**
+     *  构造分页 响应 数据
+     *
+     * @author: lig
+     * @date: 2023-06-28
+     */
+    public PageResult buildPageResponse(IPage page) {
+        PageResult p = new PageResult();
+        p.setPageNum((int)page.getCurrent());
+        p.setPageSize((int)page.getSize());
+        p.setTotalPages((int)page.getPages());
+        p.setTotalSize((int)page.getTotal());
+
+        p.setContent(page.getRecords()) ;
+        return p;
+
+    }
+
+
+
+
+
+
+
+}

src/main/java/com/ydtech/modules/base/model/dto/BaseDto.java

@@ -0,0 +1,29 @@
+package com.ydtech.modules.base.model.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 基础 DTO
+ *
+ * @author: lig
+ * @date: 2023-06-28
+ */
+@Data
+@ApiModel(description = "基础分页dto")
+public class BaseDto {
+
+
+    @ApiModelProperty(value = "参数1")
+    private String param1;
+
+    @ApiModelProperty(value = "参数2")
+    private String param2;
+
+    @ApiModelProperty(value = "参数3")
+    private String param3;
+
+
+
+}

src/main/java/com/ydtech/modules/base/model/dto/BasePageDto.java

@@ -0,0 +1,37 @@
+package com.ydtech.modules.base.model.dto;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ydtech.core.page.BasePageVO;
+import com.ydtech.core.page.PageResult;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.apache.poi.ss.formula.functions.T;
+import springfox.documentation.annotations.ApiIgnore;
+
+import java.io.Serializable;
+
+
+/**
+ * 基础分页 DTO
+ *
+ * @author: lig
+ * @date: 2023-06-28
+ */
+@Data
+@ApiModel(description = "基础分页dto")
+public class BasePageDto<T> {
+
+    @ApiModelProperty(value = "页码",allowableValues = "1")
+    private Integer pageNum = 1;
+
+    @ApiModelProperty(value = "每页数据量" ,allowableValues = "10")
+    private Integer pageSize = 10;
+
+    @ApiModelProperty(value = "参数DTO")
+    private T dto;
+
+
+
+}

src/main/java/com/ydtech/modules/base/model/dto/TestDto.java

@@ -0,0 +1,30 @@
+package com.ydtech.modules.base.model.dto;
+
+import com.ydtech.core.page.BasePageVO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.Extension;
+import lombok.Data;
+
+import java.lang.annotation.Annotation;
+
+/**
+ * 测试DTO
+ *
+ * @author: lig
+ * @date: 2023-06-28
+ */
+@Data
+@ApiModel
+public class TestDto {
+
+
+    @ApiModelProperty(value = "测试001")
+    private String batchNum;
+
+    @ApiModelProperty(value = "匹配数据（1匹配  0不匹配）")
+    private String isMatch;
+
+
+
+}

src/main/java/com/ydtech/modules/demo/controller/DemoController.java

@@ -0,0 +1,103 @@
+package com.ydtech.modules.demo.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ydtech.core.page.HttpResult;
+import com.ydtech.modules.admin.model.SysUser;
+import com.ydtech.modules.admin.service.SysUserService;
+import com.ydtech.modules.base.controller.BaseController;
+import com.ydtech.modules.base.model.dto.BaseDto;
+import com.ydtech.modules.base.model.dto.BasePageDto;
+import com.ydtech.modules.base.model.dto.TestDto;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+/**
+ * 演示控制器
+ *
+ * @author: lig
+ * @date: 2023-06-28
+ */
+@Api(tags = "演示控制器")
+@RestController
+@RequestMapping("api/demo")
+@Slf4j
+public class DemoController extends BaseController {
+
+    @Autowired
+    private SysUserService sysUserService;
+
+
+    @PostMapping(value = "/demo01")
+    @ApiOperation(value = "post请求，三个以内参数可用", notes = "" +
+            "参数1:列表ID" +
+            "</br>参数2：通过状态（1通过，2失败）" +
+            "</br>参数3：类型（1报价，2核保）")
+    public HttpResult demo01(@RequestBody BaseDto dto) {
+        //业务代码。。。
+        return HttpResult.ok();
+    }
+
+    @PostMapping(value = "/demo02")
+    @ApiOperation(value = "post请求，三个以上参数可用，根据业务自建DTO")
+    public HttpResult demo02(@RequestBody TestDto dto) {
+        //业务代码。。。
+        return HttpResult.ok();
+    }
+
+
+    @GetMapping(value = "/demo03")
+    @ApiOperation(value = "get请求，地址参数拼接")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "param1", value = "参数1", required = true, dataType = "String"),
+            @ApiImplicitParam(name = "param2", value = "参数2", required = false, dataType = "String")
+    })
+    public HttpResult demo03(@RequestParam String param1, @RequestParam String param2) {
+        //业务代码。。。
+        return HttpResult.ok("参数1：" + param1 + "|" + "参数2：" + param2);
+    }
+
+    @GetMapping(value = "/demo04/{param1}/{param2}")
+    @ApiOperation(value = "get请求，地址拼接")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "param1", value = "参数1", required = true, dataType = "String"),
+            @ApiImplicitParam(name = "param2", value = "参数2", required = true, dataType = "String")
+    })
+    public HttpResult demo04(@PathVariable String param1, @PathVariable String param2) {
+        //业务代码。。。
+        return HttpResult.ok("get请求，地址拼接,参数1：" + param1 + "|" + "参数2：" + param2);
+    }
+
+
+    @PostMapping(value = "/demo05")
+    @ApiOperation(value = "post请求，数据导入，文件上传")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "file", value = "excel文件", required = true, dataType = "__file"),
+            @ApiImplicitParam(name = "batchNum", value = "批次号", required = true, dataType = "String")
+    })
+    public HttpResult demo05(@RequestPart MultipartFile file, @RequestParam String batchNum) {
+        //业务代码
+        return HttpResult.ok(batchNum);
+    }
+
+
+    @PostMapping(value = "/demo06")
+    @ApiOperation(value = "post请求，分页查询")
+    public HttpResult demo06(@RequestBody BasePageDto pageDto) {
+        LambdaQueryWrapper<SysUser> lqw = new LambdaQueryWrapper();
+        Page page = buildPageRequest(pageDto);
+        IPage<SysUser> pageResult = sysUserService.page(page, lqw);
+        return HttpResult.ok(buildPageResponse(pageResult));
+    }
+
+
+
+
+}

src/main/java/com/ydtech/modules/esm/controller/EsmAgreementCheckController.java

@@ -1,11 +1,10 @@
 package com.ydtech.modules.esm.controller;
 
 
-import com.ydtech.core.page.BaseController;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.core.page.PageRequest;
 import com.ydtech.core.page.PageResult;
-import com.ydtech.modules.admin.model.SysUser;
+import com.ydtech.modules.base.controller.BaseController;
 import com.ydtech.modules.esm.model.*;
 import com.ydtech.modules.esm.service.*;
 import com.ydtech.utils.idgen.IdGenerate;

src/main/java/com/ydtech/modules/esm/controller/EsmAgreementController.java

@@ -1,14 +1,13 @@
 package com.ydtech.modules.esm.controller;
 
 
-import com.ydtech.core.page.BaseController;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.core.page.PageRequest;
 import com.ydtech.core.page.PageResult;
+import com.ydtech.modules.base.controller.BaseController;
 import com.ydtech.modules.esm.model.*;
 import com.ydtech.modules.esm.service.*;
 import com.ydtech.utils.idgen.IdGenerate;
-import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 

src/main/java/com/ydtech/modules/esm/controller/EsmAgreementGroupController.java

@@ -1,10 +1,10 @@
 package com.ydtech.modules.esm.controller;
 
 
-import com.ydtech.core.page.BaseController;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.core.page.PageRequest;
 import com.ydtech.core.page.PageResult;
+import com.ydtech.modules.base.controller.BaseController;
 import com.ydtech.modules.esm.model.EsmAgreementGroup;
 import com.ydtech.modules.esm.service.EsmAgreementGroupService;
 import com.ydtech.utils.idgen.IdGenerate;

src/main/java/com/ydtech/modules/esm/controller/EsmAgreementProdController.java

@@ -1,15 +1,9 @@
 package com.ydtech.modules.esm.controller;
 
 
-import com.ydtech.core.page.BaseController;
-import com.ydtech.core.page.HttpResult;
-import com.ydtech.core.page.PageRequest;
-import com.ydtech.core.page.PageResult;
+import com.ydtech.modules.base.controller.BaseController;
 import com.ydtech.modules.esm.service.EsmAgreementProdService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 @RestController

src/main/java/com/ydtech/modules/esm/controller/EsmInsAttributionController.java

@@ -6,14 +6,19 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ydtech.core.page.BaseController;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.core.page.PageRequest;
 import com.ydtech.core.page.PageResult;
-import com.ydtech.modules.esm.model.*;
-import com.ydtech.modules.esm.service.*;
-import com.ydtech.modules.esm.model.vo.EsmInsAttributionVo;
+import com.ydtech.modules.base.controller.BaseController;
+import com.ydtech.modules.esm.model.EsmInsAttribution;
+import com.ydtech.modules.esm.model.EsmInsAttributionDept;
+import com.ydtech.modules.esm.model.EsmInsAttributionTemplate;
+import com.ydtech.modules.esm.model.EsmInsCompany;
 import com.ydtech.modules.esm.model.vo.req.EsmInsAttributionAuthorizeReq;
+import com.ydtech.modules.esm.service.EsmInsAttributionDeptService;
+import com.ydtech.modules.esm.service.EsmInsAttributionService;
+import com.ydtech.modules.esm.service.EsmInsAttributionTemplateService;
+import com.ydtech.modules.esm.service.EsmInsCompanyService;
 import com.ydtech.modules.order.entity.vo.zm.ZmAscriptionResponse;
 import com.ydtech.modules.order.entity.vo.zm.ZmAscriptionVo;
 import com.ydtech.modules.order.service.ZhongMeiOrderService;
@@ -105,7 +110,7 @@ public class EsmInsAttributionController extends BaseController {
         if (StringUtils.isEmpty(eia.getId()) && i > 0) return HttpResult.ok("保险公司账号不可重复！");
         if (StringUtils.isNotEmpty(eia.getId()) && i > 1) return HttpResult.ok("保险公司账号不可重复！");
 
-        String userId = getUserId(request);
+        String userId = getUserId();
         eia.setUserId(userId);
 
         //需要调用python 新增归属信息
@@ -144,7 +149,7 @@ public class EsmInsAttributionController extends BaseController {
     @GetMapping(value = "/findPage")
     public HttpResult findPage(PageRequest pageRequest, HttpServletRequest request) {
 
-        String userId = getUserId(request);
+        String userId = getUserId();
 //        int pageNum = pageRequest.getPageNum();
 //        int pageSize = pageRequest.getPageSize();
         String insCompanyId = pageRequest.getColumnFilterValue(pageRequest, "ins_company_id"); // 保险公司ID

src/main/java/com/ydtech/modules/esm/controller/EsmInsCompanyController.java

@@ -8,10 +8,10 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
-import com.ydtech.core.page.BaseController;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.core.page.PageRequest;
 import com.ydtech.core.page.PageResult;
+import com.ydtech.modules.base.controller.BaseController;
 import com.ydtech.modules.esm.model.EsmInsCompany;
 import com.ydtech.modules.esm.model.vo.res.EsmInsCompanyResVo;
 import com.ydtech.modules.esm.service.EsmInsCompanyService;

src/main/java/com/ydtech/modules/esm/controller/EsmProductController.java

@@ -1,14 +1,11 @@
 package com.ydtech.modules.esm.controller;
 
 
-import com.ydtech.core.page.BaseController;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.core.page.PageRequest;
 import com.ydtech.core.page.PageResult;
-import com.ydtech.modules.admin.model.SysUser;
-import com.ydtech.modules.admin.service.SysUserService;
+import com.ydtech.modules.base.controller.BaseController;
 import com.ydtech.modules.esm.model.EsmProduct;
-import com.ydtech.modules.esm.model.EsmTeam;
 import com.ydtech.modules.esm.service.EsmProductService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;

src/main/java/com/ydtech/modules/esm/controller/EsmRetailController.java

@@ -1,19 +1,13 @@
 package com.ydtech.modules.esm.controller;
 
 
-import com.ydtech.core.page.BaseController;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.core.page.PageRequest;
 import com.ydtech.core.page.PageResult;
+import com.ydtech.modules.base.controller.BaseController;
 import com.ydtech.modules.esm.model.EsmRetail;
-import com.ydtech.modules.esm.model.EsmRule;
-import com.ydtech.modules.esm.model.EsmRuleCheck;
 import com.ydtech.modules.esm.service.EsmRetailService;
-import com.ydtech.modules.esm.service.EsmRuleCheckService;
-import com.ydtech.modules.esm.service.EsmRuleService;
 import com.ydtech.utils.idgen.IdGenerate;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;

src/main/java/com/ydtech/modules/esm/controller/EsmRuleCheckController.java

@@ -1,10 +1,10 @@
 package com.ydtech.modules.esm.controller;
 
 
-import com.ydtech.core.page.BaseController;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.core.page.PageRequest;
 import com.ydtech.core.page.PageResult;
+import com.ydtech.modules.base.controller.BaseController;
 import com.ydtech.modules.esm.model.*;
 import com.ydtech.modules.esm.service.*;
 import com.ydtech.utils.idgen.IdGenerate;

src/main/java/com/ydtech/modules/esm/controller/EsmRuleController.java

@@ -1,23 +1,17 @@
 package com.ydtech.modules.esm.controller;
 
 
-import com.ydtech.core.page.BaseController;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.core.page.PageRequest;
 import com.ydtech.core.page.PageResult;
+import com.ydtech.modules.base.controller.BaseController;
 import com.ydtech.modules.esm.model.EsmRule;
-import com.ydtech.modules.esm.model.EsmRuleCheck;
-import com.ydtech.modules.esm.service.EsmRuleCheckService;
 import com.ydtech.modules.esm.service.EsmRuleService;
-import com.ydtech.utils.idgen.IdGenerate;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.ArrayList;
-import java.util.Date;
 
 @RestController
 @RequestMapping("esmRule")

src/main/java/com/ydtech/modules/esm/controller/EsmSalaryManageController.java

@@ -1,7 +1,7 @@
 package com.ydtech.modules.esm.controller;
 
-import com.ydtech.core.page.BaseController;
 import com.ydtech.core.page.HttpResult;
+import com.ydtech.modules.base.controller.BaseController;
 import com.ydtech.modules.esm.model.EsmSalaryCheck;
 import com.ydtech.modules.esm.model.vo.EsmSalaryQueryVO;
 import com.ydtech.modules.esm.model.vo.EsmSocialSecurityQueryVO;
@@ -48,7 +48,7 @@ public class EsmSalaryManageController extends BaseController {
     public HttpResult importSocialSecurity(@ApiParam(name = "file", value = "excel文件") MultipartFile file, HttpServletRequest request) {
         HttpResult result = null;
         try {
-            result = esmSocialSecurityService.importSocialSecurity(file, getUserName(), getdeptId(request));
+            result = esmSocialSecurityService.importSocialSecurity(file, getUserName(), getDeptId());
         } catch (Exception e) {
             e.printStackTrace();
             return HttpResult.error(e.getMessage());
@@ -88,7 +88,7 @@ public class EsmSalaryManageController extends BaseController {
     public HttpResult listSocialSecurityPage(@RequestBody EsmSocialSecurityQueryVO queryVO, HttpServletRequest request) {
         HttpResult result = null;
         try {
-            result = esmSocialSecurityService.listSocialSecurityPage(queryVO, getdeptId(request));
+            result = esmSocialSecurityService.listSocialSecurityPage(queryVO, getDeptId());
         } catch (Exception e) {
             e.printStackTrace();
             return HttpResult.error(e.getMessage());
@@ -108,7 +108,7 @@ public class EsmSalaryManageController extends BaseController {
     public HttpResult listSocialCheck(@RequestBody EsmSocialSecurityQueryVO queryVO, HttpServletRequest request) {
         HttpResult result = null;
         try {
-            result = esmSocialSecurityService.listSocialCheck(queryVO, getdeptId(request));
+            result = esmSocialSecurityService.listSocialCheck(queryVO, getDeptId());
         } catch (Exception e) {
             e.printStackTrace();
             return HttpResult.error(e.getMessage());
@@ -128,7 +128,7 @@ public class EsmSalaryManageController extends BaseController {
     public HttpResult selectByCheckId(@RequestBody ReqVo reqVo, HttpServletRequest request) {
         HttpResult result = null;
         try {
-            result = esmSocialSecurityService.selectByCheckId(reqVo, getdeptId(request));
+            result = esmSocialSecurityService.selectByCheckId(reqVo, getDeptId());
         } catch (Exception e) {
             e.printStackTrace();
             return HttpResult.error(e.getMessage());
@@ -148,7 +148,7 @@ public class EsmSalaryManageController extends BaseController {
 
         HttpResult result = null;
         try {
-            result = esmSocialSecurityService.reviewSocialSecurity(reviewVO, getUserName(), getdeptId(request));
+            result = esmSocialSecurityService.reviewSocialSecurity(reviewVO, getUserName(), getDeptId());
         } catch (Exception e) {
             e.printStackTrace();
             return HttpResult.error("更新审核状态失败：" + e.getMessage());
@@ -170,7 +170,7 @@ public class EsmSalaryManageController extends BaseController {
                                    HttpServletRequest request) {
         HttpResult result = new HttpResult();
         try {
-            result = esmSalaryService.importSalary(file, userProp, getUserName(), getdeptId(request));
+            result = esmSalaryService.importSalary(file, userProp, getUserName(), getDeptId());
         } catch (Exception e) {
             e.printStackTrace();
             logger.error("薪酬数据导入失败：" + e.getMessage());
@@ -186,7 +186,7 @@ public class EsmSalaryManageController extends BaseController {
     public HttpResult selectSalary(@RequestBody EsmSalaryQueryVO queryVO, HttpServletRequest request) {
         HttpResult result = new HttpResult();
         try {
-            result = esmSalaryService.selectSalary(queryVO, getUserName(), getdeptId(request));
+            result = esmSalaryService.selectSalary(queryVO, getUserName(), getDeptId());
         } catch (Exception e) {
             e.printStackTrace();
             logger.error("薪酬数据查询失败：" + e.getMessage());
@@ -246,7 +246,7 @@ public class EsmSalaryManageController extends BaseController {
 
         HttpResult result = null;
         try {
-            result = esmSalaryService.reviewSalary(esmSalaryCheck, getUserName(), getdeptId(request));
+            result = esmSalaryService.reviewSalary(esmSalaryCheck, getUserName(), getDeptId());
         } catch (Exception e) {
             e.printStackTrace();
             return HttpResult.error("审核失败" + e.getMessage());

src/main/java/com/ydtech/modules/esm/controller/EsmSettlementController.java

@@ -1,10 +1,10 @@
 package com.ydtech.modules.esm.controller;
 
 
-import com.ydtech.core.page.BaseController;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.core.page.PageRequest;
 import com.ydtech.core.page.PageResult;
+import com.ydtech.modules.base.controller.BaseController;
 import com.ydtech.modules.esm.model.*;
 import com.ydtech.modules.esm.service.*;
 import com.ydtech.utils.idgen.IdGenerate;

src/main/java/com/ydtech/modules/esm/controller/EsmTeamController.java

@@ -1,17 +1,15 @@
 package com.ydtech.modules.esm.controller;
 
 
-import com.ydtech.core.page.BaseController;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.core.page.PageRequest;
 import com.ydtech.core.page.PageResult;
+import com.ydtech.modules.base.controller.BaseController;
 import com.ydtech.modules.esm.model.EsmTeam;
 import com.ydtech.modules.esm.service.EsmTeamService;
-import com.ydtech.utils.idgen.IdGenerate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
 

src/main/java/com/ydtech/modules/esm/controller/EsmUserInternalCheckController.java

@@ -1,39 +1,28 @@
 package com.ydtech.modules.esm.controller;
 
 
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.ydtech.constants.enums.dict.ApprovalStatusEnum;
-import com.ydtech.core.page.BaseController;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.core.page.PageRequest;
-import com.ydtech.core.page.PageResult;
-import com.ydtech.modules.admin.model.SysMsgLog;
 import com.ydtech.modules.admin.model.SysUser;
 import com.ydtech.modules.admin.model.SysUserRole;
 import com.ydtech.modules.admin.service.SysMsgLogService;
 import com.ydtech.modules.admin.service.SysUserRoleService;
 import com.ydtech.modules.admin.service.SysUserService;
-import com.ydtech.modules.esm.model.*;
-import com.ydtech.modules.esm.service.EsmUserAgentCheckService;
-//import com.ydtech.modules.esm.service.EsmUserInternalCheckService;
+import com.ydtech.modules.base.controller.BaseController;
+import com.ydtech.modules.esm.model.EsmUserInternal;
+import com.ydtech.modules.esm.model.vo.UserRegistVO;
 import com.ydtech.modules.esm.service.EsmUserInternalService;
 import com.ydtech.modules.esm.service.SysUserCheckService;
-import com.ydtech.modules.esm.model.vo.UserRegistVO;
-import com.ydtech.modules.esm.model.vo.VoEsmUserInternalCheck;
 import com.ydtech.security.utils.PasswordUtils;
 import com.ydtech.utils.StringUtils;
 import com.ydtech.utils.idgen.IdGenerate;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
-import java.util.ArrayList;
 import java.util.Date;
-import java.util.List;
 
 import static com.ydtech.constants.RedisConstant.PHONE_VERIFICATION_CODE_KEY;
 

src/main/java/com/ydtech/modules/esm/controller/EsmUserInternalController.java

@@ -6,15 +6,17 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.ydtech.constants.SysConstants;
 import com.ydtech.constants.enums.dict.ApprovalStatusEnum;
-import com.ydtech.core.page.BaseController;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.core.page.PageRequest;
-import com.ydtech.core.page.PageResult;
 import com.ydtech.modules.admin.model.SysUser;
 import com.ydtech.modules.admin.service.SysUserService;
+import com.ydtech.modules.base.controller.BaseController;
 import com.ydtech.modules.esm.model.*;
 import com.ydtech.modules.esm.model.vo.*;
-import com.ydtech.modules.esm.service.*;
+import com.ydtech.modules.esm.service.EsmUserAgentCheckService;
+import com.ydtech.modules.esm.service.EsmUserAgentService;
+import com.ydtech.modules.esm.service.EsmUserInternalService;
+import com.ydtech.modules.esm.service.SysUserCheckService;
 import com.ydtech.modules.ins.model.InsOrder;
 import com.ydtech.modules.ins.service.InsOrderService;
 import com.ydtech.utils.StringUtils;
@@ -22,7 +24,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.math.BigDecimal;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 /**

src/main/java/com/ydtech/modules/esm/controller/InsPosterController.java

@@ -1,10 +1,10 @@
 package com.ydtech.modules.esm.controller;
 
 
-import com.ydtech.core.page.BaseController;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.core.page.PageRequest;
 import com.ydtech.core.page.PageResult;
+import com.ydtech.modules.base.controller.BaseController;
 import com.ydtech.modules.esm.model.InsTaskImage;
 import com.ydtech.modules.esm.service.InsTaskImageService;
 import com.ydtech.utils.idgen.IdGenerate;

src/main/java/com/ydtech/modules/esm/controller/InsTaskImageController.java

@@ -1,12 +1,9 @@
 package com.ydtech.modules.esm.controller;
 
 
-import com.alibaba.fastjson.JSONObject;
-import com.ydtech.core.page.BaseController;
 import com.ydtech.core.page.HttpResult;
-import com.ydtech.core.page.PageRequest;
-import com.ydtech.core.page.PageResult;
-import com.ydtech.modules.esm.model.*;
+import com.ydtech.modules.base.controller.BaseController;
+import com.ydtech.modules.esm.model.InsTaskImage;
 import com.ydtech.modules.esm.service.InsTaskImageService;
 import com.ydtech.modules.ins.model.InsOrder;
 import com.ydtech.modules.ins.service.InsOrderService;

src/main/java/com/ydtech/modules/esm/controller/SysAppController.java

@@ -1,13 +1,11 @@
 package com.ydtech.modules.esm.controller;
 
 
-import com.ydtech.core.page.BaseController;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.core.page.PageRequest;
 import com.ydtech.core.page.PageResult;
-import com.ydtech.modules.esm.model.EsmTeam;
+import com.ydtech.modules.base.controller.BaseController;
 import com.ydtech.modules.esm.model.SysApp;
-import com.ydtech.modules.esm.service.EsmTeamService;
 import com.ydtech.modules.esm.service.SysAppService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/com/ydtech/modules/esm/controller/SysVersionController.java

@@ -1,18 +1,15 @@
 package com.ydtech.modules.esm.controller;
 
 
-import com.ydtech.core.page.BaseController;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.core.page.PageRequest;
 import com.ydtech.core.page.PageResult;
-import com.ydtech.modules.esm.model.SysApp;
+import com.ydtech.modules.base.controller.BaseController;
 import com.ydtech.modules.esm.model.SysVersion;
-import com.ydtech.modules.esm.service.SysAppService;
 import com.ydtech.modules.esm.service.SysVersionService;
 import com.ydtech.utils.idgen.IdGenerate;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpRequest;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.ArrayList;

src/main/java/com/ydtech/modules/fnc/service/impl/BookServiceImpl.java

@@ -67,7 +67,7 @@ public class BookServiceImpl implements BookService {
         // 创建人
         book.setCreateBy(new PubUserInfo().getUserName());
         // 所属商户
-        book.setShopId(new PubUserInfo().getdeptId(request));
+        book.setShopId(new PubUserInfo().getDeptId());
         fncBookMapper.insert(book);
         return HttpResult.ok(msg, book.getBookCode());
     }
@@ -89,7 +89,7 @@ public class BookServiceImpl implements BookService {
             return HttpResult.error("公司代码不能为空！");
         }
         // 判断该条数据当前登录用户是否有权限修改
-        String tokenDeptId = new PubUserInfo().getdeptId(request);
+        String tokenDeptId = new PubUserInfo().getDeptId();
         if (!SysConstants.DEPT.equals(tokenDeptId)) {
             // 查询数据
             FncBook fncBook = fncBookMapper.selectByPrimaryKey(book.getBookCode());
@@ -133,7 +133,7 @@ public class BookServiceImpl implements BookService {
             return HttpResult.error("分页信息为空！");
         }
         // 判断是否有权限查询数据
-        String tokenDeptId = new PubUserInfo().getdeptId(request);
+        String tokenDeptId = new PubUserInfo().getDeptId();
         if (!SysConstants.DEPT.equals(tokenDeptId)) {
             String shopId = req.getShopId();
             if (StringUtils.isNullOrEmpty(shopId)) {
@@ -168,7 +168,7 @@ public class BookServiceImpl implements BookService {
             msg = "无数据";
         } else {
             // 判断该条数据当前登录用户是否有权限查看
-            String tokenDeptId = new PubUserInfo().getdeptId(request);
+            String tokenDeptId = new PubUserInfo().getDeptId();
             if (!SysConstants.DEPT.equals(tokenDeptId)) {
                 String shopId = fncBook.getShopId();
                 if (!shopId.startsWith(tokenDeptId)) {

src/main/java/com/ydtech/modules/fnc/service/impl/SubjectServiceImpl.java

@@ -67,7 +67,7 @@ public class SubjectServiceImpl implements SubjectService {
         // 创建人
         subject.setCreateBy(new PubUserInfo().getUserName());
         // 所属商户
-        subject.setShopId(new PubUserInfo().getdeptId(request));
+        subject.setShopId(new PubUserInfo().getDeptId());
         fncSubjectMapper.insert(subject);
         return HttpResult.ok(msg, subject.getSbjtNo());
     }
@@ -93,7 +93,7 @@ public class SubjectServiceImpl implements SubjectService {
             return HttpResult.error("会计年度不能为空！");
         }
         // 判断该条数据当前登录用户是否有权限修改
-        String tokenDeptId = new PubUserInfo().getdeptId(request);
+        String tokenDeptId = new PubUserInfo().getDeptId();
         if (!SysConstants.DEPT.equals(tokenDeptId)) {
             // 查询数据
             FncSubject fncSubject = fncSubjectMapper.selectBySbjtNo(subject.getSbjtNo());
@@ -138,7 +138,7 @@ public class SubjectServiceImpl implements SubjectService {
             return HttpResult.error("分页信息为空！");
         }
         // 判断是否有权限查询数据
-        String tokenDeptId = new PubUserInfo().getdeptId(request);
+        String tokenDeptId = new PubUserInfo().getDeptId();
         if (!SysConstants.DEPT.equals(tokenDeptId)) {
             String shopId = req.getShopId();
             if (StringUtils.isNullOrEmpty(shopId)) {
@@ -174,7 +174,7 @@ public class SubjectServiceImpl implements SubjectService {
             msg = "无数据";
         } else {
             // 判断该条数据当前登录用户是否有权限查看
-            String tokenDeptId = new PubUserInfo().getdeptId(request);
+            String tokenDeptId = new PubUserInfo().getDeptId();
             if (!SysConstants.DEPT.equals(tokenDeptId)) {
                 String shopId = fncSubject.getShopId();
                 if (!shopId.startsWith(tokenDeptId)) {

src/main/java/com/ydtech/modules/ins/controller/InsALY_CBITAPIController.java

@@ -4,13 +4,13 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.ObjectReader;
-import com.ydtech.core.page.BaseController;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.modules.admin.model.SysCbitError;
 import com.ydtech.modules.admin.model.SysDept;
 import com.ydtech.modules.admin.model.SysUser;
 import com.ydtech.modules.admin.service.SysDeptService;
 import com.ydtech.modules.admin.service.SysUserService;
+import com.ydtech.modules.base.controller.BaseController;
 import com.ydtech.modules.esm.model.EsmAgreement;
 import com.ydtech.modules.esm.model.EsmAgreementProd;
 import com.ydtech.modules.esm.model.EsmRetail;

src/main/java/com/ydtech/modules/ins/controller/InsAllController.java

@@ -2,16 +2,16 @@ package com.ydtech.modules.ins.controller;
 
 
 import com.ydtech.aop.GlobalExceptionHandler;
-import com.ydtech.core.page.BaseController;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.core.page.PageRequest;
 import com.ydtech.core.page.PageResult;
+import com.ydtech.modules.base.controller.BaseController;
 import com.ydtech.modules.ins.model.InsTaskDetail;
 import com.ydtech.modules.ins.model.InsTaskHistory;
 import com.ydtech.modules.ins.model.InsTaskList;
-import com.ydtech.modules.ins.service.*;
 import com.ydtech.modules.ins.model.vo.PiccPriceSearchVo;
 import com.ydtech.modules.ins.model.vo.TaskFlowVo;
+import com.ydtech.modules.ins.service.*;
 import com.ydtech.utils.StringUtils;
 import com.ydtech.utils.idgen.IdGenerate;
 import io.swagger.annotations.ApiImplicitParam;

src/main/java/com/ydtech/modules/ins/controller/InsCBITAPIController.java

@@ -4,7 +4,6 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.ObjectReader;
-import com.ydtech.core.page.BaseController;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.modules.admin.model.SysCbitError;
 import com.ydtech.modules.admin.model.SysCbitLog;
@@ -12,6 +11,7 @@ import com.ydtech.modules.admin.model.SysDept;
 import com.ydtech.modules.admin.model.SysUser;
 import com.ydtech.modules.admin.service.SysDeptService;
 import com.ydtech.modules.admin.service.SysUserService;
+import com.ydtech.modules.base.controller.BaseController;
 import com.ydtech.modules.esm.model.EsmAgreement;
 import com.ydtech.modules.esm.model.EsmAgreementProd;
 import com.ydtech.modules.esm.model.EsmRetail;

src/main/java/com/ydtech/modules/ins/controller/InsCBITController.java

@@ -1,19 +1,18 @@
 package com.ydtech.modules.ins.controller;
 
 import com.alibaba.fastjson.JSON;
-
 import com.alibaba.fastjson.JSONObject;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.ObjectReader;
-import com.ydtech.core.page.BaseController;
-
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.modules.admin.model.SysCbitError;
 import com.ydtech.modules.admin.model.SysCbitLog;
+import com.ydtech.modules.base.controller.BaseController;
 import com.ydtech.modules.ins.model.cbit.*;
-import com.ydtech.modules.ins.service.*;
 import com.ydtech.modules.ins.model.vo.CarModelQryVo;
 import com.ydtech.modules.ins.model.vo.QuoteInfoVo;
+import com.ydtech.modules.ins.service.SysCbitErrorService;
+import com.ydtech.modules.ins.service.SysCbitLogService;
 import com.ydtech.utils.HttpsPostUtil;
 import com.ydtech.utils.RSA.RSAUtils;
 import org.slf4j.Logger;
@@ -22,14 +21,20 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.core.env.Environment;
 import org.springframework.util.StringUtils;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.text.SimpleDateFormat;
-import java.util.*;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
 
 /**
  * @author gws

src/main/java/com/ydtech/modules/ins/controller/InsFeeDetailController.java

@@ -1,9 +1,9 @@
 package com.ydtech.modules.ins.controller;
 
-import com.ydtech.core.page.BaseController;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.core.page.PageRequest;
 import com.ydtech.core.page.PageResult;
+import com.ydtech.modules.base.controller.BaseController;
 import com.ydtech.modules.ins.model.*;
 import com.ydtech.modules.ins.service.*;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/com/ydtech/modules/ins/controller/InsOrderController.java

@@ -3,25 +3,25 @@ package com.ydtech.modules.ins.controller;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.ydtech.core.page.BaseController;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.core.page.PageRequest;
 import com.ydtech.core.page.PageResult;
 import com.ydtech.modules.admin.model.SysUser;
+import com.ydtech.modules.base.controller.BaseController;
 import com.ydtech.modules.esm.model.EsmAgreement;
 import com.ydtech.modules.esm.model.EsmAgreementProdfee;
 import com.ydtech.modules.esm.model.EsmRetail;
 import com.ydtech.modules.esm.model.InsTaskImage;
 import com.ydtech.modules.esm.service.*;
 import com.ydtech.modules.ins.model.*;
-import com.ydtech.modules.ins.service.*;
 import com.ydtech.modules.ins.model.vo.OrderPayVo;
 import com.ydtech.modules.ins.model.vo.OrderPaymentVo;
 import com.ydtech.modules.ins.model.vo.OrderVo;
+import com.ydtech.modules.ins.service.*;
 import com.ydtech.modules.nai.httpvo.*;
+import com.ydtech.utils.Base64Utils;
 import com.ydtech.utils.HeadUtils;
 import com.ydtech.utils.HttpsPostUtil;
-import com.ydtech.utils.Base64Utils;
 import com.ydtech.utils.idgen.IdGenerate;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -32,7 +32,10 @@ import org.springframework.web.bind.annotation.*;
 
 import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
 
 /**
  * @author qinfenglong

src/main/java/com/ydtech/modules/ins/controller/InsOrderTaskController.java

@@ -1,9 +1,9 @@
 package com.ydtech.modules.ins.controller;
 
-import com.ydtech.core.page.BaseController;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.core.page.PageRequest;
 import com.ydtech.core.page.PageResult;
+import com.ydtech.modules.base.controller.BaseController;
 import com.ydtech.modules.ins.model.InsOrderTask;
 import com.ydtech.modules.ins.service.InsOrderTaskService;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/com/ydtech/modules/ins/controller/InsPayApplyController.java

@@ -1,7 +1,6 @@
 package com.ydtech.modules.ins.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.ydtech.core.page.BaseController;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.core.page.PageRequest;
 import com.ydtech.core.page.PageResult;
@@ -9,18 +8,19 @@ import com.ydtech.modules.admin.model.SysDept;
 import com.ydtech.modules.admin.model.SysUser;
 import com.ydtech.modules.admin.service.SysDeptService;
 import com.ydtech.modules.admin.service.SysUserService;
+import com.ydtech.modules.base.controller.BaseController;
 import com.ydtech.modules.esm.model.EsmUserInternal;
-import com.ydtech.modules.esm.service.EsmUserAgentService;
-import com.ydtech.modules.esm.service.EsmUserInternalService;
 import com.ydtech.modules.esm.model.vo.ExtensionVO;
 import com.ydtech.modules.esm.model.vo.TeamUserQryVO;
 import com.ydtech.modules.esm.model.vo.TeamUserVO;
 import com.ydtech.modules.esm.model.vo.TeamUserVONew;
+import com.ydtech.modules.esm.service.EsmUserAgentService;
+import com.ydtech.modules.esm.service.EsmUserInternalService;
 import com.ydtech.modules.ins.model.InsOrder;
 import com.ydtech.modules.ins.model.InsPayApply;
-import com.ydtech.modules.ins.service.*;
 import com.ydtech.modules.ins.model.vo.AccountVo;
 import com.ydtech.modules.ins.model.vo.ApplyVo;
+import com.ydtech.modules.ins.service.*;
 import com.ydtech.utils.DateMonthUtils;
 import com.ydtech.utils.StringUtils;
 import com.ydtech.utils.idgen.IdGenerate;

src/main/java/com/ydtech/modules/ins/controller/InsSettleController.java

@@ -2,13 +2,13 @@ package com.ydtech.modules.ins.controller;
 
 import com.ydtech.aop.exception.DescribeException;
 import com.ydtech.constants.SysConstants;
-import com.ydtech.core.page.BaseController;
 import com.ydtech.core.page.HttpResult;
-import com.ydtech.modules.ins.service.InsSettleService;
+import com.ydtech.modules.base.controller.BaseController;
 import com.ydtech.modules.ins.model.vo.InsIncomeAndCmainReqVo;
 import com.ydtech.modules.ins.model.vo.InsSettleReqListVo;
 import com.ydtech.modules.ins.model.vo.InsSettleReqVo;
 import com.ydtech.modules.ins.model.vo.req.InsCminReqVo;
+import com.ydtech.modules.ins.service.InsSettleService;
 import com.ydtech.utils.StringUtils;
 import io.swagger.annotations.*;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -161,7 +161,7 @@ public class InsSettleController extends BaseController {
      */
     private String checkAuth(HttpServletRequest request, String comcode2) {
         // 设置查询权限
-        String tokenDeptId = getdeptId(request);
+        String tokenDeptId = getDeptId();
         String comcode = comcode2;
         if (StringUtils.isNullOrEmpty(comcode)) {
             comcode = tokenDeptId.contains("D") ? tokenDeptId.substring(0, tokenDeptId.indexOf("D")) : tokenDeptId.equalsIgnoreCase(SysConstants.DEPT) ? "" : tokenDeptId;

src/main/java/com/ydtech/modules/ins/model/yc/ruote/Base.java

@@ -283,7 +283,7 @@ public class Base {
 
         base.setCDptCde(apiComponents.getDptCde());
 //        base.setCDptCde("14A4");
-        //@TODO 不确定  340001	按日计算（D）  340002	按月计算（M）
+        //  340001	按日计算（D）  340002	按月计算（M）
         base.setCRatioTyp("340001");
         base.setNRatioCoef("1");
         base.setNPrmRmbExch("1");

src/main/java/com/ydtech/modules/ins/service/impl/InsCmainServiceImpl.java

@@ -168,7 +168,7 @@ public class InsCmainServiceImpl implements InsCmainService {
             int count = 0;
             // 获取token权限
             PubUserInfo pubUserInfo = new PubUserInfo();
-            String tokenDeptId = pubUserInfo.getdeptId(request);
+            String tokenDeptId = pubUserInfo.getDeptId();
             tokenDeptId = tokenDeptId.contains("D") ? tokenDeptId.substring(0, tokenDeptId.indexOf("D")) : tokenDeptId;
             for (int i = 0; i < insCmainList.size(); i++) {
                 InsCmainExcelVO excelVo = insCmainList.get(i);
@@ -292,7 +292,7 @@ public class InsCmainServiceImpl implements InsCmainService {
             int count = 0;
             // 获取token权限
             PubUserInfo pubUserInfo = new PubUserInfo();
-            String tokenDeptId = pubUserInfo.getdeptId(request);
+            String tokenDeptId = pubUserInfo.getDeptId();
             tokenDeptId = tokenDeptId.contains("D") ? tokenDeptId.substring(0, tokenDeptId.indexOf("D")) : tokenDeptId;
             //  校验保单信息
             for (int i = 0; i < insPmainList.size(); i++) {

src/main/java/com/ydtech/modules/inv/controller/InvChannelsExternalBillsDetailsController.java

@@ -5,10 +5,11 @@ import cn.hutool.core.bean.copier.CopyOptions;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ydtech.core.page.BaseController;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.core.page.PageRequest;
 import com.ydtech.core.page.PageResult;
+import com.ydtech.modules.base.controller.BaseController;
+import com.ydtech.modules.base.model.dto.BaseDto;
 import com.ydtech.modules.inv.model.InvChannelsExternalBillsDetails;
 import com.ydtech.modules.inv.model.InvChannelsExternalBillsDetailsHistory;
 import com.ydtech.modules.inv.model.vo.req.InvInsExternalBillsDetailsReqVO;
@@ -16,13 +17,17 @@ import com.ydtech.modules.inv.service.InvChannelsExternalBillsDetailsHistoryServ
 import com.ydtech.modules.inv.service.InvChannelsExternalBillsDetailsService;
 import com.ydtech.utils.StringUtils;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
+import javax.validation.constraints.NotBlank;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -45,8 +50,6 @@ public class InvChannelsExternalBillsDetailsController extends BaseController {
     private InvChannelsExternalBillsDetailsHistoryService icebdhService;
 
 
-
-
     /**
      * 分页查询
      *
@@ -55,10 +58,10 @@ public class InvChannelsExternalBillsDetailsController extends BaseController {
      */
     @ApiOperation(value = "分页查询")
     @PostMapping(value = "/queryPage")
-    public HttpResult queryPage(@RequestBody InvInsExternalBillsDetailsReqVO reqVo){
+    public HttpResult queryPage(@RequestBody InvInsExternalBillsDetailsReqVO reqVo) {
 
         LambdaQueryWrapper<InvChannelsExternalBillsDetails> lqw = new LambdaQueryWrapper();
-        lqw.eq(StringUtils.isNotEmpty(reqVo.getBatchNum()),InvChannelsExternalBillsDetails::getBatchNum,reqVo.getBatchNum());
+        lqw.eq(StringUtils.isNotEmpty(reqVo.getBatchNum()), InvChannelsExternalBillsDetails::getBatchNum, reqVo.getBatchNum());
 
         Page p = PageRequest.buildPageRequestByVo(reqVo);
         IPage<InvChannelsExternalBillsDetails> pResult = icebdService.page(p, lqw);
@@ -68,17 +71,20 @@ public class InvChannelsExternalBillsDetailsController extends BaseController {
     }
 
 
-
-
     @GetMapping("/detailsById")
     @ApiOperation(value = "详情")
     public HttpResult detailsById(String id) {
         return HttpResult.ok(icebdService.getById(id));
 
     }
-    @GetMapping("/aaaaa")
-    @ApiOperation(value = "测试用户ID是否获取到")
-    public HttpResult aaaa(HttpServletRequest request) {
+
+    @PutMapping("/aaaaa")
+    @ApiOperation(value = "测试用户ID是否获取到", notes = "" +
+            "参数1:列表ID" +
+            "</br>参数2：通过状态（1通过，2失败）" +
+            "</br>参数3：类型（1报价，2核保）")
+    public HttpResult aaaa(@RequestBody BaseDto dto) {
+//    public HttpResult aaaa(@ApiIgnore @RequestBody BaseDto dto) {
 //        log.error("********************");
 //        log.error("Authorization:"+request.getHeader("Authorization"));
 //        log.error("token:"+request.getHeader("token"));
@@ -94,35 +100,58 @@ public class InvChannelsExternalBillsDetailsController extends BaseController {
 //        log.error("测试获取的用户ID 2222："+getUserId2());
 //        log.error("测试获取的用户ID 1111："+getUserId());
 //        return HttpResult.ok("获取用户ID测试：",getUserId());
-        return HttpResult.ok("获取用户部门ID：",getdeptId(request));
-//        return HttpResult.ok();
+//        return HttpResult.ok("获取用户部门ID：",getdeptId(request));
+        return HttpResult.ok(dto);
 
     }
-    @GetMapping("/bbbb")
+
+    @GetMapping(value = "/bbbb")
     @ApiOperation(value = "测试用户ID是否获取到2222")
     public HttpResult bbbb() {
-        return HttpResult.ok("获取用户信息测试：",getUser());
+        return HttpResult.ok("获取用户信息测试：", getUser());
 //        return HttpResult.ok("获取用户ID测试2222：",getUserId2());
 
     }
 
 
+    @PostMapping(value = "/demo02")
+    @ApiOperation(value = "数据导入")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "file", value = "excel文件", required = true, dataType = "__file"),
+            @ApiImplicitParam(name = "batchNum", value = "批次号", required = true, dataType = "String")
+    })
+    public HttpResult demo02(@RequestPart MultipartFile file, @RequestParam String batchNum) {
+        //业务代码
+        return HttpResult.ok();
+    }
+
+    @GetMapping(value = "/demo03")
+    @ApiOperation(value = "查询")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "file", value = "excel文件", required = true, dataType = "__file"),
+            @ApiImplicitParam(name = "batchNum", value = "批次号", required = true, dataType = "String")
+    })
+    public HttpResult demo03(@RequestParam @NotBlank(message = "报价号ID不能为空") String quoteNo) {
+        return HttpResult.ok();
+    }
+
+
+
     @ApiOperation(value = "修改")
     @PostMapping(value = "/edit")
     @Transactional
     public HttpResult edit(@RequestBody InvChannelsExternalBillsDetails icebd, HttpServletRequest request) {
 
 
-
         List<InvChannelsExternalBillsDetailsHistory> list = icebdhService.gainListByEditId(icebd.getId());
 
         List<InvChannelsExternalBillsDetailsHistory> icebdhList = new ArrayList<>();
         InvChannelsExternalBillsDetails icebdOld = icebdService.getById(icebd.getId());
-        if(null == list || list.size() < 1){
+        if (null == list || list.size() < 1) {
             //初始历史数据
             InvChannelsExternalBillsDetailsHistory icebdh = new InvChannelsExternalBillsDetailsHistory();
 //            BeanUtils.copyProperties(icebdOld, icebdh,"id");
-            BeanUtil.copyProperties(icebdOld, icebdh, CopyOptions.create(null, true,"id"));
+            BeanUtil.copyProperties(icebdOld, icebdh, CopyOptions.create(null, true, "id"));
             icebdh.setEditId(icebd.getId());
             icebdhList.add(icebdh);
         }
@@ -134,7 +163,7 @@ public class InvChannelsExternalBillsDetailsController extends BaseController {
         BeanUtil.copyProperties(icebd, icebdOld, CopyOptions.create(null, true));
 
         //构造历史数据
-        BeanUtil.copyProperties(icebdOld, icebdh, CopyOptions.create(null, true,"id"));
+        BeanUtil.copyProperties(icebdOld, icebdh, CopyOptions.create(null, true, "id"));
 
 //        //构造更新数据
 //        BeanUtils.copyProperties(icebdOld , icebd);
@@ -154,7 +183,4 @@ public class InvChannelsExternalBillsDetailsController extends BaseController {
     }
 
 
-
-
-
 }

src/main/java/com/ydtech/modules/inv/controller/InvCompanyController.java

@@ -1,13 +1,12 @@
 package com.ydtech.modules.inv.controller;
 
-import com.ydtech.core.page.BaseController;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.core.page.PageResult;
-import com.ydtech.modules.admin.model.SysUser;
+import com.ydtech.modules.base.controller.BaseController;
 import com.ydtech.modules.inv.model.InvCompany;
-import com.ydtech.modules.inv.service.InvCompanyService;
 import com.ydtech.modules.inv.model.vo.req.InvCompanyReqVO;
 import com.ydtech.modules.inv.model.vo.res.InvCompanyResVO;
+import com.ydtech.modules.inv.service.InvCompanyService;
 import com.ydtech.utils.DateUtil;
 import com.ydtech.utils.StringUtils;
 import io.swagger.annotations.Api;
@@ -52,13 +51,13 @@ public class InvCompanyController extends BaseController {
 
         if(StringUtils.isNotEmpty(invCompany.getId())){
             //更新
-            invCompany.setUpdateBy(getUserId(request));
+            invCompany.setUpdateBy(getUserId());
             invCompany.setUpdateTime(new Date());
 
         }else{
             //新增
             invCompany.setDelFlag(0);
-            invCompany.setCreateBy(getUserId(request));
+            invCompany.setCreateBy(getUserId());
             invCompany.setCreateTime(new Date());
         }
 

src/main/java/com/ydtech/modules/inv/controller/InvExternalBillsController.java

@@ -3,18 +3,17 @@ package com.ydtech.modules.inv.controller;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ydtech.core.page.BaseController;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.core.page.PageRequest;
 import com.ydtech.core.page.PageResult;
 import com.ydtech.exception.SystemException;
+import com.ydtech.modules.base.controller.BaseController;
 import com.ydtech.modules.esm.model.EsmInsCompany;
 import com.ydtech.modules.esm.service.EsmInsCompanyService;
 import com.ydtech.modules.inv.model.InvExternalBills;
 import com.ydtech.modules.inv.model.vo.req.InvChannelExternalBillsDetailsReqVO;
 import com.ydtech.modules.inv.model.vo.req.InvInsExternalBillsReqVO;
 import com.ydtech.modules.inv.model.vo.res.InvBaseChannelMatchInsResVO;
-import com.ydtech.modules.inv.model.vo.res.InvCompanyResVO;
 import com.ydtech.modules.inv.service.InvChannelsExternalBillsDetailsService;
 import com.ydtech.modules.inv.service.InvExternalBillsService;
 import com.ydtech.modules.inv.service.InvInsExternalBillsDetailsService;
@@ -22,13 +21,11 @@ import com.ydtech.utils.StringUtils;
 import io.swagger.annotations.*;
 import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.Async;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.Date;
-import java.util.List;
 
 /**
  * 外部单据控制层  临时
@@ -94,7 +91,7 @@ public class InvExternalBillsController extends BaseController {
 
         InvExternalBills iieb = new InvExternalBills();
         iieb.setCreateTime(new Date());
-        iieb.setCreateBy(getUserId(request));
+        iieb.setCreateBy(getUserId());
         iieb.setImportStatus("1");
         iieb.setFlag(flag);
 
@@ -138,7 +135,7 @@ public class InvExternalBillsController extends BaseController {
 
 
         ieb.setCreateTime(new Date());
-        ieb.setCreateBy(getUserId(request));
+        ieb.setCreateBy(getUserId());
         ieb.setImportStatus("1");
         invExternalBillsService.updateById(ieb);
 

src/main/java/com/ydtech/modules/inv/controller/InvInsExternalBillsDetailsController.java

@@ -3,17 +3,18 @@ package com.ydtech.modules.inv.controller;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ydtech.core.page.BaseController;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.core.page.PageRequest;
 import com.ydtech.core.page.PageResult;
+import com.ydtech.modules.base.controller.BaseController;
 import com.ydtech.modules.esm.service.EsmInsCompanyService;
 import com.ydtech.modules.inv.model.InvInsExternalBillsDetails;
 import com.ydtech.modules.inv.model.vo.req.InvInsExternalBillsDetailsReqVO;
 import com.ydtech.modules.inv.service.InvExternalBillsService;
 import com.ydtech.modules.inv.service.InvInsExternalBillsDetailsService;
 import com.ydtech.utils.StringUtils;
-import io.swagger.annotations.*;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 

src/main/java/com/ydtech/modules/inv/controller/InvInvoiceInfoController.java

@@ -1,18 +1,17 @@
 package com.ydtech.modules.inv.controller;
 
-import cn.dev33.satoken.stp.StpUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ydtech.aop.exception.DescribeException;
 import com.ydtech.constants.enums.dict.ApprovalStatusEnum;
-import com.ydtech.core.page.BaseController;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.core.page.PageRequest;
 import com.ydtech.core.page.PageResult;
+import com.ydtech.modules.base.controller.BaseController;
 import com.ydtech.modules.inv.model.InvInvoiceInfo;
-import com.ydtech.modules.inv.service.InvInvoiceInfoService;
 import com.ydtech.modules.inv.model.vo.req.InvInvoiceInfoReqVO;
+import com.ydtech.modules.inv.service.InvInvoiceInfoService;
 import com.ydtech.utils.StringUtils;
 import io.swagger.annotations.*;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -58,12 +57,12 @@ public class InvInvoiceInfoController extends BaseController {
 //                return HttpResult.error("审核通过的不允许修改");
 //            }
 
-            invInvoiceInfo.setUpdateBy(getUserId(request));
+            invInvoiceInfo.setUpdateBy(getUserId());
             invInvoiceInfo.setUpdateTime(new Date());
 
         }else{
             //新增
-            invInvoiceInfo.setCreateBy(getUserId(request));
+            invInvoiceInfo.setCreateBy(getUserId());
             invInvoiceInfo.setCreateTime(new Date());
         }
 

src/main/java/com/ydtech/modules/nai/controller/ExcelCeController.java

@@ -1,12 +1,16 @@
 package com.ydtech.modules.nai.controller;
 
-import com.ydtech.core.page.*;
+import com.ydtech.core.page.ColumnFilter;
+import com.ydtech.core.page.HttpResult;
+import com.ydtech.core.page.PageRequest;
+import com.ydtech.core.page.PageResult;
+import com.ydtech.modules.base.controller.BaseController;
 import com.ydtech.modules.ins.service.InsCompanyFeeService;
+import com.ydtech.modules.nai.excelvo.OfflineExcelVO;
+import com.ydtech.modules.nai.excelvo.SettlementVO;
 import com.ydtech.modules.nai.httpvo.excel.InsCompanyFeeExcel;
 import com.ydtech.modules.nai.service.ExcelService;
 import com.ydtech.modules.nai.utils.ExcelUtil;
-import com.ydtech.modules.nai.excelvo.OfflineExcelVO;
-import com.ydtech.modules.nai.excelvo.SettlementVO;
 import com.ydtech.modules.nai.utils.ExcelUtils;
 import org.apache.commons.collections4.ListUtils;
 import org.slf4j.Logger;
@@ -1023,4 +1027,4 @@ public class ExcelCeController extends BaseController {
 
     }
 
-}
+}

src/main/java/com/ydtech/modules/order/controller/OrderTaskImageController.java

@@ -1,8 +1,8 @@
 package com.ydtech.modules.order.controller;
 
-import com.ydtech.core.page.BaseController;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.exception.SystemException;
+import com.ydtech.modules.base.controller.BaseController;
 import com.ydtech.modules.esm.model.InsTaskImage;
 import com.ydtech.modules.esm.service.InsTaskImageService;
 import com.ydtech.modules.order.convert.InsTaskImageConvert;
@@ -79,7 +79,7 @@ public class OrderTaskImageController extends BaseController {
     @PostMapping(value = "/uploadImages")
     @ApiOperation(value = "新上传影像")
     public HttpResult uploadImages(@RequestBody InsTaskImagesVo insTaskImagesVo, HttpServletRequest request) {
-        return insTaskImagesService.uploadImages(insTaskImagesVo, getJwtUserName(request));
+        return insTaskImagesService.uploadImages(insTaskImagesVo, getUserName());
     }
 
 
@@ -121,7 +121,7 @@ public class OrderTaskImageController extends BaseController {
     @PostMapping("/uploadFile")
     @ApiOperation(value = "文件上传")
     public HttpResult uploadFile(@CheckObjectNotNull(message = "上传文件不能为空") MultipartFile multipartFile, String type, HttpServletRequest request) throws IOException {
-        InsUploadFiles insUploadFiles = insUploadFilesService.uploadFile(multipartFile, getJwtUserName(request), type);
+        InsUploadFiles insUploadFiles = insUploadFilesService.uploadFile(multipartFile, getUserName(), type);
         return HttpResult.ok(insUploadFiles);
     }
 

src/main/java/com/ydtech/modules/order/controller/RenewalController.java

@@ -1,10 +1,9 @@
 package com.ydtech.modules.order.controller;
 
-import com.ydtech.core.page.BaseController;
 import com.ydtech.core.page.BasePageVO;
 import com.ydtech.core.page.HttpResult;
-import com.ydtech.modules.admin.model.SysUser;
 import com.ydtech.modules.admin.service.SysUserService;
+import com.ydtech.modules.base.controller.BaseController;
 import com.ydtech.modules.ins.model.ya.YaQuoteInfoVo;
 import com.ydtech.modules.order.entity.vo.InsRenewalVo;
 import com.ydtech.modules.order.entity.vo.QueryRenewalVo;
@@ -13,8 +12,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletRequest;
-
 /**
  * @author wenks
  * @version 0.0.2

src/main/java/com/ydtech/modules/order/service/impl/OrderTaskPoolsServiceImpl.java

@@ -3,10 +3,10 @@ package com.ydtech.modules.order.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ydtech.core.page.BaseController;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.modules.admin.model.SysUser;
 import com.ydtech.modules.admin.service.SysUserService;
+import com.ydtech.modules.base.controller.BaseController;
 import com.ydtech.modules.ins.model.InsTaskHistory;
 import com.ydtech.modules.ins.service.InsTaskHistoryService;
 import com.ydtech.modules.order.entity.BasePageResult;

src/main/java/com/ydtech/modules/protocol/controller/EsProductController.java

@@ -4,10 +4,10 @@ package com.ydtech.modules.protocol.controller;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ydtech.core.page.BaseController;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.core.page.PageRequest;
 import com.ydtech.core.page.PageResult;
+import com.ydtech.modules.base.controller.BaseController;
 import com.ydtech.modules.protocol.entity.po.EsProduct;
 import com.ydtech.modules.protocol.service.EsProductService;
 import io.swagger.annotations.Api;

src/main/java/com/ydtech/modules/protocol/controller/PtlAgreementController.java

@@ -1,9 +1,9 @@
 package com.ydtech.modules.protocol.controller;
 
 
-import com.ydtech.core.page.BaseController;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.core.page.PageResult;
+import com.ydtech.modules.base.controller.BaseController;
 import com.ydtech.modules.protocol.entity.po.PtlAgreement;
 import com.ydtech.modules.protocol.entity.vo.PtlAgreementAuditVo;
 import com.ydtech.modules.protocol.entity.vo.PtlAgreementPageVo;

src/main/java/com/ydtech/security/PubUserInfo.java

@@ -1,6 +1,7 @@
 package com.ydtech.security;
 
-import com.ydtech.core.page.BaseController;
+
+import com.ydtech.modules.base.controller.BaseController;
 
 /**
  * @Author: shixk

src/main/java/com/ydtech/security/utils/PubUserInfo.java

@@ -1,6 +1,6 @@
 package com.ydtech.security.utils;
 
-import com.ydtech.core.page.BaseController;
+import com.ydtech.modules.base.controller.BaseController;
 
 /**
  * @Author: shixk

src/main/resources/application.yml

@@ -3,7 +3,7 @@ server:
     encoding:
       charset: UTF-8
       force: true
-  port: 9001
+  port: 8080
 
 spring:
   profiles: