优化代码

service-api/src/main/java/com/java110/api/components/resourceStore/DeleteResourceStoreComponent.java

@@ -1,7 +1,7 @@
 package com.java110.api.components.resourceStore;
 
-import com.java110.core.context.IPageData;
 import com.java110.api.smo.resourceStore.IDeleteResourceStoreSMO;
+import com.java110.core.context.IPageData;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;
@@ -12,23 +12,24 @@ import org.springframework.stereotype.Component;
 @Component("deleteResourceStore")
 public class DeleteResourceStoreComponent {
 
-@Autowired
-private IDeleteResourceStoreSMO deleteResourceStoreSMOImpl;
+    @Autowired
+    private IDeleteResourceStoreSMO deleteResourceStoreSMOImpl;
 
-/**
- * 添加物品管理数据
- * @param pd 页面数据封装
- * @return ResponseEntity 对象
- */
-public ResponseEntity<String> delete(IPageData pd){
+    /**
+     * 添加物品管理数据
+     *
+     * @param pd 页面数据封装
+     * @return ResponseEntity 对象
+     */
+    public ResponseEntity<String> delete(IPageData pd) {
         return deleteResourceStoreSMOImpl.deleteResourceStore(pd);
     }
 
-public IDeleteResourceStoreSMO getDeleteResourceStoreSMOImpl() {
+    public IDeleteResourceStoreSMO getDeleteResourceStoreSMOImpl() {
         return deleteResourceStoreSMOImpl;
     }
 
-public void setDeleteResourceStoreSMOImpl(IDeleteResourceStoreSMO deleteResourceStoreSMOImpl) {
+    public void setDeleteResourceStoreSMOImpl(IDeleteResourceStoreSMO deleteResourceStoreSMOImpl) {
         this.deleteResourceStoreSMOImpl = deleteResourceStoreSMOImpl;
     }
-            }
+}

service-api/src/main/java/com/java110/api/listener/resourceStore/DeleteResourceStoreListener.java

@@ -1,47 +0,0 @@
-package com.java110.api.listener.resourceStore;
-
-import com.alibaba.fastjson.JSONObject;
-import com.java110.api.bmo.resourceStore.IResourceStoreBMO;
-import com.java110.api.listener.AbstractServiceApiPlusListener;
-import com.java110.core.annotation.Java110Listener;
-import com.java110.core.context.DataFlowContext;
-import com.java110.core.event.service.api.ServiceDataFlowEvent;
-import com.java110.utils.constant.ServiceCodeResourceStoreConstant;
-import com.java110.utils.util.Assert;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpMethod;
-
-/**
- * 保存小区侦听
- * add by wuxw 2019-06-30
- */
-@Java110Listener("deleteResourceStoreListener")
-public class DeleteResourceStoreListener extends AbstractServiceApiPlusListener {
-
-    @Autowired
-    private IResourceStoreBMO resourceStoreBMOImpl;
-
-    @Override
-    protected void validate(ServiceDataFlowEvent event, JSONObject reqJson) {
-        //Assert.hasKeyAndValue(reqJson, "xxx", "xxx");
-        Assert.hasKeyAndValue(reqJson, "resId", "物品ID不能为空");
-        Assert.hasKeyAndValue(reqJson, "storeId", "商户信息不能为空");
-    }
-
-    @Override
-    protected void doSoService(ServiceDataFlowEvent event, DataFlowContext context, JSONObject reqJson) {
-        resourceStoreBMOImpl.deleteResourceStore(reqJson, context);
-    }
-
-    @Override
-    public String getServiceCode() {
-        return ServiceCodeResourceStoreConstant.DELETE_RESOURCESTORE;
-    }
-
-    @Override
-    public HttpMethod getHttpMethod() {
-        return HttpMethod.POST;
-    }
-
-
-}

service-store/src/main/java/com/java110/store/cmd/resourceStore/DeleteResourceStoreCmd.java

@@ -0,0 +1,91 @@
+package com.java110.store.cmd.resourceStore;
+
+import com.alibaba.fastjson.JSONObject;
+import com.java110.core.annotation.Java110Cmd;
+import com.java110.core.context.ICmdDataFlowContext;
+import com.java110.core.event.cmd.Cmd;
+import com.java110.core.event.cmd.CmdEvent;
+import com.java110.dto.allocationStorehouse.AllocationStorehouseDto;
+import com.java110.dto.file.FileRelDto;
+import com.java110.dto.purchaseApplyDetail.PurchaseApplyDetailDto;
+import com.java110.intf.common.IFileInnerServiceSMO;
+import com.java110.intf.common.IFileRelInnerServiceSMO;
+import com.java110.intf.store.IAllocationStorehouseInnerServiceSMO;
+import com.java110.intf.store.IPurchaseApplyDetailInnerServiceSMO;
+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;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.util.List;
+
+@Java110Cmd(serviceCode = "resourceStore.deleteResourceStore")
+public class DeleteResourceStoreCmd extends Cmd {
+
+    @Autowired
+    private IResourceStoreInnerServiceSMO resourceStoreInnerServiceSMOImpl;
+
+    @Autowired
+    private IFileRelInnerServiceSMO fileRelInnerServiceSMOImpl;
+
+    @Autowired
+    private IFileInnerServiceSMO fileInnerServiceSMOImpl;
+
+    @Autowired
+    private IPurchaseApplyDetailInnerServiceSMO purchaseApplyDetailInnerServiceSMOImpl;
+
+    @Autowired
+    private IAllocationStorehouseInnerServiceSMO allocationStorehouseInnerServiceSMOImpl;
+
+
+    @Autowired
+    private IResourceStoreV1InnerServiceSMO resourceStoreV1InnerServiceSMOImpl;
+
+    @Override
+    public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
+        Assert.hasKeyAndValue(reqJson, "resId", "物品ID不能为空");
+        Assert.hasKeyAndValue(reqJson, "storeId", "商户信息不能为空");
+        //根据物品id查询采购明细表
+        String resId = reqJson.getString("resId");
+        PurchaseApplyDetailDto purchaseApplyDetailDto = new PurchaseApplyDetailDto();
+        purchaseApplyDetailDto.setResId(resId);
+        List<PurchaseApplyDetailDto> purchaseApplyDetailDtos = purchaseApplyDetailInnerServiceSMOImpl.queryPurchaseApplyDetails(purchaseApplyDetailDto);
+        Assert.listIsNull(purchaseApplyDetailDtos, "该物品存在采购或领用记录，不能删除！");
+        //根据物品id查询调拨记录
+        AllocationStorehouseDto allocationStorehouseDto = new AllocationStorehouseDto();
+        allocationStorehouseDto.setResId(resId);
+        List<AllocationStorehouseDto> allocationStorehouseDtos = allocationStorehouseInnerServiceSMOImpl.queryAllocationStorehouses(allocationStorehouseDto);
+        Assert.listIsNull(allocationStorehouseDtos, "该物品存在调拨记录，不能删除！");
+    }
+
+    @Override
+    public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
+        String resId = reqJson.getString("resId");
+        reqJson.put("statusCd", "1");
+        ResourceStorePo resourceStorePo = BeanConvertUtil.covertBean(reqJson, ResourceStorePo.class);
+
+        int flag = resourceStoreV1InnerServiceSMOImpl.deleteResourceStore(resourceStorePo);
+        if (flag < 1) {
+            throw new CmdException("保存数据失败");
+        }
+        FileRelDto fileRelDto = new FileRelDto();
+        fileRelDto.setObjId(resId);
+        List<FileRelDto> fileRelDtos = fileRelInnerServiceSMOImpl.queryFileRels(fileRelDto);
+        if (fileRelDtos != null && fileRelDtos.size() > 0) {
+            //删除文件表图片
+            for (FileRelDto fileRel : fileRelDtos) {
+                FileRelPo fileRelpo = new FileRelPo();
+                fileRelpo.setFileRelId(fileRel.getFileRelId());
+                flag = fileRelInnerServiceSMOImpl.deleteFileRel(fileRelpo);
+                if (flag < 1) {
+                    throw new CmdException("保存数据失败");
+                }
+            }
+        }
+    }
+}