From eaec3e8bcaf227ef3e3d1f2bffd59dd24600b01f Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 28 六月 2022 10:22:07 +0800
Subject: [PATCH] 兼容性优化处理

---
 service-fee/src/main/java/com/java110/fee/cmd/fee/QueryArrearsFeeCmd.java |  148 +++++++++---------------------------------------
 1 files changed, 29 insertions(+), 119 deletions(-)

diff --git a/service-api/src/main/java/com/java110/api/listener/fee/QueryArrearsFeeListener.java b/service-fee/src/main/java/com/java110/fee/cmd/fee/QueryArrearsFeeCmd.java
old mode 100755
new mode 100644
similarity index 63%
rename from service-api/src/main/java/com/java110/api/listener/fee/QueryArrearsFeeListener.java
rename to service-fee/src/main/java/com/java110/fee/cmd/fee/QueryArrearsFeeCmd.java
index 2421602..2a0c7d8
--- a/service-api/src/main/java/com/java110/api/listener/fee/QueryArrearsFeeListener.java
+++ b/service-fee/src/main/java/com/java110/fee/cmd/fee/QueryArrearsFeeCmd.java
@@ -1,44 +1,34 @@
-package com.java110.api.listener.fee;
-
+package com.java110.fee.cmd.fee;
 
 import com.alibaba.fastjson.JSONObject;
-import com.java110.api.listener.AbstractServiceApiDataFlowListener;
+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.fee.FeeDto;
+import com.java110.dto.owner.OwnerDto;
+import com.java110.intf.community.IFloorInnerServiceSMO;
+import com.java110.intf.community.IRoomInnerServiceSMO;
+import com.java110.intf.community.IUnitInnerServiceSMO;
+import com.java110.intf.fee.IFeeInnerServiceSMO;
+import com.java110.intf.user.IOwnerInnerServiceSMO;
+import com.java110.intf.user.IOwnerRoomRelInnerServiceSMO;
 import com.java110.utils.constant.FeeTypeConstant;
-import com.java110.utils.constant.ServiceCodeConstant;
+import com.java110.utils.exception.CmdException;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
 import com.java110.utils.util.DateUtil;
-import com.java110.core.annotation.Java110Listener;
-import com.java110.core.context.DataFlowContext;
-import com.java110.intf.fee.IFeeInnerServiceSMO;
-import com.java110.intf.community.IFloorInnerServiceSMO;
-import com.java110.intf.user.IOwnerInnerServiceSMO;
-import com.java110.intf.user.IOwnerRoomRelInnerServiceSMO;
-import com.java110.intf.community.IRoomInnerServiceSMO;
-import com.java110.intf.community.IUnitInnerServiceSMO;
-import com.java110.dto.fee.FeeDto;
-import com.java110.dto.owner.OwnerDto;
-import com.java110.core.event.service.api.ServiceDataFlowEvent;
 import com.java110.vo.api.ApiArrearsFeeDataVo;
 import com.java110.vo.api.ApiArrearsFeeVo;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpMethod;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 
 import java.util.ArrayList;
 import java.util.List;
 
-/**
- * @ClassName FloorDto
- * @Description 灏忓尯妤兼暟鎹眰渚﹀惉绫�
- * @Author wuxw
- * @Date 2019/4/24 8:52
- * @Version 1.0
- * add by wuxw 2019/4/24
- **/
-@Java110Listener("queryArrearsFee")
-public class QueryArrearsFeeListener extends AbstractServiceApiDataFlowListener {
+@Java110Cmd(serviceCode = "fee.queryArrearsFee")
+public class QueryArrearsFeeCmd extends Cmd {
 
     @Autowired
     private IFeeInnerServiceSMO feeInnerServiceSMOImpl;
@@ -59,26 +49,19 @@
     private IOwnerRoomRelInnerServiceSMO ownerRoomRelInnerServiceSMOImpl;
 
     @Override
-    public String getServiceCode() {
-        return ServiceCodeConstant.SERVICE_CODE_QUERY_ARREARS_FEE;
+    public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
+        Assert.jsonObjectHaveKey(reqJson, "communityId", "璇锋眰涓湭鍖呭惈communityId淇℃伅");
+        Assert.jsonObjectHaveKey(reqJson, "feeTypeCd", "璇锋眰涓湭鍖呭惈feeTypeCd淇℃伅");
+        Assert.jsonObjectHaveKey(reqJson, "page", "璇锋眰涓湭鍖呭惈page淇℃伅");
+        Assert.jsonObjectHaveKey(reqJson, "row", "璇锋眰涓湭鍖呭惈row淇℃伅");
+
+
+        Assert.isInteger(reqJson.getString("row"), "row蹇呴』涓烘暟瀛�");
+        Assert.isInteger(reqJson.getString("page"), "page蹇呴』涓烘暟瀛�");
     }
 
     @Override
-    public HttpMethod getHttpMethod() {
-        return HttpMethod.GET;
-    }
-
-    /**
-     * 涓氬姟灞傛暟鎹鐞�
-     *
-     * @param event 鏃堕棿瀵硅薄
-     */
-    @Override
-    public void soService(ServiceDataFlowEvent event) {
-        DataFlowContext dataFlowContext = event.getDataFlowContext();
-        //鑾峰彇璇锋眰鏁版嵁
-        JSONObject reqJson = dataFlowContext.getReqJson();
-        validateFeeData(reqJson);
+    public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
 
         FeeDto feeDtoParamIn = BeanConvertUtil.covertBean(reqJson, FeeDto.class);
         feeDtoParamIn.setArrearsEndTime(DateUtil.getCurrentDate());
@@ -100,7 +83,7 @@
         ResponseEntity<String> responseEntity = null;
         if (feeCount == 0) {
             responseEntity = new ResponseEntity<String>(JSONObject.toJSONString(apiArrearsFeeVo), HttpStatus.OK);
-            dataFlowContext.setResponseEntity(responseEntity);
+            context.setResponseEntity(responseEntity);
             return;
         }
 
@@ -128,7 +111,7 @@
         responseEntity = new ResponseEntity<String>(JSONObject.toJSONString(apiArrearsFeeVo), HttpStatus.OK);
 
 
-        dataFlowContext.setResponseEntity(responseEntity);
+        context.setResponseEntity(responseEntity);
     }
 
     /**
@@ -170,24 +153,8 @@
     }
 
     /**
-     * 鏍¢獙鏌ヨ鏉′欢鏄惁婊¤冻鏉′欢
-     *
-     * @param reqJson 鍖呭惈鏌ヨ鏉′欢
-     */
-    private void validateFeeData(JSONObject reqJson) {
-        Assert.jsonObjectHaveKey(reqJson, "communityId", "璇锋眰涓湭鍖呭惈communityId淇℃伅");
-        Assert.jsonObjectHaveKey(reqJson, "feeTypeCd", "璇锋眰涓湭鍖呭惈feeTypeCd淇℃伅");
-        Assert.jsonObjectHaveKey(reqJson, "page", "璇锋眰涓湭鍖呭惈page淇℃伅");
-        Assert.jsonObjectHaveKey(reqJson, "row", "璇锋眰涓湭鍖呭惈row淇℃伅");
-
-
-        Assert.isInteger(reqJson.getString("row"), "row蹇呴』涓烘暟瀛�");
-        Assert.isInteger(reqJson.getString("page"), "page蹇呴』涓烘暟瀛�");
-
-    }
-
-    /**
      * 鏌ヨ objIds
+     *
      * @param feeDtos 璐圭敤淇℃伅
      * @return objIds淇℃伅
      */
@@ -199,61 +166,4 @@
 
         return objIds.toArray(new String[objIds.size()]);
     }
-
-    @Override
-    public int getOrder() {
-        return super.DEFAULT_ORDER;
-    }
-
-    public IFeeInnerServiceSMO getFeeInnerServiceSMOImpl() {
-        return feeInnerServiceSMOImpl;
-    }
-
-    public void setFeeInnerServiceSMOImpl(IFeeInnerServiceSMO feeInnerServiceSMOImpl) {
-        this.feeInnerServiceSMOImpl = feeInnerServiceSMOImpl;
-    }
-
-
-    public IRoomInnerServiceSMO getRoomInnerServiceSMOImpl() {
-        return roomInnerServiceSMOImpl;
-    }
-
-    public void setRoomInnerServiceSMOImpl(IRoomInnerServiceSMO roomInnerServiceSMOImpl) {
-        this.roomInnerServiceSMOImpl = roomInnerServiceSMOImpl;
-    }
-
-
-    public IFloorInnerServiceSMO getFloorInnerServiceSMOImpl() {
-        return floorInnerServiceSMOImpl;
-    }
-
-    public void setFloorInnerServiceSMOImpl(IFloorInnerServiceSMO floorInnerServiceSMOImpl) {
-        this.floorInnerServiceSMOImpl = floorInnerServiceSMOImpl;
-    }
-
-    public IUnitInnerServiceSMO getUnitInnerServiceSMOImpl() {
-        return unitInnerServiceSMOImpl;
-    }
-
-    public void setUnitInnerServiceSMOImpl(IUnitInnerServiceSMO unitInnerServiceSMOImpl) {
-        this.unitInnerServiceSMOImpl = unitInnerServiceSMOImpl;
-    }
-
-    public IOwnerInnerServiceSMO getOwnerInnerServiceSMOImpl() {
-        return ownerInnerServiceSMOImpl;
-    }
-
-    public void setOwnerInnerServiceSMOImpl(IOwnerInnerServiceSMO ownerInnerServiceSMOImpl) {
-        this.ownerInnerServiceSMOImpl = ownerInnerServiceSMOImpl;
-    }
-
-    public IOwnerRoomRelInnerServiceSMO getOwnerRoomRelInnerServiceSMOImpl() {
-        return ownerRoomRelInnerServiceSMOImpl;
-    }
-
-    public void setOwnerRoomRelInnerServiceSMOImpl(IOwnerRoomRelInnerServiceSMO ownerRoomRelInnerServiceSMOImpl) {
-        this.ownerRoomRelInnerServiceSMOImpl = ownerRoomRelInnerServiceSMOImpl;
-    }
-
-
 }

--
Gitblit v1.8.0