活动改为 cmd模式

java110-db/src/main/resources/mapper/community/ActivitiesV1ServiceDaoImplMapper.xml

@@ -0,0 +1,187 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="activitiesV1ServiceDaoImpl">
+
+
+
+
+
+    <!-- 保存活动信息 add by wuxw 2018-07-03 -->
+    <insert id="saveActivitiesInfo" parameterType="Map">
+        insert into activities(
+collect_count,like_count,title,read_count,user_name,user_id,activities_id,type_cd,context,start_time,end_time,state,community_id,header_img
+) values (
+#{collectCount},#{likeCount},#{title},#{readCount},#{userName},#{userId},#{activitiesId},#{typeCd},#{context},#{startTime},#{endTime},#{state},#{communityId},#{headerImg}
+)
+    </insert>
+
+
+
+    <!-- 查询活动信息 add by wuxw 2018-07-03 -->
+    <select id="getActivitiesInfo" parameterType="Map" resultType="Map">
+        select  t.collect_count,t.collect_count collectCount,t.like_count,t.like_count likeCount,t.status_cd,t.status_cd statusCd,t.title,t.read_count,t.read_count readCount,t.user_name,t.user_name userName,t.user_id,t.user_id userId,t.activities_id,t.activities_id activitiesId,t.type_cd,t.type_cd typeCd,t.context,t.start_time,t.start_time startTime,t.end_time,t.end_time endTime,t.state,t.community_id,t.community_id communityId,t.header_img,t.header_img headerImg 
+from activities t 
+where 1 =1 
+<if test="collectCount !=null and collectCount != ''">
+   and t.collect_count= #{collectCount}
+</if> 
+<if test="likeCount !=null and likeCount != ''">
+   and t.like_count= #{likeCount}
+</if> 
+<if test="statusCd !=null and statusCd != ''">
+   and t.status_cd= #{statusCd}
+</if> 
+<if test="title !=null and title != ''">
+   and t.title= #{title}
+</if> 
+<if test="readCount !=null and readCount != ''">
+   and t.read_count= #{readCount}
+</if> 
+<if test="userName !=null and userName != ''">
+   and t.user_name= #{userName}
+</if> 
+<if test="userId !=null and userId != ''">
+   and t.user_id= #{userId}
+</if> 
+<if test="activitiesId !=null and activitiesId != ''">
+   and t.activities_id= #{activitiesId}
+</if> 
+<if test="typeCd !=null and typeCd != ''">
+   and t.type_cd= #{typeCd}
+</if> 
+<if test="context !=null and context != ''">
+   and t.context= #{context}
+</if> 
+<if test="startTime !=null and startTime != ''">
+   and t.start_time= #{startTime}
+</if> 
+<if test="endTime !=null and endTime != ''">
+   and t.end_time= #{endTime}
+</if> 
+<if test="state !=null and state != ''">
+   and t.state= #{state}
+</if> 
+<if test="communityId !=null and communityId != ''">
+   and t.community_id= #{communityId}
+</if> 
+<if test="headerImg !=null and headerImg != ''">
+   and t.header_img= #{headerImg}
+</if> 
+order by t.create_time desc
+<if test="page != -1 and page != null ">
+   limit #{page}, #{row}
+</if> 
+
+    </select>
+
+
+
+
+    <!-- 修改活动信息 add by wuxw 2018-07-03 -->
+    <update id="updateActivitiesInfo" parameterType="Map">
+        update  activities t set t.status_cd = #{statusCd}
+<if test="newBId != null and newBId != ''">
+,t.b_id = #{newBId}
+</if> 
+<if test="collectCount !=null and collectCount != ''">
+, t.collect_count= #{collectCount}
+</if> 
+<if test="likeCount !=null and likeCount != ''">
+, t.like_count= #{likeCount}
+</if> 
+<if test="title !=null and title != ''">
+, t.title= #{title}
+</if> 
+<if test="readCount !=null and readCount != ''">
+, t.read_count= #{readCount}
+</if> 
+<if test="userName !=null and userName != ''">
+, t.user_name= #{userName}
+</if> 
+<if test="userId !=null and userId != ''">
+, t.user_id= #{userId}
+</if> 
+<if test="typeCd !=null and typeCd != ''">
+, t.type_cd= #{typeCd}
+</if> 
+<if test="context !=null and context != ''">
+, t.context= #{context}
+</if> 
+<if test="startTime !=null and startTime != ''">
+, t.start_time= #{startTime}
+</if> 
+<if test="endTime !=null and endTime != ''">
+, t.end_time= #{endTime}
+</if> 
+<if test="state !=null and state != ''">
+, t.state= #{state}
+</if> 
+<if test="communityId !=null and communityId != ''">
+, t.community_id= #{communityId}
+</if> 
+<if test="headerImg !=null and headerImg != ''">
+, t.header_img= #{headerImg}
+</if> 
+ where 1=1 <if test="activitiesId !=null and activitiesId != ''">
+and t.activities_id= #{activitiesId}
+</if> 
+
+    </update>
+
+    <!-- 查询活动数量 add by wuxw 2018-07-03 -->
+     <select id="queryActivitiessCount" parameterType="Map" resultType="Map">
+        select  count(1) count 
+from activities t 
+where 1 =1 
+<if test="collectCount !=null and collectCount != ''">
+   and t.collect_count= #{collectCount}
+</if> 
+<if test="likeCount !=null and likeCount != ''">
+   and t.like_count= #{likeCount}
+</if> 
+<if test="statusCd !=null and statusCd != ''">
+   and t.status_cd= #{statusCd}
+</if> 
+<if test="title !=null and title != ''">
+   and t.title= #{title}
+</if> 
+<if test="readCount !=null and readCount != ''">
+   and t.read_count= #{readCount}
+</if> 
+<if test="userName !=null and userName != ''">
+   and t.user_name= #{userName}
+</if> 
+<if test="userId !=null and userId != ''">
+   and t.user_id= #{userId}
+</if> 
+<if test="activitiesId !=null and activitiesId != ''">
+   and t.activities_id= #{activitiesId}
+</if> 
+<if test="typeCd !=null and typeCd != ''">
+   and t.type_cd= #{typeCd}
+</if> 
+<if test="context !=null and context != ''">
+   and t.context= #{context}
+</if> 
+<if test="startTime !=null and startTime != ''">
+   and t.start_time= #{startTime}
+</if> 
+<if test="endTime !=null and endTime != ''">
+   and t.end_time= #{endTime}
+</if> 
+<if test="state !=null and state != ''">
+   and t.state= #{state}
+</if> 
+<if test="communityId !=null and communityId != ''">
+   and t.community_id= #{communityId}
+</if> 
+<if test="headerImg !=null and headerImg != ''">
+   and t.header_img= #{headerImg}
+</if> 
+
+
+     </select>
+
+</mapper>

java110-interface/src/main/java/com/java110/intf/community/IActivitiesV1InnerServiceSMO.java

@@ -0,0 +1,68 @@
+/*
+ * 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.intf.community;
+
+import com.java110.config.feign.FeignConfiguration;
+import com.java110.dto.activities.ActivitiesDto;
+import com.java110.po.activities.ActivitiesPo;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+
+import java.util.List;
+
+/**
+ * 类表述： 服务之前调用的接口类，不对外提供接口能力 只用于接口建调用
+ * add by 吴学文 at 2022-06-19 10:49:17 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行
+ */
+@FeignClient(name = "community-service", configuration = {FeignConfiguration.class})
+@RequestMapping("/activitiesV1Api")
+public interface IActivitiesV1InnerServiceSMO {
+
+
+    @RequestMapping(value = "/saveActivities", method = RequestMethod.POST)
+    public int saveActivities(@RequestBody  ActivitiesPo activitiesPo);
+
+    @RequestMapping(value = "/updateActivities", method = RequestMethod.POST)
+    public int updateActivities(@RequestBody  ActivitiesPo activitiesPo);
+
+    @RequestMapping(value = "/deleteActivities", method = RequestMethod.POST)
+    public int deleteActivities(@RequestBody  ActivitiesPo activitiesPo);
+
+    /**
+     * <p>查询小区楼信息</p>
+     *
+     *
+     * @param activitiesDto 数据对象分享
+     * @return ActivitiesDto 对象数据
+     */
+    @RequestMapping(value = "/queryActivitiess", method = RequestMethod.POST)
+    List<ActivitiesDto> queryActivitiess(@RequestBody ActivitiesDto activitiesDto);
+
+    /**
+     * 查询<p>小区楼</p>总记录数
+     *
+     * @param activitiesDto 数据对象分享
+     * @return 小区下的小区楼记录数
+     */
+    @RequestMapping(value = "/queryActivitiessCount", method = RequestMethod.POST)
+    int queryActivitiessCount(@RequestBody ActivitiesDto activitiesDto);
+}

service-api/src/main/java/com/java110/api/listener/activities/DeleteActivitiesListener.java

@@ -1,64 +0,0 @@
-package com.java110.api.listener.activities;
-
-import com.alibaba.fastjson.JSONObject;
-import com.java110.api.bmo.activities.IActivitiesBMO;
-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.intf.community.IActivitiesInnerServiceSMO;
-import com.java110.po.activities.ActivitiesPo;
-import com.java110.utils.constant.BusinessTypeConstant;
-import com.java110.utils.constant.ServiceCodeActivitiesConstant;
-import com.java110.utils.util.Assert;
-import com.java110.utils.util.BeanConvertUtil;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpMethod;
-
-/**
- * 保存小区侦听
- * add by wuxw 2019-06-30
- */
-@Java110Listener("deleteActivitiesListener")
-public class DeleteActivitiesListener extends AbstractServiceApiPlusListener {
-    @Autowired
-    private IActivitiesBMO activitiesBMOImpl;
-
-    @Autowired
-    private IActivitiesInnerServiceSMO activitiesInnerServiceSMOImpl;
-
-    @Override
-    protected void validate(ServiceDataFlowEvent event, JSONObject reqJson) {
-        //Assert.hasKeyAndValue(reqJson, "xxx", "xxx");
-
-        Assert.hasKeyAndValue(reqJson, "activitiesId", "活动ID不能为空");
-
-    }
-
-    @Override
-    protected void doSoService(ServiceDataFlowEvent event, DataFlowContext context, JSONObject reqJson) {
-
-        ActivitiesPo activitiesPo = BeanConvertUtil.covertBean(reqJson, ActivitiesPo.class);
-
-        super.delete(context, activitiesPo, BusinessTypeConstant.BUSINESS_TYPE_DELETE_ACTIVITIES);
-
-
-    }
-
-    @Override
-    public String getServiceCode() {
-        return ServiceCodeActivitiesConstant.DELETE_ACTIVITIES;
-    }
-
-    @Override
-    public HttpMethod getHttpMethod() {
-        return HttpMethod.POST;
-    }
-
-    @Override
-    public int getOrder() {
-        return DEFAULT_ORDER;
-    }
-
-
-}

service-community/src/main/java/com/java110/community/cmd/activities/DeleteActivitiesCmd.java

@@ -0,0 +1,70 @@
+/*
+ * 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.community.cmd.activities;
+
+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.core.factory.GenerateCodeFactory;
+import com.java110.intf.community.IActivitiesV1InnerServiceSMO;
+import com.java110.po.activities.ActivitiesPo;
+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;
+/**
+ * 类表述：删除
+ * 服务编码：activities.deleteActivities
+ * 请求路劲：/app/activities.DeleteActivities
+ * add by 吴学文 at 2022-06-19 10:49:17 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 = "activities.deleteActivities")
+public class DeleteActivitiesCmd extends Cmd {
+  private static Logger logger = LoggerFactory.getLogger(DeleteActivitiesCmd.class);
+
+    @Autowired
+    private IActivitiesV1InnerServiceSMO activitiesV1InnerServiceSMOImpl;
+
+    @Override
+    public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
+        Assert.hasKeyAndValue(reqJson, "activitiesId", "activitiesId不能为空");
+
+    }
+
+    @Override
+    @Java110Transactional
+    public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
+
+       ActivitiesPo activitiesPo = BeanConvertUtil.covertBean(reqJson, ActivitiesPo.class);
+        int flag = activitiesV1InnerServiceSMOImpl.deleteActivities(activitiesPo);
+
+        if (flag < 1) {
+            throw new CmdException("删除数据失败");
+        }
+
+        cmdDataFlowContext.setResponseEntity(ResultVo.success());
+    }
+}

service-api/src/main/java/com/java110/api/listener/activities/ListActivitiessListener.java

@@ -1,20 +1,37 @@
-package com.java110.api.listener.activities;
+/*
+ * 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.community.cmd.activities;
 
 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.community.IActivitiesInnerServiceSMO;
+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.activities.ActivitiesDto;
-import com.java110.core.event.service.api.ServiceDataFlowEvent;
-import com.java110.utils.constant.ServiceCodeActivitiesConstant;
+import com.java110.intf.community.IActivitiesInnerServiceSMO;
+import com.java110.intf.community.IActivitiesV1InnerServiceSMO;
+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.activities.ApiActivitiesDataVo;
 import com.java110.vo.api.activities.ApiActivitiesVo;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpMethod;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 
@@ -25,45 +42,33 @@ import java.util.List;
 
 
 /**
- * 查询小区侦听类
+ * 类表述：查询
+ * 服务编码：activities.listActivities
+ * 请求路劲：/app/activities.ListActivities
+ * add by 吴学文 at 2022-06-19 10:49:17 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行
  */
-@Java110Listener("listActivitiessListener")
-public class ListActivitiessListener extends AbstractServiceApiListener {
+@Java110Cmd(serviceCode = "activities.listActivitiess")
+public class ListActivitiessCmd extends Cmd {
 
+    private static Logger logger = LoggerFactory.getLogger(ListActivitiessCmd.class);
+    @Autowired
+    private IActivitiesV1InnerServiceSMO activitiesV1InnerServiceSMOImpl;
     @Autowired
     private IActivitiesInnerServiceSMO activitiesInnerServiceSMOImpl;
 
     @Override
-    public String getServiceCode() {
-        return ServiceCodeActivitiesConstant.LIST_ACTIVITIESS;
-    }
-
-    @Override
-    public HttpMethod getHttpMethod() {
-        return HttpMethod.GET;
-    }
-
-    @Override
-    public int getOrder() {
-        return DEFAULT_ORDER;
-    }
-
-    public IActivitiesInnerServiceSMO getActivitiesInnerServiceSMOImpl() {
-        return activitiesInnerServiceSMOImpl;
-    }
-
-    public void setActivitiesInnerServiceSMOImpl(IActivitiesInnerServiceSMO activitiesInnerServiceSMOImpl) {
-        this.activitiesInnerServiceSMOImpl = activitiesInnerServiceSMOImpl;
-    }
-
-    @Override
-    protected void validate(ServiceDataFlowEvent event, JSONObject reqJson) {
+    public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
         Assert.hasKeyAndValue(reqJson, "communityId", "请求报文中未包含小区信息");
         super.validatePageInfo(reqJson);
     }
 
     @Override
-    protected void doSoService(ServiceDataFlowEvent event, DataFlowContext context, JSONObject reqJson) {
+    public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
+
 
         ActivitiesDto activitiesDto = BeanConvertUtil.covertBean(reqJson, ActivitiesDto.class);
         if (!StringUtil.isEmpty("clientType") && "H5".equals(reqJson.get("clientType"))) {

service-api/src/main/java/com/java110/api/listener/activities/SaveActivitiesListener.java

@@ -1,10 +1,27 @@
-package com.java110.api.listener.activities;
+/*
+ * 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.community.cmd.activities;
 
 import com.alibaba.fastjson.JSONObject;
-import com.java110.api.listener.AbstractServiceApiPlusListener;
-import com.java110.core.annotation.Java110Listener;
+import com.java110.core.annotation.Java110Cmd;
+import com.java110.core.annotation.Java110Transactional;
 import com.java110.core.context.DataFlowContext;
-import com.java110.core.event.service.api.ServiceDataFlowEvent;
+import com.java110.core.context.ICmdDataFlowContext;
+import com.java110.core.event.cmd.Cmd;
+import com.java110.core.event.cmd.CmdEvent;
 import com.java110.core.factory.GenerateCodeFactory;
 import com.java110.dto.activitiesType.ActivitiesTypeDto;
 import com.java110.dto.community.CommunityDto;
@@ -13,7 +30,9 @@ import com.java110.dto.org.OrgCommunityDto;
 import com.java110.dto.org.OrgDto;
 import com.java110.dto.org.OrgStaffRelDto;
 import com.java110.intf.common.IFileInnerServiceSMO;
+import com.java110.intf.common.IFileRelInnerServiceSMO;
 import com.java110.intf.community.IActivitiesTypeInnerServiceSMO;
+import com.java110.intf.community.IActivitiesV1InnerServiceSMO;
 import com.java110.intf.community.ICommunityInnerServiceSMO;
 import com.java110.intf.user.IOrgCommunityInnerServiceSMO;
 import com.java110.intf.user.IOrgInnerServiceSMO;
@@ -21,24 +40,38 @@ import com.java110.intf.user.IOrgStaffRelInnerServiceSMO;
 import com.java110.po.activities.ActivitiesPo;
 import com.java110.po.file.FileRelPo;
 import com.java110.utils.constant.BusinessTypeConstant;
-import com.java110.utils.constant.ServiceCodeActivitiesConstant;
 import com.java110.utils.constant.StateConstant;
+import com.java110.utils.exception.CmdException;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
+import com.java110.vo.ResultVo;
 import com.java110.vo.api.community.ApiCommunityDataVo;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpMethod;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.util.List;
 
 /**
- * 保存小区侦听
- * add by wuxw 2019-06-30
+ * 类表述：保存
+ * 服务编码：activities.saveActivities
+ * 请求路劲：/app/activities.SaveActivities
+ * add by 吴学文 at 2022-06-19 10:49:17 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行
  */
-@Java110Listener("saveActivitiesListener")
-public class SaveActivitiesListener extends AbstractServiceApiPlusListener {
+@Java110Cmd(serviceCode = "activities.saveActivities")
+public class SaveActivitiesCmd extends Cmd {
+
+    private static Logger logger = LoggerFactory.getLogger(SaveActivitiesCmd.class);
+
+    public static final String CODE_PREFIX_ID = "10";
 
+    @Autowired
+    private IActivitiesV1InnerServiceSMO activitiesV1InnerServiceSMOImpl;
     @Autowired
     private IFileInnerServiceSMO fileInnerServiceSMOImpl;
 
@@ -57,8 +90,13 @@ public class SaveActivitiesListener extends AbstractServiceApiPlusListener {
     @Autowired
     private IOrgInnerServiceSMO orgInnerServiceSMOImpl;
 
+
+    @Autowired
+    private IFileRelInnerServiceSMO fileRelInnerServiceSMOImpl;
+
+
     @Override
-    protected void validate(ServiceDataFlowEvent event, JSONObject reqJson) {
+    public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
         //Assert.hasKeyAndValue(reqJson, "xxx", "xxx");
         Assert.hasKeyAndValue(reqJson, "title", "必填，请填写业活动标题");
         Assert.hasKeyAndValue(reqJson, "typeCd", "必填，请选择活动类型");
@@ -71,9 +109,10 @@ public class SaveActivitiesListener extends AbstractServiceApiPlusListener {
     }
 
     @Override
-    protected void doSoService(ServiceDataFlowEvent event, DataFlowContext context, JSONObject reqJson) {
+    @Java110Transactional
+    public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
         if (!reqJson.containsKey("isMoreCommunity") || "N".equals(reqJson.getString("isMoreCommunity"))) {
-            addActivities(context, reqJson);
+            addActivities(cmdDataFlowContext, reqJson);
             return;
         }
 
@@ -100,7 +139,7 @@ public class SaveActivitiesListener extends AbstractServiceApiPlusListener {
                 continue;
             }
             reqJson.put("typeCd", activitiesTypeDtos.get(0).getTypeCd());
-            addActivities(context, reqJson);
+            addActivities(cmdDataFlowContext, reqJson);
         }
     }
 
@@ -140,7 +179,7 @@ public class SaveActivitiesListener extends AbstractServiceApiPlusListener {
         return communitys;
     }
 
-    public void addActivities(DataFlowContext context, JSONObject reqJson) {
+    public void addActivities(ICmdDataFlowContext context, JSONObject reqJson) {
         reqJson.put("activitiesId", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_activitiesId));
         if (reqJson.containsKey("headerImg") && !StringUtils.isEmpty(reqJson.getString("headerImg"))) {
             FileDto fileDto = new FileDto();
@@ -161,30 +200,20 @@ public class SaveActivitiesListener extends AbstractServiceApiPlusListener {
             fileRelPo.setObjId(reqJson.getString("activitiesId"));
             fileRelPo.setSaveWay("table");
             fileRelPo.setRelTypeCd("70000");
-            super.insert(context, fileRelPo, BusinessTypeConstant.BUSINESS_TYPE_SAVE_FILE_REL);
+            int flag = fileRelInnerServiceSMOImpl.saveFileRel(fileRelPo);
+            if(flag < 1){
+                throw new CmdException("保存广告失败");
+            }
         }
         ActivitiesPo activitiesPo = BeanConvertUtil.covertBean(reqJson, ActivitiesPo.class);
         activitiesPo.setReadCount("0");
         activitiesPo.setLikeCount("0");
         activitiesPo.setCollectCount("0");
         activitiesPo.setState("11000");
-        //添加单元信息
-        super.insert(context, activitiesPo, BusinessTypeConstant.BUSINESS_TYPE_SAVE_ACTIVITIES);
-    }
 
-
-    @Override
-    public String getServiceCode() {
-        return ServiceCodeActivitiesConstant.ADD_ACTIVITIES;
-    }
-
-    @Override
-    public HttpMethod getHttpMethod() {
-        return HttpMethod.POST;
-    }
-
-    @Override
-    public int getOrder() {
-        return DEFAULT_ORDER;
+        int flag = activitiesV1InnerServiceSMOImpl.saveActivities(activitiesPo);
+        if(flag < 1){
+            throw new CmdException("保存广告失败");
+        }
     }
 }

service-api/src/main/java/com/java110/api/listener/activities/UpdateActivitiesListener.java

@@ -1,51 +1,75 @@
-package com.java110.api.listener.activities;
+/*
+ * 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.community.cmd.activities;
 
 import com.alibaba.fastjson.JSONObject;
-import com.java110.api.bmo.activities.IActivitiesBMO;
-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.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.core.factory.GenerateCodeFactory;
-import com.java110.intf.community.IActivitiesInnerServiceSMO;
-import com.java110.intf.common.IFileInnerServiceSMO;
-import com.java110.intf.common.IFileRelInnerServiceSMO;
 import com.java110.dto.file.FileDto;
 import com.java110.dto.file.FileRelDto;
+import com.java110.intf.common.IFileInnerServiceSMO;
+import com.java110.intf.common.IFileRelInnerServiceSMO;
+import com.java110.intf.community.IActivitiesInnerServiceSMO;
+import com.java110.intf.community.IActivitiesV1InnerServiceSMO;
 import com.java110.po.activities.ActivitiesPo;
 import com.java110.po.file.FileRelPo;
 import com.java110.utils.constant.BusinessTypeConstant;
-import com.java110.utils.constant.ServiceCodeActivitiesConstant;
+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.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpMethod;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.util.List;
 
+
 /**
- * 保存活动侦听
- * add by wuxw 2019-06-30
+ * 类表述：更新
+ * 服务编码：activities.updateActivities
+ * 请求路劲：/app/activities.UpdateActivities
+ * add by 吴学文 at 2022-06-19 10:49:17 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行
  */
-@Java110Listener("updateActivitiesListener")
-public class UpdateActivitiesListener extends AbstractServiceApiPlusListener {
+@Java110Cmd(serviceCode = "activities.updateActivities")
+public class UpdateActivitiesCmd extends Cmd {
 
-    @Autowired
-    private IActivitiesInnerServiceSMO activitiesInnerServiceSMOImpl;
-
-    @Autowired
-    private IActivitiesBMO activitiesBMOImpl;
+  private static Logger logger = LoggerFactory.getLogger(UpdateActivitiesCmd.class);
 
     @Autowired
     private IFileInnerServiceSMO fileInnerServiceSMOImpl;
 
     @Autowired
     private IFileRelInnerServiceSMO fileRelInnerServiceSMOImpl;
+    @Autowired
+    private IActivitiesV1InnerServiceSMO activitiesV1InnerServiceSMOImpl;
+    @Autowired
+    private IActivitiesInnerServiceSMO activitiesInnerServiceSMOImpl;
 
     @Override
-    protected void validate(ServiceDataFlowEvent event, JSONObject reqJson) {
-
+    public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
         Assert.hasKeyAndValue(reqJson, "activitiesId", "活动ID不能为空");
         Assert.hasKeyAndValue(reqJson, "communityId", "小区ID不能为空");
         Assert.hasKeyAndValue(reqJson, "title", "必填，请填写业活动标题");
@@ -57,8 +81,10 @@ public class UpdateActivitiesListener extends AbstractServiceApiPlusListener {
 
     }
 
+
     @Override
-    protected void doSoService(ServiceDataFlowEvent event, DataFlowContext context, JSONObject reqJson) {
+    @Java110Transactional
+    public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
 
 
         if (reqJson.containsKey("headerImg") && !StringUtils.isEmpty(reqJson.getString("headerImg"))) {
@@ -80,45 +106,37 @@ public class UpdateActivitiesListener extends AbstractServiceApiPlusListener {
 
             if (fileRelDtos == null || fileRelDtos.size() == 0) {
                 FileRelPo fileRelPo = new FileRelPo();
-                fileRelPo.setFileRelId("-1");
+                fileRelPo.setFileRelId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_fileRelId));
                 fileRelPo.setFileRealName(reqJson.getString("headerImg"));
                 fileRelPo.setFileSaveName(reqJson.getString("fileSaveName"));
                 fileRelPo.setObjId(reqJson.getString("activitiesId"));
                 fileRelPo.setSaveWay("table");
                 fileRelPo.setRelTypeCd("70000");
-                super.insert(context, fileRelPo, BusinessTypeConstant.BUSINESS_TYPE_SAVE_FILE_REL);
+                int flag = fileRelInnerServiceSMOImpl.saveFileRel(fileRelPo);
+                if(flag < 1){
+                    throw new CmdException("保存广告失败");
+                }
             } else {
                 FileRelPo fileRelPo = new FileRelPo();
                 fileRelPo.setFileRelId(fileRelDtos.get(0).getFileRelId());
                 fileRelPo.setFileRealName(reqJson.getString("headerImg"));
                 fileRelPo.setFileSaveName(reqJson.getString("fileSaveName"));
                 fileRelPo.setObjId(reqJson.getString("activitiesId"));
-                super.update(context, fileRelPo, BusinessTypeConstant.BUSINESS_TYPE_UPDATE_FILE_REL);
+                int flag = fileRelInnerServiceSMOImpl.updateFileRel(fileRelPo);
+                if(flag < 1){
+                    throw new CmdException("保存广告失败");
+                }
             }
 
         }
 
         ActivitiesPo activitiesPo = BeanConvertUtil.covertBean(reqJson, ActivitiesPo.class);
+        int flag = activitiesV1InnerServiceSMOImpl.updateActivities(activitiesPo);
 
-        super.update(context, activitiesPo, BusinessTypeConstant.BUSINESS_TYPE_UPDATE_ACTIVITIES);
-
-    }
-
-
-    @Override
-    public String getServiceCode() {
-        return ServiceCodeActivitiesConstant.UPDATE_ACTIVITIES;
-    }
+        if (flag < 1) {
+            throw new CmdException("更新数据失败");
+        }
 
-    @Override
-    public HttpMethod getHttpMethod() {
-        return HttpMethod.POST;
+        cmdDataFlowContext.setResponseEntity(ResultVo.success());
     }
-
-    @Override
-    public int getOrder() {
-        return DEFAULT_ORDER;
-    }
-
-
 }

service-community/src/main/java/com/java110/community/dao/IActivitiesV1ServiceDao.java

@@ -0,0 +1,77 @@
+/*
+ * 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.community.dao;
+
+
+import com.java110.utils.exception.DAOException;
+import com.java110.entity.merchant.BoMerchant;
+import com.java110.entity.merchant.BoMerchantAttr;
+import com.java110.entity.merchant.Merchant;
+import com.java110.entity.merchant.MerchantAttr;
+
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 类表述：
+ * add by 吴学文 at 2022-06-19 10:49:16 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行
+ */
+public interface IActivitiesV1ServiceDao {
+
+
+    /**
+     * 保存 活动信息
+     * @param info
+     * @throws DAOException DAO异常
+     */
+    int saveActivitiesInfo(Map info) throws DAOException;
+
+
+
+
+    /**
+     * 查询活动信息（instance过程）
+     * 根据bId 查询活动信息
+     * @param info bId 信息
+     * @return 活动信息
+     * @throws DAOException DAO异常
+     */
+    List<Map> getActivitiesInfo(Map info) throws DAOException;
+
+
+
+    /**
+     * 修改活动信息
+     * @param info 修改信息
+     * @throws DAOException DAO异常
+     */
+    int updateActivitiesInfo(Map info) throws DAOException;
+
+
+    /**
+     * 查询活动总数
+     *
+     * @param info 活动信息
+     * @return 活动数量
+     */
+    int queryActivitiessCount(Map info);
+
+}

service-community/src/main/java/com/java110/community/dao/impl/ActivitiesV1ServiceDaoImpl.java

@@ -0,0 +1,112 @@
+/*
+ * 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.community.dao.impl;
+
+import com.alibaba.fastjson.JSONObject;
+import com.java110.utils.constant.ResponseConstant;
+import com.java110.utils.exception.DAOException;
+import com.java110.utils.util.DateUtil;
+import com.java110.core.base.dao.BaseServiceDao;
+import com.java110.community.dao.IActivitiesV1ServiceDao;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 类表述：
+ * add by 吴学文 at 2022-06-19 10:49:17 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行
+ */
+@Service("activitiesV1ServiceDaoImpl")
+public class ActivitiesV1ServiceDaoImpl extends BaseServiceDao implements IActivitiesV1ServiceDao {
+
+    private static Logger logger = LoggerFactory.getLogger(ActivitiesV1ServiceDaoImpl.class);
+
+
+
+
+
+    /**
+     * 保存活动信息 到 instance
+     * @param info   bId 信息
+     * @throws DAOException DAO异常
+     */
+    @Override
+    public int saveActivitiesInfo(Map info) throws DAOException {
+        logger.debug("保存 saveActivitiesInfo 入参 info : {}",info);
+
+        int saveFlag = sqlSessionTemplate.insert("activitiesV1ServiceDaoImpl.saveActivitiesInfo",info);
+
+        return saveFlag;
+    }
+
+
+    /**
+     * 查询活动信息（instance）
+     * @param info bId 信息
+     * @return List<Map>
+     * @throws DAOException DAO异常
+     */
+    @Override
+    public List<Map> getActivitiesInfo(Map info) throws DAOException {
+        logger.debug("查询 getActivitiesInfo 入参 info : {}",info);
+
+        List<Map> businessActivitiesInfos = sqlSessionTemplate.selectList("activitiesV1ServiceDaoImpl.getActivitiesInfo",info);
+
+        return businessActivitiesInfos;
+    }
+
+
+    /**
+     * 修改活动信息
+     * @param info 修改信息
+     * @throws DAOException DAO异常
+     */
+    @Override
+    public int updateActivitiesInfo(Map info) throws DAOException {
+        logger.debug("修改 updateActivitiesInfo 入参 info : {}",info);
+
+        int saveFlag = sqlSessionTemplate.update("activitiesV1ServiceDaoImpl.updateActivitiesInfo",info);
+
+        return saveFlag;
+    }
+
+     /**
+     * 查询活动数量
+     * @param info 活动信息
+     * @return 活动数量
+     */
+    @Override
+    public int queryActivitiessCount(Map info) {
+        logger.debug("查询 queryActivitiessCount 入参 info : {}",info);
+
+        List<Map> businessActivitiesInfos = sqlSessionTemplate.selectList("activitiesV1ServiceDaoImpl.queryActivitiessCount", info);
+        if (businessActivitiesInfos.size() < 1) {
+            return 0;
+        }
+
+        return Integer.parseInt(businessActivitiesInfos.get(0).get("count").toString());
+    }
+
+
+}

service-community/src/main/java/com/java110/community/smo/impl/ActivitiesV1InnerServiceSMOImpl.java

@@ -0,0 +1,89 @@
+/*
+ * 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.community.smo.impl;
+
+
+import com.java110.community.dao.IActivitiesV1ServiceDao;
+import com.java110.intf.community.IActivitiesV1InnerServiceSMO;
+import com.java110.dto.activities.ActivitiesDto;
+import com.java110.po.activities.ActivitiesPo;
+import com.java110.utils.util.BeanConvertUtil;
+import com.java110.core.base.smo.BaseServiceSMO;
+import com.java110.dto.user.UserDto;
+import com.java110.dto.PageDto;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 类表述： 服务之前调用的接口实现类，不对外提供接口能力 只用于接口建调用
+ * add by 吴学文 at 2022-06-19 10:49:17 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行
+ */
+@RestController
+public class ActivitiesV1InnerServiceSMOImpl extends BaseServiceSMO implements IActivitiesV1InnerServiceSMO {
+
+    @Autowired
+    private IActivitiesV1ServiceDao activitiesV1ServiceDaoImpl;
+
+
+    @Override
+    public int saveActivities(@RequestBody  ActivitiesPo activitiesPo) {
+        int saveFlag = activitiesV1ServiceDaoImpl.saveActivitiesInfo(BeanConvertUtil.beanCovertMap(activitiesPo));
+        return saveFlag;
+    }
+
+     @Override
+    public int updateActivities(@RequestBody  ActivitiesPo activitiesPo) {
+        int saveFlag = activitiesV1ServiceDaoImpl.updateActivitiesInfo(BeanConvertUtil.beanCovertMap(activitiesPo));
+        return saveFlag;
+    }
+
+     @Override
+    public int deleteActivities(@RequestBody  ActivitiesPo activitiesPo) {
+       activitiesPo.setStatusCd("1");
+       int saveFlag = activitiesV1ServiceDaoImpl.updateActivitiesInfo(BeanConvertUtil.beanCovertMap(activitiesPo));
+       return saveFlag;
+    }
+
+    @Override
+    public List<ActivitiesDto> queryActivitiess(@RequestBody  ActivitiesDto activitiesDto) {
+
+        //校验是否传了 分页信息
+
+        int page = activitiesDto.getPage();
+
+        if (page != PageDto.DEFAULT_PAGE) {
+            activitiesDto.setPage((page - 1) * activitiesDto.getRow());
+        }
+
+        List<ActivitiesDto> activitiess = BeanConvertUtil.covertBeanList(activitiesV1ServiceDaoImpl.getActivitiesInfo(BeanConvertUtil.beanCovertMap(activitiesDto)), ActivitiesDto.class);
+
+        return activitiess;
+    }
+
+
+    @Override
+    public int queryActivitiessCount(@RequestBody ActivitiesDto activitiesDto) {
+        return activitiesV1ServiceDaoImpl.queryActivitiessCount(BeanConvertUtil.beanCovertMap(activitiesDto));    }
+
+}