From 18d1f4bc4f4f77c8883702a00896dd99469db648 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期五, 25 八月 2023 16:06:37 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

---
 service-store/src/main/java/com/java110/store/cmd/resourceStore/UpdateResourceStoreCmd.java |   34 ++++++----------------------------
 1 files changed, 6 insertions(+), 28 deletions(-)

diff --git a/service-store/src/main/java/com/java110/store/cmd/resourceStore/UpdateResourceStoreCmd.java b/service-store/src/main/java/com/java110/store/cmd/resourceStore/UpdateResourceStoreCmd.java
index f90c26a..0e5fcf9 100644
--- a/service-store/src/main/java/com/java110/store/cmd/resourceStore/UpdateResourceStoreCmd.java
+++ b/service-store/src/main/java/com/java110/store/cmd/resourceStore/UpdateResourceStoreCmd.java
@@ -6,16 +6,13 @@
 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.file.FileRelDto;
-import com.java110.dto.resourceStore.ResourceStoreDto;
-import com.java110.intf.common.IFileInnerServiceSMO;
+import com.java110.dto.resource.ResourceStoreDto;
 import com.java110.intf.common.IFileRelInnerServiceSMO;
 import com.java110.intf.store.IResourceStoreInnerServiceSMO;
 import com.java110.intf.store.IResourceStoreV1InnerServiceSMO;
 import com.java110.po.file.FileRelPo;
 import com.java110.po.purchase.ResourceStorePo;
-import com.java110.utils.constant.BusinessTypeConstant;
 import com.java110.utils.exception.CmdException;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
@@ -24,10 +21,8 @@
 import java.util.Date;
 import java.util.List;
 
-
 @Java110Cmd(serviceCode = "resourceStore.updateResourceStore")
 public class UpdateResourceStoreCmd extends Cmd {
-
 
     @Autowired
     private IResourceStoreInnerServiceSMO resourceStoreInnerServiceSMOImpl;
@@ -37,10 +32,6 @@
 
     @Autowired
     private IFileRelInnerServiceSMO fileRelInnerServiceSMOImpl;
-
-    @Autowired
-    private IFileInnerServiceSMO fileInnerServiceSMOImpl;
-
 
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
@@ -104,15 +95,8 @@
                 fileRel.setRelTypeCd("22000");
                 for (String photo : photos) {
                     fileRel.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);
-                    fileRel.setFileRealName(fileName);
-                    fileRel.setFileSaveName(fileName);
-                    /*fileRelInnerServiceSMOImpl.saveFileRel(fileRel);*/
+                    fileRel.setFileRealName(photo);
+                    fileRel.setFileSaveName(photo);
                     flag = fileRelInnerServiceSMOImpl.saveFileRel(fileRel);
                     if (flag < 1) {
                         throw new CmdException("淇濆瓨鏁版嵁澶辫触");
@@ -129,14 +113,8 @@
             fileRel.setRelTypeCd("22000");
             for (String photo : photos) {
                 fileRel.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);
-                fileRel.setFileRealName(fileName);
-                fileRel.setFileSaveName(fileName);
+                fileRel.setFileRealName(photo);
+                fileRel.setFileSaveName(photo);
                 flag = fileRelInnerServiceSMOImpl.saveFileRel(fileRel);
                 if (flag < 1) {
                     throw new CmdException("淇濆瓨鏁版嵁澶辫触");
@@ -144,4 +122,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

--
Gitblit v1.8.0