优化 公众号相关功能 改造为 cmd 模式

service-api/src/main/java/com/java110/api/listener/smallWeChat/DeleteSmallWeChatListener.java

@@ -1,49 +0,0 @@
-package com.java110.api.listener.smallWeChat;
-
-import com.alibaba.fastjson.JSONObject;
-import com.java110.api.bmo.smallWeChat.ISmallWeChatBMO;
-import com.java110.api.listener.AbstractServiceApiPlusListener;
-import com.java110.core.annotation.Java110Listener;
-import com.java110.core.context.DataFlowContext;
-import com.java110.core.event.service.api.ServiceDataFlowEvent;
-import com.java110.utils.constant.ServiceCodeSmallWeChatConstant;
-import com.java110.utils.util.Assert;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpMethod;
-
-
-/**
- * 删除小程序配置
- */
-@Java110Listener("deleteSmallWeChatListener")
-public class DeleteSmallWeChatListener extends AbstractServiceApiPlusListener {
-
-    @Autowired
-    private ISmallWeChatBMO smallWeChatBMOImpl;
-
-    @Override
-    protected void validate(ServiceDataFlowEvent event, JSONObject reqJson) {
-        Assert.hasKeyAndValue(reqJson, "weChatId", "weChatId不能为空");
-    }
-
-    @Override
-    protected void doSoService(ServiceDataFlowEvent event, DataFlowContext context, JSONObject reqJson) {
-        smallWeChatBMOImpl.deleteSmallWeChat(reqJson, context);
-    }
-
-    @Override
-    public String getServiceCode() {
-        return ServiceCodeSmallWeChatConstant.DELETE_SMALL_WE_CHAT;
-    }
-
-    @Override
-    public HttpMethod getHttpMethod() {
-        return HttpMethod.POST;
-    }
-
-    @Override
-    public int getOrder() {
-        return DEFAULT_ORDER;
-    }
-
-}

service-api/src/main/java/com/java110/api/listener/smallWeChat/UpdateSmallWechatAttrListener.java

@@ -1,49 +0,0 @@
-package com.java110.api.listener.smallWeChat;
-
-import com.alibaba.fastjson.JSONObject;
-import com.java110.api.bmo.smallWeChat.ISmallWechatAttrBMO;
-import com.java110.api.listener.AbstractServiceApiPlusListener;
-import com.java110.core.annotation.Java110Listener;
-import com.java110.core.context.DataFlowContext;
-import com.java110.core.event.service.api.ServiceDataFlowEvent;
-import com.java110.utils.constant.ServiceCodeSmallWechatAttrConstant;
-import com.java110.utils.util.Assert;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpMethod;
-
-
-/**
- * 保存微信属性侦听
- * add by wuxw 2019-06-30
- */
-@Java110Listener("updateSmallWechatAttrListener")
-public class UpdateSmallWechatAttrListener extends AbstractServiceApiPlusListener {
-
-    @Autowired
-    private ISmallWechatAttrBMO smallWechatAttrBMOImpl;
-
-    @Override
-    protected void validate(ServiceDataFlowEvent event, JSONObject reqJson) {
-        Assert.hasKeyAndValue(reqJson, "attrId", "attrId不能为空");
-        Assert.hasKeyAndValue(reqJson, "specCd", "请求报文中未包含specCd");
-        Assert.hasKeyAndValue(reqJson, "communityId", "请求报文中未包含communityId");
-        Assert.hasKeyAndValue(reqJson, "value", "请求报文中未包含value");
-
-    }
-
-    @Override
-    protected void doSoService(ServiceDataFlowEvent event, DataFlowContext context, JSONObject reqJson) {
-
-        smallWechatAttrBMOImpl.updateSmallWechatAttr(reqJson, context);
-    }
-
-    @Override
-    public String getServiceCode() {
-        return ServiceCodeSmallWechatAttrConstant.UPDATE_SMALLWECHATATTR;
-    }
-
-    @Override
-    public HttpMethod getHttpMethod() {
-        return HttpMethod.POST;
-    }
-}

service-store/src/main/java/com/java110/store/cmd/smallWechat/DeleteSmallWechatCmd.java

@@ -41,9 +41,9 @@ import org.springframework.beans.factory.annotation.Autowired;
  * 温馨提示：如果您对此文件进行修改 请不要删除原有作者及注释信息，请补充您的 修改的原因以及联系邮箱如下
  * // modify by 张三 at 2021-09-12 第10行在某种场景下存在某种bug 需要修复，注释10至20行 加入 20行至30行
  */
-@Java110Cmd(serviceCode = "smallWechat.deleteSmallWechat")
-public class DeleteSmallWechatCmd extends Cmd {
-    private static Logger logger = LoggerFactory.getLogger(DeleteSmallWechatCmd.class);
+@Java110Cmd(serviceCode = "smallWeChat.deleteSmallWeChat")
+public class DeleteSmallWeChatCmd extends Cmd {
+    private static Logger logger = LoggerFactory.getLogger(DeleteSmallWeChatCmd.class);
 
     @Autowired
     private ISmallWechatV1InnerServiceSMO smallWechatV1InnerServiceSMOImpl;

service-api/src/main/java/com/java110/api/listener/smallWeChat/ListSmallWeChatOnlyAppIdListener.java

@@ -1,30 +1,25 @@
-package com.java110.api.listener.smallWeChat;
+package com.java110.store.cmd.smallWechat;
 
 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.smallWeChat.SmallWeChatDto;
 import com.java110.intf.store.ISmallWeChatInnerServiceSMO;
-import com.java110.utils.constant.ServiceCodeSmallWeChatConstant;
+import com.java110.utils.exception.CmdException;
 import com.java110.utils.util.BeanConvertUtil;
 import com.java110.vo.api.smallWeChat.ApiSmallWeChatDataVo;
 import com.java110.vo.api.smallWeChat.ApiSmallWeChatVo;
 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("listSmallWeChatOnlyAppIdListener")
-public class ListSmallWeChatOnlyAppIdListener extends AbstractServiceApiListener {
+@Java110Cmd(serviceCode = "smallWeChat.listSmallWeChatOnlyAppId")
+public class ListSmallWeChatOnlyAppIdCmd extends Cmd {
 
     private static String OWNER_APP = "992019111758490006";
     private static String OWNER_WECHAT_APP = "992020061452450002";
@@ -33,39 +28,13 @@ public class ListSmallWeChatOnlyAppIdListener extends AbstractServiceApiListener
     private ISmallWeChatInnerServiceSMO smallWeChatInnerServiceSMOImpl;
 
     @Override
-    public String getServiceCode() {
-        return ServiceCodeSmallWeChatConstant.LIST_SMALL_WE_CHAT_ONLY_APP_ID;
-    }
-
-    @Override
-    public HttpMethod getHttpMethod() {
-        return HttpMethod.GET;
-    }
-
-
-    @Override
-    public int getOrder() {
-        return DEFAULT_ORDER;
-    }
-
-
-    public ISmallWeChatInnerServiceSMO getSmallWeChatInnerServiceSMOImpl() {
-        return smallWeChatInnerServiceSMOImpl;
-    }
-
-    public void setSmallWeChatInnerServiceSMOImpl(ISmallWeChatInnerServiceSMO smallWeChatInnerServiceSMOImpl) {
-        this.smallWeChatInnerServiceSMOImpl = smallWeChatInnerServiceSMOImpl;
-    }
-
-    @Override
-    protected void validate(ServiceDataFlowEvent event, JSONObject reqJson) {
+    public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
         super.validatePageInfo(reqJson);
         //Assert.hasKeyAndValue(reqJson, "communityId", "未包含小区信息");
     }
 
     @Override
-    protected void doSoService(ServiceDataFlowEvent event, DataFlowContext context, JSONObject reqJson) {
-
+    public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
         SmallWeChatDto smallWeChatDto = BeanConvertUtil.covertBean(reqJson, SmallWeChatDto.class);
         smallWeChatDto.setObjType(SmallWeChatDto.OBJ_TYPE_COMMUNITY);
         smallWeChatDto.setObjId(reqJson.getString("communityId"));

service-api/src/main/java/com/java110/api/listener/smallWeChat/ListSmallWechatAttrsListener.java

@@ -1,67 +1,38 @@
-package com.java110.api.listener.smallWeChat;
+package com.java110.store.cmd.smallWechat;
 
 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.intf.store.ISmallWechatAttrInnerServiceSMO;
+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.smallWechatAttr.SmallWechatAttrDto;
-import com.java110.utils.constant.ServiceCodeSmallWechatAttrConstant;
+import com.java110.intf.store.ISmallWechatAttrInnerServiceSMO;
+import com.java110.utils.exception.CmdException;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
 import com.java110.vo.ResultVo;
 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("listSmallWechatAttrsListener")
-public class ListSmallWechatAttrsListener extends AbstractServiceApiListener {
+@Java110Cmd(serviceCode = "smallWechat.listSmallWechatAttrs")
+public class ListSmallWechatAttrsCmd extends Cmd {
 
     @Autowired
     private ISmallWechatAttrInnerServiceSMO smallWechatAttrInnerServiceSMOImpl;
 
-    @Override
-    public String getServiceCode() {
-        return ServiceCodeSmallWechatAttrConstant.LIST_SMALLWECHATATTRS;
-    }
-
-    @Override
-    public HttpMethod getHttpMethod() {
-        return HttpMethod.GET;
-    }
-
-
-    @Override
-    public int getOrder() {
-        return DEFAULT_ORDER;
-    }
-
-
-    public ISmallWechatAttrInnerServiceSMO getSmallWechatAttrInnerServiceSMOImpl() {
-        return smallWechatAttrInnerServiceSMOImpl;
-    }
-
-    public void setSmallWechatAttrInnerServiceSMOImpl(ISmallWechatAttrInnerServiceSMO smallWechatAttrInnerServiceSMOImpl) {
-        this.smallWechatAttrInnerServiceSMOImpl = smallWechatAttrInnerServiceSMOImpl;
-    }
 
     @Override
-    protected void validate(ServiceDataFlowEvent event, JSONObject reqJson) {
+    public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
         Assert.hasKeyAndValue(reqJson, "wechatId", "微信ID");
         //super.validatePageInfo(reqJson);
     }
 
     @Override
-    protected void doSoService(ServiceDataFlowEvent event, DataFlowContext context, JSONObject reqJson) {
-
+    public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
         SmallWechatAttrDto smallWechatAttrDto = BeanConvertUtil.covertBean(reqJson, SmallWechatAttrDto.class);
 
         int count = smallWechatAttrInnerServiceSMOImpl.querySmallWechatAttrsCount(smallWechatAttrDto);
@@ -79,6 +50,5 @@ public class ListSmallWechatAttrsListener extends AbstractServiceApiListener {
         ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
 
         context.setResponseEntity(responseEntity);
-
     }
 }

service-store/src/main/java/com/java110/store/cmd/smallWechat/UpdateSmallWechatAttrCmd.java

@@ -0,0 +1,41 @@
+package com.java110.store.cmd.smallWechat;
+
+import com.alibaba.fastjson.JSONObject;
+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.intf.store.ISmallWechatAttrV1InnerServiceSMO;
+import com.java110.po.smallWechatAttr.SmallWechatAttrPo;
+import com.java110.utils.exception.CmdException;
+import com.java110.utils.util.Assert;
+import com.java110.utils.util.BeanConvertUtil;
+import com.java110.vo.ResultVo;
+import org.springframework.beans.factory.annotation.Autowired;
+
+@Java110Cmd(serviceCode = "smallWechat.updateSmallWechatAttr")
+public class UpdateSmallWechatAttrCmd extends Cmd {
+
+    @Autowired
+    private ISmallWechatAttrV1InnerServiceSMO smallWechatAttrV1InnerServiceSMOImpl;
+
+    @Override
+    public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
+        Assert.hasKeyAndValue(reqJson, "attrId", "attrId不能为空");
+        Assert.hasKeyAndValue(reqJson, "specCd", "请求报文中未包含specCd");
+        Assert.hasKeyAndValue(reqJson, "communityId", "请求报文中未包含communityId");
+        Assert.hasKeyAndValue(reqJson, "value", "请求报文中未包含value");
+    }
+
+    @Override
+    public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
+        SmallWechatAttrPo smallWechatAttrPo = BeanConvertUtil.covertBean(reqJson, SmallWechatAttrPo.class);
+        int flag = smallWechatAttrV1InnerServiceSMOImpl.updateSmallWechatAttr(smallWechatAttrPo);
+
+        if (flag < 1) {
+            throw new CmdException("更新数据失败");
+        }
+
+        context.setResponseEntity(ResultVo.success());
+    }
+}

service-store/src/main/java/com/java110/store/cmd/smallWechatAttr/UpdateSmallWechatAttrCmd.java

@@ -1,74 +0,0 @@
-/*
- * Copyright 2017-2020 吴学文 and java110 team.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.java110.store.cmd.smallWechatAttr;
-
-import com.alibaba.fastjson.JSONObject;
-import com.java110.core.annotation.Java110Cmd;
-import com.java110.core.annotation.Java110Transactional;
-import com.java110.core.context.ICmdDataFlowContext;
-import com.java110.core.event.cmd.Cmd;
-import com.java110.core.event.cmd.CmdEvent;
-import com.java110.intf.store.ISmallWechatAttrV1InnerServiceSMO;
-import com.java110.po.smallWechatAttr.SmallWechatAttrPo;
-import com.java110.utils.exception.CmdException;
-import com.java110.utils.util.Assert;
-import com.java110.utils.util.BeanConvertUtil;
-import com.java110.vo.ResultVo;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-
-/**
- * 类表述：更新
- * 服务编码：smallWechatAttr.updateSmallWechatAttr
- * 请求路劲：/app/smallWechatAttr.UpdateSmallWechatAttr
- * add by 吴学文 at 2022-05-25 10:58:13 mail: 928255095@qq.com
- * open source address: https://gitee.com/wuxw7/MicroCommunity
- * 官网：http://www.homecommunity.cn
- * 温馨提示：如果您对此文件进行修改 请不要删除原有作者及注释信息，请补充您的 修改的原因以及联系邮箱如下
- * // modify by 张三 at 2021-09-12 第10行在某种场景下存在某种bug 需要修复，注释10至20行 加入 20行至30行
- */
-@Java110Cmd(serviceCode = "smallWechatAttr.updateSmallWechatAttr")
-public class UpdateSmallWechatAttrCmd extends Cmd {
-
-  private static Logger logger = LoggerFactory.getLogger(UpdateSmallWechatAttrCmd.class);
-
-
-    @Autowired
-    private ISmallWechatAttrV1InnerServiceSMO smallWechatAttrV1InnerServiceSMOImpl;
-
-    @Override
-    public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
-        Assert.hasKeyAndValue(reqJson, "attrId", "attrId不能为空");
-Assert.hasKeyAndValue(reqJson, "communityId", "communityId不能为空");
-
-    }
-
-    @Override
-    @Java110Transactional
-    public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
-
-       SmallWechatAttrPo smallWechatAttrPo = BeanConvertUtil.covertBean(reqJson, SmallWechatAttrPo.class);
-        int flag = smallWechatAttrV1InnerServiceSMOImpl.updateSmallWechatAttr(smallWechatAttrPo);
-
-        if (flag < 1) {
-            throw new CmdException("更新数据失败");
-        }
-
-        cmdDataFlowContext.setResponseEntity(ResultVo.success());
-    }
-}