将小区审核 和入住审核调整为cmd模式

service-api/src/main/java/com/java110/api/listener/community/AuditCommunityListener.java

@@ -1,59 +0,0 @@
-package com.java110.api.listener.community;
-
-import com.alibaba.fastjson.JSONObject;
-import com.java110.api.bmo.community.ICommunityBMO;
-import com.java110.api.listener.AbstractServiceApiPlusListener;
-import com.java110.core.annotation.Java110Listener;
-import com.java110.core.context.DataFlowContext;
-import com.java110.intf.community.ICommunityInnerServiceSMO;
-import com.java110.core.event.service.api.ServiceDataFlowEvent;
-import com.java110.utils.constant.ServiceCodeConstant;
-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("auditCommunity")
-public class AuditCommunityListener extends AbstractServiceApiPlusListener {
-
-    @Autowired
-    private ICommunityBMO communityBMOImpl;
-
-    @Autowired
-    private ICommunityInnerServiceSMO communityInnerServiceSMOImpl;
-
-    @Override
-    protected void validate(ServiceDataFlowEvent event, JSONObject reqJson) {
-
-        Assert.hasKeyAndValue(reqJson, "communityId", "小区ID不能为空");
-        Assert.hasKeyAndValue(reqJson, "state", "必填，请填写小区审核状态");
-        Assert.hasKeyAndValue(reqJson, "remark", "必填，请填写小区审核原因");
-
-    }
-
-    @Override
-    protected void doSoService(ServiceDataFlowEvent event, DataFlowContext context, JSONObject reqJson) {
-
-        communityBMOImpl.updateCommunity(reqJson, context);
-    }
-
-    @Override
-    public String getServiceCode() {
-        return ServiceCodeConstant.SERVICE_CODE_AUDIT_COMMUNITY;
-    }
-
-    @Override
-    public HttpMethod getHttpMethod() {
-        return HttpMethod.POST;
-    }
-
-    @Override
-    public int getOrder() {
-        return DEFAULT_ORDER;
-    }
-
-
-}

service-api/src/main/java/com/java110/api/listener/community/AuditEnterCommunityListener.java

@@ -1,67 +0,0 @@
-package com.java110.api.listener.community;
-
-import com.alibaba.fastjson.JSONObject;
-import com.java110.api.bmo.community.ICommunityBMO;
-import com.java110.api.listener.AbstractServiceApiPlusListener;
-import com.java110.core.annotation.Java110Listener;
-import com.java110.core.context.DataFlowContext;
-import com.java110.intf.community.ICommunityInnerServiceSMO;
-import com.java110.core.event.service.api.ServiceDataFlowEvent;
-import com.java110.utils.constant.ServiceCodeConstant;
-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("auditEnterCommunity")
-public class AuditEnterCommunityListener extends AbstractServiceApiPlusListener {
-
-    @Autowired
-    private ICommunityBMO communityBMOImpl;
-    @Autowired
-    private ICommunityInnerServiceSMO communityInnerServiceSMOImpl;
-
-    @Override
-    protected void validate(ServiceDataFlowEvent event, JSONObject reqJson) {
-
-        Assert.hasKeyAndValue(reqJson, "communityMemberId", "小区成员ID不能为空");
-        Assert.hasKeyAndValue(reqJson, "state", "必填，请填写小区审核状态");
-        Assert.hasKeyAndValue(reqJson, "remark", "必填，请填写小区审核原因");
-
-    }
-
-    @Override
-    protected void doSoService(ServiceDataFlowEvent event, DataFlowContext context, JSONObject reqJson) {
-
-        communityBMOImpl.updateCommunityMember(reqJson, context);
-
-
-    }
-
-    @Override
-    public String getServiceCode() {
-        return ServiceCodeConstant.SERVICE_CODE_AUDIT_ENTER_COMMUNITY;
-    }
-
-    @Override
-    public HttpMethod getHttpMethod() {
-        return HttpMethod.POST;
-    }
-
-    @Override
-    public int getOrder() {
-        return DEFAULT_ORDER;
-    }
-
-
-    public ICommunityInnerServiceSMO getCommunityInnerServiceSMOImpl() {
-        return communityInnerServiceSMOImpl;
-    }
-
-    public void setCommunityInnerServiceSMOImpl(ICommunityInnerServiceSMO communityInnerServiceSMOImpl) {
-        this.communityInnerServiceSMOImpl = communityInnerServiceSMOImpl;
-    }
-}

service-community/src/main/java/com/java110/community/cmd/community/AuditCommunityCmd.java

@@ -0,0 +1,56 @@
+package com.java110.community.cmd.community;
+
+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.dto.community.CommunityDto;
+import com.java110.intf.community.ICommunityInnerServiceSMO;
+import com.java110.intf.community.ICommunityV1InnerServiceSMO;
+import com.java110.po.community.CommunityPo;
+import com.java110.utils.exception.CmdException;
+import com.java110.utils.util.Assert;
+import com.java110.utils.util.BeanConvertUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.util.List;
+import java.util.Map;
+
+@Java110Cmd(serviceCode = "community.auditCommunity")
+public class AuditCommunityCmd extends Cmd {
+
+    @Autowired
+    private ICommunityInnerServiceSMO communityInnerServiceSMOImpl;
+
+    @Autowired
+    private ICommunityV1InnerServiceSMO communityV1InnerServiceSMOImpl;
+
+    @Override
+    public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
+
+        Assert.hasKeyAndValue(reqJson, "communityId", "小区ID不能为空");
+        Assert.hasKeyAndValue(reqJson, "state", "必填，请填写小区审核状态");
+        Assert.hasKeyAndValue(reqJson, "remark", "必填，请填写小区审核原因");
+    }
+
+    @Override
+    @Java110Transactional
+    public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
+        CommunityDto communityDto = new CommunityDto();
+        communityDto.setCommunityId(reqJson.getString("communityId"));
+        List<CommunityDto> communityDtos = communityInnerServiceSMOImpl.queryCommunitys(communityDto);
+        Assert.listOnlyOne(communityDtos, "未查询到该小区信息【" + communityDto.getCommunityId() + "】");
+        communityDto = communityDtos.get(0);
+
+        Map oldCommunityInfo = BeanConvertUtil.beanCovertMap(communityDto);
+        oldCommunityInfo.put("state", reqJson.getString("state"));
+        CommunityPo communityPo = BeanConvertUtil.covertBean(oldCommunityInfo, CommunityPo.class);
+        int flag = communityV1InnerServiceSMOImpl.updateCommunity(communityPo);
+
+        if (flag < 1) {
+            throw new CmdException("更新小区失败");
+        }
+    }
+}

service-community/src/main/java/com/java110/community/cmd/community/AuditEnterCommunityCmd.java

@@ -0,0 +1,56 @@
+package com.java110.community.cmd.community;
+
+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.dto.CommunityMemberDto;
+import com.java110.intf.community.ICommunityInnerServiceSMO;
+import com.java110.intf.community.ICommunityMemberV1InnerServiceSMO;
+import com.java110.po.community.CommunityMemberPo;
+import com.java110.utils.constant.BusinessTypeConstant;
+import com.java110.utils.exception.CmdException;
+import com.java110.utils.util.Assert;
+import com.java110.utils.util.BeanConvertUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.util.List;
+import java.util.Map;
+
+@Java110Cmd(serviceCode = "community.auditEnterCommunity")
+public class AuditEnterCommunityCmd  extends Cmd {
+
+    @Autowired
+    private ICommunityMemberV1InnerServiceSMO communityMemberV1InnerServiceSMOImpl;
+
+    @Autowired
+    private ICommunityInnerServiceSMO communityInnerServiceSMOImpl;
+
+    @Override
+    public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
+        Assert.hasKeyAndValue(reqJson, "communityMemberId", "小区成员ID不能为空");
+        Assert.hasKeyAndValue(reqJson, "state", "必填，请填写小区审核状态");
+        Assert.hasKeyAndValue(reqJson, "remark", "必填，请填写小区审核原因");
+    }
+
+    @Override
+    @Java110Transactional
+    public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
+        CommunityMemberDto communityMemberDto = new CommunityMemberDto();
+        communityMemberDto.setCommunityMemberId(reqJson.getString("communityMemberId"));
+        List<CommunityMemberDto> communityMemberDtos = communityInnerServiceSMOImpl.getCommunityMembers(communityMemberDto);
+        Assert.listOnlyOne(communityMemberDtos, "未查询到该小区成员信息【" + communityMemberDto.getCommunityMemberId() + "】");
+        communityMemberDto = communityMemberDtos.get(0);
+
+        Map oldCommunityInfo = BeanConvertUtil.beanCovertMap(communityMemberDto);
+        oldCommunityInfo.put("auditStatusCd", reqJson.getString("state"));
+        CommunityMemberPo communityMemberPo = BeanConvertUtil.covertBean(oldCommunityInfo, CommunityMemberPo.class);
+        int flag = communityMemberV1InnerServiceSMOImpl.updateCommunityMember(communityMemberPo);
+
+        if (flag < 1) {
+            throw new CmdException("更新小区失败");
+        }
+    }
+}