From 402ae2d8a44cc3db14f8b8d88e93288de55adddb Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 01 十一月 2022 17:55:40 +0800
Subject: [PATCH] 优化 代码
---
service-user/src/main/java/com/java110/user/cmd/owner/EditOwnerCmd.java | 51 ++++++++++++++++++++++++++++-----------------------
1 files changed, 28 insertions(+), 23 deletions(-)
diff --git a/service-user/src/main/java/com/java110/user/cmd/owner/EditOwnerCmd.java b/service-user/src/main/java/com/java110/user/cmd/owner/EditOwnerCmd.java
index 3610822..765a6eb 100644
--- a/service-user/src/main/java/com/java110/user/cmd/owner/EditOwnerCmd.java
+++ b/service-user/src/main/java/com/java110/user/cmd/owner/EditOwnerCmd.java
@@ -5,7 +5,7 @@
import com.java110.core.annotation.Java110Cmd;
import com.java110.core.annotation.Java110Transactional;
import com.java110.core.context.ICmdDataFlowContext;
-import com.java110.core.event.cmd.AbstractServiceCmdListener;
+import com.java110.core.event.cmd.Cmd;
import com.java110.core.event.cmd.CmdEvent;
import com.java110.core.factory.GenerateCodeFactory;
import com.java110.dto.file.FileDto;
@@ -34,11 +34,7 @@
import java.util.List;
@Java110Cmd(serviceCode = "owner.editOwner")
-public class EditOwnerCmd extends AbstractServiceCmdListener {
-
-
- @Autowired
- private IFileInnerServiceSMO fileInnerServiceSMOImpl;
+public class EditOwnerCmd extends Cmd {
@Autowired
private IOwnerInnerServiceSMO ownerInnerServiceSMOImpl;
@@ -51,18 +47,21 @@
@Autowired
private IOwnerAppUserInnerServiceSMO ownerAppUserInnerServiceSMOImpl;
+
@Autowired
private IOwnerAppUserV1InnerServiceSMO ownerAppUserV1InnerServiceSMOImpl;
@Autowired
private IFileRelInnerServiceSMO fileRelInnerServiceSMOImpl;
+ @Autowired
+ private IFileInnerServiceSMO fileInnerServiceSMOImpl;
@Override
public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
Assert.jsonObjectHaveKey(reqJson, "memberId", "璇锋眰鎶ユ枃涓湭鍖呭惈ownerId");
Assert.jsonObjectHaveKey(reqJson, "name", "璇锋眰鎶ユ枃涓湭鍖呭惈name");
- Assert.jsonObjectHaveKey(reqJson, "age", "璇锋眰鎶ユ枃涓湭鍖呭惈age");
+// Assert.jsonObjectHaveKey(reqJson, "age", "璇锋眰鎶ユ枃涓湭鍖呭惈age");
Assert.jsonObjectHaveKey(reqJson, "link", "璇锋眰鎶ユ枃涓湭鍖呭惈link");
Assert.jsonObjectHaveKey(reqJson, "sex", "璇锋眰鎶ユ枃涓湭鍖呭惈sex");
Assert.jsonObjectHaveKey(reqJson, "ownerTypeCd", "璇锋眰鎶ユ枃涓湭鍖呭惈ownerTypeCd");
@@ -84,6 +83,7 @@
}
//鑾峰彇韬唤璇佸彿(鍒ゆ柇韬唤璇佸彿鏄惁閲嶅)
String idCard = reqJson.getString("idCard");
+
if (!StringUtil.isEmpty(idCard) && idCard.contains("*")) {
OwnerDto owner = new OwnerDto();
owner.setOwnerId(reqJson.getString("ownerId"));
@@ -97,8 +97,8 @@
String userValidate = MappingCache.getValue("USER_VALIDATE");
- if(!"ON".equals(userValidate)){
- return ;
+ if (!"ON".equals(userValidate)) {
+ return;
}
OwnerDto ownerDto = new OwnerDto();
@@ -143,15 +143,6 @@
// throw new IllegalArgumentException("鎵嬫満鍙疯緭鍏ヤ笉姝ｇ‘锛�");
// }
if (reqJson.containsKey("ownerPhoto") && !StringUtils.isEmpty(reqJson.getString("ownerPhoto"))) {
- FileDto fileDto = new FileDto();
- fileDto.setFileId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_file_id));
- fileDto.setFileName(fileDto.getFileId());
- fileDto.setContext(reqJson.getString("ownerPhoto"));
- fileDto.setSuffix("jpeg");
- fileDto.setCommunityId(reqJson.getString("communityId"));
- String fileName = fileInnerServiceSMOImpl.saveFile(fileDto);
- reqJson.put("ownerPhotoId", fileDto.getFileId());
- reqJson.put("fileSaveName", fileName);
editOwnerPhoto(reqJson);
}
editOwner(reqJson);
@@ -199,6 +190,9 @@
}
businessOwner.put("state", ownerDtos.get(0).getState());
OwnerPo ownerPo = BeanConvertUtil.covertBean(businessOwner, OwnerPo.class);
+ if (StringUtil.isEmpty(ownerPo.getIdCard())) {
+ ownerPo.setAge(null);
+ }
int flag = ownerV1InnerServiceSMOImpl.updateOwner(ownerPo);
if (flag < 1) {
throw new CmdException("淇敼涓氫富澶辫触");
@@ -223,6 +217,17 @@
public void editOwnerPhoto(JSONObject paramInJson) {
+ String _photo = paramInJson.getString("ownerPhoto");
+ if(_photo.length()> 512){
+ FileDto fileDto = new FileDto();
+ fileDto.setFileId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_file_id));
+ fileDto.setFileName(fileDto.getFileId());
+ fileDto.setContext(_photo);
+ fileDto.setSuffix("jpeg");
+ fileDto.setCommunityId(paramInJson.getString("communityId"));
+ _photo = fileInnerServiceSMOImpl.saveFile(fileDto);
+ }
+
FileRelDto fileRelDto = new FileRelDto();
fileRelDto.setRelTypeCd("10000");
fileRelDto.setObjId(paramInJson.getString("memberId"));
@@ -230,12 +235,12 @@
List<FileRelDto> fileRelDtos = fileRelInnerServiceSMOImpl.queryFileRels(fileRelDto);
if (fileRelDtos == null || fileRelDtos.size() == 0) {
JSONObject businessUnit = new JSONObject();
- businessUnit.put("fileRelId", "-1");
+ businessUnit.put("fileRelId", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_fileRelId));
businessUnit.put("relTypeCd", "10000");
businessUnit.put("saveWay", "table");
businessUnit.put("objId", paramInJson.getString("memberId"));
- businessUnit.put("fileRealName", paramInJson.getString("ownerPhotoId"));
- businessUnit.put("fileSaveName", paramInJson.getString("ownerPhotoId"));
+ businessUnit.put("fileRealName", _photo);
+ businessUnit.put("fileSaveName", _photo);
FileRelPo fileRelPo = BeanConvertUtil.covertBean(businessUnit, FileRelPo.class);
flag = fileRelInnerServiceSMOImpl.saveFileRel(fileRelPo);
if (flag < 1) {
@@ -246,8 +251,8 @@
JSONObject businessUnit = new JSONObject();
businessUnit.putAll(BeanConvertUtil.beanCovertMap(fileRelDtos.get(0)));
- businessUnit.put("fileRealName", paramInJson.getString("ownerPhotoId"));
- businessUnit.put("fileSaveName", paramInJson.getString("fileSaveName"));
+ businessUnit.put("fileRealName", _photo);
+ businessUnit.put("fileSaveName", _photo);
FileRelPo fileRelPo = BeanConvertUtil.covertBean(businessUnit, FileRelPo.class);
flag = fileRelInnerServiceSMOImpl.updateFileRel(fileRelPo);
if (flag < 1) {
--
Gitblit v1.8.0