优化代码

service-api/src/main/java/com/java110/api/listener/auditOrder/ListAuditHistoryComplaintsListener.java

@@ -1,63 +1,33 @@
-package com.java110.api.listener.auditOrder;
+package com.java110.common.cmd.auditUser;
 
 import com.alibaba.fastjson.JSONObject;
-import com.java110.api.listener.AbstractServiceApiListener;
-import com.java110.core.annotation.Java110Listener;
-import com.java110.core.context.DataFlowContext;
-import com.java110.intf.common.IComplaintUserInnerServiceSMO;
+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.entity.audit.AuditUser;
-import com.java110.core.event.service.api.ServiceDataFlowEvent;
-import com.java110.utils.constant.ServiceCodeAuditUserConstant;
+import com.java110.intf.common.IComplaintUserInnerServiceSMO;
+import com.java110.utils.exception.CmdException;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
 import com.java110.utils.util.StringUtil;
 import com.java110.vo.api.complaint.ApiComplaintDataVo;
 import com.java110.vo.api.complaint.ApiComplaintVo;
 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;
 
-
-/**
- * 查询审核订单侦听类
- */
-@Java110Listener("listAuditHistoryComplaintsListener")
-public class ListAuditHistoryComplaintsListener extends AbstractServiceApiListener {
+@Java110Cmd(serviceCode = "auditUser.listAuditHistoryComplaints")
+public class ListAuditHistoryComplaintsCmd extends Cmd {
 
     @Autowired
     private IComplaintUserInnerServiceSMO complaintUserInnerServiceSMOImpl;
 
     @Override
-    public String getServiceCode() {
-        return ServiceCodeAuditUserConstant.LIST_AUDIT_HISTORY_COMPLAINTS;
-    }
-
-    @Override
-    public HttpMethod getHttpMethod() {
-        return HttpMethod.GET;
-    }
-
-
-    @Override
-    public int getOrder() {
-        return DEFAULT_ORDER;
-    }
-
-
-    public IComplaintUserInnerServiceSMO getComplaintUserInnerServiceSMOImpl() {
-        return complaintUserInnerServiceSMOImpl;
-    }
-
-    public void setComplaintUserInnerServiceSMOImpl(IComplaintUserInnerServiceSMO complaintUserInnerServiceSMOImpl) {
-        this.complaintUserInnerServiceSMOImpl = complaintUserInnerServiceSMOImpl;
-    }
-
-    @Override
-    protected void validate(ServiceDataFlowEvent event, JSONObject reqJson) {
+    public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
         Assert.hasKeyAndValue(reqJson, "storeId", "必填，请填写商户ID");
         Assert.hasKeyAndValue(reqJson, "userId", "必填，请填写用户ID");
         Assert.hasKeyAndValue(reqJson, "communityId", "必填，请填写小区ID");
@@ -68,8 +38,7 @@ public class ListAuditHistoryComplaintsListener extends AbstractServiceApiListen
     }
 
     @Override
-    protected void doSoService(ServiceDataFlowEvent event, DataFlowContext context, JSONObject reqJson) {
-
+    public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
         AuditUser auditUser = new AuditUser();
         auditUser.setUserId(reqJson.getString("userId"));
         auditUser.setStoreId(reqJson.getString("storeId"));
@@ -100,6 +69,5 @@ public class ListAuditHistoryComplaintsListener extends AbstractServiceApiListen
         ResponseEntity<String> responseEntity = new ResponseEntity<String>(JSONObject.toJSONString(apiComplaintVo), HttpStatus.OK);
 
         context.setResponseEntity(responseEntity);
-
     }
 }

service-api/src/main/java/com/java110/api/listener/auditOrder/ListAuditHistoryOrdersListener.java

@@ -1,63 +1,33 @@
-package com.java110.api.listener.auditOrder;
+package com.java110.common.cmd.auditUser;
 
 import com.alibaba.fastjson.JSONObject;
-import com.java110.api.listener.AbstractServiceApiListener;
-import com.java110.core.annotation.Java110Listener;
-import com.java110.core.context.DataFlowContext;
-import com.java110.core.event.service.api.ServiceDataFlowEvent;
+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.purchaseApply.PurchaseApplyDto;
 import com.java110.entity.audit.AuditUser;
 import com.java110.intf.common.IResourceEntryStoreInnerServiceSMO;
-import com.java110.utils.constant.ServiceCodeAuditUserConstant;
+import com.java110.utils.exception.CmdException;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
 import com.java110.vo.api.resourceOrder.ApiResourceOrderDataVo;
 import com.java110.vo.api.resourceOrder.ApiResourceOrderVo;
 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;
 
-
-/**
- * 查询审核订单侦听类
- */
-@Java110Listener("listAuditHistoryOrdersListener")
-public class ListAuditHistoryOrdersListener extends AbstractServiceApiListener {
+@Java110Cmd(serviceCode = "auditUser.listAuditHistoryOrders")
+public class ListAuditHistoryOrdersCmd extends Cmd {
 
     @Autowired
     private IResourceEntryStoreInnerServiceSMO resourceEntryStoreInnerServiceSMOImpl;
 
     @Override
-    public String getServiceCode() {
-        return ServiceCodeAuditUserConstant.LIST_AUDIT_HISTORY_ORDERS;
-    }
-
-    @Override
-    public HttpMethod getHttpMethod() {
-        return HttpMethod.GET;
-    }
-
-
-    @Override
-    public int getOrder() {
-        return DEFAULT_ORDER;
-    }
-
-
-    public IResourceEntryStoreInnerServiceSMO getResourceEntryStoreInnerServiceSMOImpl() {
-        return resourceEntryStoreInnerServiceSMOImpl;
-    }
-
-    public void setResourceEntryStoreInnerServiceSMOImpl(IResourceEntryStoreInnerServiceSMO resourceEntryStoreInnerServiceSMOImpl) {
-        this.resourceEntryStoreInnerServiceSMOImpl = resourceEntryStoreInnerServiceSMOImpl;
-    }
-
-    @Override
-    protected void validate(ServiceDataFlowEvent event, JSONObject reqJson) {
+    public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
         Assert.hasKeyAndValue(reqJson, "storeId", "必填，请填写商户ID");
         Assert.hasKeyAndValue(reqJson, "userId", "必填，请填写用户ID");
         Assert.hasKeyAndValue(reqJson, "row", "必填，请填写每页显示数");
@@ -67,8 +37,7 @@ public class ListAuditHistoryOrdersListener extends AbstractServiceApiListener {
     }
 
     @Override
-    protected void doSoService(ServiceDataFlowEvent event, DataFlowContext context, JSONObject reqJson) {
-
+    public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
         AuditUser auditUser = new AuditUser();
         auditUser.setUserId(reqJson.getString("userId"));
         auditUser.setPage(reqJson.getInteger("page"));
@@ -114,6 +83,5 @@ public class ListAuditHistoryOrdersListener extends AbstractServiceApiListener {
         ResponseEntity<String> responseEntity = new ResponseEntity<String>(JSONObject.toJSONString(apiResourceOrderVo), HttpStatus.OK);
 
         context.setResponseEntity(responseEntity);
-
     }
 }

service-api/src/main/java/com/java110/api/listener/auditOrder/ListAuditOrdersListener.java

@@ -1,63 +1,33 @@
-package com.java110.api.listener.auditOrder;
+package com.java110.common.cmd.auditUser;
 
 import com.alibaba.fastjson.JSONObject;
-import com.java110.api.listener.AbstractServiceApiListener;
-import com.java110.core.annotation.Java110Listener;
-import com.java110.core.context.DataFlowContext;
-import com.java110.intf.common.IResourceEntryStoreInnerServiceSMO;
+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.purchaseApply.PurchaseApplyDto;
 import com.java110.entity.audit.AuditUser;
-import com.java110.core.event.service.api.ServiceDataFlowEvent;
-import com.java110.utils.constant.ServiceCodeAuditUserConstant;
+import com.java110.intf.common.IResourceEntryStoreInnerServiceSMO;
+import com.java110.utils.exception.CmdException;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
 import com.java110.vo.api.resourceOrder.ApiResourceOrderDataVo;
 import com.java110.vo.api.resourceOrder.ApiResourceOrderVo;
 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;
 
-
-/**
- * 查询审核订单侦听类
- */
-@Java110Listener("listAuditOrdersListener")
-public class ListAuditOrdersListener extends AbstractServiceApiListener {
+@Java110Cmd(serviceCode = "auditUser.listAuditOrders")
+public class ListAuditOrdersCmd extends Cmd {
 
     @Autowired
     private IResourceEntryStoreInnerServiceSMO resourceEntryStoreInnerServiceSMOImpl;
 
     @Override
-    public String getServiceCode() {
-        return ServiceCodeAuditUserConstant.LIST_AUDITORDERS;
-    }
-
-    @Override
-    public HttpMethod getHttpMethod() {
-        return HttpMethod.GET;
-    }
-
-
-    @Override
-    public int getOrder() {
-        return DEFAULT_ORDER;
-    }
-
-
-    public IResourceEntryStoreInnerServiceSMO getResourceEntryStoreInnerServiceSMOImpl() {
-        return resourceEntryStoreInnerServiceSMOImpl;
-    }
-
-    public void setResourceEntryStoreInnerServiceSMOImpl(IResourceEntryStoreInnerServiceSMO resourceEntryStoreInnerServiceSMOImpl) {
-        this.resourceEntryStoreInnerServiceSMOImpl = resourceEntryStoreInnerServiceSMOImpl;
-    }
-
-    @Override
-    protected void validate(ServiceDataFlowEvent event, JSONObject reqJson) {
+    public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
         Assert.hasKeyAndValue(reqJson, "storeId", "必填，请填写商户ID");
         Assert.hasKeyAndValue(reqJson, "userId", "必填，请填写用户ID");
         Assert.hasKeyAndValue(reqJson, "row", "必填，请填写每页显示数");
@@ -67,8 +37,7 @@ public class ListAuditOrdersListener extends AbstractServiceApiListener {
     }
 
     @Override
-    protected void doSoService(ServiceDataFlowEvent event, DataFlowContext context, JSONObject reqJson) {
-
+    public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
         AuditUser auditUser = new AuditUser();
         auditUser.setUserId(reqJson.getString("userId"));
         auditUser.setPage(reqJson.getInteger("page"));
@@ -108,6 +77,5 @@ public class ListAuditOrdersListener extends AbstractServiceApiListener {
         ResponseEntity<String> responseEntity = new ResponseEntity<String>(JSONObject.toJSONString(apiResourceOrderVo), HttpStatus.OK);
 
         context.setResponseEntity(responseEntity);
-
     }
 }

service-api/src/main/java/com/java110/api/listener/auditOrder/ListItemOutAuditHistoryOrdersListener.java

@@ -1,56 +1,33 @@
-package com.java110.api.listener.auditOrder;
+package com.java110.common.cmd.auditUser;
 
 import com.alibaba.fastjson.JSONObject;
-import com.java110.api.listener.AbstractServiceApiListener;
-import com.java110.core.annotation.Java110Listener;
-import com.java110.core.context.DataFlowContext;
-import com.java110.core.event.service.api.ServiceDataFlowEvent;
+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.purchaseApply.PurchaseApplyDto;
 import com.java110.entity.audit.AuditUser;
 import com.java110.intf.common.IGoodCollectionUserInnerServiceSMO;
-import com.java110.intf.common.IResourceEntryStoreInnerServiceSMO;
-import com.java110.utils.constant.ServiceCodeAuditUserConstant;
+import com.java110.utils.exception.CmdException;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
 import com.java110.vo.api.resourceOrder.ApiResourceOrderDataVo;
 import com.java110.vo.api.resourceOrder.ApiResourceOrderVo;
 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;
 
-
-/**
- * 查询审核订单侦听类
- */
-@Java110Listener("listItemOutAuditHistoryOrdersListener")
-public class ListItemOutAuditHistoryOrdersListener extends AbstractServiceApiListener {
+@Java110Cmd(serviceCode = "auditUser.listItemOutAuditHistoryOrders")
+public class ListItemOutAuditHistoryOrdersCmd extends Cmd {
 
     @Autowired
     private IGoodCollectionUserInnerServiceSMO goodCollectionUserInnerServiceSMOImpl;
 
     @Override
-    public String getServiceCode() {
-        return ServiceCodeAuditUserConstant.LIST_ITEM_OUT_AUDIT_HISTORY_ORDERS;
-    }
-
-    @Override
-    public HttpMethod getHttpMethod() {
-        return HttpMethod.GET;
-    }
-
-
-    @Override
-    public int getOrder() {
-        return DEFAULT_ORDER;
-    }
-
-
-    @Override
-    protected void validate(ServiceDataFlowEvent event, JSONObject reqJson) {
+    public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
         Assert.hasKeyAndValue(reqJson, "storeId", "必填，请填写商户ID");
         Assert.hasKeyAndValue(reqJson, "userId", "必填，请填写用户ID");
         Assert.hasKeyAndValue(reqJson, "row", "必填，请填写每页显示数");
@@ -60,8 +37,7 @@ public class ListItemOutAuditHistoryOrdersListener extends AbstractServiceApiLis
     }
 
     @Override
-    protected void doSoService(ServiceDataFlowEvent event, DataFlowContext context, JSONObject reqJson) {
-
+    public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
         AuditUser auditUser = new AuditUser();
         auditUser.setUserId(reqJson.getString("userId"));
         auditUser.setPage(reqJson.getInteger("page"));
@@ -108,6 +84,5 @@ public class ListItemOutAuditHistoryOrdersListener extends AbstractServiceApiLis
         ResponseEntity<String> responseEntity = new ResponseEntity<String>(JSONObject.toJSONString(apiResourceOrderVo), HttpStatus.OK);
 
         context.setResponseEntity(responseEntity);
-
     }
 }