部分接口

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

@@ -1,28 +1,19 @@
 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.system.api.model.dto.res.*;
 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
@@ -36,39 +27,38 @@ public class IndexServiceImpl implements IIndexService {
 
     @Override
     public LoginResDto login(LoginReqDto reqDto) {
-        /**1、根据账号密码或者手机号校验码登录,密码加密处理后面做*/
-        KwsUser kwsUser = remoteUserService.checkUserBase(reqDto.getUsername());
+        /*1、根据账号密码或者手机号校验码登录,密码加密处理后面做*/
+        KwsUserResDto kwsUser = remoteUserService.checkUserBase(reqDto.getUsername());
 
         //密码校验
         remoteUserService.checkPassword(reqDto.getPassword(), kwsUser.getPassword());
 
 
-        /**2、登录成功,查询用户机构*/
-        List<KwsUserDept> kwsUserDepts = remoteUserService.queryUserDeptByUserId(kwsUser.getId());
+        /*2、登录成功,查询用户机构*/
+        List<KwsUserDeptResDto> kwsUserDepts = remoteUserService.queryUserDeptByUserId(kwsUser.getId());
         if (CollectionUtils.isEmpty(kwsUserDepts)) {
             //不用抛异常，可能没有认证
+            log.info("");
         }
-        List<Long> deptIds = kwsUserDepts.stream().map(KwsUserDept::getDeptId).toList();
-        List<KwsDept> kwsDepts = remoteUserService.queryDeptByIds(deptIds);
+        List<Long> deptIds = kwsUserDepts.stream().map(KwsUserDeptResDto::getDeptId).toList();
+        List<KwsDeptResDto> kwsDepts = remoteUserService.queryDeptByIds(deptIds);
 
-        /**3、查企业*/
-        List<Long> entIds = kwsDepts.stream().map(KwsDept::getEntId).toList();
-        List<KwsEnterprise> kwsEnterprises = remoteUserService.queryEnterpriseByIds(entIds);
+        /*3、查企业*/
+        List<Long> entIds = kwsDepts.stream().map(KwsDeptResDto::getEntId).toList();
+        List<KwsEnterpriseResDto> kwsEnterprises = remoteUserService.queryEnterpriseByIds(entIds);
 
-        /**4、以uuid作为主键存redis,也是会话token*/
+        /*4、以uuid作为主键存redis,也是会话token*/
         String key = UUIDUtils.get32UUID();
         redissonUtils.add(key, "");
 
-        /**5、组装返参*/
+        /*5、组装返参*/
         //todo
         return null;
     }
 
     @Override
     public void register(RegisterReqDto reqDto) {
-        KwsUser kwsUser = new KwsUser();
-        BeanUtils.copyProperties(reqDto, kwsUser);
-        remoteUserService.register(kwsUser);
+        remoteUserService.register(reqDto);
     }
 
 }

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

@@ -26,11 +26,6 @@
             <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,9 +1,10 @@
 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 com.sckw.system.api.model.dto.req.RegisterReqDto;
+import com.sckw.system.api.model.dto.res.KwsDeptResDto;
+import com.sckw.system.api.model.dto.res.KwsEnterpriseResDto;
+import com.sckw.system.api.model.dto.res.KwsUserDeptResDto;
+import com.sckw.system.api.model.dto.res.KwsUserResDto;
 
 import java.util.List;
 
@@ -16,33 +17,33 @@ public interface RemoteUserService {
      * @param username
      * @return
      */
-    KwsUser getUserByAccount(String username);
+    KwsUserResDto getUserByAccount(String username);
 
     /**
      * 根据用户id查用户和机构关联关系
      * @param userId
      * @return
      */
-    List<KwsUserDept> queryUserDeptByUserId(Long userId);
+    List<KwsUserDeptResDto> queryUserDeptByUserId(Long userId);
 
     /**
      * 根据机构id查机构信息
      * @param ids
      * @return
      */
-    List<KwsDept> queryDeptByIds(List<Long> ids);
+    List<KwsDeptResDto> queryDeptByIds(List<Long> ids);
 
     /**
      * 根据企业id查企业信息
      * @param ids
      * @return
      */
-    List<KwsEnterprise> queryEnterpriseByIds(List<Long> ids);
+    List<KwsEnterpriseResDto> queryEnterpriseByIds(List<Long> ids);
 
     /**
      * 注册
      */
-    void register(KwsUser kwsUser);
+    void register(RegisterReqDto reqDto);
 
     /**
      * 校验密码
@@ -56,5 +57,5 @@ public interface RemoteUserService {
      * @param username
      * @return
      */
-    KwsUser checkUserBase(String username);
+    KwsUserResDto checkUserBase(String username);
 }

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

@@ -0,0 +1,62 @@
+package com.sckw.system.api.model.dto;
+
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class BaseModelResDto {
+
+    /**
+     * 主键
+     */
+    private Long id;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 状态:0正常/1锁定
+     */
+    private Integer status;
+
+    /**
+     * 创建人
+     */
+    private Long createBy;
+
+    /**
+     * 创建人姓名
+     */
+//	private String createByName;
+
+    /**
+     * 创建时间
+     */
+    //@JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date createTime;
+
+    /**
+     * 更新人
+     */
+    private Long updateBy;
+
+    /**
+     * 跟新人姓名
+     */
+//	private String updateByName;
+
+    /**
+     * 更新时间
+     */
+    //@JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date updateTime;
+
+    /**
+     * 删除标识(0正常/-1删除)
+     */
+    private Integer delFlag;
+
+}

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

@@ -0,0 +1,51 @@
+package com.sckw.system.api.model.dto.res;
+
+import com.sckw.system.api.model.dto.BaseModelResDto;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class KwsDeptResDto extends BaseModelResDto implements Serializable {
+
+    /**
+     * 机构类型(1系统管理机构、2平台企业机构)
+     */
+    private Integer systemType;
+
+    /**
+     * 企业id
+     */
+    private Long entId;
+
+    /**
+     * 机构名称
+     */
+    private String name;
+
+    /**
+     * 是否是公司（0 机构部门/1 公司）
+     */
+    private Integer company;
+
+    /**
+     * 上级机构ID，一级机构为0
+     */
+    private Long parentId;
+
+    /**
+     * 所有上级机构id
+     */
+    private String parentIds;
+
+    /**
+     * 机构层级(1更目录、...递增)
+     */
+    private Integer level;
+
+    /**
+     * 排序
+     */
+    private Integer sort;
+
+}

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

@@ -0,0 +1,122 @@
+package com.sckw.system.api.model.dto.res;
+
+import com.sckw.system.api.model.dto.BaseModelResDto;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+public class KwsEnterpriseResDto extends BaseModelResDto implements Serializable {
+
+    /**
+     * 企业编号
+     */
+    private String code;
+
+    /**
+     * 企业名称
+     */
+    private String firmName;
+
+    /**
+     * 企业联系人
+     */
+    private String contacts;
+
+    /**
+     * 联系电话
+     */
+    private String telephone;
+
+    /**
+     * 法人姓名
+     */
+    private String legalName;
+
+    /**
+     * 法人联系电话
+     */
+    private String legalTelephone;
+
+    /**
+     * 企业头像
+     */
+    private String head;
+
+    /**
+     * 积分
+     */
+    private Integer integral;
+
+    /**
+     * 账号余额（分）
+     */
+    private Long balance;
+
+    /**
+     * 经验值
+     */
+    private Integer experience;
+
+    /**
+     * 会员等级
+     */
+    private Integer memberLevel;
+
+    /**
+     * 注册时间
+     */
+    private Date regTime;
+
+    /**
+     * 注册来源(app、pc)
+     */
+    private String regSource;
+
+    /**
+     * 组织机构代码
+     */
+    private String orgCode;
+
+    /**
+     * 企业地址code-----区域表id---实际用途？
+     */
+    private Integer cityCode;
+
+    /**
+     * 企业地址-----区域表id---实际用途？
+     */
+    private Integer cityName;
+
+    /**
+     * 企业详细地址
+     */
+    private String detailAddress;
+
+    /**
+     * 企业地址坐标----纬度
+     */
+    private String lat;
+
+    /**
+     * 企业地址坐标----经度
+     */
+    private String lng;
+
+    /**
+     * 资料审批状态（0未审批、1通过、2未通过、3审批中）
+     */
+    private Integer approval;
+
+    /**
+     * 审批时间
+     */
+    private Date approvalTime;
+
+    /**
+     * 专属客户经理（用户ID）
+     */
+    private long manager;
+
+}

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

@@ -0,0 +1,20 @@
+package com.sckw.system.api.model.dto.res;
+
+import com.sckw.system.api.model.dto.BaseModelResDto;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class KwsUserDeptResDto extends BaseModelResDto implements Serializable {
+    /**
+     * 用户id
+     */
+    private Long userId;
+
+    /**
+     * 机构id
+     */
+    private Long deptId;
+
+}

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

@@ -0,0 +1,56 @@
+package com.sckw.system.api.model.dto.res;
+
+import com.sckw.system.api.model.dto.BaseModelResDto;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class KwsUserResDto extends BaseModelResDto implements Serializable {
+
+    /**
+     * 系统类型(1运营端、2企业开户)
+     */
+    private Integer systemType;
+
+    /**
+     * 账号
+     */
+    private String account;
+
+    /**
+     * 密码
+     */
+    private String password;
+
+    /**
+     * 用户名
+     */
+    private String name;
+
+    /**
+     * 手机号
+     */
+    private String telephone;
+
+    /**
+     * 头像
+     */
+    private String photo;
+
+    /**
+     * 邮箱
+     */
+    private String email;
+
+    /**
+     * 推送设备id
+     */
+    private String clientId;
+
+    /**
+     * 是否是企业管理（0是 1否）
+     */
+    private Integer isMain;
+
+}

sckw-modules/pom.xml

@@ -55,7 +55,11 @@
             <artifactId>sckw-common-stream</artifactId>
             <version>1.0.0</version>
         </dependency>
-
+            <dependency>
+                <groupId>com.sckw</groupId>
+                <artifactId>sckw-system-api</artifactId>
+                <version>1.0.0</version>
+            </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>

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

@@ -1,58 +1,58 @@
-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 com.sckw.system.model.KwsDept;
-import com.sckw.system.model.KwsEnterprise;
-import com.sckw.system.model.KwsUser;
-import com.sckw.system.model.KwsUserDept;
-import org.apache.dubbo.config.annotation.DubboService;
-
-import java.util.Date;
-import java.util.List;
-
-@DubboService(group = "design", version = "2.0.0")
-public class RemoteUserService1Impl implements RemoteUserService {
-
-    @Override
-    public String getUserInfoV1(String account) {
-        return "getUserInfoV1:"+new Date() +account;
-    }
-
-    @Override
-    public KwsUser getUserByAccount(String username) {
-        return null;
-    }
-
-    @Override
-    public List<KwsUserDept> queryUserDeptByUserId(Long userId) {
-        return null;
-    }
-
-    @Override
-    public List<KwsDept> queryDeptByIds(List<Long> ids) {
-        return null;
-    }
-
-    @Override
-    public List<KwsEnterprise> queryEnterpriseByIds(List<Long> ids) {
-        return null;
-    }
-
-    @Override
-    public void register(KwsUser kwsUser) {
-
-    }
-
-    @Override
-    public void checkPassword(String password, String currentPwd) {
-
-    }
-
-    @Override
-    public KwsUser checkUserBase(String username) {
-        return null;
-    }
-
-}
+//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 com.sckw.system.model.KwsDept;
+//import com.sckw.system.model.KwsEnterprise;
+//import com.sckw.system.model.KwsUser;
+//import com.sckw.system.model.KwsUserDept;
+//import org.apache.dubbo.config.annotation.DubboService;
+//
+//import java.util.Date;
+//import java.util.List;
+//
+//@DubboService(group = "design", version = "2.0.0")
+//public class RemoteUserService1Impl implements RemoteUserService {
+//
+//    @Override
+//    public String getUserInfoV1(String account) {
+//        return "getUserInfoV1:"+new Date() +account;
+//    }
+//
+//    @Override
+//    public KwsUser getUserByAccount(String username) {
+//        return null;
+//    }
+//
+//    @Override
+//    public List<KwsUserDept> queryUserDeptByUserId(Long userId) {
+//        return null;
+//    }
+//
+//    @Override
+//    public List<KwsDept> queryDeptByIds(List<Long> ids) {
+//        return null;
+//    }
+//
+//    @Override
+//    public List<KwsEnterprise> queryEnterpriseByIds(List<Long> ids) {
+//        return null;
+//    }
+//
+//    @Override
+//    public void register(KwsUser kwsUser) {
+//
+//    }
+//
+//    @Override
+//    public void checkPassword(String password, String currentPwd) {
+//
+//    }
+//
+//    @Override
+//    public KwsUser checkUserBase(String username) {
+//        return null;
+//    }
+//
+//}

sckw-modules/sckw-system/pom.xml

@@ -20,8 +20,4 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 
-
-    <dependencies>
-    </dependencies>
-
 </project>

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

@@ -1,15 +0,0 @@
-package com.sckw.system.dubbo;//package com.sckw.system.dubbo;
-//
-//import com.sckw.system.api.RemoteUserService;
-//import org.apache.dubbo.config.annotation.DubboService;
-//
-//import java.util.Date;
-//
-//@DubboService(group = "design", version = "2.0.0")
-//public class RemoteUserService1Impl implements RemoteUserService {
-//
-//    @Override
-//    public String getUserInfoV1(String account) {
-//        return "getUserInfoV1:"+new Date() +account;
-//    }
-//}

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

@@ -1,98 +1,59 @@
-//package com.sckw.system.dubbo;
-//
-//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 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;
-//
-//@Deprecated
-//@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);
-//    }
-//
-//    /**
-//     * 校验密码
-//     * @param password 入参传的密码
-//     * @param currentPwd 当前用户的密码
-//     */
-//    @Override
-//    public void checkPassword(String password, String currentPwd) {
-//        kwsUserService.checkPassword(password, currentPwd);
-//    }
-//
-//    /**
-//     * 检验用户信息
-//     * @param username
-//     * @return
-//     */
-//    @Override
-//    public KwsUser checkUserBase(String username) {
-//        return kwsUserService.checkUserBase(username);
-//    }
-//
-//}
+package com.sckw.system.dubbo;
+
+import com.sckw.system.api.RemoteUserService;
+import com.sckw.system.api.model.dto.req.RegisterReqDto;
+import com.sckw.system.api.model.dto.res.KwsDeptResDto;
+import com.sckw.system.api.model.dto.res.KwsEnterpriseResDto;
+import com.sckw.system.api.model.dto.res.KwsUserDeptResDto;
+import com.sckw.system.api.model.dto.res.KwsUserResDto;
+import org.apache.dubbo.config.annotation.DubboService;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+
+@Deprecated
+@DubboService(group = "design", version = "2.0.0")
+@Service
+public class RemoteUserServiceImpl implements RemoteUserService {
+
+    @Override
+    public String getUserInfoV1(String account) {
+        return null;
+    }
+
+    @Override
+    public KwsUserResDto getUserByAccount(String username) {
+        return null;
+    }
+
+    @Override
+    public List<KwsUserDeptResDto> queryUserDeptByUserId(Long userId) {
+        return null;
+    }
+
+    @Override
+    public List<KwsDeptResDto> queryDeptByIds(List<Long> ids) {
+        return null;
+    }
+
+    @Override
+    public List<KwsEnterpriseResDto> queryEnterpriseByIds(List<Long> ids) {
+        return null;
+    }
+
+    @Override
+    public void register(RegisterReqDto reqDto) {
+
+    }
+
+    @Override
+    public void checkPassword(String password, String currentPwd) {
+
+    }
+
+    @Override
+    public KwsUserResDto checkUserBase(String username) {
+        return null;
+    }
+}