From 793a80e25c218d2a1c7078b6aeda8e0032b89efd Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期日, 31 五月 2020 23:22:44 +0800
Subject: [PATCH] 优化 钥匙类型 错误问题

---
 Api/src/main/java/com/java110/api/bmo/junkRequirement/impl/JunkRequirementBMOImpl.java |   65 +++++++++++++++++++-------------
 1 files changed, 39 insertions(+), 26 deletions(-)

diff --git a/Api/src/main/java/com/java110/api/bmo/junkRequirement/impl/JunkRequirementBMOImpl.java b/Api/src/main/java/com/java110/api/bmo/junkRequirement/impl/JunkRequirementBMOImpl.java
index ebfb004..283b227 100644
--- a/Api/src/main/java/com/java110/api/bmo/junkRequirement/impl/JunkRequirementBMOImpl.java
+++ b/Api/src/main/java/com/java110/api/bmo/junkRequirement/impl/JunkRequirementBMOImpl.java
@@ -6,6 +6,8 @@
 import com.java110.core.context.DataFlowContext;
 import com.java110.core.smo.junkRequirement.IJunkRequirementInnerServiceSMO;
 import com.java110.dto.junkRequirement.JunkRequirementDto;
+import com.java110.po.file.FileRelPo;
+import com.java110.po.junkRequirement.JunkRequirementPo;
 import com.java110.utils.constant.BusinessTypeConstant;
 import com.java110.utils.constant.CommonConstant;
 import com.java110.utils.util.Assert;
@@ -29,19 +31,18 @@
      * @param dataFlowContext 鏁版嵁涓婁笅鏂�
      * @return 璁㈠崟鏈嶅姟鑳藉鎺ュ彈鐨勬姤鏂�
      */
-    public JSONObject addJunkRequirement(JSONObject paramInJson, DataFlowContext dataFlowContext) {
+    public void addJunkRequirement(JSONObject paramInJson, DataFlowContext dataFlowContext) {
 
 
-        JSONObject business = JSONObject.parseObject("{\"datas\":{}}");
-        business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_SAVE_JUNK_REQUIREMENT);
-        business.put(CommonConstant.HTTP_SEQ, DEFAULT_SEQ);
-        business.put(CommonConstant.HTTP_INVOKE_MODEL, CommonConstant.HTTP_INVOKE_MODEL_S);
         JSONObject businessJunkRequirement = new JSONObject();
         businessJunkRequirement.putAll(paramInJson);
-        businessJunkRequirement.put("junkRequirementId", "-1");
-        //璁$畻 搴旀敹閲戦
-        business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessJunkRequirement", businessJunkRequirement);
-        return business;
+        if (!paramInJson.containsKey("junkRequirementId")) {
+            businessJunkRequirement.put("junkRequirementId", "-1");
+        }
+        JunkRequirementPo junkRequirementPo = BeanConvertUtil.covertBean(businessJunkRequirement, JunkRequirementPo.class);
+
+        super.insert(dataFlowContext, junkRequirementPo, BusinessTypeConstant.BUSINESS_TYPE_SAVE_JUNK_REQUIREMENT);
+
     }
 
 
@@ -52,7 +53,7 @@
      * @param dataFlowContext 鏁版嵁涓婁笅鏂�
      * @return 璁㈠崟鏈嶅姟鑳藉鎺ュ彈鐨勬姤鏂�
      */
-    public JSONObject updateJunkRequirement(JSONObject paramInJson, DataFlowContext dataFlowContext) {
+    public void updateJunkRequirement(JSONObject paramInJson, DataFlowContext dataFlowContext) {
 
         JunkRequirementDto junkRequirementDto = new JunkRequirementDto();
         junkRequirementDto.setJunkRequirementId(paramInJson.getString("junkRequirementId"));
@@ -61,17 +62,12 @@
 
         Assert.listOnlyOne(junkRequirementDtos, "鏈壘鍒伴渶瑕佷慨鏀圭殑娲诲姩 鎴栧鏉℃暟鎹�");
 
-
-        JSONObject business = JSONObject.parseObject("{\"datas\":{}}");
-        business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_UPDATE_JUNK_REQUIREMENT);
-        business.put(CommonConstant.HTTP_SEQ, DEFAULT_SEQ);
-        business.put(CommonConstant.HTTP_INVOKE_MODEL, CommonConstant.HTTP_INVOKE_MODEL_S);
         JSONObject businessJunkRequirement = new JSONObject();
         businessJunkRequirement.putAll(BeanConvertUtil.beanCovertMap(junkRequirementDtos.get(0)));
         businessJunkRequirement.putAll(paramInJson);
-        //璁$畻 搴旀敹閲戦
-        business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessJunkRequirement", businessJunkRequirement);
-        return business;
+        JunkRequirementPo junkRequirementPo = BeanConvertUtil.covertBean(businessJunkRequirement, JunkRequirementPo.class);
+
+        super.update(dataFlowContext, junkRequirementPo, BusinessTypeConstant.BUSINESS_TYPE_UPDATE_JUNK_REQUIREMENT);
     }
 
 
@@ -82,18 +78,35 @@
      * @param dataFlowContext 鏁版嵁涓婁笅鏂�
      * @return 璁㈠崟鏈嶅姟鑳藉鎺ュ彈鐨勬姤鏂�
      */
-    public JSONObject deleteJunkRequirement(JSONObject paramInJson, DataFlowContext dataFlowContext) {
+    public void deleteJunkRequirement(JSONObject paramInJson, DataFlowContext dataFlowContext) {
 
 
-        JSONObject business = JSONObject.parseObject("{\"datas\":{}}");
-        business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_DELETE_JUNK_REQUIREMENT);
-        business.put(CommonConstant.HTTP_SEQ, DEFAULT_SEQ);
-        business.put(CommonConstant.HTTP_INVOKE_MODEL, CommonConstant.HTTP_INVOKE_MODEL_S);
         JSONObject businessJunkRequirement = new JSONObject();
         businessJunkRequirement.putAll(paramInJson);
-        //璁$畻 搴旀敹閲戦
-        business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessJunkRequirement", businessJunkRequirement);
-        return business;
+        JunkRequirementPo junkRequirementPo = BeanConvertUtil.covertBean(paramInJson, JunkRequirementPo.class);
+
+        super.delete(dataFlowContext, junkRequirementPo, BusinessTypeConstant.BUSINESS_TYPE_DELETE_JUNK_REQUIREMENT);
+    }
+
+    /**
+     * 娣诲姞鐗╀笟璐圭敤
+     *
+     * @param paramInJson     鎺ュ彛璋冪敤鏀句紶鍏ュ叆鍙�
+     * @param dataFlowContext 鏁版嵁涓婁笅鏂�
+     * @return 璁㈠崟鏈嶅姟鑳藉鎺ュ彈鐨勬姤鏂�
+     */
+    public void addPhoto(JSONObject paramInJson, DataFlowContext dataFlowContext) {
+
+        JSONObject businessUnit = new JSONObject();
+        businessUnit.put("fileRelId", "-1");
+        businessUnit.put("relTypeCd", "80000");
+        businessUnit.put("saveWay", "ftp");
+        businessUnit.put("objId", paramInJson.getString("junkRequirementId"));
+        businessUnit.put("fileRealName", paramInJson.getString("photoId"));
+        businessUnit.put("fileSaveName", paramInJson.getString("fileSaveName"));
+        FileRelPo fileRelPo = BeanConvertUtil.covertBean(businessUnit, FileRelPo.class);
+
+        super.insert(dataFlowContext, fileRelPo, BusinessTypeConstant.BUSINESS_TYPE_SAVE_FILE_REL);
     }
 
 }

--
Gitblit v1.8.0