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/QueryFeeDetailCmd.java | 80 +++++++--------------------------------
1 files changed, 15 insertions(+), 65 deletions(-)
diff --git a/service-api/src/main/java/com/java110/api/listener/fee/QueryFeeDetailListener.java b/service-fee/src/main/java/com/java110/fee/cmd/fee/QueryFeeDetailCmd.java
old mode 100755
new mode 100644
similarity index 70%
rename from service-api/src/main/java/com/java110/api/listener/fee/QueryFeeDetailListener.java
rename to service-fee/src/main/java/com/java110/fee/cmd/fee/QueryFeeDetailCmd.java
index d42f0c6..361adf3
--- a/service-api/src/main/java/com/java110/api/listener/fee/QueryFeeDetailListener.java
+++ b/service-fee/src/main/java/com/java110/fee/cmd/fee/QueryFeeDetailCmd.java
@@ -1,40 +1,30 @@
-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.FeeDetailDto;
import com.java110.dto.feeAccountDetail.FeeAccountDetailDto;
import com.java110.intf.fee.IFeeAccountDetailServiceSMO;
-import com.java110.utils.constant.ServiceCodeConstant;
+import com.java110.intf.fee.IFeeDetailInnerServiceSMO;
+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.IFeeDetailInnerServiceSMO;
-import com.java110.dto.fee.FeeDetailDto;
-import com.java110.core.event.service.api.ServiceDataFlowEvent;
import com.java110.utils.util.StringUtil;
import com.java110.vo.api.ApiFeeDetailDataVo;
import com.java110.vo.api.ApiFeeDetailVo;
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("queryFeeDetail")
-public class QueryFeeDetailListener extends AbstractServiceApiDataFlowListener {
+@Java110Cmd(serviceCode = "fee.queryFeeDetail")
+public class QueryFeeDetailCmd extends Cmd {
@Autowired
private IFeeDetailInnerServiceSMO feeDetailInnerServiceSMOImpl;
@@ -43,26 +33,13 @@
private IFeeAccountDetailServiceSMO feeAccountDetailServiceSMOImpl;
@Override
- public String getServiceCode() {
- return ServiceCodeConstant.SERVICE_CODE_QUERY_FEE_DETAIL;
+ public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
+ Assert.jsonObjectHaveKey(reqJson, "communityId", "璇锋眰涓湭鍖呭惈communityId淇℃伅");
}
@Override
- public HttpMethod getHttpMethod() {
- return HttpMethod.GET;
- }
-
- /**
- * 涓氬姟灞傛暟鎹鐞�
- *
- * @param event 鏃堕棿瀵硅薄
- */
- @Override
- public void soService(ServiceDataFlowEvent event) {
- DataFlowContext dataFlowContext = event.getDataFlowContext();
- //鑾峰彇璇锋眰鏁版嵁
- JSONObject reqJson = dataFlowContext.getReqJson();
- //鑾峰彇寮�濮嬫椂闂�
+ public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
+//鑾峰彇寮�濮嬫椂闂�
if (!StringUtil.isEmpty(reqJson.getString("startTime"))) {
String startTime = reqJson.getString("startTime") + " 00:00:00";
reqJson.put("startTime", startTime);
@@ -72,8 +49,6 @@
String endTime = reqJson.getString("endTime") + " 23:59:59";
reqJson.put("endTime", endTime);
}
- validateFeeConfigData(reqJson);
-
//鏌ヨ鎬昏褰曟暟
ApiFeeDetailVo apiFeeDetailVo = new ApiFeeDetailVo();
FeeDetailDto feeDetailDto = BeanConvertUtil.covertBean(reqJson, FeeDetailDto.class);
@@ -119,7 +94,7 @@
apiFeeDetailVo.setRecords((int) Math.ceil((double) total / (double) row));
ResponseEntity<String> responseEntity = new ResponseEntity<String>(JSONObject.toJSONString(apiFeeDetailVo), HttpStatus.OK);
- dataFlowContext.setResponseEntity(responseEntity);
+ context.setResponseEntity(responseEntity);
}
/**
@@ -136,30 +111,5 @@
}
}
}
- }
-
- /**
- * 鏍￠獙鏌ヨ鏉′欢鏄惁婊¤冻鏉′欢
- *
- * @param reqJson 鍖呭惈鏌ヨ鏉′欢
- */
- private void validateFeeConfigData(JSONObject reqJson) {
- Assert.jsonObjectHaveKey(reqJson, "communityId", "璇锋眰涓湭鍖呭惈communityId淇℃伅");
- // Assert.jsonObjectHaveKey(reqJson, "feeId", "璇锋眰涓湭鍖呭惈feeId淇℃伅");
-
-
- }
-
- @Override
- public int getOrder() {
- return super.DEFAULT_ORDER;
- }
-
- public IFeeDetailInnerServiceSMO getFeeDetailInnerServiceSMOImpl() {
- return feeDetailInnerServiceSMOImpl;
- }
-
- public void setFeeDetailInnerServiceSMOImpl(IFeeDetailInnerServiceSMO feeDetailInnerServiceSMOImpl) {
- this.feeDetailInnerServiceSMOImpl = feeDetailInnerServiceSMOImpl;
}
}
--
Gitblit v1.8.0