From 5fc2fc57afc63a906ec5567e91aeab72d20aab7d Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期一, 16 一月 2023 23:17:50 +0800
Subject: [PATCH] 优化代码
---
service-common/src/main/java/com/java110/common/cmd/itemRelease/SaveItemReleaseCmd.java | 141 ++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 139 insertions(+), 2 deletions(-)
diff --git a/service-common/src/main/java/com/java110/common/cmd/itemRelease/SaveItemReleaseCmd.java b/service-common/src/main/java/com/java110/common/cmd/itemRelease/SaveItemReleaseCmd.java
index 9c3e98f..679baab 100644
--- a/service-common/src/main/java/com/java110/common/cmd/itemRelease/SaveItemReleaseCmd.java
+++ b/service-common/src/main/java/com/java110/common/cmd/itemRelease/SaveItemReleaseCmd.java
@@ -15,6 +15,7 @@
*/
package com.java110.common.cmd.itemRelease;
+import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.java110.core.annotation.Java110Cmd;
import com.java110.core.annotation.Java110Transactional;
@@ -23,15 +24,29 @@
import com.java110.core.event.cmd.CmdEvent;
import com.java110.core.factory.GenerateCodeFactory;
import com.java110.doc.annotation.*;
+import com.java110.dto.itemRelease.ItemReleaseDto;
+import com.java110.dto.itemReleaseType.ItemReleaseTypeDto;
+import com.java110.dto.oaWorkflow.OaWorkflowDto;
+import com.java110.dto.user.UserDto;
+import com.java110.intf.common.IItemReleaseResV1InnerServiceSMO;
+import com.java110.intf.common.IItemReleaseTypeV1InnerServiceSMO;
import com.java110.intf.common.IItemReleaseV1InnerServiceSMO;
+import com.java110.intf.common.IOaWorkflowActivitiInnerServiceSMO;
+import com.java110.intf.oa.IOaWorkflowInnerServiceSMO;
+import com.java110.intf.user.IUserInnerServiceSMO;
import com.java110.po.itemRelease.ItemReleasePo;
+import com.java110.po.itemReleaseRes.ItemReleaseResPo;
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 java.util.ArrayList;
+import java.util.List;
@Java110CmdDoc(title = "鐢宠鐗╁搧鏀捐",
description = "鐢宠鐗╁搧鏀捐",
@@ -61,7 +76,29 @@
)
@Java110ExampleDoc(
- reqBody="{'typeId':'123','communityId':'123','applyCompany':'123','applyPerson':'123','idCard':'123','applyTel':'123','passTime':'123','amount':'123'}",
+ reqBody="{\n" +
+ "\t\"irId\": \"\",\n" +
+ "\t\"typeId\": \"102023011264340006\",\n" +
+ "\t\"applyCompany\": \"123123\",\n" +
+ "\t\"applyPerson\": \"12312\",\n" +
+ "\t\"idCard\": \"12312\",\n" +
+ "\t\"applyTel\": \"18909711443\",\n" +
+ "\t\"passTime\": \"2023-01-13 11:55:00\",\n" +
+ "\t\"resNames\": [{\n" +
+ "\t\t\"resName\": \"123\",\n" +
+ "\t\t\"amount\": \"123\"\n" +
+ "\t}],\n" +
+ "\t\"state\": \"\",\n" +
+ "\t\"carNum\": \"123123\",\n" +
+ "\t\"remark\": \"123\",\n" +
+ "\t\"audit\": {\n" +
+ "\t\t\"assignee\": \"-2\",\n" +
+ "\t\t\"staffId\": \"\",\n" +
+ "\t\t\"staffName\": \"\",\n" +
+ "\t\t\"taskId\": \"\"\n" +
+ "\t},\n" +
+ "\t\"communityId\": \"2022120695590004\"\n" +
+ "}",
resBody="{'code':0,'msg':'鎴愬姛'}"
)
/**
@@ -84,6 +121,22 @@
@Autowired
private IItemReleaseV1InnerServiceSMO itemReleaseV1InnerServiceSMOImpl;
+ @Autowired
+ private IItemReleaseResV1InnerServiceSMO itemReleaseResV1InnerServiceSMOImpl;
+
+ @Autowired
+ private IItemReleaseTypeV1InnerServiceSMO itemReleaseTypeV1InnerServiceSMOImpl;
+
+ @Autowired
+ private IOaWorkflowInnerServiceSMO oaWorkflowInnerServiceSMOImpl;
+
+ @Autowired
+ private IUserInnerServiceSMO userInnerServiceSMOImpl;
+
+ @Autowired
+ private IOaWorkflowActivitiInnerServiceSMO oaWorkflowUserInnerServiceSMOImpl;
+
+
@Override
public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
Assert.hasKeyAndValue(reqJson, "typeId", "璇锋眰鎶ユ枃涓湭鍖呭惈typeId");
@@ -92,22 +145,106 @@
Assert.hasKeyAndValue(reqJson, "idCard", "璇锋眰鎶ユ枃涓湭鍖呭惈idCard");
Assert.hasKeyAndValue(reqJson, "applyTel", "璇锋眰鎶ユ枃涓湭鍖呭惈applyTel");
Assert.hasKeyAndValue(reqJson, "passTime", "璇锋眰鎶ユ枃涓湭鍖呭惈passTime");
- Assert.hasKeyAndValue(reqJson, "amount", "璇锋眰鎶ユ枃涓湭鍖呭惈amount");
Assert.hasKeyAndValue(reqJson, "communityId", "璇锋眰鎶ユ枃涓湭鍖呭惈communityId");
+
+ //鏍￠獙鐗╁搧鏄惁瀛樺湪
+ if(!reqJson.containsKey("resNames")){
+ throw new CmdException("鏈寘鍚墿鍝�");
+ }
+
+ JSONArray resNames = reqJson.getJSONArray("resNames");
+ if(resNames == null || resNames.size() < 1){
+ throw new CmdException("鏈寘鍚墿鍝�");
+ }
}
@Override
@Java110Transactional
public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
+ String userId = cmdDataFlowContext.getReqHeaders().get("user-id");
+
+ ItemReleaseTypeDto itemReleaseTypeDto = new ItemReleaseTypeDto();
+ itemReleaseTypeDto.setTypeId(reqJson.getString("typeId"));
+ itemReleaseTypeDto.setCommunityId(reqJson.getString("communityId"));
+ List<ItemReleaseTypeDto> itemReleaseTypeDtos = itemReleaseTypeV1InnerServiceSMOImpl.queryItemReleaseTypes(itemReleaseTypeDto);
+ Assert.listOnlyOne(itemReleaseTypeDtos,"鏈寘鍚斁琛岀被鍨�");
+
+ OaWorkflowDto oaWorkflowDto = new OaWorkflowDto();
+ oaWorkflowDto.setStoreId(itemReleaseTypeDtos.get(0).getStoreId());
+ oaWorkflowDto.setFlowId(itemReleaseTypeDtos.get(0).getFlowId());
+ List<OaWorkflowDto> oaWorkflowDtos = oaWorkflowInnerServiceSMOImpl.queryOaWorkflows(oaWorkflowDto);
+ Assert.listOnlyOne(oaWorkflowDtos, "娴佺▼涓嶅瓨鍦�");
+ if (!OaWorkflowDto.STATE_COMPLAINT.equals(oaWorkflowDtos.get(0).getState())) {
+ throw new IllegalArgumentException(oaWorkflowDtos.get(0).getFlowName() + "娴佺▼鏈儴缃�");
+ }
+
+ if (StringUtil.isEmpty(oaWorkflowDtos.get(0).getProcessDefinitionKey())) {
+ throw new IllegalArgumentException(oaWorkflowDtos.get(0).getFlowName() + "娴佺▼鏈儴缃�");
+ }
+
+ //鏌ヨ鐢ㄦ埛鍚嶇О
+ UserDto userDto = new UserDto();
+ userDto.setUserId(userId);
+ List<UserDto> userDtos = userInnerServiceSMOImpl.getUsers(userDto);
+ Assert.listOnlyOne(userDtos, "鐢ㄦ埛涓嶅瓨鍦�");
+
+
ItemReleasePo itemReleasePo = BeanConvertUtil.covertBean(reqJson, ItemReleasePo.class);
itemReleasePo.setIrId(GenerateCodeFactory.getGeneratorId(CODE_PREFIX_ID));
+ itemReleasePo.setState(ItemReleaseDto.STATE_WAIT);
+ itemReleasePo.setCreateUserId(userId);
int flag = itemReleaseV1InnerServiceSMOImpl.saveItemRelease(itemReleasePo);
if (flag < 1) {
throw new CmdException("淇濆瓨鏁版嵁澶辫触");
}
+ JSONArray resNames = reqJson.getJSONArray("resNames");
+ JSONObject resNameObj = null;
+ ItemReleaseResPo itemReleaseResPo = null;
+ List<ItemReleaseResPo> itemReleaseResPos = new ArrayList<>();
+ for(int resNameIndex = 0; resNameIndex< resNames.size(); resNameIndex++){
+ resNameObj = resNames.getJSONObject(resNameIndex);
+ itemReleaseResPo = new ItemReleaseResPo();
+ itemReleaseResPo.setAmount(resNameObj.getString("amount"));
+ itemReleaseResPo.setResName(resNameObj.getString("resName"));
+ itemReleaseResPo.setResId(GenerateCodeFactory.getGeneratorId(CODE_PREFIX_ID));
+ itemReleaseResPo.setIrId(itemReleasePo.getIrId());
+ itemReleaseResPo.setCommunityId(itemReleasePo.getCommunityId());
+ itemReleaseResPos.add(itemReleaseResPo);
+ }
+
+ flag = itemReleaseResV1InnerServiceSMOImpl.saveItemReleaseReses(itemReleaseResPos);
+
+ if (flag < 1) {
+ throw new CmdException("淇濆瓨鏁版嵁澶辫触");
+ }
+
+ //鍚姩浠诲姟
+ JSONObject flowJson = new JSONObject();
+ flowJson.put("processDefinitionKey", oaWorkflowDtos.get(0).getProcessDefinitionKey());
+ flowJson.put("createUserId",userId);
+ flowJson.put("flowId",oaWorkflowDtos.get(0).getFlowId());
+ flowJson.put("id",itemReleasePo.getIrId());
+ flowJson.put("auditMessage","鎻愪氦瀹℃牳");
+ flowJson.put("storeId",itemReleaseTypeDtos.get(0).getStoreId());
+ reqJson.put("processDefinitionKey", oaWorkflowDtos.get(0).getProcessDefinitionKey());
+ JSONObject result = oaWorkflowUserInnerServiceSMOImpl.startProcess(flowJson);
+
+ //鎻愪氦鑰呮彁浜�
+ flowJson = new JSONObject();
+ flowJson.put("processInstanceId",result.getString("processInstanceId"));
+ flowJson.put("createUserId",userId);
+ flowJson.put("nextUserId",reqJson.getJSONObject("audit").getString("staffId"));
+ flowJson.put("storeId",itemReleaseTypeDtos.get(0).getStoreId());
+ flowJson.put("id",itemReleasePo.getIrId());
+ flowJson.put("flowId",oaWorkflowDtos.get(0).getFlowId());
+
+
+ oaWorkflowUserInnerServiceSMOImpl.autoFinishFirstTask(flowJson);
+
+
cmdDataFlowContext.setResponseEntity(ResultVo.success());
}
}
--
Gitblit v1.8.0