Forráskód Böngészése

优化停车位取消 userId

wuxw 6 éve%!(EXTRA string=óta)
szülő
commit
8ea6d27d63

+ 0 - 40
CommunityService/src/main/java/com/java110/community/smo/impl/ParkingSpaceInnerServiceSMOImpl.java

@@ -46,49 +46,9 @@ public class ParkingSpaceInnerServiceSMOImpl extends BaseServiceSMO implements I
 
         List<ParkingSpaceDto> parkingSpaces = BeanConvertUtil.covertBeanList(parkingSpaceServiceDaoImpl.getParkingSpaceInfo(BeanConvertUtil.beanCovertMap(parkingSpaceDto)), ParkingSpaceDto.class);
 
-        if (parkingSpaces == null || parkingSpaces.size() == 0) {
-            return parkingSpaces;
-        }
-
-        String[] userIds = getUserIds(parkingSpaces);
-        //根据 userId 查询用户信息
-        List<UserDto> users = userInnerServiceSMOImpl.getUserInfo(userIds);
-
-        for (ParkingSpaceDto parkingSpace : parkingSpaces) {
-            refreshParkingSpace(parkingSpace, users);
-        }
         return parkingSpaces;
     }
 
-    /**
-     * 从用户列表中查询用户,将用户中的信息 刷新到 floor对象中
-     *
-     * @param parkingSpace 小区停车位信息
-     * @param users 用户列表
-     */
-    private void refreshParkingSpace(ParkingSpaceDto parkingSpace, List<UserDto> users) {
-        for (UserDto user : users) {
-            if (parkingSpace.getUserId().equals(user.getUserId())) {
-                BeanConvertUtil.covertBean(user, parkingSpace);
-            }
-        }
-    }
-
-    /**
-     * 获取批量userId
-     *
-     * @param parkingSpaces 小区楼信息
-     * @return 批量userIds 信息
-     */
-    private String[] getUserIds(List<ParkingSpaceDto> parkingSpaces) {
-        List<String> userIds = new ArrayList<String>();
-        for (ParkingSpaceDto parkingSpace : parkingSpaces) {
-            userIds.add(parkingSpace.getUserId());
-        }
-
-        return userIds.toArray(new String[userIds.size()]);
-    }
-
     @Override
     public int queryParkingSpacesCount(@RequestBody ParkingSpaceDto parkingSpaceDto) {
         return parkingSpaceServiceDaoImpl.queryParkingSpacesCount(BeanConvertUtil.beanCovertMap(parkingSpaceDto));    }

+ 1 - 0
java110-code-generator/src/main/java/com/java110/code/GeneratorServiceDaoImplMapperListener.java

@@ -180,6 +180,7 @@ public class GeneratorServiceDaoImplMapperListener extends BaseGenerator {
         //加入分页功能<if test="page != -1">
         //            limit page,row
         //        </if>
+        sqlValue += "order by t.create_time desc\n";
         sqlValue += "<if test=\"page != -1 and page != null \">\n";
         sqlValue += "   limit #{page}, #{row}\n";
         sqlValue += "</if> \n";

+ 9 - 22
java110-db/src/main/resources/mapper/community/ParkingSpaceServiceDaoImplMapper.xml

@@ -7,9 +7,9 @@
     <!-- 保存停车位信息 add by wuxw 2018-07-03 -->
     <insert id="saveBusinessParkingSpaceInfo" parameterType="Map">
         insert into business_parking_space(
-        area,operate,num,ps_id,pa_id, remark,state,community_id,b_id,user_id
+        area,operate,num,ps_id,pa_id, remark,state,community_id,b_id
         ) values (
-        #{area},#{operate},#{num},#{psId},#{paId},#{remark},#{state},#{communityId},#{bId},#{userId}
+        #{area},#{operate},#{num},#{psId},#{paId},#{remark},#{state},#{communityId},#{bId}
         )
     </insert>
 
@@ -18,7 +18,7 @@
     <select id="getBusinessParkingSpaceInfo" parameterType="Map" resultType="Map">
         select t.area,t.operate,t.num,t.ps_id,t.ps_id
         psId,t.pa_id,t.pa_id
-        paId,t.remark,t.state,t.community_id,t.community_id communityId,t.b_id,t.b_id bId,t.user_id,t.user_id userId
+        paId,t.remark,t.state,t.community_id,t.community_id communityId,t.b_id,t.b_id bId
         from business_parking_space t
         where 1 =1
         <if test="area !=null and area != ''">
@@ -50,9 +50,7 @@
         <if test="bId !=null and bId != ''">
             and t.b_id= #{bId}
         </if>
-        <if test="userId !=null and userId != ''">
-            and t.user_id= #{userId}
-        </if>
+
 
     </select>
 
@@ -60,8 +58,8 @@
     <!-- 保存停车位信息至 instance表中 add by wuxw 2018-07-03 -->
     <insert id="saveParkingSpaceInfoInstance" parameterType="Map">
         insert into parking_space(
-        area,num,ps_id,pa_id,remark,status_cd,state,community_id,b_id,user_id
-        ) select t.area,t.t.num,t.ps_id,t.pa_id,t.remark,'0',t.state,t.community_id,t.b_id,t.user_id from
+        area,num,ps_id,pa_id,remark,status_cd,state,community_id,b_id
+        ) select t.area,t.t.num,t.ps_id,t.pa_id,t.remark,'0',t.state,t.community_id,t.b_id from
         business_parking_space t where 1=1
         <if test="area !=null and area != ''">
             and t.area= #{area}
@@ -89,9 +87,7 @@
         <if test="bId !=null and bId != ''">
             and t.b_id= #{bId}
         </if>
-        <if test="userId !=null and userId != ''">
-            and t.user_id= #{userId}
-        </if>
+
 
     </insert>
 
@@ -113,8 +109,6 @@
             t.community_id communityId,
             t.b_id,
             t.b_id bId,
-            t.user_id,
-            t.user_id userId,
             td.name stateName,
             pa.num areaNum
         FROM
@@ -164,9 +158,7 @@
             <if test="bId !=null and bId != ''">
                 and t.b_id= #{bId}
             </if>
-            <if test="userId !=null and userId != ''">
-                and t.user_id= #{userId}
-            </if>
+            order by t.create_time desc
 
             <if test="page != -1 and page != null ">
                 limit #{page}, #{row}
@@ -196,9 +188,6 @@
         <if test="communityId !=null and communityId != ''">
             , t.community_id= #{communityId}
         </if>
-        <if test="userId !=null and userId != ''">
-            , t.user_id= #{userId}
-        </if>
         where 1=1
         <if test="psId !=null and psId != ''">
             and t.ps_id= #{psId}
@@ -253,9 +242,7 @@
         <if test="bId !=null and bId != ''">
             and t.b_id= #{bId}
         </if>
-        <if test="userId !=null and userId != ''">
-            and t.user_id= #{userId}
-        </if>
+
 
 
     </select>