【功能开发】app 端:省核验人员:注册

delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/controller/admin/task/vo/TaskKqxxRespVO.java

@@ -3,6 +3,7 @@ package com.unis.module.coding.controller.admin.task.vo;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
+import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 
 import java.math.BigDecimal;
 
@@ -43,4 +44,25 @@ public class TaskKqxxRespVO {
 
     @Schema(description = "库区图")
     private String resid;
+
+    @Schema(description = "社会信用代码")
+    private String shxydm;
+
+    @Schema(description = "库区编码")
+    private String kqbm;
+
+    @Schema(description = "库区地址-省")
+    private String sheng;
+
+    private Long userId;
+    /**
+     * 用户账号
+     */
+    private String username;
+    /**
+     * 加密后的密码
+     *
+     * 因为目前使用 {@link BCryptPasswordEncoder} 加密器，所以无需自己处理 salt 盐
+     */
+    private String password;
 }

delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/controller/admin/task/vo/TaskRespVO.java

@@ -51,4 +51,10 @@ public class TaskRespVO {
     @Schema(description = "核验数量")
     private Integer hyNum;
 
+    @Schema(description = "社会信用代码")
+    private String shxydm;
+
+    @Schema(description = "库区编码")
+    private String kqbm;
+
 }

delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/service/task/TaskServiceImpl.java

@@ -32,6 +32,7 @@ import com.unis.module.core.enums.ErrorCodeConstants;
 import com.unis.module.core.enums.project.DeliveryHyState;
 import com.unis.module.system.api.permission.PermissionApi;
 import com.unis.module.system.enums.permission.RoleCodeEnum;
+import com.unis.module.system.service.user.AdminUserService;
 import lombok.extern.slf4j.Slf4j;
 import org.jetbrains.annotations.NotNull;
 import org.springframework.stereotype.Service;
@@ -77,6 +78,8 @@ public class TaskServiceImpl implements TaskService {
     private BankMapper bankMapper;
     @Resource
     private UsersMapper usersMapper;
+    @Resource
+    private AdminUserService userService;
 
     @Override
     public IPage<TaskRespVO> getTaskList(TaskPageReqVO pageReqVO) {
@@ -210,6 +213,7 @@ public class TaskServiceImpl implements TaskService {
 
         if(ObjectUtils.isNotEmpty(kqxxDO)) {
 
+            //单位信息
             DwxxDO dwxxDO = dwxxMapper.selectById(kqxxDO.getDwid());
 
             TaskKqxxRespVO kqxx = BeanUtils.toBean(kqxxDO, TaskKqxxRespVO.class);
@@ -218,6 +222,14 @@ public class TaskServiceImpl implements TaskService {
             kqxx.setQyxz(dwxxDO.getQyxz());
             kqxx.setJd(dwxxDO.getJd());
             kqxx.setWd(dwxxDO.getWd());
+
+            // 账号信息
+//            AdminUserDO user = userService.getUserByKqbm(kqxxDO.getKqbm());
+//            if(ObjectUtils.isNotEmpty(user)){
+//                kqxx.setUserId(user.getId());
+//                kqxx.setUsername(user.getUsername());
+//                kqxx.setPassword(user.getPassword());
+//            }
             return kqxx;
         }
 

delivery-module-core/delivery-module-core-biz/src/main/resources/mapper/dk/DkMapper.xml

@@ -13,6 +13,8 @@
             dp.HYRY_ID ,
             dp.HYRY_NAME ,
             dp.HY_STATE ,
+            dk.SHXYDM ,
+            dk.KQBM ,
             COUNT(distinct dc.ID) AS HY_NUM
         FROM
             ${pageReqVO.tableName} dp

delivery-module-system/delivery-module-system-biz/src/main/java/com/unis/module/system/controller/admin/user/UserController.java

@@ -33,7 +33,10 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.io.IOException;
-import java.util.*;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
 import static com.unis.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
 import static com.unis.framework.common.exception.util.ServiceExceptionUtil.exception;
@@ -224,4 +227,11 @@ public class UserController {
         return success(userService.importUserList(list, updateSupport));
     }
 
+    @PostMapping("/createUserForKq")
+    @Operation(summary = "新增用户")
+    public CommonResult<Long> createUserForKq(@Valid @RequestBody UserSaveReqVO reqVO) {
+
+        Long id = userService.createUser(reqVO);
+        return success(id);
+    }
 }

delivery-module-system/delivery-module-system-biz/src/main/java/com/unis/module/system/controller/admin/user/vo/user/UserSaveReqVO.java

@@ -1,17 +1,15 @@
 package com.unis.module.system.controller.admin.user.vo.user;
 
 import cn.hutool.core.util.ObjectUtil;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.mzt.logapi.starter.annotation.DiffLogField;
 import com.unis.framework.common.validation.Mobile;
 import com.unis.module.system.framework.operatelog.core.DeptParseFunction;
 import com.unis.module.system.framework.operatelog.core.PostParseFunction;
 import com.unis.module.system.framework.operatelog.core.SexParseFunction;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.mzt.logapi.starter.annotation.DiffLogField;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
-import lombok.Getter;
-import lombok.Setter;
 import org.hibernate.validator.constraints.Length;
 
 import javax.validation.constraints.*;
@@ -119,6 +117,9 @@ public class UserSaveReqVO implements Serializable {
     @Length(min = 4, max = 16, message = "密码长度为 4-16 位")
     private String password;
 
+    @Schema(description = "库区编码", requiredMode = Schema.RequiredMode.REQUIRED, example = "123456")
+    private String kqbm;
+
     @AssertTrue(message = "密码不能为空")
     @JsonIgnore
     public boolean isPasswordValid() {

delivery-module-system/delivery-module-system-biz/src/main/java/com/unis/module/system/dal/mysql/user/AdminUserMapper.java

@@ -49,4 +49,7 @@ public interface AdminUserMapper extends BaseMapperX<AdminUserDO> {
         return selectList(AdminUserDO::getDeptId, deptIds);
     }
 
+    default AdminUserDO getUserByKqbm(String kqbm){
+        return selectOne(AdminUserDO::getKqbm, kqbm);
+    }
 }

delivery-module-system/delivery-module-system-biz/src/main/java/com/unis/module/system/service/user/AdminUserService.java

@@ -1,16 +1,22 @@
 package com.unis.module.system.service.user;
 
 import cn.hutool.core.collection.CollUtil;
+import com.unis.framework.common.pojo.PageResult;
 import com.unis.framework.common.util.collection.CollectionUtils;
 import com.unis.module.system.controller.admin.user.vo.profile.UserProfileUpdatePasswordReqVO;
 import com.unis.module.system.controller.admin.user.vo.profile.UserProfileUpdateReqVO;
-import com.unis.module.system.controller.admin.user.vo.user.*;
-import com.unis.framework.common.pojo.PageResult;
+import com.unis.module.system.controller.admin.user.vo.user.UserImportExcelVO;
+import com.unis.module.system.controller.admin.user.vo.user.UserImportRespVO;
+import com.unis.module.system.controller.admin.user.vo.user.UserPageReqVO;
+import com.unis.module.system.controller.admin.user.vo.user.UserSaveReqVO;
 import com.unis.module.system.dal.dataobject.user.AdminUserDO;
 
 import javax.validation.Valid;
 import java.io.InputStream;
-import java.util.*;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 后台用户 Service 接口
@@ -201,4 +207,5 @@ public interface AdminUserService {
      */
     boolean isPasswordMatch(String rawPassword, String encodedPassword);
 
+    AdminUserDO getUserByKqbm(String kqbm);
 }

delivery-module-system/delivery-module-system-biz/src/main/java/com/unis/module/system/service/user/AdminUserServiceImpl.java

@@ -4,19 +4,18 @@ import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.io.IoUtil;
 import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
-import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.github.yitter.idgen.YitIdHelper;
+import com.google.common.annotations.VisibleForTesting;
+import com.mzt.logapi.context.LogRecordContext;
+import com.mzt.logapi.service.impl.DiffParseFunction;
+import com.mzt.logapi.starter.annotation.LogRecord;
 import com.unis.framework.common.enums.CommonStatusEnum;
 import com.unis.framework.common.exception.ServiceException;
 import com.unis.framework.common.pojo.PageResult;
-import com.unis.framework.common.util.business.PermissionUtils;
 import com.unis.framework.common.util.collection.CollectionUtils;
 import com.unis.framework.common.util.object.BeanUtils;
 import com.unis.framework.datapermission.core.util.DataPermissionUtils;
-import com.unis.framework.security.core.LoginUser;
 import com.unis.framework.security.core.util.AreaUtils;
-import com.unis.framework.security.core.util.SecurityFrameworkUtils;
 import com.unis.module.infra.api.file.FileApi;
 import com.unis.module.system.controller.admin.user.vo.profile.UserProfileUpdatePasswordReqVO;
 import com.unis.module.system.controller.admin.user.vo.profile.UserProfileUpdateReqVO;
@@ -26,19 +25,13 @@ import com.unis.module.system.controller.admin.user.vo.user.UserPageReqVO;
 import com.unis.module.system.controller.admin.user.vo.user.UserSaveReqVO;
 import com.unis.module.system.dal.dataobject.dept.DeptDO;
 import com.unis.module.system.dal.dataobject.dept.UserPostDO;
-import com.unis.module.system.dal.dataobject.permission.UserRoleDO;
 import com.unis.module.system.dal.dataobject.user.AdminUserDO;
 import com.unis.module.system.dal.mysql.dept.UserPostMapper;
-import com.unis.module.system.dal.mysql.permission.UserRoleMapper;
 import com.unis.module.system.dal.mysql.user.AdminUserMapper;
 import com.unis.module.system.service.dept.DeptService;
 import com.unis.module.system.service.dept.PostService;
 import com.unis.module.system.service.permission.PermissionService;
 import com.unis.module.system.service.tenant.TenantService;
-import com.google.common.annotations.VisibleForTesting;
-import com.mzt.logapi.context.LogRecordContext;
-import com.mzt.logapi.service.impl.DiffParseFunction;
-import com.mzt.logapi.starter.annotation.LogRecord;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Lazy;
@@ -506,4 +499,8 @@ public class AdminUserServiceImpl implements AdminUserService {
         return passwordEncoder.encode(password);
     }
 
+    @Override
+    public AdminUserDO getUserByKqbm(String kqbm) {
+        return userMapper.getUserByKqbm(kqbm);
+    }
 }