f_floor 中加入community_id 用来分片

Api/src/main/java/com/java110/api/listener/floor/DeleteFloorListener.java

@@ -91,6 +91,7 @@ public class DeleteFloorListener extends AbstractServiceApiDataFlowListener {
         business.put(CommonConstant.HTTP_INVOKE_MODEL, CommonConstant.HTTP_INVOKE_MODEL_S);
         JSONObject businessFloor = new JSONObject();
         businessFloor.put("floorId", paramInJson.getString("floorId"));
+        businessFloor.put("communityId", paramInJson.getString("communityId"));
         business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessFloor", businessFloor);
 
         return business;

Api/src/main/java/com/java110/api/listener/floor/EditFloorListener.java

@@ -109,6 +109,7 @@ public class EditFloorListener extends AbstractServiceApiDataFlowListener {
         businessFloor.put("remark", paramInJson.getString("remark"));
         businessFloor.put("userId", paramInJson.getString("userId"));
         businessFloor.put("floorNum", paramInJson.getString("floorNum"));
+        businessFloor.put("communityId", paramInJson.getString("communityId"));
         business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessFloor", businessFloor);
 
         return business;

Api/src/main/java/com/java110/api/listener/floor/SaveFloorListener.java

@@ -121,6 +121,7 @@ public class SaveFloorListener extends AbstractServiceApiDataFlowListener {
         businessFloor.put("remark", paramInJson.getString("remark"));
         businessFloor.put("userId", paramInJson.getString("userId"));
         businessFloor.put("floorNum", paramInJson.getString("floorNum"));
+        businessFloor.put("communityId", paramInJson.getString("communityId"));
         business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessFloor", businessFloor);
 
         return business;

CommunityService/src/main/java/com/java110/community/listener/floor/AbstractFloorBusinessServiceDataFlowListener.java

@@ -43,6 +43,7 @@ public abstract class AbstractFloorBusinessServiceDataFlowListener extends Abstr
         businessFloorInfo.put("remark", businessFloorInfo.get("remark"));
         businessFloorInfo.put("userId", businessFloorInfo.get("user_id"));
         businessFloorInfo.put("floorNum", businessFloorInfo.get("floor_num"));
+        businessFloorInfo.put("communityId", businessFloorInfo.get("community_id"));
 
         businessFloorInfo.put("statusCd", statusCd);
     }
@@ -73,6 +74,7 @@ public abstract class AbstractFloorBusinessServiceDataFlowListener extends Abstr
         currentFloorInfo.put("remark", currentFloorInfo.get("remark"));
         currentFloorInfo.put("userId", currentFloorInfo.get("user_id"));
         currentFloorInfo.put("floorNum", currentFloorInfo.get("floor_num"));
+        currentFloorInfo.put("communityId", currentFloorInfo.get("community_id"));
 
 
         currentFloorInfo.put("operate", StatusConstant.OPERATE_DEL);

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

@@ -7,16 +7,16 @@
     <!-- 保存小区楼信息 add by wuxw 2018-07-03 -->
     <insert id="saveBusinessFloorInfo" parameterType="Map">
         insert into business_floor(
-        floor_id,operate,name,remark,b_id,user_id,floor_num
+        floor_id,operate,name,remark,b_id,user_id,floor_num,community_id
         ) values (
-        #{floorId},#{operate},#{name},#{remark},#{bId},#{userId},#{floorNum}
+        #{floorId},#{operate},#{name},#{remark},#{bId},#{userId},#{floorNum},#{floorNum}
         )
     </insert>
 
 
     <!-- 查询小区楼信息（Business） add by wuxw 2018-07-03 -->
     <select id="getBusinessFloorInfo" parameterType="Map" resultType="Map">
-        select t.floor_id,t.operate,t.name,t.remark,t.b_id,t.user_id,t.floor_num
+        select t.floor_id,t.operate,t.name,t.remark,t.b_id,t.user_id,t.floor_num,t.community_id
         from business_floor t
         where 1 =1
         <if test="floorId !=null and floorId != ''">
@@ -40,6 +40,9 @@
         <if test="floorNum !=null and floorNum != ''">
             and t.floor_num= #{floorNum}
         </if>
+        <if test="communityId !=null and communityId != ''">
+            and t.community_id= #{communityId}
+        </if>
 
     </select>
 
@@ -47,8 +50,9 @@
     <!-- 保存小区楼信息至 instance表中 add by wuxw 2018-07-03 -->
     <insert id="saveFloorInfoInstance" parameterType="Map">
         insert into f_floor(
-        floor_id,name,status_cd,remark,b_id,user_id,floor_num
-        ) select t.floor_id,t.name,'0',t.remark,t.b_id,t.user_id,t.floor_num from business_floor t where 1=1
+        floor_id,name,status_cd,remark,b_id,user_id,floor_num,community_id
+        ) select t.floor_id,t.name,'0',t.remark,t.b_id,t.user_id,t.floor_num,t.community_id
+        from business_floor t where 1=1
         <if test="floorId !=null and floorId != ''">
             and t.floor_id= #{floorId}
         </if>
@@ -68,6 +72,10 @@
         <if test="floorNum !=null and floorNum != ''">
             and t.floor_num= #{floorNum}
         </if>
+        <if test="communityId !=null and communityId != ''">
+            and t.community_id= #{communityId}
+        </if>
+
 
     </insert>
 
@@ -75,7 +83,7 @@
     <!-- 查询小区楼信息 add by wuxw 2018-07-03 -->
     <select id="getFloorInfo" parameterType="Map" resultType="Map">
         select t.floor_id,t.floor_id floorId,t.name,t.status_cd, t.status_cd statusCd,t.remark,t.b_id,
-        t.b_id bId,t.user_id, t.user_id userId,t.floor_num ,t.floor_num floorNum
+        t.b_id bId,t.user_id, t.user_id userId,t.floor_num ,t.floor_num floorNum,t.community_id communityId
         from f_floor t
         where 1 =1
         <if test="floorId !=null and floorId != ''">
@@ -99,6 +107,10 @@
         <if test="floorNum !=null and floorNum != ''">
             and t.floor_num= #{floorNum}
         </if>
+        <if test="communityId !=null and communityId != ''">
+            and t.community_id= #{communityId}
+        </if>
+        order by t.create_time desc
         <if test="page != -1 and page != null ">
             limit #{page}, #{row}
         </if>
@@ -128,6 +140,9 @@
         <if test="floorId !=null and floorId != ''">
             and t.floor_id= #{floorId}
         </if>
+        <if test="communityId !=null and communityId != ''">
+            and t.community_id= #{communityId}
+        </if>
         <if test="bId !=null and bId != ''">
             and t.b_id= #{bId}
         </if>
@@ -138,11 +153,8 @@
         SELECT
         COUNT(1) count
         FROM
-        f_floor f,
-        s_community_member cm
-        WHERE f.`floor_id` = cm.`member_id`
-        AND cm.`member_type_cd` = '390001200004'
-        AND cm.`community_id` = #{communityId}
+        f_floor f
+        where f.`community_id` = #{communityId}
         <if test="floorId !=null and floorId != ''">
             and f.floor_id= #{floorId}
         </if>
@@ -174,7 +186,6 @@
             and f.floor_num= #{floorNum}
         </if>
         AND f.`status_cd` = '0'
-        AND cm.`status_cd` = '0'
     </select>
     <!-- 查询小区 内的楼 -->
     <select id="queryFloors" parameterType="Map" resultType="Map">
@@ -185,13 +196,10 @@
         f.`name` floorName,
         f.`remark`,
         f.`user_id` userId,
-        cm.`community_id` communityId
+        f.`community_id` communityId
         FROM
-        f_floor f,
-        s_community_member cm
-        WHERE f.`floor_id` = cm.`member_id`
-        AND cm.`member_type_cd` = '390001200004'
-        AND cm.`community_id` = #{communityId}
+        f_floor f
+        where f.`community_id` = #{communityId}
         <if test="floorId !=null and floorId != ''">
             and f.floor_id= #{floorId}
         </if>
@@ -223,7 +231,7 @@
             and f.floor_num= #{floorNum}
         </if>
         AND f.`status_cd` = '0'
-        AND cm.`status_cd` = '0'
+        order by f.create_time desc
         <if test="page != -1 and page != null ">
             LIMIT #{page}, #{row}
         </if>