From 21a1e9048def7ef0a74cf4efeba596e62d0a06eb Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 13 七月 2023 17:15:12 +0800
Subject: [PATCH] 优化代码
---
service-user/src/main/java/com/java110/user/cmd/notepad/SaveNotepadCmd.java | 48 +++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 41 insertions(+), 7 deletions(-)
diff --git a/service-user/src/main/java/com/java110/user/cmd/notepad/SaveNotepadCmd.java b/service-user/src/main/java/com/java110/user/cmd/notepad/SaveNotepadCmd.java
index 9a0f6a2..c0dfbd2 100644
--- a/service-user/src/main/java/com/java110/user/cmd/notepad/SaveNotepadCmd.java
+++ b/service-user/src/main/java/com/java110/user/cmd/notepad/SaveNotepadCmd.java
@@ -22,15 +22,21 @@
import com.java110.core.event.cmd.Cmd;
import com.java110.core.event.cmd.CmdEvent;
import com.java110.core.factory.GenerateCodeFactory;
+import com.java110.dto.notepad.NotepadDto;
+import com.java110.dto.user.UserDto;
import com.java110.intf.user.INotepadV1InnerServiceSMO;
+import com.java110.intf.user.IUserInnerServiceSMO;
import com.java110.po.notepad.NotepadPo;
import com.java110.utils.exception.CmdException;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
+import com.java110.utils.util.StringUtil;
import com.java110.vo.ResultVo;
-import org.springframework.beans.factory.annotation.Autowired;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.util.List;
/**
* 绫昏〃杩帮細淇濆瓨
@@ -52,25 +58,53 @@
@Autowired
private INotepadV1InnerServiceSMO notepadV1InnerServiceSMOImpl;
+ @Autowired
+ private IUserInnerServiceSMO userInnerServiceSMOImpl;
+
@Override
public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
Assert.hasKeyAndValue(reqJson, "noteType", "璇锋眰鎶ユ枃涓湭鍖呭惈noteType");
Assert.hasKeyAndValue(reqJson, "title", "璇锋眰鎶ユ枃涓湭鍖呭惈title");
Assert.hasKeyAndValue(reqJson, "objType", "璇锋眰鎶ユ枃涓湭鍖呭惈objType");
- Assert.hasKeyAndValue(reqJson, "objId", "璇锋眰鎶ユ枃涓湭鍖呭惈objId");
- Assert.hasKeyAndValue(reqJson, "objName", "璇锋眰鎶ユ枃涓湭鍖呭惈objName");
- Assert.hasKeyAndValue(reqJson, "createUserId", "璇锋眰鎶ユ枃涓湭鍖呭惈createUserId");
- Assert.hasKeyAndValue(reqJson, "createUserName", "璇锋眰鎶ユ枃涓湭鍖呭惈createUserName");
- Assert.hasKeyAndValue(reqJson, "state", "璇锋眰鎶ユ枃涓湭鍖呭惈state");
-
}
@Override
@Java110Transactional
public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
+ String userId = cmdDataFlowContext.getReqHeaders().get("user-id");
+ UserDto userDto = new UserDto();
+ userDto.setUserId(userId);
+ userDto.setPage(1);
+ userDto.setRow(1);
+ List<UserDto> userDtos = userInnerServiceSMOImpl.getUsers(userDto);
+ Assert.listOnlyOne(userDtos, "鐢ㄦ埛涓嶅瓨鍦�");
+
+ reqJson.put("createUserId", userDtos.get(0).getUserId());
+ reqJson.put("createUserName", userDtos.get(0).getName());
+
+ if (!StringUtil.jsonHasKayAndValue(reqJson, "roomId")) {
+ reqJson.put("roomId", "-1");
+ }
+ if (!StringUtil.jsonHasKayAndValue(reqJson, "roomName")) {
+ reqJson.put("roomId", "鏃�");
+ }
+
+ if (!StringUtil.jsonHasKayAndValue(reqJson, "objId")) {
+ reqJson.put("objId", "-1");
+ }
+
+ if (!StringUtil.jsonHasKayAndValue(reqJson, "objName")) {
+ reqJson.put("objName", "鏃�");
+ }
+
+ if (!StringUtil.jsonHasKayAndValue(reqJson, "objType")) {
+ reqJson.put("objType", "3309");
+ }
+
NotepadPo notepadPo = BeanConvertUtil.covertBean(reqJson, NotepadPo.class);
notepadPo.setNoteId(GenerateCodeFactory.getGeneratorId(CODE_PREFIX_ID));
+ notepadPo.setState(NotepadDto.STATE_DOING);
int flag = notepadV1InnerServiceSMOImpl.saveNotepad(notepadPo);
if (flag < 1) {
--
Gitblit v1.8.0