From b88a288f4f787b509463678e3cd9ccfa3f37014b Mon Sep 17 00:00:00 2001
From: chengf <cgf12138@163.com>
Date: 星期三, 11 三月 2026 12:01:05 +0800
Subject: [PATCH] 导入测试
---
service-user/src/main/java/com/java110/user/cmd/user/UserStaffModifyCmd.java | 134 ++++++++++++++++++++++++++++++++++----------
1 files changed, 102 insertions(+), 32 deletions(-)
diff --git a/service-user/src/main/java/com/java110/user/cmd/user/UserStaffModifyCmd.java b/service-user/src/main/java/com/java110/user/cmd/user/UserStaffModifyCmd.java
index 02e2e54..35fc599 100644
--- a/service-user/src/main/java/com/java110/user/cmd/user/UserStaffModifyCmd.java
+++ b/service-user/src/main/java/com/java110/user/cmd/user/UserStaffModifyCmd.java
@@ -3,6 +3,7 @@
import com.alibaba.fastjson.JSONObject;
import com.java110.core.annotation.Java110Cmd;
import com.java110.core.annotation.Java110Transactional;
+import com.java110.core.context.CmdContextUtils;
import com.java110.core.context.ICmdDataFlowContext;
import com.java110.core.event.cmd.Cmd;
import com.java110.core.event.cmd.CmdEvent;
@@ -12,21 +13,25 @@
import com.java110.dto.file.FileRelDto;
import com.java110.dto.org.OrgStaffRelDto;
import com.java110.dto.store.StoreUserDto;
+import com.java110.dto.user.UserAttrDto;
import com.java110.dto.user.UserDto;
import com.java110.intf.common.IFileInnerServiceSMO;
import com.java110.intf.common.IFileRelInnerServiceSMO;
import com.java110.intf.store.IOrgStaffRelV1InnerServiceSMO;
import com.java110.intf.store.IStoreUserV1InnerServiceSMO;
import com.java110.intf.user.IOrgStaffRelInnerServiceSMO;
+import com.java110.intf.user.IUserAttrV1InnerServiceSMO;
import com.java110.intf.user.IUserInnerServiceSMO;
import com.java110.intf.user.IUserV1InnerServiceSMO;
import com.java110.po.file.FileRelPo;
import com.java110.po.org.OrgStaffRelPo;
import com.java110.po.store.StoreUserPo;
+import com.java110.po.user.UserAttrPo;
import com.java110.po.user.UserPo;
import com.java110.utils.exception.CmdException;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
+import com.java110.utils.util.ListUtil;
import com.java110.utils.util.StringUtil;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -64,8 +69,8 @@
)
@Java110ExampleDoc(
- reqBody="{\"userId\":\"123123\",\"orgId\":\"102022091988250052\",\"orgName\":\"婕旂ず鐗╀笟 / 浠堕儴\",\"username\":\"寮犱笁\",\"sex\":\"0\",\"email\":\"231@qq.com\",\"tel\":\"123\",\"address\":\"123\",\"relCd\":\"1000\",\"photo\":\"\",\"name\":\"寮犱笁\"}",
- resBody="{'code':0,'msg':'鎴愬姛'"
+ reqBody = "{\"userId\":\"123123\",\"orgId\":\"102022091988250052\",\"orgName\":\"婕旂ず鐗╀笟 / 浠堕儴\",\"username\":\"寮犱笁\",\"sex\":\"0\",\"email\":\"231@qq.com\",\"tel\":\"123\",\"address\":\"123\",\"relCd\":\"1000\",\"photo\":\"\",\"name\":\"寮犱笁\"}",
+ resBody = "{'code':0,'msg':'鎴愬姛'"
)
@Java110Cmd(serviceCode = "user.staff.modify")
@@ -92,12 +97,38 @@
@Autowired
private IStoreUserV1InnerServiceSMO storeUserV1InnerServiceSMOImpl;
+ @Autowired
+ private IUserAttrV1InnerServiceSMO userAttrV1InnerServiceSMOImpl;
+
@Override
public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
Assert.jsonObjectHaveKey(reqJson, "staffId", "璇锋眰鍙傛暟涓湭鍖呭惈鍛樺伐 鑺傜偣锛岃纭");
//鏍￠獙json 鏍煎紡涓槸鍚﹀寘鍚� name,email,levelCd,tel
Assert.jsonObjectHaveKey(reqJson, "name", "璇锋眰鍙傛暟涓湭鍖呭惈name 鑺傜偣锛岃纭");
Assert.jsonObjectHaveKey(reqJson, "tel", "璇锋眰鍙傛暟涓湭鍖呭惈tel 鑺傜偣锛岃纭");
+ StoreUserDto storeUserDto = new StoreUserDto();
+ storeUserDto.setUserId(reqJson.getString("staffId"));
+ storeUserDto.setStoreId(CmdContextUtils.getStoreId(context));
+ List<StoreUserDto> storeUserDtos = storeUserV1InnerServiceSMOImpl.queryStoreUsers(storeUserDto);
+
+ if (ListUtil.isNull(storeUserDtos)) {
+ throw new CmdException("淇敼鍛樺伐涓嶆槸璐靛叕鍙稿憳宸�");
+ }
+
+ UserDto userDto = new UserDto();
+ userDto.setTel(reqJson.getString("tel"));
+ userDto.setUserFlag("1");
+ userDto.setLevelCd(UserDto.LEVEL_CD_STAFF); //鍛樺伐
+ //涓�涓猻tore涓嬮潰鍙厑璁镐竴涓墜鏈哄彿鍒涘缓
+ userDto.setStoreId(CmdContextUtils.getStoreId(context));
+ List<UserDto> users = userInnerServiceSMOImpl.getUsers(userDto);
+ if (!ListUtil.isNull(users)) {
+ for (UserDto user : users) {
+ if (!user.getUserId().equals(reqJson.getString("staffId"))) {
+ throw new IllegalArgumentException("鍛樺伐鎵嬫満鍙蜂笉鑳介噸澶嶏紝璇烽噸鏂拌緭鍏�");
+ }
+ }
+ }
}
@Override
@@ -105,7 +136,7 @@
public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
if (reqJson.containsKey("photo") && !StringUtils.isEmpty(reqJson.getString("photo"))) {
- if(reqJson.getString("photo").length()> 200){
+ if (reqJson.getString("photo").length() > 200) {
FileDto fileDto = new FileDto();
fileDto.setFileId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_file_id));
fileDto.setFileName(fileDto.getFileId());
@@ -114,14 +145,14 @@
fileDto.setCommunityId(reqJson.getString("communityId"));
String fileName = fileInnerServiceSMOImpl.saveFile(fileDto);
- reqJson.put("photo",fileName);
+ reqJson.put("photo", fileName);
}
FileRelDto fileRelDto = new FileRelDto();
fileRelDto.setRelTypeCd("12000");
fileRelDto.setObjId(reqJson.getString("userId"));
List<FileRelDto> fileRelDtos = fileRelInnerServiceSMOImpl.queryFileRels(fileRelDto);
- if (fileRelDtos == null || fileRelDtos.size() == 0) {
+ if (ListUtil.isNull(fileRelDtos)) {
JSONObject businessUnit = new JSONObject();
businessUnit.put("fileRelId", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_relId));
businessUnit.put("relTypeCd", "12000");
@@ -152,19 +183,9 @@
private void modifyStaff(JSONObject paramObj) {
UserPo userPo = BeanConvertUtil.covertBean(paramObj, UserPo.class);
+ userPo.setUserId(paramObj.getString("staffId"));
//鏍规嵁鎵嬫満鍙锋煡璇㈢敤鎴�
- UserDto userDto = new UserDto();
- userDto.setTel(userPo.getTel());
- userDto.setUserFlag("1");
- userDto.setLevelCd("01"); //鍛樺伐
- List<UserDto> users = userInnerServiceSMOImpl.getUsers(userDto);
- if (users != null && users.size() > 0) {
- for (UserDto user : users) {
- if (!user.getUserId().equals(userPo.getUserId())) {
- throw new IllegalArgumentException("鍛樺伐鎵嬫満鍙蜂笉鑳介噸澶嶏紝璇烽噸鏂拌緭鍏�");
- }
- }
- }
+
if (paramObj.containsKey("email") && !StringUtil.isEmpty(paramObj.getString("email"))) {
Assert.isEmail(paramObj, "email", "涓嶆槸鏈夋晥鐨勯偖绠辨牸寮�");
}
@@ -173,16 +194,42 @@
if (flag < 1) {
throw new CmdException("淇濆瓨鐢ㄦ埛寮傚父");
}
- OrgStaffRelDto orgStaffRelDto = new OrgStaffRelDto();
- orgStaffRelDto.setStaffId(userPo.getUserId());
- List<OrgStaffRelDto> orgStaffRelDtoList = orgStaffRelInnerServiceSMOImpl.queryOrgInfoByStaffIds(orgStaffRelDto);
+ UserDto userDto = new UserDto();
+ userDto.setUserId(userPo.getUserId());
+ List<UserDto> users = userInnerServiceSMOImpl.getUsers(userDto);
+ //todo 淇敼韬唤璇�
+ updateStaffIdCard(users.get(0), paramObj);
- if (orgStaffRelDtoList == null || orgStaffRelDtoList.size() < 1) {
+ StoreUserDto storeUserDto = new StoreUserDto();
+ storeUserDto.setUserId(userPo.getUserId());
+ List<StoreUserDto> storeUserDtos = storeUserV1InnerServiceSMOImpl.queryStoreUsers(storeUserDto);
+
+ if (ListUtil.isNull(storeUserDtos)) {
return;
}
+
+ StoreUserPo storeUserPo = new StoreUserPo();
+ storeUserPo.setRelCd(paramObj.getString("relCd"));
+ storeUserPo.setStoreUserId(storeUserDtos.get(0).getStoreUserId());
+ storeUserPo.setUserId(userPo.getUserId());
+
+ flag = storeUserV1InnerServiceSMOImpl.updateStoreUser(storeUserPo);
+ if (flag < 1) {
+ throw new CmdException("淇濆瓨鍛樺伐 澶辫触");
+ }
+
+ OrgStaffRelDto orgStaffRelDto = new OrgStaffRelDto();
+ orgStaffRelDto.setStaffId(userPo.getUserId());
+ List<OrgStaffRelDto> orgStaffRelDtos = orgStaffRelInnerServiceSMOImpl.queryOrgInfoByStaffIds(orgStaffRelDto);
+
+ if (ListUtil.isNull(orgStaffRelDtos)) {
+ return;
+ }
+
+
OrgStaffRelPo orgStaffRelPo = new OrgStaffRelPo();
orgStaffRelPo.setRelCd(paramObj.getString("relCd"));
- orgStaffRelPo.setRelId(orgStaffRelDtoList.get(0).getRelId());
+ orgStaffRelPo.setRelId(orgStaffRelDtos.get(0).getRelId());
orgStaffRelPo.setOrgId(paramObj.getString("orgId"));
flag = orgStaffRelV1InnerServiceSMOImpl.updateOrgStaffRel(orgStaffRelPo);
@@ -190,21 +237,44 @@
throw new CmdException("淇濆瓨鍛樺伐 澶辫触");
}
- StoreUserDto storeUserDto = new StoreUserDto();
- storeUserDto.setUserId(userPo.getUserId());
- List<StoreUserDto> storeUserDtos = storeUserV1InnerServiceSMOImpl.queryStoreUsers(storeUserDto);
+ }
- if (storeUserDtos == null || storeUserDtos.size() < 1) {
+ /**
+ * 淇敼鍛樺伐韬唤璇佸彿
+ *
+ * @param userDto
+ * @param paramObj
+ */
+ private void updateStaffIdCard(UserDto userDto, JSONObject paramObj) {
+
+ if (!paramObj.containsKey("idCard")) {
return;
}
- StoreUserPo storeUserPo = new StoreUserPo();
- storeUserPo.setRelCd(paramObj.getString("relCd"));
- storeUserPo.setStoreUserId(storeUserDtos.get(0).getStoreUserId());
- flag = storeUserV1InnerServiceSMOImpl.updateStoreUser(storeUserPo);
- if (flag < 1) {
- throw new CmdException("淇濆瓨鍛樺伐 澶辫触");
+ UserAttrDto userAttrDto = new UserAttrDto();
+ userAttrDto.setUserId(userDto.getUserId());
+ userAttrDto.setSpecCd(UserAttrDto.SPEC_ID_CARD);
+ List<UserAttrDto> userAttrDtos = userAttrV1InnerServiceSMOImpl.queryUserAttrs(userAttrDto);
+
+ if (!ListUtil.isNull(userAttrDtos)) {
+ UserAttrPo userAttrPo = new UserAttrPo();
+ userAttrPo.setAttrId(userAttrDtos.get(0).getAttrId());
+ userAttrV1InnerServiceSMOImpl.deleteUserAttr(userAttrPo);
}
+
+
+ String idCard = paramObj.getString("idCard");
+ if (StringUtil.isEmpty(idCard)) {
+ return;
+ }
+
+ UserAttrPo userAttrPo = new UserAttrPo();
+ userAttrPo.setAttrId(GenerateCodeFactory.getAttrId());
+ userAttrPo.setSpecCd(UserAttrDto.SPEC_ID_CARD);
+ userAttrPo.setUserId(userDto.getUserId());
+ userAttrPo.setValue(idCard);
+
+ userAttrV1InnerServiceSMOImpl.saveUserAttr(userAttrPo);
}
--
Gitblit v1.8.0