部分接口

pom.xml

@@ -129,7 +129,7 @@
                 <artifactId>pagehelper-spring-boot-starter</artifactId>
                 <version>${pagehelper-spring-boot-starter.version}</version>
             </dependency>
-	    
+
 	    <dependency>
                 <groupId>junit</groupId>
                 <artifactId>junit</artifactId>
@@ -222,6 +222,11 @@
             <artifactId>tomcat-embed-core</artifactId>
             <version>10.1.7</version>
         </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-webmvc</artifactId>
+        </dependency>
+
     </dependencies>
     <build>
         <plugins>

sckw-auth/src/main/java/com/sckw/auth/service/IIndexService.java

@@ -0,0 +1,21 @@
+package com.sckw.auth.service;
+
+import com.sckw.system.api.model.dto.req.LoginReqDto;
+import com.sckw.system.api.model.dto.req.RegisterReqDto;
+import com.sckw.system.api.model.dto.res.LoginResDto;
+
+public interface IIndexService {
+
+    /**
+     * 登录
+     * @param reqVo
+     * @return
+     */
+    LoginResDto login(LoginReqDto reqVo);
+
+    /**
+     * 注册
+     * @param reqVo
+     */
+    void register(RegisterReqDto reqVo);
+}

sckw-auth/src/main/java/com/sckw/auth/service/impl/IndexServiceImpl.java

@@ -0,0 +1,79 @@
+package com.sckw.auth.service.impl;
+
+import cn.hutool.core.lang.UUID;
+import com.sckw.core.utils.CollectionUtils;
+import com.sckw.core.utils.PasswordUtils;
+import com.sckw.core.utils.UUIDUtils;
+import com.sckw.redis.utils.RedissonUtils;
+import com.sckw.system.api.model.dto.req.LoginReqDto;
+import com.sckw.system.api.model.dto.req.RegisterReqDto;
+import com.sckw.system.api.model.dto.res.LoginResDto;
+import com.sckw.auth.service.IIndexService;
+import com.sckw.system.api.RemoteUserService;
+import com.sckw.system.model.KwsDept;
+import com.sckw.system.model.KwsEnterprise;
+import com.sckw.system.model.KwsUser;
+import com.sckw.system.model.KwsUserDept;
+import jakarta.annotation.Resource;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.dubbo.config.annotation.DubboReference;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Objects;
+
+@Slf4j
+@Service
+public class IndexServiceImpl implements IIndexService {
+
+    @DubboReference(version = "2.0.0", group = "design", check = false)
+    private RemoteUserService remoteUserService;
+
+    @Resource
+    private RedissonUtils redissonUtils;
+
+    @Override
+    public LoginResDto login(LoginReqDto reqDto) {
+        /**1、根据账号密码或者手机号校验码登录,密码加密处理后面做*/
+        KwsUser kwsUser = remoteUserService.getUserByAccount(reqDto.getUsername());
+        if (Objects.isNull(kwsUser)) {
+            //抛异常
+        }
+
+        //密码校验
+        if (!PasswordUtils.entryptPassword(reqDto.getPassword()).equals(kwsUser.getPassword())) {
+            //抛异常
+        }
+
+
+        /**2、登录成功,查询用户机构*/
+        List<KwsUserDept> kwsUserDepts = remoteUserService.queryUserDeptByUserId(kwsUser.getId());
+        if (CollectionUtils.isEmpty(kwsUserDepts)) {
+            //不用抛异常，可能没有认证
+        }
+        List<Long> deptIds = kwsUserDepts.stream().map(KwsUserDept::getDeptId).toList();
+        List<KwsDept> kwsDepts = remoteUserService.queryDeptByIds(deptIds);
+
+        /**3、查企业*/
+        List<Long> entIds = kwsDepts.stream().map(KwsDept::getEntId).toList();
+        List<KwsEnterprise> kwsEnterprises = remoteUserService.queryEnterpriseByIds(entIds);
+
+        /**4、以uuid作为主键存redis,也是会话token*/
+        String key = UUIDUtils.get32UUID();
+        redissonUtils.add(key, "");
+
+        /**5、组装返参*/
+        //todo
+        return null;
+    }
+
+    @Override
+    public void register(RegisterReqDto reqDto) {
+        KwsUser kwsUser = new KwsUser();
+        BeanUtils.copyProperties(reqDto, kwsUser);
+        remoteUserService.register(kwsUser);
+    }
+
+}

sckw-common/sckw-common-core/pom.xml

@@ -22,11 +22,6 @@
 
 
     <dependencies>
-        <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>fastjson</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-autoconfigure</artifactId>
@@ -106,6 +101,15 @@
             <artifactId>sckw-common-remote</artifactId>
             <version>1.0.0</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.tomcat.embed</groupId>
+            <artifactId>tomcat-embed-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.sckw</groupId>
+            <artifactId>sckw-common-redis</artifactId>
+            <version>1.0.0</version>
+        </dependency>
         <dependency>
             <groupId>jakarta.validation</groupId>
             <artifactId>jakarta.validation-api</artifactId>

sckw-common/sckw-common-core/src/main/java/com/sckw/core/exception/GlobalSystemExceptionHandler.java

@@ -0,0 +1,19 @@
+package com.sckw.core.exception;
+
+import com.sckw.core.web.response.HttpResult;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.ControllerAdvice;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+@Slf4j
+@ControllerAdvice
+public class GlobalSystemExceptionHandler {
+
+    @ExceptionHandler(value = SystemException.class)
+    @ResponseBody
+    public HttpResult handlerRuntimeException(SystemException e) {
+        return HttpResult.error(e.getCode(), e.getMessage());
+    }
+}
+

sckw-common/sckw-common-core/src/main/java/com/sckw/core/exception/SystemException.java

@@ -0,0 +1,25 @@
+package com.sckw.core.exception;
+
+import com.sckw.core.web.constant.HttpStatus;
+import lombok.Data;
+
+@Data
+public class SystemException extends RuntimeException {
+
+    private final int code;
+
+    private final String message;
+
+    public SystemException(String message) {
+        super();
+        this.code = HttpStatus.GLOBAL_EXCEPTION_CODE;
+        this.message = message;
+    }
+
+    public SystemException(int code, String message) {
+        super();
+        this.code = code;
+        this.message = message;
+    }
+
+}

sckw-common/sckw-common-core/src/main/java/com/sckw/core/interceptor/webInterceptor.java

@@ -0,0 +1,42 @@
+package com.sckw.core.interceptor;
+
+import com.sckw.core.web.constant.RequestConstant;
+import com.sckw.redis.utils.RedissonUtils;
+import jakarta.annotation.Resource;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+import org.springframework.web.servlet.HandlerInterceptor;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+
+@Slf4j
+@Component
+public class webInterceptor implements HandlerInterceptor {
+
+    public static final List<String> EXCLUDEMETHOD = new ArrayList<>();
+
+    @Resource
+    private RedissonUtils redissonUtils;
+
+    public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
+        // todo
+        //1、解析请求的url，如果是登录接口则直接放行
+        String method = request.getMethod();
+        if (EXCLUDEMETHOD.contains(method)){
+            log.info("登录接口");
+        }
+
+        //2、非登录接口，校验token是否过期
+        String token = request.getHeader(RequestConstant.TOKEN);
+        Object object = redissonUtils.get(token);
+        if (Objects.isNull(object)) {
+            log.error("过期抛异常。。。。");
+        }
+        return true;
+    }
+
+}

sckw-common/sckw-common-core/src/main/java/com/sckw/core/model/page/PageHelperUtil.java

@@ -19,7 +19,6 @@ public class PageHelperUtil {
      * 分页查询, 约定查询方法名为 “findPage”
      * @param pageRequest 分页请求
      * @param mapper Dao对象，MyBatis的 Mapper
-     * @return
      */
     public static PageResult findPage(PageRequest pageRequest, Object mapper) {
         return findPage(pageRequest, mapper, FIND_PAGE);
@@ -31,7 +30,6 @@ public class PageHelperUtil {
      * @param mapper Dao对象，MyBatis的 Mapper
      * @param queryMethodName 要分页的查询方法名
      * @param args 方法参数
-     * @return
      */
     @SuppressWarnings({ "unchecked", "rawtypes" })
     public static PageResult findPage(PageRequest pageRequest, Object mapper, String queryMethodName, Object... args) {
@@ -46,9 +44,6 @@ public class PageHelperUtil {
 
     /**
      * 将分页信息封装到统一的接口
-     * @param pageRequest
-     * @param pageInfo
-     * @return
      */
     private static PageResult getPageResult(PageRequest pageRequest, PageInfo<?> pageInfo) {
         return setPageResult(pageInfo);
@@ -56,7 +51,6 @@ public class PageHelperUtil {
 
     /**
      * 将分页信息封装到统一的接口
-     * @param pageInfo
      * @return PageResult
      */
     public static PageResult getPageResult(PageInfo<?> pageInfo) {

sckw-common/sckw-common-core/src/main/java/com/sckw/core/utils/UUIDUtils.java

@@ -0,0 +1,10 @@
+package com.sckw.core.utils;
+
+import cn.hutool.core.lang.UUID;
+
+public class UUIDUtils {
+
+    public static String get32UUID(){
+        return UUID.randomUUID().toString().replace("-", "");
+    }
+}

sckw-common/sckw-common-core/src/main/java/com/sckw/core/web/constant/HttpStatus.java

@@ -27,10 +27,11 @@ public class HttpStatus {
 
     /**参数缺失状态码*/
     public static final int PARAMETERS_MISSING_CODE = 60600;
+    public static final String ACCOUNT_MISSING = "用户账号必填！";
+    public static final String ACCOUNT_EXISTS = "用户账号已存在！";
+
 
     /**其他自定义状态码*/
-    public static final int CODE_60601 = 60601;
-    public static final int CODE_60602 = 60602;
     public static final int CODE_60603 = 60603;
     public static final int CODE_60604 = 60604;
     public static final int CODE_60605 = 60605;
@@ -94,4 +95,18 @@ public class HttpStatus {
      * 自定义状态码,该状态码没有特殊含义,只是提供一个状态标识(目前提供9个,可自行扩展)
      */
     public static final int CODE_10301 = 10301;
+
+    /**数据库的操作失败*/
+    public static final int CODE_60601 = 60601;
+    public static final String UPDATE_FAIL = "更新失败";
+    public static final String INSERT_FAIL = "新增失败";
+    public static final String DELETE_FAIL = "删除失败";
+
+    /**未查询到相关信息*/
+    public static final int CODE_60602 = 60602;
+    public static final String ACCOUNT_NOT_EXISTS = "用户信息不存在";
+
+    /**自定义提示消息*/
+    public static final String MSG_001 = "密码重置成功";
+    public static final String MSG_002 = "密码修改成功";
 }

sckw-common/sckw-common-redis/pom.xml

@@ -28,11 +28,15 @@
 <!--            <groupId>org.redisson</groupId>-->
 <!--            <artifactId>redisson-spring-boot-starter</artifactId>-->
 <!--            <version>${redisson.version}</version>-->
+<!--        </dependency>-->
+<!--        <dependency>-->
+<!--            <groupId>com.sckw</groupId>-->
+<!--            <artifactId>sckw-common-core</artifactId>-->
+<!--            <version>1.0.0</version>-->
 <!--        </dependency>-->
         <dependency>
-            <groupId>com.sckw</groupId>
-            <artifactId>sckw-common-core</artifactId>
-            <version>1.0.0</version>
+            <groupId>com.alibaba</groupId>
+            <artifactId>fastjson</artifactId>
         </dependency>
         <dependency>
             <groupId>org.redisson</groupId>

sckw-modules-api/sckw-system-api/pom.xml

@@ -26,7 +26,11 @@
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-openfeign-core</artifactId>
         </dependency>
-
+        <dependency>
+            <groupId>com.sckw</groupId>
+            <artifactId>sckw-system</artifactId>
+            <version>1.0.0</version>
+        </dependency>
     </dependencies>
 
 </project>

sckw-modules-api/sckw-system-api/src/main/java/com/sckw/system/api/RemoteUserService.java

@@ -1,7 +1,46 @@
 package com.sckw.system.api;
 
+import com.sckw.system.model.KwsDept;
+import com.sckw.system.model.KwsEnterprise;
+import com.sckw.system.model.KwsUser;
+import com.sckw.system.model.KwsUserDept;
+
+import java.util.List;
 
 public interface RemoteUserService {
 
     String getUserInfoV1(String account);
+
+    /**
+     * 根据用户名查用户信息
+     * @param username
+     * @return
+     */
+    KwsUser getUserByAccount(String username);
+
+    /**
+     * 根据用户id查用户和机构关联关系
+     * @param userId
+     * @return
+     */
+    List<KwsUserDept> queryUserDeptByUserId(Long userId);
+
+    /**
+     * 根据机构id查机构信息
+     * @param ids
+     * @return
+     */
+    List<KwsDept> queryDeptByIds(List<Long> ids);
+
+    /**
+     * 根据企业id查企业信息
+     * @param ids
+     * @return
+     */
+    List<KwsEnterprise> queryEnterpriseByIds(List<Long> ids);
+
+    /**
+     * 注册
+     */
+    void register(KwsUser kwsUser);
 }

sckw-modules-api/sckw-system-api/src/main/java/com/sckw/system/api/model/dto/req/LoginReqDto.java

@@ -0,0 +1,30 @@
+package com.sckw.system.api.model.dto.req;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class LoginReqDto implements Serializable {
+
+    /**
+     * 用户名
+     */
+    private String username;
+
+    /**
+     * 密码
+     */
+    private String password;
+
+    /**
+     * 手机号
+     */
+    private String phoneNum;
+
+    /**
+     * 验证码
+     */
+    private String code;
+
+}

sckw-modules-api/sckw-system-api/src/main/java/com/sckw/system/api/model/dto/req/RegisterReqDto.java

@@ -0,0 +1,50 @@
+package com.sckw.system.api.model.dto.req;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class RegisterReqDto implements Serializable {
+
+    /**
+     * 用户名
+     */
+    private String account;
+
+    /**
+     * 密码
+     */
+    private String password;
+
+    /**
+     *真实姓名
+     */
+    private String name;
+
+    /**
+     * 手机号
+     */
+    private String telephone;
+
+    /**
+     * 照片
+     */
+    private String photo;
+
+    /**
+     * 邮件
+     */
+    private String email;
+
+    /**
+     * 是否是企业管理（0是 1否）
+     */
+    private String isMain;
+
+    /**
+     *系统类型(1运营端、2企业开户)
+     */
+    private String systemType;
+
+}

sckw-modules-api/sckw-system-api/src/main/java/com/sckw/system/api/model/dto/res/LoginResDto.java

@@ -0,0 +1,11 @@
+package com.sckw.system.api.model.dto.res;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class LoginResDto implements Serializable {
+
+
+}

sckw-modules/sckw-example/src/main/java/com/sckw/example/dubbo/RemoteUserService1Impl.java

@@ -1,6 +1,8 @@
 package com.sckw.example.dubbo;
 
+import com.sckw.system.api.model.dto.req.LoginReqDto;
 import com.sckw.system.api.RemoteUserService;
+import com.sckw.system.api.model.dto.res.LoginResDto;
 import org.apache.dubbo.config.annotation.DubboService;
 
 import java.util.Date;
@@ -12,4 +14,5 @@ public class RemoteUserService1Impl implements RemoteUserService {
     public String getUserInfoV1(String account) {
         return "getUserInfoV1:"+new Date() +account;
     }
+
 }

sckw-modules/sckw-system/src/main/java/com/sckw/system/controller/KwsEnterpriseController.java

@@ -3,7 +3,7 @@ package com.sckw.system.controller;
 import com.sckw.core.web.response.HttpResult;
 import com.sckw.system.model.KwsEntCheckTrack;
 import com.sckw.system.model.KwsEnterprise;
-import com.sckw.system.model.vo.KwsEnterpriseVo;
+import com.sckw.system.model.vo.res.KwsEnterpriseResVo;
 import com.sckw.system.service.KwsEnterpriseService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -92,7 +92,7 @@ public class KwsEnterpriseController {
      * @date 2023/06/02
      **/
     @PostMapping("/update")
-    public HttpResult update(@RequestBody KwsEnterpriseVo params) throws Exception {
+    public HttpResult update(@RequestBody KwsEnterpriseResVo params) throws Exception {
         return kwsEntService.update(params);
     }
 

sckw-modules/sckw-system/src/main/java/com/sckw/system/controller/KwsUserController.java

@@ -4,8 +4,10 @@ import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.sckw.core.model.page.PageHelperUtil;
 import com.sckw.core.model.page.PageResult;
+import com.sckw.core.web.constant.HttpStatus;
 import com.sckw.core.web.response.HttpResult;
 import com.sckw.system.model.KwsUser;
+import com.sckw.system.model.vo.req.UpdatePasswordReqVo;
 import com.sckw.system.service.KwsUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -27,20 +29,17 @@ public class KwsUserController {
 
     /**
      * @param id 主键ID
-     * @return
      * @description 根据主键查询
      * @author zk
      * @date 2023/5/30
      **/
     @GetMapping("/detail")
     public HttpResult selectByKey(Long id) throws Exception {
-        KwsUser sysDict = kwsUserService.selectByKey(id);
-        return HttpResult.ok(sysDict);
+        return HttpResult.ok(kwsUserService.selectByKey(id));
     }
 
     /**
      * @param params {pageNum：页数、pageSize：每页条数、。。。}
-     * @return
      * @description 分页查询
      * @author zk
      * @date 2023/5/30
@@ -56,34 +55,31 @@ public class KwsUserController {
 
     /**
      * @param params {pageNum：页数、pageSize：每页条数、。。。}
-     * @return
      * @description 分页查询
      * @author zk
      * @date 2023/5/30
      **/
     @PostMapping("/findList")
     public HttpResult findList(@RequestBody HashMap params) throws Exception {
-        List<HashMap> list = kwsUserService.findList(params);
-        return HttpResult.ok(list);
+        return HttpResult.ok(kwsUserService.findList(params));
     }
 
     /**
      * @param params {systemType:系统类型(1运营端、2企业开户)、account：账号、password：密码、name：姓名、telephone：联系电话
      *               ，photo：头像，email：邮箱}
-     * @return
      * @description 新增
      * @author zk
      * @date 2023/5/30
      **/
     @PostMapping("/add")
-    public HttpResult add(@RequestBody KwsUser params) throws Exception {
-        return kwsUserService.add(params);
+    public HttpResult add(@RequestBody KwsUser params) {
+        kwsUserService.add(params);
+        return HttpResult.ok();
     }
 
     /**
      * @param params {id：主键ID、systemType:系统类型(1运营端、2企业开户)、account：账号、password：密码、name：姓名、telephone：联系电话
      *      *               ，photo：头像，email：邮箱}
-     * @return
      * @description 更新
      * @author zk
      * @date 2023/5/30
@@ -95,33 +91,30 @@ public class KwsUserController {
 
     /**
      * @param id 主键ID
-     * @return
      * @description 重置密码
      * @author zk
      * @date 2023/06/02
      **/
     @PostMapping("/resetPassword")
-    public HttpResult resetPassword(@RequestParam String id) throws Exception {
-
-        return HttpResult.ok();
+    public HttpResult resetPassword(@RequestParam Long id) throws Exception {
+        kwsUserService.resetPassword(id);
+        return HttpResult.ok(HttpStatus.MSG_001);
     }
 
     /**
      * @param {password 旧密码、newPassword 新密码、account 账号}
-     * @return
      * @description 修改密码
      * @author zk
      * @date 2023/06/02
      **/
     @PostMapping("/updatePassword")
-    public HttpResult updatePassword(@RequestBody Map<String, Object> params) {
-
-        return HttpResult.ok();
+    public HttpResult updatePassword(@RequestBody UpdatePasswordReqVo reqVo) {
+        kwsUserService.updatePassword(reqVo);
+        return HttpResult.ok(HttpStatus.MSG_002);
     }
 
     /**
      * @param params {account 账号、password 密码、captcha 验证码}
-     * @return
      * @description 忘记密码
      * @author zk
      * @date 2023/06/02
@@ -134,7 +127,6 @@ public class KwsUserController {
 
     /**
      * @param account 账号
-     * @return
      * @description 注销账户
      * @author zk
      * @date 2023/06/02
@@ -147,7 +139,6 @@ public class KwsUserController {
 
     /**
      * @param ids {ids：主键ID（多个以逗号隔开）}
-     * @return
      * @description 更新
      * @author zk
      * @date 2023/5/30

sckw-modules/sckw-system/src/main/java/com/sckw/system/dao/KwsDeptDao.java

@@ -1,7 +1,8 @@
 package com.sckw.system.dao;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.sckw.system.model.KwsDept;
-import com.sckw.system.model.vo.KwsDeptVo;
+import com.sckw.system.model.vo.res.KwsDeptResVo;
 import org.apache.ibatis.annotations.Mapper;
 import java.util.List;
 import java.util.Map;
@@ -12,7 +13,7 @@ import java.util.Map;
  * @date 2023-05-31
  */
 @Mapper
-public interface KwsDeptDao {
+public interface KwsDeptDao extends BaseMapper<KwsDept> {
 
     /**
      * 新增
@@ -41,5 +42,5 @@ public interface KwsDeptDao {
      * @return
      * @throws Exception
      */
-    List<KwsDeptVo> findList(Map<String, Object> params);
+    List<KwsDeptResVo> findList(Map<String, Object> params);
 }

sckw-modules/sckw-system/src/main/java/com/sckw/system/dao/KwsEnterpriseDao.java

@@ -1,5 +1,6 @@
 package com.sckw.system.dao;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.sckw.system.model.KwsEnterprise;
 import org.apache.ibatis.annotations.Mapper;
 import java.util.List;
@@ -11,7 +12,7 @@ import java.util.Map;
  * @date 2023-06-02
  */
 @Mapper
-public interface KwsEnterpriseDao {
+public interface KwsEnterpriseDao extends BaseMapper<KwsEnterprise> {
     /**
      * 新增
      * @param record

sckw-modules/sckw-system/src/main/java/com/sckw/system/dao/KwsMenuDao.java

@@ -1,7 +1,7 @@
 package com.sckw.system.dao;
 
 import com.sckw.system.model.KwsMenu;
-import com.sckw.system.model.vo.KwsMenuVo;
+import com.sckw.system.model.vo.res.KwsMenuResVo;
 import org.apache.ibatis.annotations.Mapper;
 import java.util.List;
 import java.util.Map;
@@ -41,5 +41,5 @@ public interface KwsMenuDao {
      * @return
      * @throws Exception
      */
-    List<KwsMenuVo> findList(Map<String, Object> params);
+    List<KwsMenuResVo> findList(Map<String, Object> params);
 }

sckw-modules/sckw-system/src/main/java/com/sckw/system/dao/KwsUserDao.java

@@ -1,5 +1,6 @@
 package com.sckw.system.dao;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.sckw.system.model.KwsUser;
 import org.apache.ibatis.annotations.Mapper;
 import java.util.List;
@@ -11,7 +12,7 @@ import java.util.Map;
  * @date 2023-05-31
  */
 @Mapper
-public interface KwsUserDao {
+public interface KwsUserDao extends BaseMapper<KwsUser> {
     /**
      * 新增
      * @param record

sckw-modules/sckw-system/src/main/java/com/sckw/system/dao/KwsUserDeptDao.java

@@ -1,5 +1,6 @@
 package com.sckw.system.dao;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.sckw.system.model.KwsUserDept;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -9,7 +10,7 @@ import org.apache.ibatis.annotations.Mapper;
  * @date 2023-05-31
  */
 @Mapper
-public interface KwsUserDeptDao {
+public interface KwsUserDeptDao extends BaseMapper<KwsUserDept> {
     /**
      * 新增
      * @param record

sckw-modules/sckw-system/src/main/java/com/sckw/system/dubbo/RemoteUserServiceImpl.java

@@ -0,0 +1,79 @@
+package com.sckw.system.dubbo;
+
+import com.sckw.system.api.model.dto.req.LoginReqDto;
+import com.sckw.system.api.RemoteUserService;
+import com.sckw.system.api.model.dto.res.LoginResDto;
+import com.sckw.system.model.KwsDept;
+import com.sckw.system.model.KwsEnterprise;
+import com.sckw.system.model.KwsUser;
+import com.sckw.system.model.KwsUserDept;
+import com.sckw.system.service.KwsDeptService;
+import com.sckw.system.service.KwsEnterpriseService;
+import com.sckw.system.service.KwsUserDeptService;
+import com.sckw.system.service.KwsUserService;
+import org.apache.dubbo.config.annotation.DubboService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@DubboService(group = "design", version = "2.0.0")
+@Service
+public class RemoteUserServiceImpl implements RemoteUserService {
+
+    @Autowired
+    private KwsUserService kwsUserService;
+
+    @Autowired
+    private KwsUserDeptService kwsUserDeptService;
+
+    @Autowired
+    private KwsDeptService kwsDeptService;
+
+    @Autowired
+    private KwsEnterpriseService kwsEnterpriseService;
+
+    @Override
+    public String getUserInfoV1(String account) {
+        return null;
+    }
+
+    @Override
+    public KwsUser getUserByAccount(String username) {
+        return kwsUserService.getUserByAccount(username);
+    }
+
+    @Override
+    public List<KwsUserDept> queryUserDeptByUserId(Long userId) {
+        return kwsUserDeptService.queryUserDeptByUserId(userId);
+    }
+
+    /**
+     * 根据机构id查机构信息
+     * @param ids
+     * @return
+     */
+    @Override
+    public List<KwsDept> queryDeptByIds(List<Long> ids) {
+        return kwsDeptService.listByIds(ids);
+    }
+
+    /**
+     * 根据企业id查企业信息
+     * @param ids
+     * @return
+     */
+    @Override
+    public List<KwsEnterprise> queryEnterpriseByIds(List<Long> ids) {
+        return kwsEnterpriseService.listByIds(ids);
+    }
+
+    /**
+     * 注册
+     */
+    @Override
+    public void register(KwsUser kwsUser) {
+        kwsUserService.add(kwsUser);
+    }
+
+}

sckw-modules/sckw-system/src/main/java/com/sckw/system/model/vo/req/UpdatePasswordReqVo.java

@@ -0,0 +1,25 @@
+package com.sckw.system.model.vo.req;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class UpdatePasswordReqVo implements Serializable {
+
+    /**
+     * 账号
+     */
+    private String account;
+
+    /**
+     * 旧密码
+     */
+    private String password;
+
+    /**
+     * 新密码
+     */
+    private String newPassword;
+
+}

sckw-modules/sckw-system/src/main/java/com/sckw/system/model/vo/KwsDeptVo.java → sckw-modules/sckw-system/src/main/java/com/sckw/system/model/vo/res/KwsDeptResVo.java

@@ -1,4 +1,4 @@
-package com.sckw.system.model.vo;
+package com.sckw.system.model.vo.res;
 
 import com.sckw.system.model.KwsDept;
 import lombok.Data;
@@ -10,10 +10,10 @@ import java.util.List;
  * @date 2023-06-01
  */
 @Data
-public class KwsDeptVo extends KwsDept {
+public class KwsDeptResVo extends KwsDept {
 
     /**
      * 下级菜单
      */
-    private List<KwsDeptVo> children;
+    private List<KwsDeptResVo> children;
 }

sckw-modules/sckw-system/src/main/java/com/sckw/system/model/vo/KwsEnterpriseVo.java → sckw-modules/sckw-system/src/main/java/com/sckw/system/model/vo/res/KwsEnterpriseResVo.java

@@ -1,4 +1,4 @@
-package com.sckw.system.model.vo;
+package com.sckw.system.model.vo.res;
 
 import com.sckw.core.model.base.BaseModel;
 import com.sckw.system.model.KwsEntCertificate;
@@ -12,7 +12,7 @@ import java.util.List;
  * @date 2023-06-02
  */
 @Data
-public class KwsEnterpriseVo extends BaseModel {
+public class KwsEnterpriseResVo extends BaseModel {
 
     /**
      * 企业证件信息

sckw-modules/sckw-system/src/main/java/com/sckw/system/model/vo/KwsMenuVo.java → sckw-modules/sckw-system/src/main/java/com/sckw/system/model/vo/res/KwsMenuResVo.java

@@ -1,4 +1,4 @@
-package com.sckw.system.model.vo;
+package com.sckw.system.model.vo.res;
 
 import com.sckw.system.model.KwsMenu;
 import lombok.Data;
@@ -10,10 +10,10 @@ import java.util.List;
  * @date 2023-06-02
  */
 @Data
-public class KwsMenuVo extends KwsMenu {
+public class KwsMenuResVo extends KwsMenu {
 
     /**
      * 自菜单
      */
-    private List<KwsMenuVo> children;
+    private List<KwsMenuResVo> children;
 }

sckw-modules/sckw-system/src/main/java/com/sckw/system/service/KwsDeptService.java

@@ -1,16 +1,14 @@
 package com.sckw.system.service;
 
 import cn.hutool.core.collection.CollectionUtil;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.sckw.core.model.constant.Global;
 import com.sckw.core.utils.IdWorker;
 import com.sckw.core.utils.StringUtils;
-import com.sckw.core.web.context.LoginEntHolder;
-import com.sckw.core.web.model.LoginEntInfo;
 import com.sckw.core.web.response.HttpResult;
 import com.sckw.system.dao.KwsDeptDao;
 import com.sckw.system.model.KwsDept;
-import com.sckw.system.model.vo.KwsDeptVo;
-import org.checkerframework.checker.units.qual.K;
+import com.sckw.system.model.vo.res.KwsDeptResVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -24,7 +22,7 @@ import java.util.Map;
  * @date 2023-05-31
  */
 @Service
-public class KwsDeptService {
+public class KwsDeptService extends ServiceImpl<KwsDeptDao, KwsDept> {
 
     @Autowired
     KwsDeptDao kwsDeptDao;
@@ -104,16 +102,16 @@ public class KwsDeptService {
      * @return
      * @throws Exception
      */
-    public List<KwsDeptVo> findTree(Map<String, Object> params) throws Exception{
+    public List<KwsDeptResVo> findTree(Map<String, Object> params) throws Exception{
         //机构数据
-        List<KwsDeptVo> deptList = kwsDeptDao.findList(params);
+        List<KwsDeptResVo> deptList = kwsDeptDao.findList(params);
         //跟节点
-        List<KwsDeptVo> rootList = new ArrayList();
+        List<KwsDeptResVo> rootList = new ArrayList();
 
         //获取根节点数据
         if (CollectionUtil.isNotEmpty(deptList)) {
             int level = deptList.get(0).getLevel();
-            for(KwsDeptVo kwsDept:deptList){
+            for(KwsDeptResVo kwsDept:deptList){
                 if (kwsDept.getLevel() == level) {
                     rootList.add(kwsDept);
                 }
@@ -121,8 +119,8 @@ public class KwsDeptService {
         }
 
         //遍历，找到二级机构（根机构的id和所有机构中的pid比较）
-        for (KwsDeptVo kwsDept : rootList) {
-            List<KwsDeptVo> child = getChild(kwsDept.getId(), deptList);
+        for (KwsDeptResVo kwsDept : rootList) {
+            List<KwsDeptResVo> child = getChild(kwsDept.getId(), deptList);
             kwsDept.setChildren(child);
         }
 
@@ -135,17 +133,17 @@ public class KwsDeptService {
      * @param deptList 所有机构
      * @return
      */
-    public List<KwsDeptVo> getChild(Long parentId, List<KwsDeptVo> deptList) {
-        List<KwsDeptVo> childList = new ArrayList();
-        for (KwsDeptVo kwsDept : deptList) {
+    public List<KwsDeptResVo> getChild(Long parentId, List<KwsDeptResVo> deptList) {
+        List<KwsDeptResVo> childList = new ArrayList();
+        for (KwsDeptResVo kwsDept : deptList) {
             if(parentId.equals(kwsDept.getParentId())){
                 //获取当前机构id的所有子列表
                 childList.add(kwsDept);
             }
         }
-        for (KwsDeptVo kwsDept : childList) {
+        for (KwsDeptResVo kwsDept : childList) {
             //将该id的子机构进行遍历，通过递归调用，获取每一个子机构的子机构数据
-            List<KwsDeptVo> child = getChild(kwsDept.getId(), deptList);
+            List<KwsDeptResVo> child = getChild(kwsDept.getId(), deptList);
             kwsDept.setChildren(child);
         }
         if(childList.size()==0){

sckw-modules/sckw-system/src/main/java/com/sckw/system/service/KwsEnterpriseService.java

@@ -1,16 +1,12 @@
 package com.sckw.system.service;
 
-import com.sckw.core.model.constant.Global;
-import com.sckw.core.utils.CollectionUtils;
-import com.sckw.core.utils.PasswordUtils;
-import com.sckw.core.utils.StringUtils;
-import com.sckw.core.web.constant.HttpStatus;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.sckw.core.web.response.HttpResult;
+import com.sckw.system.dao.KwsEnterpriseDao;
 import com.sckw.system.model.KwsEnterprise;
-import com.sckw.system.model.KwsUser;
-import com.sckw.system.model.vo.KwsEnterpriseVo;
+import com.sckw.system.model.vo.res.KwsEnterpriseResVo;
 import org.springframework.stereotype.Service;
-import java.util.HashMap;
+
 import java.util.List;
 import java.util.Map;
 
@@ -20,7 +16,7 @@ import java.util.Map;
  * @date 2023-05-31
  */
 @Service
-public class KwsEnterpriseService {
+public class KwsEnterpriseService extends ServiceImpl<KwsEnterpriseDao, KwsEnterprise> {
 
     /**
      * 添加新纪录
@@ -56,7 +52,7 @@ public class KwsEnterpriseService {
      * @return
      * @throws Exception
      */
-    public HttpResult update(KwsEnterpriseVo params) throws Exception {
+    public HttpResult update(KwsEnterpriseResVo params) throws Exception {
         return null;
     }
 

sckw-modules/sckw-system/src/main/java/com/sckw/system/service/KwsMenuService.java

@@ -6,8 +6,7 @@ import com.sckw.core.utils.StringUtils;
 import com.sckw.core.web.response.HttpResult;
 import com.sckw.system.dao.KwsMenuDao;
 import com.sckw.system.model.KwsMenu;
-import com.sckw.system.model.vo.KwsDeptVo;
-import com.sckw.system.model.vo.KwsMenuVo;
+import com.sckw.system.model.vo.res.KwsMenuResVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import java.util.ArrayList;
@@ -96,14 +95,14 @@ public class KwsMenuService {
      * @return
      * @throws Exception
      */
-    public List<KwsMenuVo> findTree(Map<String, Object> params) throws Exception{
-        List<KwsMenuVo> menuList = kwsMenuDao.findList(params);
-        List<KwsMenuVo> rootList = new ArrayList();
+    public List<KwsMenuResVo> findTree(Map<String, Object> params) throws Exception{
+        List<KwsMenuResVo> menuList = kwsMenuDao.findList(params);
+        List<KwsMenuResVo> rootList = new ArrayList();
 
         //获取根节点数据
         if (CollectionUtil.isNotEmpty(menuList)) {
             int level = menuList.get(0).getLevel();
-            for(KwsMenuVo kwsMenu:menuList){
+            for(KwsMenuResVo kwsMenu:menuList){
                 if (kwsMenu.getLevel() == level) {
                     rootList.add(kwsMenu);
                 }
@@ -111,8 +110,8 @@ public class KwsMenuService {
         }
 
         //遍历，找到二级机构（根机构的id和所有机构中的pid比较）
-        for (KwsMenuVo kwsMenu : rootList) {
-            List<KwsMenuVo> child = getChild(kwsMenu.getId(), menuList);
+        for (KwsMenuResVo kwsMenu : rootList) {
+            List<KwsMenuResVo> child = getChild(kwsMenu.getId(), menuList);
             kwsMenu.setChildren(child);
         }
         return rootList;
@@ -124,17 +123,17 @@ public class KwsMenuService {
      * @param deptList 所有机构
      * @return
      */
-    public List<KwsMenuVo> getChild(Long parentId, List<KwsMenuVo> deptList) {
-        List<KwsMenuVo> childList = new ArrayList();
-        for (KwsMenuVo kwsMenu : deptList) {
+    public List<KwsMenuResVo> getChild(Long parentId, List<KwsMenuResVo> deptList) {
+        List<KwsMenuResVo> childList = new ArrayList();
+        for (KwsMenuResVo kwsMenu : deptList) {
             if(parentId.equals(kwsMenu.getParentId())){
                 //获取当前菜单id的所有子列表
                 childList.add(kwsMenu);
             }
         }
-        for (KwsMenuVo kwsMenu : childList) {
+        for (KwsMenuResVo kwsMenu : childList) {
             //将该id的子菜单进行遍历，通过递归调用，获取每一个子菜单的子菜单数据
-            List<KwsMenuVo> child = getChild(kwsMenu.getId(), deptList);
+            List<KwsMenuResVo> child = getChild(kwsMenu.getId(), deptList);
             kwsMenu.setChildren(child);
         }
         if(childList.size()==0){

sckw-modules/sckw-system/src/main/java/com/sckw/system/service/KwsUserDeptService.java

@@ -0,0 +1,28 @@
+package com.sckw.system.service;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.sckw.system.dao.KwsUserDeptDao;
+import com.sckw.system.model.KwsUserDept;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Slf4j
+@Service
+public class KwsUserDeptService extends ServiceImpl<KwsUserDeptDao, KwsUserDept> {
+
+    /**
+     * 根据用户id查用户和机构关联关系
+     * @param userId
+     * @return
+     */
+    public List<KwsUserDept> queryUserDeptByUserId(Long userId) {
+        LambdaQueryWrapper<KwsUserDept> kwsUserDeptWrapper = new LambdaQueryWrapper<>();
+        kwsUserDeptWrapper.eq(KwsUserDept::getUserId, userId);
+        return this.list(kwsUserDeptWrapper);
+    }
+
+
+}

sckw-modules/sckw-system/src/main/java/com/sckw/system/service/KwsUserService.java

@@ -1,5 +1,8 @@
 package com.sckw.system.service;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.sckw.core.exception.SystemException;
 import com.sckw.core.model.constant.Global;
 import com.sckw.core.utils.CollectionUtils;
 import com.sckw.core.utils.PasswordUtils;
@@ -7,49 +10,74 @@ import com.sckw.core.utils.StringUtils;
 import com.sckw.core.web.constant.HttpStatus;
 import com.sckw.core.web.response.HttpResult;
 import com.sckw.system.dao.KwsUserDao;
+import com.sckw.system.dao.KwsUserDeptDao;
 import com.sckw.system.model.KwsUser;
+import com.sckw.system.model.vo.req.UpdatePasswordReqVo;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 
 /**
  * 用户service接口
  * @author zk
  * @date 2023-05-31
  */
+@Slf4j
 @Service
-public class KwsUserService {
+public class KwsUserService extends ServiceImpl<KwsUserDao, KwsUser> {
 
     @Autowired
     KwsUserDao kwsUserDao;
 
+    @Autowired
+    KwsUserDeptDao kwsUserDeptDao;
+
+    @Autowired
+    KwsDeptService kwsDeptService;
+
+    @Autowired
+    KwsUserDeptService kwsUserDeptService;
+
+    @Autowired
+    KwsEnterpriseService kwsEnterpriseService;
+    
     /**
      * 添加新纪录
-     * @param params
-     * @return
-     * @throws Exception
      */
-    public HttpResult add(KwsUser params) throws Exception {
-        /**1、数据校验**/
-        HttpResult result = paramsCheck(params);
-        if (result != null) {
-            return result;
+    public void add(KwsUser kwsUser) {
+        /*1、数据校验*/
+        paramsCheck(kwsUser);
+
+        /*2、填充密码*/
+        fillPassword(kwsUser);
+
+        /*3、存库*/
+        kwsUser.setCreateBy(0L);
+        kwsUser.setUpdateBy(0L);
+        int count = kwsUserDao.insert(kwsUser);
+        if (count <= 0) {
+           throw new SystemException(HttpStatus.CODE_60601, HttpStatus.INSERT_FAIL);
         }
+    }
 
-        params.setCreateBy(0L);
-        params.setUpdateBy(0L);
-        int count = kwsUserDao.insert(params);
-        return count > 0 ? HttpResult.ok("添加成功！") : HttpResult.error();
+    private void fillPassword(KwsUser kwsUser) {
+        //密码为空时，以登录名作为密码
+        if (StringUtils.isBlank(kwsUser.getPassword())) {
+            String password = PasswordUtils.entryptPassword( PasswordUtils.md5(kwsUser.getAccount()));
+            kwsUser.setPassword(password);
+        } else {
+            String password = PasswordUtils.entryptPassword(kwsUser.getPassword());
+            kwsUser.setPassword(password);
+        }
     }
 
     /**
      * 删除记录-根据主键
-     * @param ids
-     * @return
-     * @throws Exception
      */
     public HttpResult deleteByKey(String ids) throws Exception {
         /**1.数据校验**/
@@ -84,9 +112,9 @@ public class KwsUserService {
             if (!user.getAccount().equals(params.getAccount())) {
                 //用户账号唯一性校验
                 Map userParams = new HashMap(){{put("systemType", params.getSystemType()); put("account", params.getAccount());}};
-                List<Map<String, Object>> users = kwsUserDao.findList(userParams);
+                List users = kwsUserDao.findList(userParams);
                 if (CollectionUtils.isNotEmpty(users)) {
-                    return HttpResult.error(HttpStatus.PARAMETERS_MISSING_CODE, "用户账号已存在！");
+                    return HttpResult.error(HttpStatus.PARAMETERS_MISSING_CODE, HttpStatus.ACCOUNT_EXISTS);
                 }
             }
         }
@@ -102,16 +130,18 @@ public class KwsUserService {
      * @return
      * @throws Exception
      */
-    public HttpResult resetPassword(Long id) throws Exception {
-        //用户信息
+    public void resetPassword(Long id) throws Exception {
+        //查用户信息
         KwsUser user = kwsUserDao.selectByKey(id);
-        if (user == null) {
-            return HttpResult.error("重置密码失败，用户信息不存在！");
+        if (Objects.isNull(user)) {
+            throw new SystemException(HttpStatus.CODE_60602, HttpStatus.ACCOUNT_NOT_EXISTS);
+        }
+
+        //重置密码
+        user.setPassword(PasswordUtils.entryptPassword(PasswordUtils.md5(user.getAccount())));
+        if (kwsUserDao.update(user) <= 0) {
+            throw new SystemException(HttpStatus.CODE_60601, HttpStatus.UPDATE_FAIL);
         }
-        String password = PasswordUtils.entryptPassword( PasswordUtils.md5(user.getAccount()));
-        user.setPassword(password);
-        int count = kwsUserDao.update(user);
-        return count > 0 ? HttpResult.ok("密码重置成功！") : HttpResult.error();
     }
 
     /**
@@ -146,32 +176,42 @@ public class KwsUserService {
 
     /**
      * 参数校验
-     * @param params
+     * @param kwsUser
      * @return
      * @throws Exception
      */
-    public HttpResult paramsCheck(KwsUser params) {
+    public void paramsCheck(KwsUser kwsUser) {
         //用户账号必填校验
-        if (StringUtils.isBlank(params.getAccount())) {
-            return HttpResult.error(HttpStatus.PARAMETERS_MISSING_CODE, "用户账号必填！");
+        if (StringUtils.isBlank(kwsUser.getAccount())) {
+            throw new SystemException(HttpStatus.PARAMETERS_MISSING_CODE, HttpStatus.ACCOUNT_MISSING);
         }
 
         //用户账号唯一性校验
-        Map userParams = new HashMap(){{put("systemType", params.getSystemType()); put("account", params.getAccount());}};
-        List<Map<String, Object>> users = kwsUserDao.findList(userParams);
+        LambdaQueryWrapper<KwsUser> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(KwsUser::getSystemType, kwsUser.getSystemType());
+        wrapper.eq(KwsUser::getAccount, kwsUser.getAccount());
+        List<KwsUser> users = this.list(wrapper);
         if (CollectionUtils.isNotEmpty(users)) {
-            return HttpResult.error(HttpStatus.PARAMETERS_MISSING_CODE, "用户账号已存在！");
+            throw new SystemException(HttpStatus.PARAMETERS_MISSING_CODE, HttpStatus.ACCOUNT_EXISTS);
         }
 
-        //密码校验
-        if (StringUtils.isBlank(params.getPassword())) {
-            String password = PasswordUtils.entryptPassword( PasswordUtils.md5(params.getAccount()));
-            params.setPassword(password);
-        } else {
-            String password = PasswordUtils.entryptPassword(params.getPassword());
-            params.setPassword(password);
-        }
+    }
+
+
+    /**
+     * 根据用户名查用户信息
+     */
+    public KwsUser getUserByAccount(String username) {
+        LambdaQueryWrapper<KwsUser> kwsUserWrapper = new LambdaQueryWrapper<>();
+        kwsUserWrapper.eq(KwsUser::getAccount, username);
+        kwsUserWrapper.eq(KwsUser::getDelFlag, Global.NO);
+        return kwsUserDao.selectOne(kwsUserWrapper);
+    }
+
+    /**
+     * 修改密码
+     */
+    public void updatePassword(UpdatePasswordReqVo reqVo) {
 
-        return null;
     }
 }

sckw-modules/sckw-system/src/main/resources/mapper/KwsDeptDao.xml

@@ -188,7 +188,7 @@
     where id = #{id,jdbcType=BIGINT}
   </update>
 
-  <select id="findList" resultType="com.sckw.system.model.vo.KwsDeptVo" parameterType="java.util.Map" >
+  <select id="findList" resultType="com.sckw.system.model.vo.res.KwsDeptResVo" parameterType="java.util.Map" >
     select
       id, system_type systemType, ent_id entId, name, company, parent_id parentId, level, sort, remark,
       status, create_by createBy, create_time createTime, update_by updateBy, update_time updateTime

sckw-modules/sckw-system/src/main/resources/mapper/KwsMenuDao.xml

@@ -228,7 +228,7 @@
     where id = #{id,jdbcType=BIGINT}
   </update>
 
-  <select id="findList" resultType="com.sckw.system.model.vo.KwsMenuVo" parameterType="java.util.Map" >
+  <select id="findList" resultType="com.sckw.system.model.vo.res.KwsMenuResVo" parameterType="java.util.Map" >
     select
     <include refid="Base_Column_List" />
     from kws_menu sm