From 334fabfc24a0e8a24b4f7a9034349fd1f070956c Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 01 十一月 2022 23:28:15 +0800
Subject: [PATCH] 优化班次功能
---
service-store/src/main/java/com/java110/store/cmd/resourceStore/SaveResourceStoreCmd.java | 33 ++++++++++++---------------------
1 files changed, 12 insertions(+), 21 deletions(-)
diff --git a/service-store/src/main/java/com/java110/store/cmd/resourceStore/SaveResourceStoreCmd.java b/service-store/src/main/java/com/java110/store/cmd/resourceStore/SaveResourceStoreCmd.java
index 4babea0..2975c60 100644
--- a/service-store/src/main/java/com/java110/store/cmd/resourceStore/SaveResourceStoreCmd.java
+++ b/service-store/src/main/java/com/java110/store/cmd/resourceStore/SaveResourceStoreCmd.java
@@ -22,9 +22,7 @@
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;
import com.java110.dto.resourceStore.ResourceStoreDto;
-import com.java110.intf.common.IFileInnerServiceSMO;
import com.java110.intf.common.IFileRelInnerServiceSMO;
import com.java110.intf.store.IResourceStoreInnerServiceSMO;
import com.java110.intf.store.IResourceStoreV1InnerServiceSMO;
@@ -67,9 +65,6 @@
@Autowired
private IFileRelInnerServiceSMO fileRelInnerServiceSMOImpl;
- @Autowired
- private IFileInnerServiceSMO fileInnerServiceSMOImpl;
-
@Override
public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
//Assert.hasKeyAndValue(reqJson, "xxx", "xxx");
@@ -86,19 +81,21 @@
throw new IllegalArgumentException("鏈�浣庢敹璐规爣鍑嗕笉鑳藉ぇ浜庢渶楂樻敹璐规爣鍑嗭紒");
}
+ String resCode = reqJson.getString("resCode");
+ String storeId = cmdDataFlowContext.getReqHeaders().get("store-id");
+ //鏍规嵁鐗╁搧缂栫爜鏌ヨ鐗╁搧璧勬簮琛�
+ ResourceStoreDto resourceStoreDto = new ResourceStoreDto();
+ resourceStoreDto.setResCode(resCode);
+ resourceStoreDto.setStoreId(storeId);
+ List<ResourceStoreDto> resourceStoreDtos = resourceStoreInnerServiceSMOImpl.queryResourceStores(resourceStoreDto);
+ //鍒ゆ柇璧勬簮琛ㄩ噷鏄惁鏈夎鐗╁搧缂栫爜锛岄伩鍏嶇墿鍝佺紪鐮侀噸澶�
+ Assert.listIsNull(resourceStoreDtos, "鐗╁搧缂栫爜閲嶅锛岃閲嶆柊娣诲姞锛�");
+
}
@Override
@Java110Transactional
public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
-
- String resCode = reqJson.getString("resCode");
- //鏍规嵁鐗╁搧缂栫爜鏌ヨ鐗╁搧璧勬簮琛�
- ResourceStoreDto resourceStoreDto = new ResourceStoreDto();
- resourceStoreDto.setResCode(resCode);
- List<ResourceStoreDto> resourceStoreDtos = resourceStoreInnerServiceSMOImpl.queryResourceStores(resourceStoreDto);
- //鍒ゆ柇璧勬簮琛ㄩ噷鏄惁鏈夎鐗╁搧缂栫爜锛岄伩鍏嶇墿鍝佺紪鐮侀噸澶�
- Assert.listIsNull(resourceStoreDtos, "鐗╁搧缂栫爜閲嶅锛岃閲嶆柊娣诲姞锛�");
JSONObject businessResourceStore = new JSONObject();
businessResourceStore.putAll(reqJson);
businessResourceStore.put("resId", GenerateCodeFactory.getResId(GenerateCodeFactory.CODE_PREFIX_resId));
@@ -126,14 +123,8 @@
fileRelPo.setRelTypeCd("22000");
for (String photo : photos) {
fileRelPo.setFileRelId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_relId));
- FileDto fileDto = new FileDto();
- fileDto.setCommunityId("-1");
- fileDto.setContext(photo);
- fileDto.setFileId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_file_id));
- fileDto.setFileName(fileDto.getFileId());
- String fileName = fileInnerServiceSMOImpl.saveFile(fileDto);
- fileRelPo.setFileRealName(fileName);
- fileRelPo.setFileSaveName(fileName);
+ fileRelPo.setFileRealName(photo);
+ fileRelPo.setFileSaveName(photo);
flag = fileRelInnerServiceSMOImpl.saveFileRel(fileRelPo);
if (flag < 1) {
throw new CmdException("淇濆瓨鏁版嵁澶辫触");
--
Gitblit v1.8.0