优化代码

java110-bean/src/main/java/com/java110/dto/FloorDto.java

@@ -48,6 +48,8 @@ public class FloorDto extends PageDto implements Serializable {
 
     private String statusCd = "0";
 
+    private int seq;
+
     private List<FloorAttrDto> floorAttrDto;
 
     public String getFloorId() {
@@ -145,4 +147,12 @@ public class FloorDto extends PageDto implements Serializable {
     public void setFloorAttrDto(List<FloorAttrDto> floorAttrDto) {
         this.floorAttrDto = floorAttrDto;
     }
+
+    public int getSeq() {
+        return seq;
+    }
+
+    public void setSeq(int seq) {
+        this.seq = seq;
+    }
 }

java110-bean/src/main/java/com/java110/dto/basePrivilege/BasePrivilegeDto.java

@@ -38,6 +38,7 @@ public class BasePrivilegeDto extends PageDto implements Serializable {
     private String stName;
 
     private String createTime;
+    private String communityId;
 
     public String getPId() {
         return pId;
@@ -134,4 +135,12 @@ public class BasePrivilegeDto extends PageDto implements Serializable {
     public void setStName(String stName) {
         this.stName = stName;
     }
+
+    public String getCommunityId() {
+        return communityId;
+    }
+
+    public void setCommunityId(String communityId) {
+        this.communityId = communityId;
+    }
 }

java110-bean/src/main/java/com/java110/po/floor/FloorPo.java

@@ -24,6 +24,7 @@ public class FloorPo implements Serializable {
     private String remark;
     private String communityId;
     private String statusCd = "0";
+    private int seq;
 
     public String getFloorId() {
         return floorId;
@@ -96,4 +97,12 @@ public class FloorPo implements Serializable {
     public void setbId(String bId) {
         this.bId = bId;
     }
+
+    public int getSeq() {
+        return seq;
+    }
+
+    public void setSeq(int seq) {
+        this.seq = seq;
+    }
 }

java110-db/src/main/resources/mapper/center/PrivilegeDAOImplMapper.xml

@@ -187,6 +187,9 @@
         inner join p_privilege_group pg on t.p_id = pg.pg_id and pg.status_cd = '0' and pg.pg_id != '600201904002'
         inner join p_privilege_rel pr on pg.pg_id = pr.pg_id and pr.status_cd ='0'
         INNER JOIN p_privilege p on pr.p_id = p.p_id and p.status_cd = '0'
+        <if test="communityId != null and communityId != ''">
+            LEFT JOIN u_role_community rc on pg.pg_id = rc.role_id and rc.status_cd = '0'
+        </if>
         where t.status_cd = '0'
         and t.privilege_flag = '1'
         <if test="resource != null and resource != ''">
@@ -195,6 +198,9 @@
         <if test="storeId != null and storeId != ''">
             and t.store_id = #{storeId}
         </if>
+        <if test="communityId != null and communityId != ''">
+            and t.community_id = #{communityId}
+        </if>
     </select>
 
 </mapper>

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

@@ -266,7 +266,7 @@
         <if test="lift !=null and lift != ''">
             and bu.lift= #{lift}
         </if>
-        order by t.floor_num,unitNum asc
+        order by t.seq,unitNum asc
         <!-- <if test="page != -1 and page != null ">
              limit #{page}, #{row}
          </if>limit 10;-->

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

@@ -8,9 +8,9 @@
     <!-- 保存楼栋信息 add by wuxw 2018-07-03 -->
     <insert id="saveFloorInfo" parameterType="Map">
         insert into f_floor(
-        floor_id,name,remark,b_id,community_id,user_id,floor_num,floor_area
+        floor_id,name,remark,b_id,community_id,user_id,floor_num,floor_area,seq
         ) values (
-        #{floorId},#{name},#{remark},#{bId},#{communityId},#{userId},#{floorNum},#{floorArea}
+        #{floorId},#{name},#{remark},#{bId},#{communityId},#{userId},#{floorNum},#{floorArea},#{seq}
         )
     </insert>
 
@@ -19,7 +19,7 @@
     <select id="getFloorInfo" parameterType="Map" resultType="Map">
         select t.floor_id,t.floor_id floorId,t.name floorName,t.remark,t.b_id,t.b_id bId,t.community_id,t.community_id
         communityId,t.user_id,t.user_id userId,t3.name userName,
-        t.floor_num,t.floor_num floorNum,t.floor_area,t.floor_area floorArea
+        t.floor_num,t.floor_num floorNum,t.floor_area,t.floor_area floorArea,t.seq
         from f_floor t
         LEFT JOIN f_floor_attr t2 on t.floor_id = t2.floor_id and t2.spec_cd='100201912001' and t2.value='8008'
         LEFT JOIN u_user t3 on t.user_id = t3.user_id and t3.status_cd = 0
@@ -48,7 +48,7 @@
         <if test="floorArea !=null and floorArea != ''">
             and t.floor_area= #{floorArea}
         </if>
-        order by t.create_time desc
+        order by t.seq
         <if test="page != -1 and page != null ">
             limit #{page}, #{row}
         </if>
@@ -80,6 +80,9 @@
         <if test="floorArea !=null and floorArea != ''">
             , t.floor_area= #{floorArea}
         </if>
+        <if test="seq !=null and seq != ''">
+            , t.seq= #{seq}
+        </if>
         where 1=1
         <if test="floorId !=null and floorId != ''">
             and t.floor_id= #{floorId}
@@ -121,8 +124,6 @@
         <if test="floorArea !=null and floorArea != ''">
             and t.floor_area= #{floorArea}
         </if>
-
-
     </select>
 
 </mapper>

service-job/src/main/java/com/java110/job/adapt/Repair/MachineAddOwnerRepairAdapt.java

@@ -142,6 +142,7 @@ public class MachineAddOwnerRepairAdapt extends DatabusAdaptImpl {
         BasePrivilegeDto basePrivilegeDto = new BasePrivilegeDto();
         basePrivilegeDto.setResource("/wechatRepairRegistration");
         basePrivilegeDto.setStoreId(communityMemberDtos.get(0).getMemberId());
+        basePrivilegeDto.setCommunityId(communityMemberDtos.get(0).getCommunityId());
         List<UserDto> userDtos = privilegeInnerServiceSMO.queryPrivilegeUsers(basePrivilegeDto);
         String url = sendMsgUrl + accessToken;
         for (UserDto userDto : userDtos) {