同步平台

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/dto/PersonAccountDto.java

@@ -25,7 +25,7 @@ public class PersonAccountDto  extends BaseDto {
 
 
     @ApiModelProperty(value = "平台user_id")
-    private Long userId;
+    private String userId;
 
     @ApiModelProperty(value = "平台账号名称")
     private String accountName;

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/dto/UserDto.java

 package com.yeejoin.amos.boot.module.jxiop.api.dto;
 
+import com.yeejoin.amos.feign.privilege.model.CompanyModel;
+import com.yeejoin.amos.feign.privilege.model.DepartmentModel;
+import com.yeejoin.amos.feign.privilege.model.RoleModel;
 import lombok.Data;
 
 import java.util.List;
@@ -27,4 +30,8 @@ public class UserDto {
     private List<String>  roleSeqs;//角色
     private String userName;//账号
 
+
+
+
+
 }

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/entity/PersonAccount.java

@@ -30,7 +30,7 @@ public class PersonAccount extends BaseEntity {
      * 平台user_id
      */
 	@TableField("user_id")
-    private Long userId;
+    private String userId;
 
     /**
      * 平台账号名称

amos-boot-system-jxiop/amos-boot-module-jxiop-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/fegin/PrivilegeFeignClient.java

-package com.yeejoin.amos.boot.module.jxiop.biz.fegin;
-
-import com.yeejoin.amos.boot.biz.common.feign.MultipartSupportConfig;
-import com.yeejoin.amos.boot.module.jxiop.api.dto.UserDto;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.*;
-import org.typroject.tyboot.core.restful.utils.ResponseModel;
-
-import java.util.List;
-
-/**
- * @description:
- * @author: tw
- * @createDate: 2023/4/22
- */
-@FeignClient(name ="${privilege.fegin.name:AMOS-API-PRIVILEGE}", path = "", configuration = {MultipartSupportConfig.class})
-public interface PrivilegeFeignClient {
-
-
-
-    @RequestMapping(value = "/privilege/v1/agencyuser", method = RequestMethod.POST)
-    ResponseModel<Object> create(
-            @RequestHeader("appKey") String appKey,
-            @RequestHeader("product") String product,
-            @RequestHeader("token") String token,
-            @RequestBody UserDto var1);
-
-
-
-    @RequestMapping(value = "/privilege/v1/agencyuser/{userId}", method = RequestMethod.PUT)
-    ResponseModel<Object> update(
-            @PathVariable("userId") String var2,
-            @RequestHeader("appKey") String appKey,
-            @RequestHeader("product") String product,
-            @RequestHeader("token") String token,
-            @RequestBody UserDto var1);
-
-
-
-    @RequestMapping(value = "/privilege/v1/groupUser", method = RequestMethod.POST)
-    ResponseModel<Object> groupUser(
-            @RequestHeader("appKey") String appKey,
-            @RequestHeader("product") String product,
-            @RequestHeader("token") String token,
-            @RequestParam("groupSeq") Long groupSeq, @RequestBody List<String> var2);
-
-}

amos-boot-system-jxiop/amos-boot-module-jxiop-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/PersonBasicServiceImpl.java

@@ -11,6 +11,7 @@ import com.yeejoin.amos.boot.module.jxiop.biz.fegin.PrivilegeFeignClient;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.feign.privilege.Privilege;
 import com.yeejoin.amos.feign.privilege.client.DepartmentClient;
+import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.amos.feign.privilege.model.CompanyModel;
 import com.yeejoin.amos.feign.privilege.model.DepartmentModel;
 import com.yeejoin.amos.feign.privilege.util.DesUtil;
@@ -26,6 +27,7 @@ import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * 人员基本信息服务实现类
@@ -87,21 +89,19 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto,PersonBas
 
         //新增平台账号
         //组装数据
-        UserDto usd=new UserDto();
+        AgencyUserModel usd=new AgencyUserModel();
         //应用
         usd.setAppCodes(personAccount.getApplication());
-        //公司
-        usd.setCompanySeqs(personUser.getProjectId().toString());
-        //部门
-        usd.setDeptSeqs(personUser.getDepartmentId()!=null?personUser.getDepartmentId().toString():null);
         //手机号
         usd.setMobile(personUser.getPhone());
         //角色
-        Map<String,List<String>> map=new HashMap<>();
+        Map<Long,List<Long>> map=new HashMap<>();
+        List<Long> cdids = personAccount.getRoles().stream().map(s -> Long.parseLong(s.trim())).collect(Collectors.toList()); //测点数组
         if(personUser.getDepartmentId()!=null){
-            map.put(personUser.getDepartmentId().toString(),personAccount.getRoles());
+
+            map.put(personUser.getDepartmentId(),cdids);
         }else{
-            map.put(personUser.getProjectId().toString(),personAccount.getRoles());
+            map.put(personUser.getProjectId(),cdids);
         }
         usd.setOrgRoleSeqs(map);
         //密码
@@ -110,29 +110,34 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto,PersonBas
         usd.setRePassword(DesUtil.encode(personAccount.getSecondaryPassword(), "qaz"));
         //用户名
         usd.setRealName(personUser.getName());
-        //角色
-        usd.setRoleSeqs(personAccount.getRoles());
         //账号
         usd.setUserName(personAccount.getAccountName());
-        LinkedHashMap<String, Object> user= this.setcreateUser( usd,  appKey,  product,  token);
-
-        //orgcode
-
-        //公司名称
-
-        //部门名称
-
-        //平台USERID
-
-
+        usd.setLockStatus("UNLOCK");
+        //新增平台用户
+        AgencyUserModel agencyUserModel=this.setcreateUser(usd);
+        //查询部门
+        DepartmentModel departmentModel=null;
+        if(personUser.getDepartmentId()!=null){
+            departmentModel= this.getdepartmentModel(personUser.getDepartmentId());
+        }
+        CompanyModel companyModel=new CompanyModel();
+        //单位
+        companyModel=this.getCompanyModel(personUser.getProjectId());
         //人员基础信息
         PersonBasic personBasic = new PersonBasic();
         BeanUtils.copyProperties(personUser,personBasic);
+        if(departmentModel!=null){
+            personBasic.setOrgCode(departmentModel.getOrgCode());
+        }else{
+            personBasic.setOrgCode(companyModel.getOrgCode());
+        }
         this.baseMapper.insert(personBasic);
         //人员归属信息
         PersonAscription personAscription = new PersonAscription();
         BeanUtils.copyProperties(personUser,personAscription);
         personAscription.setPersonId(personBasic.getSequenceNbr());
+        personAscription.setDepartmentName(departmentModel.getDepartmentName());
+        personAscription.setProjectName(companyModel.getCompanyName());
         personAscriptionService.save(personAscription);
         //人员归属信息
         PersonSkillEducation personSkillEducation = new PersonSkillEducation();
@@ -144,6 +149,7 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto,PersonBas
         personCertificateService.save(personCertificate);
         //人员账号信息
         personAccount.setPersonId(personBasic.getSequenceNbr());
+        personAccount.setUserId(agencyUserModel.getUserId());
         personAccountService.save(personAccount);
     }
 
@@ -226,14 +232,14 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto,PersonBas
     }
 
     //新增平台用户
-    private    LinkedHashMap<String, Object> setcreateUser(UserDto userDto, String appKey, String product, String token) {
-        ResponseModel<Object> amosUser = privilegeFeignClient.create(appKey, product, token, userDto);
+    private    AgencyUserModel setcreateUser(AgencyUserModel userDto) {
+        FeignClientResult<AgencyUserModel>  amosUser=Privilege.agencyUserClient.create(userDto);
 
-        LinkedHashMap<String, Object> user=new LinkedHashMap<>();
+        AgencyUserModel user=new AgencyUserModel();
 
         if (!ObjectUtils.isEmpty(amosUser)) {
             if(amosUser.getStatus()==200){
-                user = (LinkedHashMap<String, Object>) amosUser.getResult();
+                user =  amosUser.getResult();
             }else{
                 throw new RuntimeException();
             }
@@ -242,13 +248,13 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto,PersonBas
     }
 
     //修改平台用户
-    private LinkedHashMap<String, Object> update(String userId, UserDto userDto, String appKey, String product, String token) {
-        ResponseModel<Object> amosUser =privilegeFeignClient.update(userId, appKey, product, token, userDto);
-        LinkedHashMap<String, Object> user=new LinkedHashMap<>();
+    private AgencyUserModel update(String userId, AgencyUserModel userDto) {
+        FeignClientResult<AgencyUserModel>  amosUser=Privilege.agencyUserClient.update(userDto,userId);
+        AgencyUserModel user=new AgencyUserModel();
 
         if (!ObjectUtils.isEmpty(amosUser)) {
             if(amosUser.getStatus()==200){
-                user = (LinkedHashMap<String, Object>) amosUser.getResult();
+                user = amosUser.getResult();
             }else{
                 throw new RuntimeException();
             }
@@ -256,6 +262,33 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto,PersonBas
         return user;
     }
 
+    private DepartmentModel getdepartmentModel(Long departmentId) {
+        FeignClientResult<DepartmentModel>   de=Privilege.departmentClient.seleteOne(departmentId);
+
+        DepartmentModel departmentModel=new DepartmentModel();
+
+        if (!ObjectUtils.isEmpty(de)) {
+            if(de.getStatus()==200){
+                departmentModel = de.getResult();
+            }else{
+                throw new RuntimeException();
+            }
+        }
+        return departmentModel;
+    }
+    private CompanyModel getCompanyModel(Long projectId) {
+        FeignClientResult<CompanyModel> cResult = Privilege.companyClient.seleteOne(projectId);
+        CompanyModel companyModel=new CompanyModel();
+
+        if (!ObjectUtils.isEmpty(cResult)) {
+            if(cResult.getStatus()==200){
+                companyModel = cResult.getResult();
+            }else{
+                throw new RuntimeException();
+            }
+        }
+        return companyModel;
+    }
 
 
     /**