Merge remote-tracking branch 'origin/dev_czh' into dev_czh

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-common/sckw-common-core/pom.xml

@@ -102,6 +102,11 @@
             <artifactId>sckw-common-redis</artifactId>
             <version>1.0.0</version>
         </dependency>
+        <dependency>
+            <groupId>com.sckw</groupId>
+            <artifactId>sckw-common-datasource</artifactId>
+            <version>1.0.0</version>
+        </dependency>
 
     </dependencies>
 

sckw-common/sckw-common-core/src/main/java/com/sckw/core/aspect/DaoAspect.java

@@ -89,17 +89,26 @@ public class DaoAspect {
                     if (isProperty(arg, UPDATE_BY) && BeanUtils.getProperty(arg, UPDATE_BY) == null) {
                         BeanUtils.setProperty(arg, UPDATE_BY, userId);
                     }
-                }
-
-                if (userName != null){
-                    if (isProperty(arg, CREATE_BY_NAME) && StringUtils.isBlank(BeanUtils.getProperty(arg, CREATE_BY_NAME))) {
-                        BeanUtils.setProperty(arg, CREATE_BY_NAME, userName);
+                } else {
+                    userId = 1L;
+                    userName = "暂无";
+                    if (isProperty(arg, CREATE_BY) && BeanUtils.getProperty(arg, CREATE_BY) == null) {
+                        BeanUtils.setProperty(arg, CREATE_BY, userId);
                     }
-                    if (isProperty(arg, UPDATE_BY_NAME) && StringUtils.isBlank(BeanUtils.getProperty(arg, UPDATE_BY_NAME))) {
-                        BeanUtils.setProperty(arg, UPDATE_BY_NAME, userName);
+                    if (isProperty(arg, UPDATE_BY) && BeanUtils.getProperty(arg, UPDATE_BY) == null) {
+                        BeanUtils.setProperty(arg, UPDATE_BY, userId);
                     }
                 }
 
+//                if (userName != null){
+//                    if (isProperty(arg, CREATE_BY_NAME) && StringUtils.isBlank(BeanUtils.getProperty(arg, CREATE_BY_NAME))) {
+//                        BeanUtils.setProperty(arg, CREATE_BY_NAME, userName);
+//                    }
+//                    if (isProperty(arg, UPDATE_BY_NAME) && StringUtils.isBlank(BeanUtils.getProperty(arg, UPDATE_BY_NAME))) {
+//                        BeanUtils.setProperty(arg, UPDATE_BY_NAME, userName);
+//                    }
+//                }
+
                 if (isProperty(arg, CREATE_TIME) && StringUtils.isBlank(BeanUtils.getProperty(arg, CREATE_TIME))) {
                     BeanUtils.setProperty(arg, CREATE_TIME, date);
                 }
@@ -112,9 +121,9 @@ public class DaoAspect {
                     BeanUtils.setProperty(arg, ID, new IdWorker(1).nextId());
                 }
 
-                if (isProperty(arg, STATUS) && StringUtils.isBlank(BeanUtils.getProperty(arg, STATUS))) {
-                    BeanUtils.setProperty(arg, STATUS, Global.NO);
-                }
+//                if (isProperty(arg, STATUS) && StringUtils.isBlank(String.valueOf(BeanUtils.getProperty(arg, STATUS)))) {
+//                    BeanUtils.setProperty(arg, STATUS, Global.NO);
+//                }
 
                 if (isProperty(arg, DEL_FLAG) && StringUtils.isBlank(BeanUtils.getProperty(arg, DEL_FLAG))) {
                     BeanUtils.setProperty(arg, DEL_FLAG, Global.NO);

sckw-common/sckw-common-core/src/main/java/com/sckw/core/handle/CustomDataSource.java

@@ -0,0 +1,38 @@
+package com.sckw.core.handle;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.boot.jdbc.DataSourceBuilder;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import javax.sql.DataSource;
+
+/**
+ * @author czh
+ * @desc TODO
+ * @date 2023/6/9
+ */
+//@Configuration
+public class CustomDataSource {
+
+    @Value("${spring.datasource.dynamic.datasource.master.url}")
+    private String url;
+
+    @Value("${spring.datasource.dynamic.datasource.master.username}")
+    private String username;
+
+    @Value("${spring.datasource.dynamic.datasource.master.password}")
+    private String password;
+
+    @Value("${spring.datasource.dynamic.datasource.master.driver-class-name}")
+    private String driver;
+
+    @Bean
+    @ConfigurationProperties(prefix = "spring.datasource.dynamic.datasource.master")
+    public DataSource dataSource() {
+        return DataSourceBuilder.create().url(url).username(username).password(password).driverClassName(driver).build();
+
+    }
+}

sckw-common/sckw-common-core/src/main/java/com/sckw/core/handle/CustomMetaHandle.java

@@ -0,0 +1,47 @@
+package com.sckw.core.handle;
+
+import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
+import com.sckw.core.model.auth.context.LoginUserHolder;
+import com.sckw.core.model.constant.Global;
+import com.sckw.core.utils.IdWorker;
+import com.sckw.core.utils.StringUtils;
+import org.apache.ibatis.reflection.MetaObject;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+import java.util.Objects;
+
+/**
+ * @author czh
+ * @desc TODO
+ * @date 2023/6/9
+ */
+//@Component
+public class CustomMetaHandle implements MetaObjectHandler {
+
+    @Override
+    public void insertFill(MetaObject metaObject) {
+        Long userId = Objects.isNull(LoginUserHolder.getUserId()) ? 1 : LoginUserHolder.getUserId();
+        String userName = StringUtils.isBlank(LoginUserHolder.getUserName()) ? "无" : LoginUserHolder.getUserName();
+        Date date = new Date();
+        metaObject.setValue("createBy", userId);
+        metaObject.setValue("updateBy", userId);
+//        metaObject.setValue("createByName", userName);
+        metaObject.setValue("createTime", date);
+        metaObject.setValue("updateTime", date);
+        metaObject.setValue("status",  Global.NO);
+        metaObject.setValue("delFlag", Global.NO);
+        metaObject.setValue("id", new IdWorker(1).nextId());
+    }
+
+    @Override
+    public void updateFill(MetaObject metaObject) {
+        Long userId = Objects.isNull(LoginUserHolder.getUserId()) ? 1 : LoginUserHolder.getUserId();
+        String userName = StringUtils.isBlank(LoginUserHolder.getUserName()) ? "无" : LoginUserHolder.getUserName();
+        metaObject.setValue("updateBy", userId);
+//        metaObject.setValue("updateByName", userName);
+        metaObject.setValue("updateTime", new Date());
+    }
+}

sckw-common/sckw-common-core/src/main/java/com/sckw/core/handle/MyConfig.java

@@ -0,0 +1,57 @@
+package com.sckw.core.handle;
+
+import com.baomidou.mybatisplus.annotation.DbType;
+import com.baomidou.mybatisplus.core.MybatisConfiguration;
+import com.baomidou.mybatisplus.core.MybatisXMLLanguageDriver;
+import com.baomidou.mybatisplus.core.config.GlobalConfig;
+import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
+import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
+import com.baomidou.mybatisplus.extension.spring.MybatisSqlSessionFactoryBean;
+import jakarta.annotation.Resource;
+import org.apache.ibatis.session.SqlSessionFactory;
+import org.apache.ibatis.type.JdbcType;
+import org.mybatis.spring.annotation.MapperScan;
+import org.mybatis.spring.transaction.SpringManagedTransactionFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
+import org.springframework.stereotype.Component;
+import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
+
+import javax.sql.DataSource;
+
+
+/**
+ * @author czh
+ * @desc TODO
+ * @date 2023/6/9
+ */
+//@Configuration
+public class MyConfig {
+
+    @Autowired
+    private CustomDataSource customDataSource;
+
+    @Bean
+    public MybatisPlusInterceptor mybatisPlusInterceptor() {
+        MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
+        interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL));
+        return interceptor;
+    }
+
+    @Bean
+    public SqlSessionFactory sqlSessionFactory() throws Exception {
+        MybatisSqlSessionFactoryBean factoryBean = new MybatisSqlSessionFactoryBean();
+        factoryBean.setDataSource(customDataSource.dataSource());
+        factoryBean.setMapperLocations(new PathMatchingResourcePatternResolver().getResources("classpath*:/mapper/*.xml "));
+        factoryBean.setTypeAliases();
+        MybatisConfiguration configuration = new MybatisConfiguration();
+        configuration.setMapUnderscoreToCamelCase(true);
+        factoryBean.setConfiguration(configuration);
+        factoryBean.setGlobalConfig(new GlobalConfig().setMetaObjectHandler(new CustomMetaHandle()));
+        return factoryBean.getObject();
+    }
+}

sckw-common/sckw-common-core/src/main/java/com/sckw/core/model/base/BaseModel.java

@@ -1,5 +1,7 @@
 package com.sckw.core.model.base;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -17,6 +19,7 @@ public class BaseModel implements Serializable {
 	/**
 	 * 主键
 	 */
+	@TableField(fill = FieldFill.INSERT)
 	private Long id;
 
 	/**
@@ -27,11 +30,13 @@ public class BaseModel implements Serializable {
 	/**
 	 * 状态:0正常/1锁定
 	 */
+//	@TableField(fill = FieldFill.INSERT_UPDATE)
 	private Integer status;
 
 	/**
 	 * 创建人
 	 */
+//	@TableField(fill = FieldFill.INSERT)
 	private Long createBy;
 
 	/**
@@ -43,11 +48,13 @@ public class BaseModel implements Serializable {
 	 * 创建时间
 	 */
 	//@JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+//	@TableField(fill = FieldFill.INSERT)
 	private Date createTime;
 
 	/**
 	 * 更新人
 	 */
+//	@TableField(fill = FieldFill.INSERT_UPDATE)
 	private Long updateBy;
 
 	/**
@@ -59,11 +66,13 @@ public class BaseModel implements Serializable {
 	 * 更新时间
 	 */
 	//@JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+//	@TableField(fill = FieldFill.INSERT_UPDATE)
 	private Date updateTime;
 
 	/**
 	 * 删除标识(0正常/-1删除)
 	 */
+//	@TableField(fill = FieldFill.INSERT_UPDATE)
 	private Integer delFlag;
 
 }

sckw-common/sckw-common-core/src/main/java/com/sckw/core/model/enums/ApprovalEnum.java

@@ -0,0 +1,34 @@
+package com.sckw.core.model.enums;
+
+import lombok.Getter;
+
+/**
+ * 审批状态枚举
+ */
+@Getter
+public enum ApprovalEnum {
+
+    NO(0, "未审批"),
+    OK(1, "通过"),
+    PASS(2, "未通过"),
+    PROCESS(3, "审批中");
+
+    private int code;
+
+    private String name;
+
+    ApprovalEnum(int code, String name){
+        this.code = code;
+        this.name = name;
+    }
+
+    public static ApprovalEnum getName(int code){
+        for (ApprovalEnum aprovalEnum : values()) {
+            if (aprovalEnum.getCode() == code) {
+                return aprovalEnum;
+            }
+        }
+        return null;
+    }
+
+}

sckw-common/sckw-common-core/src/main/java/com/sckw/core/model/enums/CertificateTypeEnum.java

@@ -0,0 +1,36 @@
+package com.sckw.core.model.enums;
+
+import lombok.Getter;
+
+/**
+ * 证照类型枚举
+ */
+@Getter
+public enum CertificateTypeEnum {
+
+    CONTACTS_IDCARD(1, "联系人身份证"),
+    CORPORATION_IDCARD(2, "法人身份证"),
+    BUSINESSLICENSE(3, "营业执照"),
+    ROADLICENSE(4, "道路运输许可证"),
+    ACCOUNT(5, "开户许可证号"),
+    AUTHORIZE(6, "授权证书"),
+    SIGNATURES(7, "电子签章授权书");
+
+    private int code;
+
+    private String name;
+
+    CertificateTypeEnum(int code, String name){
+        this.code = code;
+        this.name = name;
+    }
+
+    public static CertificateTypeEnum getName(int code){
+        for (CertificateTypeEnum certificateTypeEnum : values()) {
+            if (certificateTypeEnum.getCode() == code) {
+                return certificateTypeEnum;
+            }
+        }
+        return null;
+    }
+}

sckw-common/sckw-common-core/src/main/java/com/sckw/core/model/enums/EntTypeEnum.java

@@ -0,0 +1,33 @@
+package com.sckw.core.model.enums;
+
+import lombok.Getter;
+
+/**
+ * 企业类型枚举
+ */
+@Getter
+public enum EntTypeEnum {
+
+    SUPPLIER(1, "供应商"),
+    PURCHASER(2, "采购商"),
+    LOGISTICS34(3, "34PL物流"),
+    LOGISTICS43(4, "43PL物流");
+
+    private int code;
+
+    private String name;
+
+    EntTypeEnum(int code, String name){
+        this.code = code;
+        this.name = name;
+    }
+
+    public static EntTypeEnum getName(int code) {
+        for (EntTypeEnum entTypeEnum : values()) {
+            if (entTypeEnum.getCode() == code) {
+                return entTypeEnum;
+            }
+        }
+        return null;
+    }
+}

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

@@ -107,7 +107,8 @@ public class IdWorker {
     }
 
     public static void main(String[] args) {
-        System.out.println(new IdWorker(1).nextId());
-        System.out.println(System.currentTimeMillis());
+        for (int i  = 0; i < 100; i++) {
+            System.out.println(new IdWorker(1).nextId());
+        }
     }
 }

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

@@ -89,16 +89,21 @@ public class HttpStatus {
 
 
     /**数据库的操作失败*/
-    public static final int CODE_60601 = 60601;
+    public static final int CRUD_FAIL_CODE = 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 int QUERY_FAIL_CODE = 60602;
+    public static final String ACCOUNT_NOT_EXISTS = "用户信息不存在或已失效";
+    public static final String ENT_NOT_EXISTS = "企业信息不存在或已失效";
+    public static final String ENTCERTIFICATES_NOT_EXISTS = "未查询到企业资质信息";
 
     /**自定义提示消息*/
     public static final String MSG_001 = "密码重置成功";
     public static final String MSG_002 = "密码修改成功";
+    public static final String MSG_003 = "新增成功";
+    public static final String MSG_004 = "审批完成";
+    public static final String MSG_005 = "更新成功";
 }

sckw-common/sckw-common-datasource/pom.xml

@@ -39,7 +39,6 @@
             <artifactId>mybatis-plus-boot-starter</artifactId>
             <version>${mybatis-plus.version}</version>
         </dependency>
-
         <!--多数据源-->
         <dependency>
             <groupId>com.baomidou</groupId>

sckw-common/sckw-common-redis/src/main/java/com/sckw/redis/configure/RedissonConfiguration.java

@@ -21,8 +21,8 @@ public class RedissonConfiguration {
     @Value("${spring.data.redis.port}")
     private String port;
 
-    @Value("${spring.data.redis.password}")
-    private String password;
+//    @Value("${spring.data.redis.password}")
+//    private String password;
 
     @Value("${spring.data.redis.database}")
     private String database;
@@ -36,7 +36,7 @@ public class RedissonConfiguration {
         config.setCodec(new JsonJacksonCodec());
         config.useSingleServer()
                 .setAddress(address())
-                .setPassword(password)
+//                .setPassword(password)
                 .setDatabase(Integer.parseInt(database))
                 .setConnectTimeout(Integer.parseInt(timeout));
         return Redisson.create(config);

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/SystemApplication.java

@@ -1,6 +1,7 @@
 package com.sckw.system;
 
 import org.apache.dubbo.config.spring.context.annotation.EnableDubbo;
+import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
@@ -9,7 +10,8 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
 @EnableDubbo
 @EnableFeignClients({"com.sckw.*.api.feign"})
 @EnableDiscoveryClient
-@SpringBootApplication(scanBasePackages = {"com.sckw.core.exception", "com.sckw.core.aspect","com.sckw.system","com.sckw.redis"})
+@SpringBootApplication(scanBasePackages = {"com.sckw.core.*", "com.sckw.core.aspect","com.sckw.system","com.sckw.redis"})
+@MapperScan(basePackages="com.sckw.system.dao")
 public class SystemApplication {
 
     public static void main(String[] args) {

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

@@ -1,9 +1,13 @@
 package com.sckw.system.controller;
 
+import com.sckw.core.web.constant.HttpStatus;
 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.res.KwsEnterpriseResVo;
+import com.sckw.system.model.vo.req.EntFindPageReqVo;
+import com.sckw.system.model.vo.req.EntRegisterReqVo;
+import com.sckw.system.model.vo.req.FreezeReqVo;
+import com.sckw.system.model.vo.req.KwsEnterpriseReqVo;
 import com.sckw.system.service.KwsEnterpriseService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -31,20 +35,19 @@ public class KwsEnterpriseController {
      **/
     @GetMapping("/detail")
     public HttpResult selectByKey(Long id) throws Exception {
-        KwsEnterprise kwsEnt = kwsEntService.selectByKey(id);
-        return HttpResult.ok(kwsEnt);
+        return HttpResult.ok(kwsEntService.selectByKey(id));
     }
 
     /**
-     * @param params {pageNum：页数、pageSize：每页条数、。。。}
+     * @param pageReqVo
      * @return
      * @description 分页查询
      * @author zk
      * @date 2023/5/30
      **/
-    @PostMapping("/select")
-    public HttpResult findPage(@RequestBody HashMap params) throws Exception {
-        return null;
+    @PostMapping("/findPage")
+    public HttpResult findPage(@RequestBody EntFindPageReqVo pageReqVo) throws Exception {
+        return HttpResult.ok(kwsEntService.findPage(pageReqVo));
     }
 
     /**
@@ -56,20 +59,19 @@ public class KwsEnterpriseController {
      **/
     @GetMapping("/certificate")
     public HttpResult certificate(@RequestParam Long id) throws Exception {
-        return HttpResult.ok();
+        return HttpResult.ok(kwsEntService.certificate(id));
     }
 
     /**
-     * @param params {username 昵称、account 账号、password 密码、captcha 验证码}
      * @return
      * @description 注册
      * @author zk
      * @date 2023/06/02
      **/
     @PostMapping("/register")
-    public HttpResult register(@RequestBody Map<String, Object> params) {
-
-        return null;
+    public HttpResult register(@RequestBody EntRegisterReqVo reqVo) {
+        kwsEntService.register(reqVo);
+        return HttpResult.ok(HttpStatus.MSG_003);
     }
 
     /**
@@ -85,15 +87,15 @@ public class KwsEnterpriseController {
     }
 
     /**
-     * @param params {id 主键ID、name 机构名称、company 是否公司}
      * @return
      * @description 更新/资质认证
      * @author zk
      * @date 2023/06/02
      **/
     @PostMapping("/update")
-    public HttpResult update(@RequestBody KwsEnterpriseResVo params) throws Exception {
-        return kwsEntService.update(params);
+    public HttpResult update(@RequestBody KwsEnterpriseReqVo reqVo) throws Exception {
+        kwsEntService.update(reqVo);
+        return HttpResult.ok(HttpStatus.MSG_005);
     }
 
     /**
@@ -117,7 +119,8 @@ public class KwsEnterpriseController {
      **/
     @PostMapping(value = "/approval")
     public HttpResult approval(@RequestBody KwsEntCheckTrack params) {
-        return null;
+        kwsEntService.approval(params);
+        return HttpResult.ok(HttpStatus.MSG_004);
     }
 
     /**
@@ -140,8 +143,9 @@ public class KwsEnterpriseController {
      * @date 2023/06/02
      **/
     @PostMapping(value = "/freeze")
-    public HttpResult freeze(@RequestBody Map<String, Object> params) {
-        return null;
+    public HttpResult freeze(@RequestBody FreezeReqVo reqVo) {
+        kwsEntService.freeze(reqVo);
+        return HttpResult.ok();
     }
 
     /**

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

@@ -60,7 +60,7 @@ public class KwsUserController {
      * @date 2023/5/30
      **/
     @PostMapping("/findList")
-    public HttpResult findList(@RequestBody HashMap params) throws Exception {
+    public HttpResult findList(@RequestBody KwsUser params) throws Exception {
         return HttpResult.ok(kwsUserService.findList(params));
     }
 
@@ -86,7 +86,8 @@ public class KwsUserController {
      **/
     @PostMapping("/update")
     public HttpResult update(@RequestBody KwsUser params) throws Exception {
-        return kwsUserService.update(params);
+        kwsUserService.update(params);
+        return HttpResult.ok();
     }
 
     /**
@@ -96,7 +97,7 @@ public class KwsUserController {
      * @date 2023/06/02
      **/
     @PostMapping("/resetPassword")
-    public HttpResult resetPassword(@RequestParam Long id) throws Exception {
+    public HttpResult resetPassword(@RequestParam Long id) {
         kwsUserService.resetPassword(id);
         return HttpResult.ok(HttpStatus.MSG_001);
     }

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

@@ -13,7 +13,7 @@ import java.util.Map;
  * @date 2023-05-31
  */
 @Mapper
-public interface KwsDeptDao extends BaseMapper<KwsDept> {
+public interface KwsDeptDao {
 
     /**
      * 新增

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

@@ -39,4 +39,11 @@ public interface KwsEntCertificateDao {
      * @throws Exception
      */
     List<KwsEntCertificate> findList(Long entId);
+
+    /**
+     * 批量插入
+     */
+    int saveBatch(List<KwsEntCertificate> list);
+
+    List<KwsEntCertificate> selectByEntId(Long id);
 }

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

@@ -2,6 +2,8 @@ package com.sckw.system.dao;
 
 import com.sckw.system.model.KwsEntType;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
 import java.util.List;
 
 /**
@@ -32,4 +34,11 @@ public interface KwsEntTypeDao {
      * @throws Exception
      */
     List<KwsEntType> findList(Long entId);
+
+    /**
+     * 批量插
+     * @param list
+     * @return
+     */
+    int saveBatch(@Param(value = "list") List<KwsEntType> list);
 }

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

@@ -2,6 +2,7 @@ package com.sckw.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.sckw.system.model.KwsEnterprise;
+import com.sckw.system.model.vo.req.EntFindPageReqVo;
 import org.apache.ibatis.annotations.Mapper;
 import java.util.List;
 import java.util.Map;
@@ -12,7 +13,7 @@ import java.util.Map;
  * @date 2023-06-02
  */
 @Mapper
-public interface KwsEnterpriseDao extends BaseMapper<KwsEnterprise> {
+public interface KwsEnterpriseDao {
     /**
      * 新增
      * @param record
@@ -47,5 +48,5 @@ public interface KwsEnterpriseDao extends BaseMapper<KwsEnterprise> {
      * @param params
      * @return
      */
-    List<Map<String, Object>> findList(Map<String, Object> params);
+    List<KwsEnterprise> findList(EntFindPageReqVo params);
 }

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

@@ -12,7 +12,7 @@ import java.util.Map;
  * @date 2023-05-31
  */
 @Mapper
-public interface KwsUserDao extends BaseMapper<KwsUser> {
+public interface KwsUserDao {
     /**
      * 新增
      * @param record
@@ -47,5 +47,5 @@ public interface KwsUserDao extends BaseMapper<KwsUser> {
      * @param params
      * @return
      */
-    List<Map<String, Object>> findList(Map<String, Object> params);
+    List<KwsUser> findList(KwsUser params);
 }

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

@@ -10,7 +10,7 @@ import org.apache.ibatis.annotations.Mapper;
  * @date 2023-05-31
  */
 @Mapper
-public interface KwsUserDeptDao extends BaseMapper<KwsUserDept> {
+public interface KwsUserDeptDao {
     /**
      * 新增
      * @param record

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

@@ -1,6 +1,7 @@
 package com.sckw.system.dao;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
+import com.sckw.system.model.KwsEntType;
 import com.sckw.system.model.SysUser;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Select;
@@ -28,4 +29,6 @@ public interface SysUserDao {
 
     @DS("slave_1")
     List<Map<String, Object>> findPage(Map<String, Object> params);
+
+    int cunstomtest(KwsEntType record);
 }

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;
+    }
+}

sckw-modules/sckw-system/src/main/java/com/sckw/system/handle/CustomMetaHandle.java

@@ -1,13 +0,0 @@
-package com.sckw.system.handle;
-
-
-import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
-import com.sckw.core.utils.IdWorker;
-import org.apache.ibatis.reflection.MetaObject;
-import org.springframework.context.annotation.Configuration;
-
-//@Configuration
-public class CustomMetaHandle  {
-
-
-}

sckw-modules/sckw-system/src/main/java/com/sckw/system/handle/MyConfig.java

@@ -1,34 +0,0 @@
-package com.sckw.system.handle;
-
-import com.baomidou.mybatisplus.core.MybatisConfiguration;
-import com.baomidou.mybatisplus.core.MybatisXMLLanguageDriver;
-import com.baomidou.mybatisplus.core.config.GlobalConfig;
-import com.baomidou.mybatisplus.extension.spring.MybatisSqlSessionFactoryBean;
-import org.apache.ibatis.session.SqlSessionFactory;
-import org.apache.ibatis.type.JdbcType;
-import org.mybatis.spring.transaction.SpringManagedTransactionFactory;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-import javax.sql.DataSource;
-
-
-//@Configuration
-public class MyConfig {
-
-//    @Bean
-    public SqlSessionFactory sqlSessionFactory(DataSource dataSource) throws Exception {
-        MybatisSqlSessionFactoryBean mybatisSqlSessionFactoryBean = new MybatisSqlSessionFactoryBean();
-        mybatisSqlSessionFactoryBean.setTypeAliasesPackage("com.sckw.*.model");
-        mybatisSqlSessionFactoryBean.setDataSource(dataSource);
-        MybatisConfiguration configuration = new MybatisConfiguration();
-        configuration.setDefaultScriptingLanguage(MybatisXMLLanguageDriver.class);
-        configuration.setJdbcTypeForNull(JdbcType.NULL);
-        mybatisSqlSessionFactoryBean.setConfiguration(configuration);
-
-        mybatisSqlSessionFactoryBean.setTransactionFactory(new SpringManagedTransactionFactory());
-//        mybatisSqlSessionFactoryBean.setGlobalConfig(new GlobalConfig().setMetaObjectHandler(new CustomMetaHandle()));
-        return mybatisSqlSessionFactoryBean.getObject();
-    }
-
-}

sckw-modules/sckw-system/src/main/java/com/sckw/system/model/KwsEnterprise.java

@@ -116,4 +116,9 @@ public class KwsEnterprise extends BaseModel {
      * 审批时间
      */
     private Date approvalTime;
+
+    /**
+     * 专属客户经理（用户ID）
+     */
+    private long manager;
 }

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

@@ -0,0 +1,48 @@
+package com.sckw.system.model.vo.req;
+
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 执照
+ */
+@Data
+public class BusinessLicense {
+
+    /**
+     * 执照记录id，新增时为空
+     */
+    private long id;
+
+    /**
+     * 执照编号
+     */
+    private String code;
+
+    /**
+     * 证书类型 （1联系人身份证 2法人身份证 3营业执照 4道路运输许可证 5开户许可证号 6授权证书 6电子签章授权书）
+     */
+    private int type;
+
+    /**
+     * 证书正面
+     */
+    private String certificateMian;
+
+    /**
+     * 证书反面
+     */
+    private String certificateRevolt;
+
+    /**
+     * 有效期
+     */
+    private Date validity;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+}

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

@@ -0,0 +1,46 @@
+package com.sckw.system.model.vo.req;
+
+import com.sckw.core.model.page.PageRequest;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author czh
+ * @desc 分页查询入参
+ * @date 2023/6/9
+ */
+@Data
+public class EntFindPageReqVo extends PageRequest implements Serializable {
+
+    /**
+     * 企业名
+     */
+    private String firmName;
+
+    /**
+     * 联系人
+     */
+    private String contacts;
+
+    /**
+     * 联系电话
+     */
+    private String telephone;
+
+    /**
+     * 法人姓名
+     */
+    private String legalName;
+
+    /**
+     * 法人电话
+     */
+    private String legalTelephone;
+
+    /**
+     * 审批状态 0未审批、1通过、2未通过、3审批中
+     */
+    private int approval;
+
+}

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

@@ -0,0 +1,106 @@
+package com.sckw.system.model.vo.req;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+@Data
+public class EntRegisterReqVo implements Serializable {
+
+    /**
+     * 企业名称
+     */
+    private String firmName;
+
+    /**
+     * 企业编号
+     */
+    private String code;
+
+    /**
+     * 企业联系人
+     */
+    private String contacts;
+
+    /**
+     * 联系电话
+     */
+    private String telephone;
+
+    /**
+     * 法人姓名
+     */
+    private String legalName;
+
+    /**
+     * 法人电话
+     */
+    private String legalTelephone;
+
+    /**
+     * 企业头像
+     */
+    private String head;
+
+    /**
+     * 企业类型 多个类型用","隔开
+     */
+    private String entTypes;
+
+    /**
+     * 企业级别
+     */
+    private String entLevel;
+
+    /**
+     * 所属一级企业
+     */
+    private String belongFirstEnt;
+
+    /**
+     * 组织机构代码
+     */
+    private String orgCode;
+
+    /**
+     * 企业地址
+     */
+    private String cityCode;
+
+    /**
+     * 详细地址
+     */
+    private String detailAddress;
+
+    /**
+     * 注册来源 (app、pc)
+     */
+    private String regSource;
+
+    /**
+     * 纬度
+     */
+    private String lat;
+
+    /**
+     * 经度
+     */
+    private String lng;
+
+    /**
+     * 专属客户经理（用户ID）
+     */
+    private long manager;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 执照集合
+     */
+    private List<BusinessLicense> businessLicense;
+
+}

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

@@ -26,4 +26,9 @@ public class ForgetPasswordReqVo implements Serializable {
     @NotBlank(message = "验证码不能为空")
     private String captcha;
 
+    /**
+     * 系统类型(1运营端、2企业开户)
+     */
+    private int systemType;
+
 }

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

@@ -0,0 +1,20 @@
+package com.sckw.system.model.vo.req;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class FreezeReqVo implements Serializable {
+
+    /**
+     * 企业id
+     */
+    private long id;
+
+    /**
+     * 状态0正常1锁定
+     */
+    private int status;
+
+}

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

@@ -0,0 +1,81 @@
+package com.sckw.system.model.vo.req;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 企业关联信息
+ * @author zk
+ * @date 2023-06-02
+ */
+@Data
+public class KwsEnterpriseReqVo implements Serializable {
+
+    /**
+     * 企业ID
+     */
+    private long id;
+
+    /**
+     * 企业名称
+     */
+    private String firmName;
+
+    /**
+     * 企业类型,多个用","隔开
+     */
+    private String entTypes;
+
+    /**
+     * 联系人
+     */
+    private String contacts;
+
+    /**
+     * 联系电话
+     */
+    private String telephone;
+
+    /**
+     * 法人姓名
+     */
+    private String legalName;
+
+    /**
+     * 法人联系方式
+     */
+    private String legalTelephone;
+
+    /**
+     * 企业头像
+     */
+    private String head;
+
+    /**
+     * 组织机构code
+     */
+    private String orgCode;
+
+    /**
+     * 企业地址code
+     */
+    private String cityCode;
+
+    /**
+     * 企业地址
+     */
+    private String cityName;
+
+    /**
+     * 详细地址
+     */
+    private String detailAddress;
+
+    /**
+     * 企业证件信息
+     */
+    private List<BusinessLicense> certificates;
+
+}

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

@@ -26,4 +26,9 @@ public class UpdatePasswordReqVo implements Serializable {
     @NotBlank(message = "新密码不能为空")
     private String newPassword;
 
+    /**
+     * 系统类型(1运营端、2企业开户)
+     */
+    private int systemType;
+
 }

sckw-modules/sckw-system/src/main/java/com/sckw/system/model/vo/res/CertificateResVo.java

@@ -0,0 +1,35 @@
+package com.sckw.system.model.vo.res;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class CertificateResVo implements Serializable {
+
+    /**
+     * 证书类型
+     */
+    private int type;
+
+    /**
+     * 证书类型名
+     */
+    private String typeName;
+
+    /**
+     * 证书编号
+     */
+    private String code;
+
+    /**
+     * 证书正面URL地址
+     */
+    private String certificateMian;
+
+    /**
+     * 证书反面
+     */
+    private String certificateRevolt;
+
+}

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

@@ -1,26 +0,0 @@
-package com.sckw.system.model.vo.res;
-
-import com.sckw.core.model.base.BaseModel;
-import com.sckw.system.model.KwsEntCertificate;
-import com.sckw.system.model.KwsEntType;
-import lombok.Data;
-import java.util.List;
-
-/**
- * 企业关联信息
- * @author zk
- * @date 2023-06-02
- */
-@Data
-public class KwsEnterpriseResVo extends BaseModel {
-
-    /**
-     * 企业证件信息
-     */
-    private List<KwsEntCertificate> certificates;
-
-    /**
-     *企业类型
-     */
-    private List<KwsEntType> entTypes;
-}

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

@@ -22,7 +22,7 @@ import java.util.Map;
  * @date 2023-05-31
  */
 @Service
-public class KwsDeptService extends ServiceImpl<KwsDeptDao, KwsDept> {
+public class KwsDeptService {
 
     @Autowired
     KwsDeptDao kwsDeptDao;

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

@@ -1,25 +1,60 @@
 package com.sckw.system.service;
 
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import java.util.*;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.sckw.core.exception.SystemException;
+import com.sckw.core.model.constant.Global;
+import com.sckw.core.model.enums.ApprovalEnum;
+import com.sckw.core.model.enums.EntTypeEnum;
+import com.sckw.core.model.page.PageHelperUtil;
+import com.sckw.core.model.page.PageResult;
+import com.sckw.core.utils.BeanUtils;
+import com.sckw.core.utils.CollectionUtils;
+import com.sckw.core.utils.IdWorker;
+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.KwsEntCertificateDao;
+import com.sckw.system.dao.KwsEntCheckTrackDao;
+import com.sckw.system.dao.KwsEntTypeDao;
 import com.sckw.system.dao.KwsEnterpriseDao;
+import com.sckw.system.model.KwsEntCertificate;
+import com.sckw.system.model.KwsEntCheckTrack;
+import com.sckw.system.model.KwsEntType;
 import com.sckw.system.model.KwsEnterprise;
-import com.sckw.system.model.vo.res.KwsEnterpriseResVo;
+import com.sckw.system.model.vo.req.*;
+import com.sckw.system.model.vo.res.CertificateResVo;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-
-import java.util.List;
-import java.util.Map;
+import org.springframework.transaction.annotation.Transactional;
 
 /**
  * 企业service接口
+ *
  * @author zk
  * @date 2023-05-31
  */
 @Service
-public class KwsEnterpriseService extends ServiceImpl<KwsEnterpriseDao, KwsEnterprise> {
+public class KwsEnterpriseService {
+
+    @Autowired
+    private KwsEnterpriseDao kwsEnterpriseDao;
+
+    @Autowired
+    private KwsEntTypeDao kwsEntTypeDao;
+
+    @Autowired
+    private KwsEntCertificateDao kwsEntCertificateDao;
+
+    @Autowired
+    private KwsEntCheckTrackDao kwsEntCheckTrackDao;
 
     /**
      * 添加新纪录
+     *
      * @param params
      * @return
      * @throws Exception
@@ -38,6 +73,7 @@ public class KwsEnterpriseService extends ServiceImpl<KwsEnterpriseDao, KwsEnter
 
     /**
      * 删除记录-根据主键
+     *
      * @param ids
      * @return
      * @throws Exception
@@ -47,47 +83,148 @@ public class KwsEnterpriseService extends ServiceImpl<KwsEnterpriseDao, KwsEnter
     }
 
     /**
-     * 更新记录
-     * @param params
-     * @return
-     * @throws Exception
+     * 更新记录,有的是更新有的是新增,两种情况
      */
-    public HttpResult update(KwsEnterpriseResVo params) throws Exception {
-        return null;
+    @Transactional(rollbackFor = {})
+    public void update(KwsEnterpriseReqVo reqVo) throws Exception {
+        /*1、更新企业信息表*/
+        long entId = reqVo.getId();
+        KwsEnterprise kwsEnterprise = checkKwsEnterpriseById(entId);
+        BeanUtils.copyProperties(reqVo, kwsEnterprise);
+        if (kwsEnterpriseDao.update(kwsEnterprise) <= 0) {
+            throw new SystemException(HttpStatus.CRUD_FAIL_CODE, HttpStatus.UPDATE_FAIL);
+        }
+
+        /*2、更新企业类型*/
+        List<KwsEntType> kwsEntTypes = null;
+        List<String> typeReqList = new ArrayList<>();
+        String entTypes = reqVo.getEntTypes();
+        if (StringUtils.isNotBlank(entTypes)) {
+            typeReqList = Arrays.stream(entTypes.split(",")).toList();
+        }
+
+        //若入参传来的type在表里面本来就有则不管,没有就新增
+        typeReqList.forEach(item -> {
+            if (CollectionUtils.isEmpty(kwsEntTypes) || kwsEntTypes.stream().filter(x -> x.getType() == Integer.parseInt(item)).findAny().isPresent()) {
+                return;
+            }
+
+            KwsEntType kwsEntType = new KwsEntType();
+            kwsEntType.setEntId(entId);
+            kwsEntType.setType(Integer.parseInt(item));
+            if (kwsEntTypeDao.insert(kwsEntType) <= 0) {
+                throw new SystemException(HttpStatus.CRUD_FAIL_CODE, HttpStatus.INSERT_FAIL);
+            }
+        });
+
+        //若表里的type没有在入参传来的type里则做逻辑删除，有就不管
+        if (CollectionUtils.isNotEmpty(kwsEntTypes)) {
+            List<String> finalTypeReqList = typeReqList;
+            kwsEntTypes.forEach(item -> {
+                if (finalTypeReqList.contains(String.valueOf(item.getType()))) {
+                    item.setDelFlag(Global.YES);
+                    if (kwsEntTypeDao.update(item) <= 0) {
+                        throw new SystemException(HttpStatus.CRUD_FAIL_CODE, HttpStatus.UPDATE_FAIL);
+                    }
+                }
+            });
+        }
+
+        /*更新证书信息*/
+        //1、没有传则全部删除
+        List<BusinessLicense> certificates = reqVo.getCertificates();
+        if (CollectionUtils.isEmpty(certificates)) {
+            List<KwsEntCertificate> kwsEntCertificates = kwsEntCertificateDao.selectByEntId(entId);
+            if (!CollectionUtils.isEmpty(kwsEntCertificates)) {
+                kwsEntCertificates.forEach(item -> {
+                    item.setDelFlag(Global.YES);
+                    if(kwsEntCertificateDao.update(item) <= 0){
+                        throw new SystemException(HttpStatus.CRUD_FAIL_CODE, HttpStatus.UPDATE_FAIL);
+                    }
+                });
+            }
+            return;
+        }
+
+        certificates.forEach(item -> {
+            long id = item.getId();
+            if (Objects.isNull(id)) {
+                KwsEntCertificate kwsEntCertificate = new KwsEntCertificate();
+                kwsEntCertificate.setEntId(entId);
+                BeanUtils.copyProperties(item, kwsEntCertificate);
+                if(kwsEntCertificateDao.insert(kwsEntCertificate) <= 0) {
+                    throw new SystemException(HttpStatus.CRUD_FAIL_CODE, HttpStatus.INSERT_FAIL);
+                }
+                return;
+            }
+
+            KwsEntCertificate kwsEntCertificate = checkEntCertificate(id);
+            BeanUtils.copyProperties(item, kwsEntCertificate);
+            //不做更新条数校验
+            kwsEntCertificateDao.update(kwsEntCertificate);
+        });
+
+
+    }
+
+    public KwsEntCertificate checkEntCertificate(long id){
+        KwsEntCertificate kwsEntCertificate = kwsEntCertificateDao.selectByKey(id);
+        if(Objects.isNull(kwsEntCertificate) || kwsEntCertificate.getDelFlag() == Global.YES){
+            throw new SystemException(HttpStatus.QUERY_FAIL_CODE, HttpStatus.ENTCERTIFICATES_NOT_EXISTS);
+        }
+        return kwsEntCertificate;
     }
 
     /**
      * 根据主键查询
+     *
      * @param key
      * @return
      * @throws Exception
      */
     public KwsEnterprise selectByKey(Long key) throws Exception {
-        return null;
+        return checkKwsEnterpriseById(key);
     }
 
     /**
-     * 分页查询
-     * @param params
-     * @return
-     * @throws Exception
+     * @param reqVo
+     * @return HttpResult
+     * @desc: 分页查询
+     * @author: czh
+     * @date: 2023/6/9
      */
-    public List<KwsEnterprise> findPage(Map<String, Object> params) throws Exception{
-        return null;
+    public PageResult findPage(EntFindPageReqVo reqVo) throws Exception {
+        PageHelper.startPage(reqVo.getPageNum(), reqVo.getPageSize());
+        List<KwsEnterprise> list = findList(reqVo);
+        return PageHelperUtil.getPageResult(new PageInfo(list));
+    }
+
+    /**
+     * @param reqVo
+     * @return List<KwsEnterprise>
+     * @desc: 全量查询
+     * @author: czh
+     * @date: 2023/6/9
+     */
+    public List<KwsEnterprise> findList(EntFindPageReqVo reqVo) {
+        return kwsEnterpriseDao.findList(reqVo);
     }
 
+
     /**
      * 查询
+     *
      * @param params
      * @return
      * @throws Exception
      */
-    public List<Map<String, Object>> findList(Map<String, Object> params) throws Exception{
+    public List<Map<String, Object>> findList(Map<String, Object> params) throws Exception {
         return null;
     }
 
     /**
      * 参数校验
+     *
      * @param params
      * @return
      * @throws Exception
@@ -96,4 +233,125 @@ public class KwsEnterpriseService extends ServiceImpl<KwsEnterpriseDao, KwsEnter
 
         return null;
     }
+
+    /**
+     * 新增企业（注册）
+     */
+    @Transactional(rollbackFor = {})
+    public void register(EntRegisterReqVo reqVo) {
+        /*存企业信息表*/
+        KwsEnterprise kwsEnterprise = new KwsEnterprise();
+        long entId = new IdWorker(1).nextId();
+        kwsEnterprise.setId(entId);
+        BeanUtils.copyProperties(reqVo, kwsEnterprise);
+
+        //一些待确认的字段
+        kwsEnterprise.setIntegral(0);
+        kwsEnterprise.setBalance(0L);
+        kwsEnterprise.setExperience(0);
+        kwsEnterprise.setMemberLevel(0);
+        kwsEnterprise.setRegTime(new Date());
+        kwsEnterprise.setApproval(ApprovalEnum.NO.getCode());
+        if (kwsEnterpriseDao.insert(kwsEnterprise) <= 0) {
+            throw new SystemException(HttpStatus.CRUD_FAIL_CODE, HttpStatus.INSERT_FAIL);
+        }
+
+        /*存企业类型,一个企业可以有多个类型*/
+        List<KwsEntType> kwsEntTypes = new ArrayList<>();
+        Arrays.stream(reqVo.getEntTypes().split(",")).toList().forEach(item -> {
+            KwsEntType kwsEntType = new KwsEntType();
+            kwsEntType.setEntId(entId);
+            kwsEntType.setType(Integer.parseInt(item));
+            kwsEntType.setId(new IdWorker(1).nextId());
+            kwsEntType.setDelFlag(Global.NO);
+            kwsEntType.setStatus(Global.NO);
+            kwsEntType.setCreateBy(1L);
+            kwsEntType.setUpdateBy(1L);
+            kwsEntType.setCreateTime(new Date());
+            kwsEntType.setUpdateTime(new Date());
+            kwsEntTypes.add(kwsEntType);
+        });
+        if (kwsEntTypeDao.saveBatch(kwsEntTypes) != kwsEntTypes.size()) {
+            throw new SystemException(HttpStatus.CRUD_FAIL_CODE, HttpStatus.INSERT_FAIL);
+        }
+
+        /*存企业证书*/
+        List<KwsEntCertificate> kwsEntCertificates = new ArrayList<>();
+        reqVo.getBusinessLicense().forEach(item -> {
+            KwsEntCertificate kwsEntCertificate = new KwsEntCertificate();
+            //todo 上传证书正反面，将url放到两个入参里
+            kwsEntCertificate.setEntId(entId);
+            kwsEntCertificate.setId(new IdWorker(1).nextId());
+            kwsEntCertificate.setDelFlag(Global.NO);
+            kwsEntCertificate.setStatus(Global.NO);
+            kwsEntCertificate.setCreateBy(1L);
+            kwsEntCertificate.setUpdateBy(1L);
+            kwsEntCertificate.setCreateTime(new Date());
+            kwsEntCertificate.setUpdateTime(new Date());
+            BeanUtils.copyProperties(item, kwsEntCertificate);
+            kwsEntCertificates.add(kwsEntCertificate);
+        });
+        if (kwsEntCertificateDao.saveBatch(kwsEntCertificates) != kwsEntCertificates.size()) {
+            throw new SystemException(HttpStatus.CRUD_FAIL_CODE, HttpStatus.INSERT_FAIL);
+        }
+    }
+
+    /**
+     * 企业审批
+     */
+    @Transactional(rollbackFor = {})
+    public void approval(KwsEntCheckTrack kwsEntCheckTrack) {
+        /*更新企业信息主表审批状态*/
+        KwsEnterprise kwsEnterprise = checkKwsEnterpriseById(kwsEntCheckTrack.getEntId());
+        kwsEnterprise.setApproval(kwsEntCheckTrack.getStatus());
+        if (kwsEnterpriseDao.update(kwsEnterprise) <= 0) {
+            throw new SystemException(HttpStatus.CRUD_FAIL_CODE, HttpStatus.UPDATE_FAIL);
+        }
+
+        /*新增审批记录*/
+        if (kwsEntCheckTrackDao.insert(kwsEntCheckTrack) <= 0) {
+            throw new SystemException(HttpStatus.CRUD_FAIL_CODE, HttpStatus.INSERT_FAIL);
+        }
+    }
+
+    private KwsEnterprise checkKwsEnterpriseById(long id) {
+        KwsEnterprise kwsEnterprise = kwsEnterpriseDao.selectByKey(id);
+        if (Objects.isNull(kwsEnterprise) || kwsEnterprise.getDelFlag() == Global.YES) {
+            throw new SystemException(HttpStatus.QUERY_FAIL_CODE, HttpStatus.ENT_NOT_EXISTS);
+        }
+        return kwsEnterprise;
+    }
+
+    /**
+     * 企业冻结/解冻
+     */
+    public void freeze(FreezeReqVo reqVo) {
+        KwsEnterprise kwsEnterprise = checkKwsEnterpriseById(reqVo.getId());
+        kwsEnterprise.setStatus(reqVo.getStatus());
+        if (kwsEnterpriseDao.update(kwsEnterprise) <= 0) {
+            throw new SystemException(HttpStatus.QUERY_FAIL_CODE, HttpStatus.UPDATE_FAIL);
+        }
+    }
+
+    /**
+     * 企业证件信息
+     */
+    public List<CertificateResVo> certificate(Long id) {
+        /*查企业资质*/
+        List<KwsEntCertificate> kwsEntCertificates = kwsEntCertificateDao.selectByEntId(id);
+        if (CollectionUtils.isEmpty(kwsEntCertificates)) {
+            throw new SystemException(HttpStatus.QUERY_FAIL_CODE, HttpStatus.ENTCERTIFICATES_NOT_EXISTS);
+        }
+
+        /*拼装返参*/
+        List<CertificateResVo> list = new ArrayList<>();
+        kwsEntCertificates.forEach(item -> {
+            CertificateResVo certificateResVo = new CertificateResVo();
+            certificateResVo.setTypeName(EntTypeEnum.getName(item.getType()).getName());
+            BeanUtils.copyProperties(item, certificateResVo);
+            list.add(certificateResVo);
+        });
+        return list;
+    }
+
 }

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

@@ -1,28 +0,0 @@
-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,4 @@
 package com.sckw.system.service;
-import java.util.Date;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -33,7 +32,7 @@ import java.util.Objects;
  */
 @Slf4j
 @Service
-public class KwsUserService extends ServiceImpl<KwsUserDao, KwsUser> {
+public class KwsUserService {
 
     @Autowired
     KwsUserDao kwsUserDao;
@@ -46,9 +45,6 @@ public class KwsUserService extends ServiceImpl<KwsUserDao, KwsUser> {
     @Autowired
     KwsDeptService kwsDeptService;
 
-    @Autowired
-    KwsUserDeptService kwsUserDeptService;
-
     @Autowired
     KwsEnterpriseService kwsEnterpriseService;
 
@@ -69,7 +65,7 @@ public class KwsUserService extends ServiceImpl<KwsUserDao, KwsUser> {
         kwsUser.setUpdateBy(0L);
         int count = kwsUserDao.insert(kwsUser);
         if (count <= 0) {
-           throw new SystemException(HttpStatus.CODE_60601, HttpStatus.INSERT_FAIL);
+           throw new SystemException(HttpStatus.CRUD_FAIL_CODE, HttpStatus.INSERT_FAIL);
         }
     }
 
@@ -105,7 +101,7 @@ public class KwsUserService extends ServiceImpl<KwsUserDao, KwsUser> {
         }
 
         if (resultCode < idArray.length) {
-            throw new SystemException(HttpStatus.CODE_60601, HttpStatus.DELETE_FAIL);
+            throw new SystemException(HttpStatus.CRUD_FAIL_CODE, HttpStatus.DELETE_FAIL);
         }
     }
 
@@ -115,35 +111,27 @@ public class KwsUserService extends ServiceImpl<KwsUserDao, KwsUser> {
      * @return
      * @throws Exception
      */
-    public HttpResult update(KwsUser params) throws Exception {
+    public void update(KwsUser params) throws Exception {
         //更换账号后账号唯一性校验
         if (StringUtils.isNotBlank(params.getAccount())) {
             //用户信息
-            KwsUser user = kwsUserDao.selectByKey(params.getId());
-            if (!user.getAccount().equals(params.getAccount())) {
-                //用户账号唯一性校验
-                Map userParams = new HashMap(){{put("systemType", params.getSystemType()); put("account", params.getAccount());}};
-                List users = kwsUserDao.findList(userParams);
-                if (CollectionUtils.isNotEmpty(users)) {
-                    return HttpResult.error(HttpStatus.PARAMETERS_MISSING_CODE, HttpStatus.ACCOUNT_EXISTS);
-                }
+            KwsUser userByAccount = getUserByAccount(params.getAccount(), params.getSystemType());
+            if (Objects.isNull(userByAccount)) {
+                throw new SystemException(HttpStatus.PARAMETERS_MISSING_CODE, HttpStatus.ACCOUNT_EXISTS);
             }
         }
-
         //更新用户信息
-        int count = kwsUserDao.update(params);
-        return count > 0 ? HttpResult.ok("更新成功！") : HttpResult.error();
+        if (kwsUserDao.update(params) <= 0) {
+            throw new SystemException(HttpStatus.CRUD_FAIL_CODE, HttpStatus.UPDATE_FAIL);
+        }
     }
 
     /**
      * 重置密码
      */
-    public void resetPassword(Long id) throws Exception {
+    public void resetPassword(Long id) {
         //查用户信息
-        KwsUser kwsUser = kwsUserDao.selectByKey(id);
-        if (Objects.isNull(kwsUser)) {
-            throw new SystemException(HttpStatus.CODE_60602, HttpStatus.ACCOUNT_NOT_EXISTS);
-        }
+        KwsUser kwsUser = checkUserBase(id);
 
         //重置密码
         updatePwd(PasswordUtils.md5(kwsUser.getAccount()), kwsUser);
@@ -166,7 +154,7 @@ public class KwsUserService extends ServiceImpl<KwsUserDao, KwsUser> {
     /**
      * 查询
      */
-    public List<Map<String, Object>> findList(Map<String, Object> params) throws Exception{
+    public List<KwsUser> findList(KwsUser params) throws Exception{
         return kwsUserDao.findList(params);
     }
 
@@ -180,10 +168,7 @@ public class KwsUserService extends ServiceImpl<KwsUserDao, KwsUser> {
         }
 
         //用户账号唯一性校验
-        LambdaQueryWrapper<KwsUser> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(KwsUser::getSystemType, kwsUser.getSystemType());
-        wrapper.eq(KwsUser::getAccount, kwsUser.getAccount());
-        List<KwsUser> users = this.list(wrapper);
+        List<KwsUser> users = kwsUserDao.findList(kwsUser);
         if (CollectionUtils.isNotEmpty(users)) {
             throw new SystemException(HttpStatus.PARAMETERS_MISSING_CODE, HttpStatus.ACCOUNT_EXISTS);
         }
@@ -194,11 +179,12 @@ public class KwsUserService extends ServiceImpl<KwsUserDao, KwsUser> {
     /**
      * 根据用户名查用户信息
      */
-    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 KwsUser getUserByAccount(String username, int systemType) {
+        KwsUser kwsUser = new KwsUser();
+        kwsUser.setAccount(username);
+        kwsUser.setSystemType(systemType);
+        List<KwsUser> list = kwsUserDao.findList(kwsUser);
+        return CollectionUtils.isEmpty(list) ? null : list.get(0);
     }
 
     /**
@@ -206,7 +192,7 @@ public class KwsUserService extends ServiceImpl<KwsUserDao, KwsUser> {
      */
     public void updatePassword(UpdatePasswordReqVo reqVo) {
         //查用户信息
-        KwsUser kwsUser = checkUserBase(reqVo.getAccount());
+        KwsUser kwsUser = checkUserBase(reqVo.getAccount(), reqVo.getSystemType());
 
         //密码校验
         String password = reqVo.getPassword();
@@ -226,7 +212,7 @@ public class KwsUserService extends ServiceImpl<KwsUserDao, KwsUser> {
     private void updatePwd(String newPassword, KwsUser kwsUser) {
         kwsUser.setPassword(PasswordUtils.entryptPassword(newPassword));
         if(kwsUserDao.update(kwsUser) <= 0) {
-            throw new SystemException(HttpStatus.CODE_60601, HttpStatus.UPDATE_FAIL);
+            throw new SystemException(HttpStatus.CRUD_FAIL_CODE, HttpStatus.UPDATE_FAIL);
         }
     }
 
@@ -235,7 +221,7 @@ public class KwsUserService extends ServiceImpl<KwsUserDao, KwsUser> {
      */
     public void forgetPassword(ForgetPasswordReqVo reqVo) {
         //查用户信息
-        KwsUser kwsUser = checkUserBase(reqVo.getAccount());
+        KwsUser kwsUser = checkUserBase(reqVo.getAccount(), reqVo.getSystemType());
 
         //从缓存中取出验证码,校验
         //todo
@@ -251,10 +237,21 @@ public class KwsUserService extends ServiceImpl<KwsUserDao, KwsUser> {
     /**
      * 根据登录名校验
      */
-    public KwsUser checkUserBase(String account) {
-        KwsUser kwsUser = getUserByAccount(account);
+    public KwsUser checkUserBase(String account, int systemType) {
+        KwsUser kwsUser = getUserByAccount(account, systemType);
         if (Objects.isNull(kwsUser)) {
-            throw new SystemException(HttpStatus.CODE_60602, HttpStatus.ACCOUNT_NOT_EXISTS);
+            throw new SystemException(HttpStatus.QUERY_FAIL_CODE, HttpStatus.ACCOUNT_NOT_EXISTS);
+        }
+        return kwsUser;
+    }
+
+    /**
+     * 根据id校验
+     */
+    public KwsUser checkUserBase(long id) {
+        KwsUser kwsUser = kwsUserDao.selectByKey(id);
+        if (Objects.isNull(kwsUser) || kwsUser.getDelFlag() != Global.NO) {
+            throw new SystemException(HttpStatus.QUERY_FAIL_CODE, HttpStatus.ACCOUNT_NOT_EXISTS);
         }
         return kwsUser;
     }

sckw-modules/sckw-system/src/main/resources/bootstrap-dev.yml

@@ -69,9 +69,27 @@ dubbo:
     #use-as-config-center: false
     #use-as-metadata-center: false
 
+  datasource:
+    dynamic:
+      primary: master #设置默认的数据源或者数据源组,默认值即为master
+      strict: false #严格匹配数据源,默认false. true未匹配到指定数据源时抛异常,false使用默认数据源
+      datasource:
+        master:
+          url: jdbc:mysql://47.108.162.14:3306/sckw_system?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
+          username: root
+          password: Yy123...
+          driver-class-name: com.mysql.jdbc.Driver # 3.2.0开始支持SPI可省略此配置
+        slave_1:
+          url: jdbc:mysql://47.108.162.14:3306/wph_system?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
+          username: root
+          password: Yy123...
+          driver-class-name: com.mysql.jdbc.Driver
+
+
 mybatis-plus:
   mapper-locations: classpath*:/mapper/*.xml    #扫描xml文件
   #实体扫描，多个package用逗号或者分号分隔
   typeAliasesPackage: com.sckw.*.model
   configuration:
     log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+

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

@@ -28,6 +28,9 @@
     from kws_ent_certificate
     where id = #{id,jdbcType=BIGINT}
   </select>
+  <select id="selectByEntId" resultType="com.sckw.system.model.KwsEntCertificate">
+    select a.* from kws_ent_certificate a where a.ent_id = #{id} and a.del_flag = 0
+  </select>
 
   <insert id="insert" parameterType="com.sckw.system.model.KwsEntCertificate">
     insert into kws_ent_certificate
@@ -115,7 +118,44 @@
     </trim>
   </insert>
 
-  <update id="update" parameterType="com.sckw.system.model.KwsEntCertificate">
+    <insert id="saveBatch">
+      insert into kws_ent_certificate
+      <trim prefix="(" suffix=")" suffixOverrides=",">
+          id,
+          ent_id,
+          type,
+          code,
+          certificate_mian,
+          certificate_revolt,
+          remark,
+          status,
+          create_by,
+          create_time,
+          update_by,
+          update_time,
+          del_flag
+      </trim>
+      values
+        <foreach collection="list" item="item" separator=",">
+          <trim prefix="(" suffix=")" suffixOverrides=",">
+            #{item.id,jdbcType=BIGINT},
+            #{item.entId,jdbcType=BIGINT},
+            #{item.type,jdbcType=INTEGER},
+            #{item.code,jdbcType=VARCHAR},
+            #{item.certificateMian,jdbcType=VARCHAR},
+            #{item.certificateRevolt,jdbcType=VARCHAR},
+            #{item.remark,jdbcType=VARCHAR},
+            #{item.status,jdbcType=INTEGER},
+            #{item.createBy,jdbcType=BIGINT},
+            #{item.createTime,jdbcType=TIMESTAMP},
+            #{item.updateBy,jdbcType=BIGINT},
+            #{item.updateTime,jdbcType=TIMESTAMP},
+            #{item.delFlag,jdbcType=INTEGER}
+          </trim>
+        </foreach>
+    </insert>
+
+    <update id="update" parameterType="com.sckw.system.model.KwsEntCertificate">
     update kws_ent_certificate
     <set>
       <if test="entId != null">

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

@@ -19,7 +19,7 @@
     del_flag
   </sql>
 
-  <insert id="insertSelective" parameterType="com.sckw.system.model.KwsEntType">
+  <insert id="insert" parameterType="com.sckw.system.model.KwsEntType">
     insert into kws_ent_type
     <trim prefix="(" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -87,6 +87,37 @@
     </trim>
   </insert>
 
+    <insert id="saveBatch" parameterType="com.sckw.system.model.KwsEntType">
+      insert into kws_ent_type
+      <trim prefix="(" suffix=")" suffixOverrides=",">
+          id,
+          ent_id,
+          type,
+          remark,
+          status,
+          create_by,
+          create_time,
+          update_by,
+          update_time,
+          del_flag
+      </trim>
+          values
+      <foreach collection="list" item="item" separator=",">
+      <trim prefix="(" suffix=")" suffixOverrides=",">
+          #{item.id,jdbcType=BIGINT},
+          #{item.entId,jdbcType=BIGINT},
+          #{item.type,jdbcType=INTEGER},
+          #{item.remark,jdbcType=VARCHAR},
+          #{item.status,jdbcType=INTEGER},
+          #{item.createBy,jdbcType=BIGINT},
+          #{item.createTime,jdbcType=TIMESTAMP},
+          #{item.updateBy,jdbcType=BIGINT},
+          #{item.updateTime,jdbcType=TIMESTAMP},
+          #{item.delFlag,jdbcType=INTEGER}
+      </trim>
+      </foreach>
+    </insert>
+
   <update id="updateByPrimaryKeySelective" parameterType="com.sckw.system.model.KwsEntType">
     update kws_ent_type
     <set>

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

@@ -47,6 +47,31 @@
     where id = #{id,jdbcType=BIGINT}
   </select>
 
+  <select id="findList" resultType="com.sckw.system.model.KwsEnterprise" parameterType="com.sckw.system.model.vo.req.EntFindPageReqVo">
+    select a.*
+      from kws_enterprise a
+    where a.del_flag = 0
+    <if test="firmName != null and firmName != ''">
+      and a.firm_name = #{firmName}
+    </if>
+    <if test="contacts != null and contacts != ''">
+      and a.contacts = #{contacts}
+    </if>
+    <if test="telephone != null and telephone != ''">
+      and a.telephone = #{telephone}
+    </if>
+    <if test="legalName != null and legalName != ''">
+      and a.legal_name = #{legalName}
+    </if>
+    <if test="legalTelephone != null and legalTelephone != ''">
+      and a.legal_telephone = #{legalName}
+    </if>
+    <if test="approval !=">
+      and a.approval = #{approval}
+    </if>
+    order by a.create_time
+  </select>
+
   <insert id="insert" parameterType="com.sckw.system.model.KwsEnterprise">
     insert into kws_enterprise
     <trim prefix="(" suffix=")" suffixOverrides=",">

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

@@ -239,7 +239,7 @@
     ORDER BY su.create_time desc
   </select>
 
-  <select id="findList" resultType="java.util.Map" parameterType="java.util.Map" >
+  <select id="findList" resultType="com.sckw.system.model.KwsUser" parameterType="com.sckw.system.model.KwsUser" >
     select
       su.id, su.system_type systemType, su.account, su.password, su.name,
       su.telephone, su.photo, su.email, su.is_main isMain, su.remark, su.status

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

@@ -19,6 +19,73 @@
     <result column="update_time" property="updateTime" />
     <result column="del_flag" property="delFlag" />
   </resultMap>
+  <insert id="cunstomtest" parameterType="com.sckw.system.model.KwsEntType">
+    insert into kws_ent_type
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="entId != null">
+        ent_id,
+      </if>
+      <if test="type != null">
+        type,
+      </if>
+      <if test="remark != null">
+        remark,
+      </if>
+      <if test="status != null">
+        status,
+      </if>
+      <if test="createBy != null">
+        create_by,
+      </if>
+      <if test="createTime != null">
+        create_time,
+      </if>
+      <if test="updateBy != null">
+        update_by,
+      </if>
+      <if test="updateTime != null">
+        update_time,
+      </if>
+      <if test="delFlag != null">
+        del_flag,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=BIGINT},
+      </if>
+      <if test="entId != null">
+        #{entId,jdbcType=BIGINT},
+      </if>
+      <if test="type != null">
+        #{type,jdbcType=INTEGER},
+      </if>
+      <if test="remark != null">
+        #{remark,jdbcType=VARCHAR},
+      </if>
+      <if test="status != null">
+        #{status,jdbcType=INTEGER},
+      </if>
+      <if test="createBy != null">
+        #{createBy,jdbcType=BIGINT},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateBy != null">
+        #{updateBy,jdbcType=BIGINT},
+      </if>
+      <if test="updateTime != null">
+        #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="delFlag != null">
+        #{delFlag,jdbcType=INTEGER},
+      </if>
+    </trim>
+  </insert>
 
   <select id="findByAccount" parameterType="java.util.Map" resultType="com.sckw.system.model.SysUser">
     SELECT