From 0077c3409b8d5919b82840a498a7ebf60c6f3fbc Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期三, 05 二月 2025 13:56:28 +0800
Subject: [PATCH] 优化代码
---
service-user/src/main/java/com/java110/user/cmd/user/UserStaffModifyCmd.java | 194 ++++++++++++++++++++++++++++++++++++++----------
1 files changed, 154 insertions(+), 40 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 e0a5d72..801a39c 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,37 +3,79 @@
import com.alibaba.fastjson.JSONObject;
import com.java110.core.annotation.Java110Cmd;
import com.java110.core.annotation.Java110Transactional;
-import com.java110.core.context.DataFlowContext;
+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;
import com.java110.core.factory.GenerateCodeFactory;
+import com.java110.doc.annotation.*;
import com.java110.dto.file.FileDto;
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;
import java.util.List;
+
+@Java110CmdDoc(title = "淇敼鍛樺伐",
+ description = "澶栭儴绯荤粺閫氳繃淇敼鍛樺伐鎺ュ彛 淇敼鍛樺伐锛屾敞鎰忛渶瑕佺墿涓氱鐞嗗憳璐﹀彿鐧诲綍锛屽洜涓轰笉闇�瑕佷紶storeId 鏄牴鎹鐞嗗憳鐧诲綍淇℃伅鑾峰彇鐨�",
+ httpMethod = "post",
+ url = "http://{ip}:{port}/app/user.staff.modify",
+ resource = "userDoc",
+ author = "鍚村鏂�",
+ serviceCode = "user.staff.modify",
+ seq = 4
+)
+
+@Java110ParamsDoc(params = {
+ @Java110ParamDoc(name = "userId", length = 30, remark = "鍛樺伐ID"),
+ @Java110ParamDoc(name = "orgId", length = 30, remark = "缁勭粐ID"),
+ @Java110ParamDoc(name = "orgName", length = 64, remark = "缁勭粐鍚嶇О"),
+ @Java110ParamDoc(name = "name", length = 64, remark = "鍚嶇О"),
+ @Java110ParamDoc(name = "sex", length = 64, remark = "鎬у埆 0濂� 1鐢�"),
+ @Java110ParamDoc(name = "email", length = 64, remark = "閭"),
+ @Java110ParamDoc(name = "tel", length = 11, remark = "鎵嬫満鍙�"),
+ @Java110ParamDoc(name = "address", length = 64, remark = "鍦板潃"),
+ @Java110ParamDoc(name = "relCd", length = 64, remark = "宀椾綅,鏅�氬憳宸� 1000 閮ㄩ棬缁忕悊 2000 閮ㄩ棬鍓粡鐞� 3000 閮ㄩ棬缁勯暱 4000 鍒嗗叕鍙告�荤粡鐞� 5000 鍒嗗叕鍙稿壇鎬荤粡鐞� 6000 鎬荤粡鐞嗗姪鐞� 7000 鎬诲叕鍙告�荤粡鐞� 8000 鎬诲叕鍙稿壇鎬荤粡鐞� 9000"),
+})
+
+@Java110ResponseDoc(
+ params = {
+ @Java110ParamDoc(name = "code", type = "int", length = 11, defaultValue = "0", remark = "杩斿洖缂栧彿锛�0 鎴愬姛 鍏朵粬澶辫触"),
+ @Java110ParamDoc(name = "msg", type = "String", length = 250, defaultValue = "鎴愬姛", remark = "鎻忚堪"),
+ }
+)
+
+@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':'鎴愬姛'"
+)
+
@Java110Cmd(serviceCode = "user.staff.modify")
public class UserStaffModifyCmd extends Cmd {
+
@Autowired
private IFileInnerServiceSMO fileInnerServiceSMOImpl;
@@ -53,7 +95,10 @@
private IOrgStaffRelV1InnerServiceSMO orgStaffRelV1InnerServiceSMOImpl;
@Autowired
- private IStoreUserV1InnerServiceSMO storeUserV1InnerServiceSMOImpl;
+ private IStoreUserV1InnerServiceSMO storeUserV1InnerServiceSMOImpl;
+
+ @Autowired
+ private IUserAttrV1InnerServiceSMO userAttrV1InnerServiceSMOImpl;
@Override
public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
@@ -61,32 +106,58 @@
//鏍￠獙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); //鍛樺伐
+ 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
@Java110Transactional
public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
if (reqJson.containsKey("photo") && !StringUtils.isEmpty(reqJson.getString("photo"))) {
- FileDto fileDto = new FileDto();
- fileDto.setFileId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_file_id));
- fileDto.setFileName(fileDto.getFileId());
- fileDto.setContext(reqJson.getString("photo"));
- fileDto.setSuffix("jpeg");
- fileDto.setCommunityId(reqJson.getString("communityId"));
- String fileName = fileInnerServiceSMOImpl.saveFile(fileDto);
+
+ if (reqJson.getString("photo").length() > 200) {
+ FileDto fileDto = new FileDto();
+ fileDto.setFileId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_file_id));
+ fileDto.setFileName(fileDto.getFileId());
+ fileDto.setContext(reqJson.getString("photo"));
+ fileDto.setSuffix("jpeg");
+ fileDto.setCommunityId(reqJson.getString("communityId"));
+ String fileName = fileInnerServiceSMOImpl.saveFile(fileDto);
+
+ 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", "-1");
+ businessUnit.put("fileRelId", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_relId));
businessUnit.put("relTypeCd", "12000");
businessUnit.put("saveWay", "table");
businessUnit.put("objId", reqJson.getString("userId"));
- businessUnit.put("fileRealName", fileDto.getFileId());
- businessUnit.put("fileSaveName", fileName);
+ businessUnit.put("fileRealName", reqJson.getString("photo"));
+ businessUnit.put("fileSaveName", reqJson.getString("photo"));
FileRelPo fileRelPo = BeanConvertUtil.covertBean(businessUnit, FileRelPo.class);
int flag = fileRelInnerServiceSMOImpl.saveFileRel(fileRelPo);
if (flag < 1) {
@@ -95,8 +166,8 @@
} else {
JSONObject businessUnit = new JSONObject();
businessUnit.putAll(BeanConvertUtil.beanCovertMap(fileRelDtos.get(0)));
- businessUnit.put("fileRealName", fileDto.getFileId());
- businessUnit.put("fileSaveName", fileName);
+ businessUnit.put("fileRealName", reqJson.getString("photo"));
+ businessUnit.put("fileSaveName", reqJson.getString("photo"));
FileRelPo fileRelPo = BeanConvertUtil.covertBean(businessUnit, FileRelPo.class);
int flag = fileRelInnerServiceSMOImpl.updateFileRel(fileRelPo);
if (flag < 1) {
@@ -110,33 +181,53 @@
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");
- 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", "涓嶆槸鏈夋晥鐨勯偖绠辨牸寮�");
}
int flag = userV1InnerServiceSMOImpl.updateUser(userPo);
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);
@@ -144,21 +235,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