java110 лет назад: 3
Родитель
Сommit
aa4dde8649

Разница между файлами не показана из-за своего большого размера
+ 4 - 4
java110-db/src/main/resources/mapper/store/ResourceStoreV1ServiceDaoImplMapper.xml


+ 4 - 3
java110-interface/src/main/java/com/java110/intf/store/IResourceStoreV1InnerServiceSMO.java

@@ -27,7 +27,7 @@ import java.util.List;
 
 /**
  * 类表述: 服务之前调用的接口类,不对外提供接口能力 只用于接口建调用
- * add by 吴学文 at 2022-03-28 16:23:49 mail: 928255095@qq.com
+ * add by 吴学文 at 2022-06-30 12:03:19 mail: 928255095@qq.com
  * open source address: https://gitee.com/wuxw7/MicroCommunity
  * 官网:http://www.homecommunity.cn
  * 温馨提示:如果您对此文件进行修改 请不要删除原有作者及注释信息,请补充您的 修改的原因以及联系邮箱如下
@@ -42,14 +42,15 @@ public interface IResourceStoreV1InnerServiceSMO {
     public int saveResourceStore(@RequestBody ResourceStorePo resourceResourceStorePo);
 
     @RequestMapping(value = "/updateResourceStore", method = RequestMethod.POST)
-    public int updateResourceStore(@RequestBody ResourceStorePo resourceResourceStorePo);
+    public int updateResourceStore(@RequestBody  ResourceStorePo resourceResourceStorePo);
 
     @RequestMapping(value = "/deleteResourceStore", method = RequestMethod.POST)
-    public int deleteResourceStore(@RequestBody ResourceStorePo resourceResourceStorePo);
+    public int deleteResourceStore(@RequestBody  ResourceStorePo resourceResourceStorePo);
 
     /**
      * <p>查询小区楼信息</p>
      *
+     *
      * @param resourceResourceStoreDto 数据对象分享
      * @return ResourceStoreDto 对象数据
      */

+ 0 - 63
service-api/src/main/java/com/java110/api/listener/resourceStore/SaveResourceStoreListener.java

@@ -1,63 +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("saveResourceStoreListener")
-public class SaveResourceStoreListener extends AbstractServiceApiPlusListener {
-
-    @Autowired
-    private IResourceStoreBMO resourceStoreBMOImpl;
-
-    @Override
-    protected void validate(ServiceDataFlowEvent event, JSONObject reqJson) {
-        //Assert.hasKeyAndValue(reqJson, "xxx", "xxx");
-        Assert.hasKeyAndValue(reqJson, "resName", "必填,请填写物品名称");
-        Assert.hasKeyAndValue(reqJson, "storeId", "必填,请填写商户信息");
-        Assert.hasKeyAndValue(reqJson, "price", "必填,请填写物品价格");
-        Assert.hasKeyAndValue(reqJson, "shId", "必填,请填写仓库");
-    }
-
-    @Override
-    protected void doSoService(ServiceDataFlowEvent event, DataFlowContext context, JSONObject reqJson) {
-        //获取最低收费标准
-        double outLowPrice = Double.parseDouble(reqJson.getString("outLowPrice"));
-        //获取最高收费标准
-        double outHighPrice = Double.parseDouble(reqJson.getString("outHighPrice"));
-        if (outLowPrice > outHighPrice) {
-            throw new IllegalArgumentException("最低收费标准不能大于最高收费标准!");
-        }
-        if (reqJson.containsKey("rsId") && !reqJson.getString("rsId").equals("")) {
-            reqJson.put("rstId", reqJson.getString("rsId"));
-        }
-        resourceStoreBMOImpl.addResourceStore(reqJson, context);
-    }
-
-    @Override
-    public String getServiceCode() {
-        return ServiceCodeResourceStoreConstant.ADD_RESOURCESTORE;
-    }
-
-    @Override
-    public HttpMethod getHttpMethod() {
-        return HttpMethod.POST;
-    }
-
-    @Override
-    public int getOrder() {
-        return DEFAULT_ORDER;
-    }
-
-}

+ 143 - 0
service-store/src/main/java/com/java110/store/cmd/resourceStore/SaveResourceStoreCmd.java

@@ -0,0 +1,143 @@
+/*
+ * Copyright 2017-2020 吴学文 and java110 team.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.java110.store.cmd.resourceStore;
+
+import com.alibaba.fastjson.JSONObject;
+import com.java110.core.annotation.Java110Cmd;
+import com.java110.core.annotation.Java110Transactional;
+import com.java110.core.context.ICmdDataFlowContext;
+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;
+import com.java110.po.file.FileRelPo;
+import com.java110.po.purchase.ResourceStorePo;
+import com.java110.utils.exception.CmdException;
+import com.java110.utils.util.Assert;
+import com.java110.utils.util.BeanConvertUtil;
+import com.java110.vo.ResultVo;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 类表述:保存
+ * 服务编码:resourceStore.saveResourceStore
+ * 请求路劲:/app/resourceStore.SaveResourceStore
+ * add by 吴学文 at 2022-06-30 12:03:19 mail: 928255095@qq.com
+ * open source address: https://gitee.com/wuxw7/MicroCommunity
+ * 官网:http://www.homecommunity.cn
+ * 温馨提示:如果您对此文件进行修改 请不要删除原有作者及注释信息,请补充您的 修改的原因以及联系邮箱如下
+ * // modify by 张三 at 2021-09-12 第10行在某种场景下存在某种bug 需要修复,注释10至20行 加入 20行至30行
+ */
+@Java110Cmd(serviceCode = "resourceStore.saveResourceStore")
+public class SaveResourceStoreCmd extends Cmd {
+
+    private static Logger logger = LoggerFactory.getLogger(SaveResourceStoreCmd.class);
+
+    public static final String CODE_PREFIX_ID = "10";
+
+    @Autowired
+    private IResourceStoreV1InnerServiceSMO resourceStoreV1InnerServiceSMOImpl;
+
+    @Autowired
+    private IResourceStoreInnerServiceSMO resourceStoreInnerServiceSMOImpl;
+
+    @Autowired
+    private IFileRelInnerServiceSMO fileRelInnerServiceSMOImpl;
+
+    @Autowired
+    private IFileInnerServiceSMO fileInnerServiceSMOImpl;
+
+    @Override
+    public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
+        //Assert.hasKeyAndValue(reqJson, "xxx", "xxx");
+        Assert.hasKeyAndValue(reqJson, "resName", "必填,请填写物品名称");
+        Assert.hasKeyAndValue(reqJson, "storeId", "必填,请填写商户信息");
+        Assert.hasKeyAndValue(reqJson, "price", "必填,请填写物品价格");
+        Assert.hasKeyAndValue(reqJson, "shId", "必填,请填写仓库");
+
+        //获取最低收费标准
+        double outLowPrice = Double.parseDouble(reqJson.getString("outLowPrice"));
+        //获取最高收费标准
+        double outHighPrice = Double.parseDouble(reqJson.getString("outHighPrice"));
+        if (outLowPrice > outHighPrice) {
+            throw new IllegalArgumentException("最低收费标准不能大于最高收费标准!");
+        }
+
+    }
+
+    @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));
+        businessResourceStore.put("stock", "0");
+        businessResourceStore.put("miniStock", "0");
+        businessResourceStore.put("createTime", new Date());
+        ResourceStorePo resourceStorePo = BeanConvertUtil.covertBean(businessResourceStore, ResourceStorePo.class);
+        int flag = resourceStoreV1InnerServiceSMOImpl.saveResourceStore(resourceStorePo);
+        if (flag < 1) {
+            throw new CmdException("保存数据失败");
+        }
+        //将图片插入文件表里
+        FileRelPo fileRelPo = new FileRelPo();
+        fileRelPo.setObjId(resourceStorePo.getResId());
+        //table表示表存储 ftp表示ftp文件存储
+        fileRelPo.setSaveWay("ftp");
+        fileRelPo.setCreateTime(new Date());
+        //图片
+        List<String> photos = resourceStorePo.getPhotos();
+        if (photos != null && photos.size() > 0) {
+            //22000表示物品图片
+            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);
+                flag = fileRelInnerServiceSMOImpl.saveFileRel(fileRelPo);
+                if (flag < 1) {
+                    throw new CmdException("保存数据失败");
+                }
+            }
+        }
+        cmdDataFlowContext.setResponseEntity(ResultVo.success());
+    }
+}

+ 9 - 9
service-store/src/main/java/com/java110/store/dao/IResourceStoreV1ServiceDao.java

@@ -28,7 +28,7 @@ import java.util.Map;
 
 /**
  * 类表述:
- * add by 吴学文 at 2022-03-28 16:23:49 mail: 928255095@qq.com
+ * add by 吴学文 at 2022-06-30 12:03:19 mail: 928255095@qq.com
  * open source address: https://gitee.com/wuxw7/MicroCommunity
  * 官网:http://www.homecommunity.cn
  * 温馨提示:如果您对此文件进行修改 请不要删除原有作者及注释信息,请补充您的 修改的原因以及联系邮箱如下
@@ -38,7 +38,7 @@ public interface IResourceStoreV1ServiceDao {
 
 
     /**
-     * 保存 物品信息
+     * 保存 物品信息信息
      * @param info
      * @throws DAOException DAO异常
      */
@@ -48,10 +48,10 @@ public interface IResourceStoreV1ServiceDao {
 
 
     /**
-     * 查询物品信息(instance过程)
-     * 根据bId 查询物品信息
+     * 查询物品信息信息(instance过程)
+     * 根据bId 查询物品信息信息
      * @param info bId 信息
-     * @return 物品信息
+     * @return 物品信息信息
      * @throws DAOException DAO异常
      */
     List<Map> getResourceStoreInfo(Map info) throws DAOException;
@@ -59,7 +59,7 @@ public interface IResourceStoreV1ServiceDao {
 
 
     /**
-     * 修改物品信息
+     * 修改物品信息信息
      * @param info 修改信息
      * @throws DAOException DAO异常
      */
@@ -67,10 +67,10 @@ public interface IResourceStoreV1ServiceDao {
 
 
     /**
-     * 查询物品总数
+     * 查询物品信息总数
      *
-     * @param info 物品信息
-     * @return 物品数量
+     * @param info 物品信息信息
+     * @return 物品信息数量
      */
     int queryResourceStoresCount(Map info);
 

+ 7 - 7
service-store/src/main/java/com/java110/store/dao/impl/ResourceStoreV1ServiceDaoImpl.java

@@ -31,7 +31,7 @@ import java.util.Map;
 
 /**
  * 类表述:
- * add by 吴学文 at 2022-03-28 16:23:49 mail: 928255095@qq.com
+ * add by 吴学文 at 2022-06-30 12:03:19 mail: 928255095@qq.com
  * open source address: https://gitee.com/wuxw7/MicroCommunity
  * 官网:http://www.homecommunity.cn
  * 温馨提示:如果您对此文件进行修改 请不要删除原有作者及注释信息,请补充您的 修改的原因以及联系邮箱如下
@@ -47,7 +47,7 @@ public class ResourceStoreV1ServiceDaoImpl extends BaseServiceDao implements IRe
 
 
     /**
-     * 保存物品信息 到 instance
+     * 保存物品信息信息 到 instance
      * @param info   bId 信息
      * @throws DAOException DAO异常
      */
@@ -62,7 +62,7 @@ public class ResourceStoreV1ServiceDaoImpl extends BaseServiceDao implements IRe
 
 
     /**
-     * 查询物品信息(instance)
+     * 查询物品信息信息(instance)
      * @param info bId 信息
      * @return List<Map>
      * @throws DAOException DAO异常
@@ -78,7 +78,7 @@ public class ResourceStoreV1ServiceDaoImpl extends BaseServiceDao implements IRe
 
 
     /**
-     * 修改物品信息
+     * 修改物品信息信息
      * @param info 修改信息
      * @throws DAOException DAO异常
      */
@@ -92,9 +92,9 @@ public class ResourceStoreV1ServiceDaoImpl extends BaseServiceDao implements IRe
     }
 
      /**
-     * 查询物品数量
-     * @param info 物品信息
-     * @return 物品数量
+     * 查询物品信息数量
+     * @param info 物品信息信息
+     * @return 物品信息数量
      */
     @Override
     public int queryResourceStoresCount(Map info) {

+ 15 - 14
service-store/src/main/java/com/java110/store/smo/impl/ResourceStoreV1InnerServiceSMOImpl.java

@@ -16,22 +16,24 @@
 package com.java110.store.smo.impl;
 
 
-import com.java110.core.base.smo.BaseServiceSMO;
-import com.java110.dto.PageDto;
 import com.java110.dto.resourceStore.ResourceStoreDto;
-import com.java110.intf.store.IResourceStoreV1InnerServiceSMO;
 import com.java110.po.purchase.ResourceStorePo;
 import com.java110.store.dao.IResourceStoreV1ServiceDao;
+import com.java110.intf.store.IResourceStoreV1InnerServiceSMO;
 import com.java110.utils.util.BeanConvertUtil;
+import com.java110.core.base.smo.BaseServiceSMO;
+import com.java110.dto.user.UserDto;
+import com.java110.dto.PageDto;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
  * 类表述: 服务之前调用的接口实现类,不对外提供接口能力 只用于接口建调用
- * add by 吴学文 at 2022-03-28 16:23:49 mail: 928255095@qq.com
+ * add by 吴学文 at 2022-06-30 12:03:19 mail: 928255095@qq.com
  * open source address: https://gitee.com/wuxw7/MicroCommunity
  * 官网:http://www.homecommunity.cn
  * 温馨提示:如果您对此文件进行修改 请不要删除原有作者及注释信息,请补充您的 修改的原因以及联系邮箱如下
@@ -50,21 +52,21 @@ public class ResourceStoreV1InnerServiceSMOImpl extends BaseServiceSMO implement
         return saveFlag;
     }
 
-    @Override
-    public int updateResourceStore(@RequestBody ResourceStorePo resourceResourceStorePo) {
+     @Override
+    public int updateResourceStore(@RequestBody  ResourceStorePo resourceResourceStorePo) {
         int saveFlag = resourceResourceStoreV1ServiceDaoImpl.updateResourceStoreInfo(BeanConvertUtil.beanCovertMap(resourceResourceStorePo));
         return saveFlag;
     }
 
-    @Override
-    public int deleteResourceStore(@RequestBody ResourceStorePo resourceResourceStorePo) {
-        resourceResourceStorePo.setStatusCd("1");
-        int saveFlag = resourceResourceStoreV1ServiceDaoImpl.updateResourceStoreInfo(BeanConvertUtil.beanCovertMap(resourceResourceStorePo));
-        return saveFlag;
+     @Override
+    public int deleteResourceStore(@RequestBody  ResourceStorePo resourceResourceStorePo) {
+       resourceResourceStorePo.setStatusCd("1");
+       int saveFlag = resourceResourceStoreV1ServiceDaoImpl.updateResourceStoreInfo(BeanConvertUtil.beanCovertMap(resourceResourceStorePo));
+       return saveFlag;
     }
 
     @Override
-    public List<ResourceStoreDto> queryResourceStores(@RequestBody ResourceStoreDto resourceResourceStoreDto) {
+    public List<ResourceStoreDto> queryResourceStores(@RequestBody  ResourceStoreDto resourceResourceStoreDto) {
 
         //校验是否传了 分页信息
 
@@ -82,7 +84,6 @@ public class ResourceStoreV1InnerServiceSMOImpl extends BaseServiceSMO implement
 
     @Override
     public int queryResourceStoresCount(@RequestBody ResourceStoreDto resourceResourceStoreDto) {
-        return resourceResourceStoreV1ServiceDaoImpl.queryResourceStoresCount(BeanConvertUtil.beanCovertMap(resourceResourceStoreDto));
-    }
+        return resourceResourceStoreV1ServiceDaoImpl.queryResourceStoresCount(BeanConvertUtil.beanCovertMap(resourceResourceStoreDto));    }
 
 }