优化活动规则

java110-bean/src/main/java/com/java110/dto/activitiesRule/ActivitiesRuleDto.java

@@ -1,6 +1,7 @@
 package com.java110.dto.activitiesRule;
 
 import com.java110.dto.PageDto;
+
 import java.io.Serializable;
 import java.util.Date;
 
@@ -15,14 +16,15 @@ import java.util.Date;
 public class ActivitiesRuleDto extends PageDto implements Serializable {
 
     private String ruleType;
-private String objId;
-private String ruleName;
-private String activitiesObj;
-private String startTime;
-private String remark;
-private String endTime;
-private String ruleId;
-private String objType;
+    private String objId;
+    private String[] objIds;
+    private String ruleName;
+    private String activitiesObj;
+    private String startTime;
+    private String remark;
+    private String endTime;
+    private String ruleId;
+    private String objType;
 
 
     private Date createTime;
@@ -33,55 +35,72 @@ private String objType;
     public String getRuleType() {
         return ruleType;
     }
-public void setRuleType(String ruleType) {
+
+    public void setRuleType(String ruleType) {
         this.ruleType = ruleType;
     }
-public String getObjId() {
+
+    public String getObjId() {
         return objId;
     }
-public void setObjId(String objId) {
+
+    public void setObjId(String objId) {
         this.objId = objId;
     }
-public String getRuleName() {
+
+    public String getRuleName() {
         return ruleName;
     }
-public void setRuleName(String ruleName) {
+
+    public void setRuleName(String ruleName) {
         this.ruleName = ruleName;
     }
-public String getActivitiesObj() {
+
+    public String getActivitiesObj() {
         return activitiesObj;
     }
-public void setActivitiesObj(String activitiesObj) {
+
+    public void setActivitiesObj(String activitiesObj) {
         this.activitiesObj = activitiesObj;
     }
-public String getStartTime() {
+
+    public String getStartTime() {
         return startTime;
     }
-public void setStartTime(String startTime) {
+
+    public void setStartTime(String startTime) {
         this.startTime = startTime;
     }
-public String getRemark() {
+
+    public String getRemark() {
         return remark;
     }
-public void setRemark(String remark) {
+
+    public void setRemark(String remark) {
         this.remark = remark;
     }
-public String getEndTime() {
+
+    public String getEndTime() {
         return endTime;
     }
-public void setEndTime(String endTime) {
+
+    public void setEndTime(String endTime) {
         this.endTime = endTime;
     }
-public String getRuleId() {
+
+    public String getRuleId() {
         return ruleId;
     }
-public void setRuleId(String ruleId) {
+
+    public void setRuleId(String ruleId) {
         this.ruleId = ruleId;
     }
-public String getObjType() {
+
+    public String getObjType() {
         return objType;
     }
-public void setObjType(String objType) {
+
+    public void setObjType(String objType) {
         this.objType = objType;
     }
 
@@ -101,4 +120,12 @@ public void setObjType(String objType) {
     public void setStatusCd(String statusCd) {
         this.statusCd = statusCd;
     }
+
+    public String[] getObjIds() {
+        return objIds;
+    }
+
+    public void setObjIds(String[] objIds) {
+        this.objIds = objIds;
+    }
 }

java110-db/src/main/resources/mapper/user/ActivitiesRuleServiceDaoImplMapper.xml

@@ -5,138 +5,148 @@
 <mapper namespace="activitiesRuleServiceDaoImpl">
 
 
-
-
-
     <!-- 保存活动规则信息 add by wuxw 2018-07-03 -->
     <insert id="saveActivitiesRuleInfo" parameterType="Map">
         insert into activities_rule(
-rule_type,obj_id,rule_name,activities_obj,start_time,remark,end_time,rule_id,obj_type
-) values (
-#{ruleType},#{objId},#{ruleName},#{activitiesObj},#{startTime},#{remark},#{endTime},#{ruleId},#{objType}
-)
+        rule_type,obj_id,rule_name,activities_obj,start_time,remark,end_time,rule_id,obj_type
+        ) values (
+        #{ruleType},#{objId},#{ruleName},#{activitiesObj},#{startTime},#{remark},#{endTime},#{ruleId},#{objType}
+        )
     </insert>
 
 
-
     <!-- 查询活动规则信息 add by wuxw 2018-07-03 -->
     <select id="getActivitiesRuleInfo" parameterType="Map" resultType="Map">
-        select  t.rule_type,t.rule_type ruleType,t.obj_id,t.obj_id objId,t.rule_name,t.rule_name ruleName,t.activities_obj,t.activities_obj activitiesObj,t.start_time,t.start_time startTime,t.remark,t.status_cd,t.status_cd statusCd,t.end_time,t.end_time endTime,t.rule_id,t.rule_id ruleId,t.obj_type,t.obj_type objType 
-from activities_rule t 
-where 1 =1 
-<if test="ruleType !=null and ruleType != ''">
-   and t.rule_type= #{ruleType}
-</if> 
-<if test="objId !=null and objId != ''">
-   and t.obj_id= #{objId}
-</if> 
-<if test="ruleName !=null and ruleName != ''">
-   and t.rule_name= #{ruleName}
-</if> 
-<if test="activitiesObj !=null and activitiesObj != ''">
-   and t.activities_obj= #{activitiesObj}
-</if> 
-<if test="startTime !=null and startTime != ''">
-   and t.start_time= #{startTime}
-</if> 
-<if test="remark !=null and remark != ''">
-   and t.remark= #{remark}
-</if> 
-<if test="statusCd !=null and statusCd != ''">
-   and t.status_cd= #{statusCd}
-</if> 
-<if test="endTime !=null and endTime != ''">
-   and t.end_time= #{endTime}
-</if> 
-<if test="ruleId !=null and ruleId != ''">
-   and t.rule_id= #{ruleId}
-</if> 
-<if test="objType !=null and objType != ''">
-   and t.obj_type= #{objType}
-</if> 
-order by t.create_time desc
-<if test="page != -1 and page != null ">
-   limit #{page}, #{row}
-</if> 
+        select t.rule_type,t.rule_type ruleType,t.obj_id,t.obj_id objId,t.rule_name,t.rule_name
+        ruleName,t.activities_obj,t.activities_obj activitiesObj,t.start_time,t.start_time
+        startTime,t.remark,t.status_cd,t.status_cd statusCd,t.end_time,t.end_time endTime,t.rule_id,t.rule_id
+        ruleId,t.obj_type,t.obj_type objType
+        from activities_rule t
+        where 1 =1
+        <if test="ruleType !=null and ruleType != ''">
+            and t.rule_type= #{ruleType}
+        </if>
+        <if test="objId !=null and objId != ''">
+            and t.obj_id= #{objId}
+        </if>
+        <if test="objIds !=null">
+            and t.obj_id in
+            <foreach collection="objIds" item="item" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="ruleName !=null and ruleName != ''">
+            and t.rule_name= #{ruleName}
+        </if>
+        <if test="activitiesObj !=null and activitiesObj != ''">
+            and t.activities_obj= #{activitiesObj}
+        </if>
+        <if test="startTime !=null and startTime != ''">
+            and t.start_time= #{startTime}
+        </if>
+        <if test="remark !=null and remark != ''">
+            and t.remark= #{remark}
+        </if>
+        <if test="statusCd !=null and statusCd != ''">
+            and t.status_cd= #{statusCd}
+        </if>
+        <if test="endTime !=null and endTime != ''">
+            and t.end_time= #{endTime}
+        </if>
+        <if test="ruleId !=null and ruleId != ''">
+            and t.rule_id= #{ruleId}
+        </if>
+        <if test="objType !=null and objType != ''">
+            and t.obj_type= #{objType}
+        </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="updateActivitiesRuleInfo" parameterType="Map">
-        update  activities_rule t set t.status_cd = #{statusCd}
-<if test="newBId != null and newBId != ''">
-,t.b_id = #{newBId}
-</if> 
-<if test="ruleType !=null and ruleType != ''">
-, t.rule_type= #{ruleType}
-</if> 
-<if test="objId !=null and objId != ''">
-, t.obj_id= #{objId}
-</if> 
-<if test="ruleName !=null and ruleName != ''">
-, t.rule_name= #{ruleName}
-</if> 
-<if test="activitiesObj !=null and activitiesObj != ''">
-, t.activities_obj= #{activitiesObj}
-</if> 
-<if test="startTime !=null and startTime != ''">
-, t.start_time= #{startTime}
-</if> 
-<if test="remark !=null and remark != ''">
-, t.remark= #{remark}
-</if> 
-<if test="endTime !=null and endTime != ''">
-, t.end_time= #{endTime}
-</if> 
-<if test="objType !=null and objType != ''">
-, t.obj_type= #{objType}
-</if> 
- where 1=1 <if test="ruleId !=null and ruleId != ''">
-and t.rule_id= #{ruleId}
-</if> 
+        update activities_rule t set t.status_cd = #{statusCd}
+        <if test="newBId != null and newBId != ''">
+            ,t.b_id = #{newBId}
+        </if>
+        <if test="ruleType !=null and ruleType != ''">
+            , t.rule_type= #{ruleType}
+        </if>
+        <if test="objId !=null and objId != ''">
+            , t.obj_id= #{objId}
+        </if>
+        <if test="ruleName !=null and ruleName != ''">
+            , t.rule_name= #{ruleName}
+        </if>
+        <if test="activitiesObj !=null and activitiesObj != ''">
+            , t.activities_obj= #{activitiesObj}
+        </if>
+        <if test="startTime !=null and startTime != ''">
+            , t.start_time= #{startTime}
+        </if>
+        <if test="remark !=null and remark != ''">
+            , t.remark= #{remark}
+        </if>
+        <if test="endTime !=null and endTime != ''">
+            , t.end_time= #{endTime}
+        </if>
+        <if test="objType !=null and objType != ''">
+            , t.obj_type= #{objType}
+        </if>
+        where 1=1
+        <if test="ruleId !=null and ruleId != ''">
+            and t.rule_id= #{ruleId}
+        </if>
 
     </update>
 
     <!-- 查询活动规则数量 add by wuxw 2018-07-03 -->
-     <select id="queryActivitiesRulesCount" parameterType="Map" resultType="Map">
-        select  count(1) count 
-from activities_rule t 
-where 1 =1 
-<if test="ruleType !=null and ruleType != ''">
-   and t.rule_type= #{ruleType}
-</if> 
-<if test="objId !=null and objId != ''">
-   and t.obj_id= #{objId}
-</if> 
-<if test="ruleName !=null and ruleName != ''">
-   and t.rule_name= #{ruleName}
-</if> 
-<if test="activitiesObj !=null and activitiesObj != ''">
-   and t.activities_obj= #{activitiesObj}
-</if> 
-<if test="startTime !=null and startTime != ''">
-   and t.start_time= #{startTime}
-</if> 
-<if test="remark !=null and remark != ''">
-   and t.remark= #{remark}
-</if> 
-<if test="statusCd !=null and statusCd != ''">
-   and t.status_cd= #{statusCd}
-</if> 
-<if test="endTime !=null and endTime != ''">
-   and t.end_time= #{endTime}
-</if> 
-<if test="ruleId !=null and ruleId != ''">
-   and t.rule_id= #{ruleId}
-</if> 
-<if test="objType !=null and objType != ''">
-   and t.obj_type= #{objType}
-</if> 
+    <select id="queryActivitiesRulesCount" parameterType="Map" resultType="Map">
+        select count(1) count
+        from activities_rule t
+        where 1 =1
+        <if test="ruleType !=null and ruleType != ''">
+            and t.rule_type= #{ruleType}
+        </if>
+        <if test="objId !=null and objId != ''">
+            and t.obj_id= #{objId}
+        </if>
+        <if test="objIds !=null">
+            and t.obj_id in
+            <foreach collection="objIds" item="item" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="ruleName !=null and ruleName != ''">
+            and t.rule_name= #{ruleName}
+        </if>
+        <if test="activitiesObj !=null and activitiesObj != ''">
+            and t.activities_obj= #{activitiesObj}
+        </if>
+        <if test="startTime !=null and startTime != ''">
+            and t.start_time= #{startTime}
+        </if>
+        <if test="remark !=null and remark != ''">
+            and t.remark= #{remark}
+        </if>
+        <if test="statusCd !=null and statusCd != ''">
+            and t.status_cd= #{statusCd}
+        </if>
+        <if test="endTime !=null and endTime != ''">
+            and t.end_time= #{endTime}
+        </if>
+        <if test="ruleId !=null and ruleId != ''">
+            and t.rule_id= #{ruleId}
+        </if>
+        <if test="objType !=null and objType != ''">
+            and t.obj_type= #{objType}
+        </if>
 
 
-     </select>
+    </select>
 
 </mapper>

service-user/src/main/java/com/java110/user/api/ActivitiesRuleApi.java

@@ -44,7 +44,6 @@ public class ActivitiesRuleApi {
     @RequestMapping(value = "/saveActivitiesRule", method = RequestMethod.POST)
     public ResponseEntity<String> saveActivitiesRule(
             @RequestHeader(value = "store-id", required = false) String storeId,
-            @RequestParam(value = "communityId", required = false) String communityId,
             @RequestBody JSONObject reqJson) {
 
         Assert.hasKeyAndValue(reqJson, "ruleName", "请求报文中未包含ruleName");
@@ -62,8 +61,9 @@ public class ActivitiesRuleApi {
             activitiesRulePo.setObjType(QuestionAnswerDto.QA_TYPE_STORE);
             activitiesRulePo.setObjId(storeId);
         } else {
+            Assert.hasKeyAndValue(reqJson, "communityId", "请求报文中未包含小区信息");
             activitiesRulePo.setObjType(QuestionAnswerDto.QA_TYPE_COMMUNITY);
-            activitiesRulePo.setObjId(communityId);
+            activitiesRulePo.setObjId(reqJson.getString("communityId"));
         }
         return saveActivitiesRuleBMOImpl.save(activitiesRulePo);
     }
@@ -120,13 +120,15 @@ public class ActivitiesRuleApi {
      * @path /app/activitiesRule/queryActivitiesRule
      */
     @RequestMapping(value = "/queryActivitiesRule", method = RequestMethod.GET)
-    public ResponseEntity<String> queryActivitiesRule(@RequestParam(value = "communityId") String communityId,
-                                                      @RequestParam(value = "page") int page,
-                                                      @RequestParam(value = "row") int row) {
+    public ResponseEntity<String> queryActivitiesRule(
+            @RequestHeader(value = "store-id", required = false) String storeId,
+            @RequestParam(value = "communityId") String communityId,
+            @RequestParam(value = "page") int page,
+            @RequestParam(value = "row") int row) {
         ActivitiesRuleDto activitiesRuleDto = new ActivitiesRuleDto();
         activitiesRuleDto.setPage(page);
         activitiesRuleDto.setRow(row);
-        activitiesRuleDto.setObjId(communityId);
+        activitiesRuleDto.setObjIds(new String[]{storeId, communityId});
         return getActivitiesRuleBMOImpl.get(activitiesRuleDto);
     }
 }