优化代码

java110-bean/src/main/java/com/java110/dto/userStorehouse/UserStorehouseDto.java

@@ -1,6 +1,7 @@
 package com.java110.dto.userStorehouse;
 
 import com.java110.dto.PageDto;
+
 import java.io.Serializable;
 import java.util.Date;
 
@@ -15,11 +16,11 @@ import java.util.Date;
 public class UserStorehouseDto extends PageDto implements Serializable {
 
     private String resName;
-private String storeId;
-private String stock;
-private String resId;
-private String userId;
-private String usId;
+    private String storeId;
+    private String stock;
+    private String resId;
+    private String userId;
+    private String usId;
 
 
     private Date createTime;
@@ -30,37 +31,48 @@ private String usId;
     public String getResName() {
         return resName;
     }
-public void setResName(String resName) {
+
+    public void setResName(String resName) {
         this.resName = resName;
     }
-public String getStoreId() {
+
+    public String getStoreId() {
         return storeId;
     }
-public void setStoreId(String storeId) {
+
+    public void setStoreId(String storeId) {
         this.storeId = storeId;
     }
-public String getStock() {
+
+    public String getStock() {
         return stock;
     }
-public void setStock(String stock) {
+
+    public void setStock(String stock) {
         this.stock = stock;
     }
-public String getResId() {
+
+    public String getResId() {
         return resId;
     }
-public void setResId(String resId) {
+
+    public void setResId(String resId) {
         this.resId = resId;
     }
-public String getUserId() {
+
+    public String getUserId() {
         return userId;
     }
-public void setUserId(String userId) {
+
+    public void setUserId(String userId) {
         this.userId = userId;
     }
-public String getUsId() {
+
+    public String getUsId() {
         return usId;
     }
-public void setUsId(String usId) {
+
+    public void setUsId(String usId) {
         this.usId = usId;
     }
 

service-store/src/main/java/com/java110/store/listener/userStorehouse/AbstractUserStorehouseBusinessServiceDataFlowListener.java

@@ -57,7 +57,7 @@ public abstract class AbstractUserStorehouseBusinessServiceDataFlowListener exte
     protected void autoSaveDelBusinessUserStorehouse(Business business, JSONObject businessUserStorehouse) {
 //自动插入DEL
         Map info = new HashMap();
-        info.put("userUserStorehousehouseId", businessUserStorehouse.getString("userUserStorehousehouseId"));
+        info.put("usId", businessUserStorehouse.getString("usId"));
         info.put("statusCd", StatusConstant.STATUS_CD_VALID);
         List<Map> currentUserStorehouseInfos = getUserStorehouseServiceDaoImpl().getUserStorehouseInfo(info);
         if (currentUserStorehouseInfos == null || currentUserStorehouseInfos.size() != 1) {

service-store/src/main/java/com/java110/store/listener/userStorehouse/DeleteUserStorehouseInfoListener.java

@@ -77,7 +77,7 @@ public class DeleteUserStorehouseInfoListener extends AbstractUserStorehouseBusi
                     JSONObject businessUserStorehouse = businessUserStorehouses.getJSONObject(_userUserStorehousehouseIndex);
                     doBusinessUserStorehouse(business, businessUserStorehouse);
                     if(_obj instanceof JSONObject) {
-                        dataFlowContext.addParamOut("userUserStorehousehouseId", businessUserStorehouse.getString("userUserStorehousehouseId"));
+                        dataFlowContext.addParamOut("usId", businessUserStorehouse.getString("usId"));
                     }
                 }
 
@@ -108,7 +108,7 @@ public class DeleteUserStorehouseInfoListener extends AbstractUserStorehouseBusi
                 Map businessUserStorehouseInfo = businessUserStorehouseInfos.get(_userUserStorehousehouseIndex);
                 flushBusinessUserStorehouseInfo(businessUserStorehouseInfo,StatusConstant.STATUS_CD_INVALID);
                 userUserStorehousehouseServiceDaoImpl.updateUserStorehouseInfoInstance(businessUserStorehouseInfo);
-                dataFlowContext.addParamOut("userUserStorehousehouseId",businessUserStorehouseInfo.get("userUserStorehousehouse_id"));
+                dataFlowContext.addParamOut("usId",businessUserStorehouseInfo.get("us_id"));
             }
         }
 
@@ -158,10 +158,10 @@ public class DeleteUserStorehouseInfoListener extends AbstractUserStorehouseBusi
      */
     private void doBusinessUserStorehouse(Business business,JSONObject businessUserStorehouse){
 
-        Assert.jsonObjectHaveKey(businessUserStorehouse,"userUserStorehousehouseId","businessUserStorehouse 节点下没有包含 userUserStorehousehouseId 节点");
+        Assert.jsonObjectHaveKey(businessUserStorehouse,"usId","businessUserStorehouse 节点下没有包含 usId 节点");
 
-        if(businessUserStorehouse.getString("userUserStorehousehouseId").startsWith("-")){
-            throw new ListenerExecuteException(ResponseConstant.RESULT_PARAM_ERROR,"userUserStorehousehouseId 错误，不能自动生成（必须已经存在的userUserStorehousehouseId）"+businessUserStorehouse);
+        if(businessUserStorehouse.getString("usId").startsWith("-")){
+            throw new ListenerExecuteException(ResponseConstant.RESULT_PARAM_ERROR,"usId 错误，不能自动生成（必须已经存在的usId）"+businessUserStorehouse);
         }
         //自动插入DEL
         autoSaveDelBusinessUserStorehouse(business,businessUserStorehouse);

service-store/src/main/java/com/java110/store/listener/userStorehouse/SaveUserStorehouseInfoListener.java

@@ -68,7 +68,7 @@ public class SaveUserStorehouseInfoListener extends AbstractUserStorehouseBusine
                 JSONObject businessUserStorehouse = businessUserStorehouses.getJSONObject(bUserStorehouseIndex);
                 doBusinessUserStorehouse(business, businessUserStorehouse);
                 if(bObj instanceof JSONObject) {
-                    dataFlowContext.addParamOut("userUserStorehousehouseId", businessUserStorehouse.getString("userUserStorehousehouseId"));
+                    dataFlowContext.addParamOut("usId", businessUserStorehouse.getString("usId"));
                 }
             }
         }
@@ -93,7 +93,7 @@ public class SaveUserStorehouseInfoListener extends AbstractUserStorehouseBusine
             reFreshShareColumn(info, businessUserStorehouseInfo.get(0));
             userUserStorehousehouseServiceDaoImpl.saveUserStorehouseInfoInstance(info);
             if(businessUserStorehouseInfo.size() == 1) {
-                dataFlowContext.addParamOut("userUserStorehousehouseId", businessUserStorehouseInfo.get(0).get("userUserStorehousehouse_id"));
+                dataFlowContext.addParamOut("usId", businessUserStorehouseInfo.get(0).get("us_id"));
             }
         }
     }
@@ -149,13 +149,13 @@ public class SaveUserStorehouseInfoListener extends AbstractUserStorehouseBusine
      */
     private void doBusinessUserStorehouse(Business business,JSONObject businessUserStorehouse){
 
-        Assert.jsonObjectHaveKey(businessUserStorehouse,"userUserStorehousehouseId","businessUserStorehouse 节点下没有包含 userUserStorehousehouseId 节点");
+        Assert.jsonObjectHaveKey(businessUserStorehouse,"usId","businessUserStorehouse 节点下没有包含 usId 节点");
 
-        if(businessUserStorehouse.getString("userUserStorehousehouseId").startsWith("-")){
+        if(businessUserStorehouse.getString("usId").startsWith("-")){
             //刷新缓存
             //flushUserStorehouseId(business.getDatas());
 
-            businessUserStorehouse.put("userUserStorehousehouseId",GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_usId));
+            businessUserStorehouse.put("usId",GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_usId));
 
         }
 

service-store/src/main/java/com/java110/store/listener/userStorehouse/UpdateUserStorehouseInfoListener.java

@@ -79,7 +79,7 @@ public class UpdateUserStorehouseInfoListener extends AbstractUserStorehouseBusi
                     JSONObject businessUserStorehouse = businessUserStorehouses.getJSONObject(_userUserStorehousehouseIndex);
                     doBusinessUserStorehouse(business, businessUserStorehouse);
                     if(_obj instanceof JSONObject) {
-                        dataFlowContext.addParamOut("userUserStorehousehouseId", businessUserStorehouse.getString("userUserStorehousehouseId"));
+                        dataFlowContext.addParamOut("usId", businessUserStorehouse.getString("usId"));
                     }
                 }
             }
@@ -108,7 +108,7 @@ public class UpdateUserStorehouseInfoListener extends AbstractUserStorehouseBusi
                 flushBusinessUserStorehouseInfo(businessUserStorehouseInfo,StatusConstant.STATUS_CD_VALID);
                 userUserStorehousehouseServiceDaoImpl.updateUserStorehouseInfoInstance(businessUserStorehouseInfo);
                 if(businessUserStorehouseInfo.size() == 1) {
-                    dataFlowContext.addParamOut("userUserStorehousehouseId", businessUserStorehouseInfo.get("userUserStorehousehouse_id"));
+                    dataFlowContext.addParamOut("usId", businessUserStorehouseInfo.get("us_id"));
                 }
             }
         }
@@ -159,10 +159,10 @@ public class UpdateUserStorehouseInfoListener extends AbstractUserStorehouseBusi
      */
     private void doBusinessUserStorehouse(Business business,JSONObject businessUserStorehouse){
 
-        Assert.jsonObjectHaveKey(businessUserStorehouse,"userUserStorehousehouseId","businessUserStorehouse 节点下没有包含 userUserStorehousehouseId 节点");
+        Assert.jsonObjectHaveKey(businessUserStorehouse,"usId","businessUserStorehouse 节点下没有包含 usId 节点");
 
-        if(businessUserStorehouse.getString("userUserStorehousehouseId").startsWith("-")){
-            throw new ListenerExecuteException(ResponseConstant.RESULT_PARAM_ERROR,"userUserStorehousehouseId 错误，不能自动生成（必须已经存在的userUserStorehousehouseId）"+businessUserStorehouse);
+        if(businessUserStorehouse.getString("usId").startsWith("-")){
+            throw new ListenerExecuteException(ResponseConstant.RESULT_PARAM_ERROR,"usId 错误，不能自动生成（必须已经存在的usId）"+businessUserStorehouse);
         }
         //自动保存DEL
         autoSaveDelBusinessUserStorehouse(business,businessUserStorehouse);