优化代码

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

@@ -0,0 +1,205 @@
+<?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="buildingRoomV1ServiceDaoImpl">
+
+
+
+
+
+    <!-- 保存房屋信息 add by wuxw 2018-07-03 -->
+    <insert id="saveBuildingRoomInfo" parameterType="Map">
+        insert into building_room(
+section,remark,room_sub_type,room_area,user_id,room_id,layer,fee_coefficient,built_up_area,room_num,unit_id,state,community_id,apartment,room_type,room_rent
+) values (
+#{section},#{remark},#{roomSubType},#{roomArea},#{userId},#{roomId},#{layer},#{feeCoefficient},#{builtUpArea},#{roomNum},#{unitId},#{state},#{communityId},#{apartment},#{roomType},#{roomRent}
+)
+    </insert>
+
+
+
+    <!-- 查询房屋信息 add by wuxw 2018-07-03 -->
+    <select id="getBuildingRoomInfo" parameterType="Map" resultType="Map">
+        select  t.section,t.remark,t.status_cd,t.status_cd statusCd,t.room_sub_type,t.room_sub_type roomSubType,t.room_area,t.room_area roomArea,t.user_id,t.user_id userId,t.room_id,t.room_id roomId,t.layer,t.fee_coefficient,t.fee_coefficient feeCoefficient,t.built_up_area,t.built_up_area builtUpArea,t.room_num,t.room_num roomNum,t.unit_id,t.unit_id unitId,t.state,t.community_id,t.community_id communityId,t.apartment,t.room_type,t.room_type roomType,t.room_rent,t.room_rent roomRent 
+from building_room t 
+where 1 =1 
+<if test="section !=null and section != ''">
+   and t.section= #{section}
+</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="roomSubType !=null and roomSubType != ''">
+   and t.room_sub_type= #{roomSubType}
+</if> 
+<if test="roomArea !=null and roomArea != ''">
+   and t.room_area= #{roomArea}
+</if> 
+<if test="userId !=null and userId != ''">
+   and t.user_id= #{userId}
+</if> 
+<if test="roomId !=null and roomId != ''">
+   and t.room_id= #{roomId}
+</if> 
+<if test="layer !=null and layer != ''">
+   and t.layer= #{layer}
+</if> 
+<if test="feeCoefficient !=null and feeCoefficient != ''">
+   and t.fee_coefficient= #{feeCoefficient}
+</if> 
+<if test="builtUpArea !=null and builtUpArea != ''">
+   and t.built_up_area= #{builtUpArea}
+</if> 
+<if test="roomNum !=null and roomNum != ''">
+   and t.room_num= #{roomNum}
+</if> 
+<if test="unitId !=null and unitId != ''">
+   and t.unit_id= #{unitId}
+</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="apartment !=null and apartment != ''">
+   and t.apartment= #{apartment}
+</if> 
+<if test="roomType !=null and roomType != ''">
+   and t.room_type= #{roomType}
+</if> 
+<if test="roomRent !=null and roomRent != ''">
+   and t.room_rent= #{roomRent}
+</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="updateBuildingRoomInfo" parameterType="Map">
+        update  building_room t set t.status_cd = #{statusCd}
+<if test="newBId != null and newBId != ''">
+,t.b_id = #{newBId}
+</if> 
+<if test="section !=null and section != ''">
+, t.section= #{section}
+</if> 
+<if test="remark !=null and remark != ''">
+, t.remark= #{remark}
+</if> 
+<if test="roomSubType !=null and roomSubType != ''">
+, t.room_sub_type= #{roomSubType}
+</if> 
+<if test="roomArea !=null and roomArea != ''">
+, t.room_area= #{roomArea}
+</if> 
+<if test="userId !=null and userId != ''">
+, t.user_id= #{userId}
+</if> 
+<if test="layer !=null and layer != ''">
+, t.layer= #{layer}
+</if> 
+<if test="feeCoefficient !=null and feeCoefficient != ''">
+, t.fee_coefficient= #{feeCoefficient}
+</if> 
+<if test="builtUpArea !=null and builtUpArea != ''">
+, t.built_up_area= #{builtUpArea}
+</if> 
+<if test="roomNum !=null and roomNum != ''">
+, t.room_num= #{roomNum}
+</if> 
+<if test="unitId !=null and unitId != ''">
+, t.unit_id= #{unitId}
+</if> 
+<if test="state !=null and state != ''">
+, t.state= #{state}
+</if> 
+<if test="communityId !=null and communityId != ''">
+, t.community_id= #{communityId}
+</if> 
+<if test="apartment !=null and apartment != ''">
+, t.apartment= #{apartment}
+</if> 
+<if test="roomType !=null and roomType != ''">
+, t.room_type= #{roomType}
+</if> 
+<if test="roomRent !=null and roomRent != ''">
+, t.room_rent= #{roomRent}
+</if> 
+ where 1=1 <if test="roomId !=null and roomId != ''">
+and t.room_id= #{roomId}
+</if> 
+
+    </update>
+
+    <!-- 查询房屋数量 add by wuxw 2018-07-03 -->
+     <select id="queryBuildingRoomsCount" parameterType="Map" resultType="Map">
+        select  count(1) count 
+from building_room t 
+where 1 =1 
+<if test="section !=null and section != ''">
+   and t.section= #{section}
+</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="roomSubType !=null and roomSubType != ''">
+   and t.room_sub_type= #{roomSubType}
+</if> 
+<if test="roomArea !=null and roomArea != ''">
+   and t.room_area= #{roomArea}
+</if> 
+<if test="userId !=null and userId != ''">
+   and t.user_id= #{userId}
+</if> 
+<if test="roomId !=null and roomId != ''">
+   and t.room_id= #{roomId}
+</if> 
+<if test="layer !=null and layer != ''">
+   and t.layer= #{layer}
+</if> 
+<if test="feeCoefficient !=null and feeCoefficient != ''">
+   and t.fee_coefficient= #{feeCoefficient}
+</if> 
+<if test="builtUpArea !=null and builtUpArea != ''">
+   and t.built_up_area= #{builtUpArea}
+</if> 
+<if test="roomNum !=null and roomNum != ''">
+   and t.room_num= #{roomNum}
+</if> 
+<if test="unitId !=null and unitId != ''">
+   and t.unit_id= #{unitId}
+</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="apartment !=null and apartment != ''">
+   and t.apartment= #{apartment}
+</if> 
+<if test="roomType !=null and roomType != ''">
+   and t.room_type= #{roomType}
+</if> 
+<if test="roomRent !=null and roomRent != ''">
+   and t.room_rent= #{roomRent}
+</if> 
+
+
+     </select>
+
+</mapper>

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

@@ -0,0 +1,205 @@
+<?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="roomV1ServiceDaoImpl">
+
+
+
+
+
+    <!-- 保存房屋信息 add by wuxw 2018-07-03 -->
+    <insert id="saveRoomInfo" parameterType="Map">
+        insert into building_room(
+section,remark,room_sub_type,room_area,user_id,room_id,layer,fee_coefficient,built_up_area,room_num,unit_id,state,community_id,apartment,room_type,room_rent
+) values (
+#{section},#{remark},#{roomSubType},#{roomArea},#{userId},#{roomId},#{layer},#{feeCoefficient},#{builtUpArea},#{roomNum},#{unitId},#{state},#{communityId},#{apartment},#{roomType},#{roomRent}
+)
+    </insert>
+
+
+
+    <!-- 查询房屋信息 add by wuxw 2018-07-03 -->
+    <select id="getRoomInfo" parameterType="Map" resultType="Map">
+        select  t.section,t.remark,t.status_cd,t.status_cd statusCd,t.room_sub_type,t.room_sub_type roomSubType,t.room_area,t.room_area roomArea,t.user_id,t.user_id userId,t.room_id,t.room_id roomId,t.layer,t.fee_coefficient,t.fee_coefficient feeCoefficient,t.built_up_area,t.built_up_area builtUpArea,t.room_num,t.room_num roomNum,t.unit_id,t.unit_id unitId,t.state,t.community_id,t.community_id communityId,t.apartment,t.room_type,t.room_type roomType,t.room_rent,t.room_rent roomRent 
+from building_room t 
+where 1 =1 
+<if test="section !=null and section != ''">
+   and t.section= #{section}
+</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="roomSubType !=null and roomSubType != ''">
+   and t.room_sub_type= #{roomSubType}
+</if> 
+<if test="roomArea !=null and roomArea != ''">
+   and t.room_area= #{roomArea}
+</if> 
+<if test="userId !=null and userId != ''">
+   and t.user_id= #{userId}
+</if> 
+<if test="roomId !=null and roomId != ''">
+   and t.room_id= #{roomId}
+</if> 
+<if test="layer !=null and layer != ''">
+   and t.layer= #{layer}
+</if> 
+<if test="feeCoefficient !=null and feeCoefficient != ''">
+   and t.fee_coefficient= #{feeCoefficient}
+</if> 
+<if test="builtUpArea !=null and builtUpArea != ''">
+   and t.built_up_area= #{builtUpArea}
+</if> 
+<if test="roomNum !=null and roomNum != ''">
+   and t.room_num= #{roomNum}
+</if> 
+<if test="unitId !=null and unitId != ''">
+   and t.unit_id= #{unitId}
+</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="apartment !=null and apartment != ''">
+   and t.apartment= #{apartment}
+</if> 
+<if test="roomType !=null and roomType != ''">
+   and t.room_type= #{roomType}
+</if> 
+<if test="roomRent !=null and roomRent != ''">
+   and t.room_rent= #{roomRent}
+</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="updateRoomInfo" parameterType="Map">
+        update  building_room t set t.status_cd = #{statusCd}
+<if test="newBId != null and newBId != ''">
+,t.b_id = #{newBId}
+</if> 
+<if test="section !=null and section != ''">
+, t.section= #{section}
+</if> 
+<if test="remark !=null and remark != ''">
+, t.remark= #{remark}
+</if> 
+<if test="roomSubType !=null and roomSubType != ''">
+, t.room_sub_type= #{roomSubType}
+</if> 
+<if test="roomArea !=null and roomArea != ''">
+, t.room_area= #{roomArea}
+</if> 
+<if test="userId !=null and userId != ''">
+, t.user_id= #{userId}
+</if> 
+<if test="layer !=null and layer != ''">
+, t.layer= #{layer}
+</if> 
+<if test="feeCoefficient !=null and feeCoefficient != ''">
+, t.fee_coefficient= #{feeCoefficient}
+</if> 
+<if test="builtUpArea !=null and builtUpArea != ''">
+, t.built_up_area= #{builtUpArea}
+</if> 
+<if test="roomNum !=null and roomNum != ''">
+, t.room_num= #{roomNum}
+</if> 
+<if test="unitId !=null and unitId != ''">
+, t.unit_id= #{unitId}
+</if> 
+<if test="state !=null and state != ''">
+, t.state= #{state}
+</if> 
+<if test="communityId !=null and communityId != ''">
+, t.community_id= #{communityId}
+</if> 
+<if test="apartment !=null and apartment != ''">
+, t.apartment= #{apartment}
+</if> 
+<if test="roomType !=null and roomType != ''">
+, t.room_type= #{roomType}
+</if> 
+<if test="roomRent !=null and roomRent != ''">
+, t.room_rent= #{roomRent}
+</if> 
+ where 1=1 <if test="roomId !=null and roomId != ''">
+and t.room_id= #{roomId}
+</if> 
+
+    </update>
+
+    <!-- 查询房屋数量 add by wuxw 2018-07-03 -->
+     <select id="queryRoomsCount" parameterType="Map" resultType="Map">
+        select  count(1) count 
+from building_room t 
+where 1 =1 
+<if test="section !=null and section != ''">
+   and t.section= #{section}
+</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="roomSubType !=null and roomSubType != ''">
+   and t.room_sub_type= #{roomSubType}
+</if> 
+<if test="roomArea !=null and roomArea != ''">
+   and t.room_area= #{roomArea}
+</if> 
+<if test="userId !=null and userId != ''">
+   and t.user_id= #{userId}
+</if> 
+<if test="roomId !=null and roomId != ''">
+   and t.room_id= #{roomId}
+</if> 
+<if test="layer !=null and layer != ''">
+   and t.layer= #{layer}
+</if> 
+<if test="feeCoefficient !=null and feeCoefficient != ''">
+   and t.fee_coefficient= #{feeCoefficient}
+</if> 
+<if test="builtUpArea !=null and builtUpArea != ''">
+   and t.built_up_area= #{builtUpArea}
+</if> 
+<if test="roomNum !=null and roomNum != ''">
+   and t.room_num= #{roomNum}
+</if> 
+<if test="unitId !=null and unitId != ''">
+   and t.unit_id= #{unitId}
+</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="apartment !=null and apartment != ''">
+   and t.apartment= #{apartment}
+</if> 
+<if test="roomType !=null and roomType != ''">
+   and t.room_type= #{roomType}
+</if> 
+<if test="roomRent !=null and roomRent != ''">
+   and t.room_rent= #{roomRent}
+</if> 
+
+
+     </select>
+
+</mapper>

java110-generator/src/main/java/com/java110/code/TableToJson.java

@@ -45,9 +45,9 @@ public class TableToJson {
         param.put("desc", "");
         param.put("id", "");
         param.put("name", "");
-        param.put("shareColumn", "");
+        param.put("shareColumn", "community_id");
         param.put("shareName", "");
-        param.put("shareParam", "");
+        param.put("shareParam", "communityId");
         param.put("tableName", tableName);
         JSONObject paramColumn = new JSONObject();
         JSONArray requireds = new JSONArray();
@@ -64,6 +64,9 @@ public class TableToJson {
             if ("KEY".equals(key)) {
                 continue;
             }
+            if ("b_id".equals(key)) {
+                continue;
+            }
             if ("create_time".equals(key)) {
                 continue;
             }

java110-generator/src/main/resources/newBack/template_1.json

@@ -1,47 +1,87 @@
 {
   "param": {
-    "requestTime": "request_time",
-    "finishTime": "finish_time",
-    "orderTypeCd": "order_type_cd",
-    "extTransactionId": "ext_transaction_id",
-    "appId": "app_id",
+    "section": "section",
     "remark": "remark",
     "statusCd": "status_cd",
-    "oId": "o_id",
-    "userId": "user_id"
+    "roomSubType": "room_sub_type",
+    "roomArea": "room_area",
+    "userId": "user_id",
+    "roomId": "room_id",
+    "layer": "layer",
+    "feeCoefficient": "fee_coefficient",
+    "builtUpArea": "built_up_area",
+    "roomNum": "room_num",
+    "unitId": "unit_id",
+    "state": "state",
+    "communityId": "community_id",
+    "apartment": "apartment",
+    "roomType": "room_type",
+    "roomRent": "room_rent"
   },
-  "name": "",
-  "shareColumn": "",
-  "id": "",
-  "shareName": "",
+  "name": "room",
+  "shareColumn": "community_id",
+  "id": "roomId",
+  "shareName": "community",
   "autoMove": true,
   "required": [
     {
-      "msg": "订单ID不能为空",
-      "code": "oId"
+      "msg": "房屋ID不能为空",
+      "code": "roomId"
     },
     {
-      "msg": "应用ID不能为空",
-      "code": "appId"
+      "msg": "房屋编号不能为空",
+      "code": "roomNum"
+    },
+    {
+      "msg": "单元ID不能为空",
+      "code": "unitId"
+    },
+    {
+      "msg": "层数不能为空",
+      "code": "layer"
+    },
+    {
+      "msg": "户型不能为空",
+      "code": "apartment"
+    },
+    {
+      "msg": "建筑面积不能为空",
+      "code": "builtUpArea"
+    },
+    {
+      "msg": "算费系数不能为空",
+      "code": "feeCoefficient"
     },
     {
       "msg": "用户ID不能为空",
       "code": "userId"
     },
     {
-      "msg": "外部系统请求时间不能为空",
-      "code": "requestTime"
+      "msg": "数据状态，详细参考c_status表，S 保存，0, 在用 1失效不能为空",
+      "code": "statusCd"
     },
     {
-      "msg": "订单类型，参考c_order_type表不能为空",
-      "code": "orderTypeCd"
+      "msg": "房屋状态，如房屋出售等，请查看state 表不能为空",
+      "code": "state"
     },
     {
-      "msg": "数据状态，详细参考c_status表不能为空",
-      "code": "statusCd"
+      "msg": "房屋类型不能为空",
+      "code": "roomType"
+    },
+    {
+      "msg": "房屋类型 110 住宅房屋，119 办公室 120 宿舍不能为空",
+      "code": "roomSubType"
+    },
+    {
+      "msg": "室内面积不能为空",
+      "code": "roomArea"
+    },
+    {
+      "msg": "租金不能为空",
+      "code": "roomRent"
     }
   ],
-  "desc": "",
-  "shareParam": "",
-  "tableName": "c_orders"
+  "desc": "房屋",
+  "shareParam": "communityId",
+  "tableName": "building_room"
 }

java110-interface/src/main/java/com/java110/intf/community/IRoomV1InnerServiceSMO.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.RoomDto;
+import com.java110.po.room.RoomPo;
+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 2021-09-14 14:28:56 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("/roomV1Api")
+public interface IRoomV1InnerServiceSMO {
+
+
+    @RequestMapping(value = "/saveRoom", method = RequestMethod.POST)
+    public int saveRoom(@RequestBody  RoomPo roomPo);
+
+    @RequestMapping(value = "/updateRoom", method = RequestMethod.POST)
+    public int updateRoom(@RequestBody  RoomPo roomPo);
+
+    @RequestMapping(value = "/deleteRoom", method = RequestMethod.POST)
+    public int deleteRoom(@RequestBody  RoomPo roomPo);
+
+    /**
+     * <p>查询小区楼信息</p>
+     *
+     *
+     * @param roomDto 数据对象分享
+     * @return RoomDto 对象数据
+     */
+    @RequestMapping(value = "/queryRooms", method = RequestMethod.POST)
+    List<RoomDto> queryRooms(@RequestBody RoomDto roomDto);
+
+    /**
+     * 查询<p>小区楼</p>总记录数
+     *
+     * @param roomDto 数据对象分享
+     * @return 小区下的小区楼记录数
+     */
+    @RequestMapping(value = "/queryRoomsCount", method = RequestMethod.POST)
+    int queryRoomsCount(@RequestBody RoomDto roomDto);
+}

service-community/src/main/java/com/java110/community/cmd/room/DeleteRoomCmd.java

@@ -0,0 +1,72 @@
+/*
+ * 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.room;
+
+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.AbstractServiceCmdListener;
+import com.java110.core.event.cmd.CmdEvent;
+import com.java110.core.factory.GenerateCodeFactory;
+import com.java110.intf.community.IRoomV1InnerServiceSMO;
+import com.java110.po.room.RoomPo;
+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;
+
+/**
+ * 类表述：删除
+ * 服务编码：room.deleteRoom
+ * 请求路劲：/app/room.DeleteRoom
+ * add by 吴学文 at 2021-09-14 14:28:56 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 = "room.DeleteRoom")
+public class DeleteRoomCmd extends AbstractServiceCmdListener {
+    private static Logger logger = LoggerFactory.getLogger(DeleteRoomCmd.class);
+
+    @Autowired
+    private IRoomV1InnerServiceSMO roomV1InnerServiceSMOImpl;
+
+    @Override
+    public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
+        Assert.hasKeyAndValue(reqJson, "roomId", "roomId不能为空");
+        Assert.hasKeyAndValue(reqJson, "communityId", "communityId不能为空");
+
+    }
+
+    @Override
+    @Java110Transactional
+    public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
+
+        RoomPo roomPo = BeanConvertUtil.covertBean(reqJson, RoomPo.class);
+        int flag = roomV1InnerServiceSMOImpl.deleteRoom(roomPo);
+
+        if (flag < 1) {
+            throw new CmdException("删除数据失败");
+        }
+
+        cmdDataFlowContext.setResponseEntity(ResultVo.success());
+    }
+}

service-community/src/main/java/com/java110/community/cmd/room/ListRoomCmd.java

@@ -0,0 +1,85 @@
+/*
+ * 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.room;
+
+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.AbstractServiceCmdListener;
+import com.java110.core.event.cmd.CmdEvent;
+import com.java110.core.factory.GenerateCodeFactory;
+import com.java110.dto.RoomDto;
+import com.java110.intf.community.IRoomV1InnerServiceSMO;
+import com.java110.po.room.RoomPo;
+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 java.util.List;
+import java.util.ArrayList;
+import org.springframework.http.ResponseEntity;
+import org.springframework.http.HttpStatus;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+/**
+ * 类表述：查询
+ * 服务编码：room.listRoom
+ * 请求路劲：/app/room.ListRoom
+ * add by 吴学文 at 2021-09-14 14:28:56 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 = "room.ListRoom")
+public class ListRoomCmd extends AbstractServiceCmdListener {
+
+  private static Logger logger = LoggerFactory.getLogger(ListRoomCmd.class);
+    @Autowired
+    private IRoomV1InnerServiceSMO roomV1InnerServiceSMOImpl;
+
+    @Override
+    public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
+        super.validatePageInfo(reqJson);
+    }
+
+    @Override
+    @Java110Transactional
+    public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
+
+           RoomDto roomDto = BeanConvertUtil.covertBean(reqJson, RoomDto.class);
+
+           int count = roomV1InnerServiceSMOImpl.queryRoomsCount(roomDto);
+
+           List<RoomDto> roomDtos = null;
+
+           if (count > 0) {
+               roomDtos = roomV1InnerServiceSMOImpl.queryRooms(roomDto);
+           } else {
+               roomDtos = new ArrayList<>();
+           }
+
+           ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) reqJson.getInteger("row")), count, roomDtos);
+
+           ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
+
+           cmdDataFlowContext.setResponseEntity(responseEntity);
+    }
+}

service-community/src/main/java/com/java110/community/cmd/room/SaveRoomCmd.java

@@ -0,0 +1,87 @@
+/*
+ * 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.room;
+
+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.AbstractServiceCmdListener;
+import com.java110.core.event.cmd.CmdEvent;
+import com.java110.core.factory.GenerateCodeFactory;
+import com.java110.intf.community.IRoomV1InnerServiceSMO;
+import com.java110.po.room.RoomPo;
+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;
+
+/**
+ * 类表述：保存
+ * 服务编码：room.saveRoom
+ * 请求路劲：/app/room.SaveRoom
+ * add by 吴学文 at 2021-09-14 14:28:56 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 = "room.SaveRoom")
+public class SaveRoomCmd extends AbstractServiceCmdListener {
+
+    private static Logger logger = LoggerFactory.getLogger(SaveRoomCmd.class);
+
+    public static final String CODE_PREFIX_ID = "10";
+
+    @Autowired
+    private IRoomV1InnerServiceSMO roomV1InnerServiceSMOImpl;
+
+    @Override
+    public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
+        Assert.hasKeyAndValue(reqJson, "roomNum", "请求报文中未包含roomNum");
+        Assert.hasKeyAndValue(reqJson, "unitId", "请求报文中未包含unitId");
+        Assert.hasKeyAndValue(reqJson, "layer", "请求报文中未包含layer");
+        Assert.hasKeyAndValue(reqJson, "apartment", "请求报文中未包含apartment");
+        Assert.hasKeyAndValue(reqJson, "builtUpArea", "请求报文中未包含builtUpArea");
+        Assert.hasKeyAndValue(reqJson, "feeCoefficient", "请求报文中未包含feeCoefficient");
+        Assert.hasKeyAndValue(reqJson, "userId", "请求报文中未包含userId");
+        Assert.hasKeyAndValue(reqJson, "statusCd", "请求报文中未包含statusCd");
+        Assert.hasKeyAndValue(reqJson, "state", "请求报文中未包含state");
+        Assert.hasKeyAndValue(reqJson, "roomType", "请求报文中未包含roomType");
+        Assert.hasKeyAndValue(reqJson, "roomSubType", "请求报文中未包含roomSubType");
+        Assert.hasKeyAndValue(reqJson, "roomArea", "请求报文中未包含roomArea");
+        Assert.hasKeyAndValue(reqJson, "roomRent", "请求报文中未包含roomRent");
+
+    }
+
+    @Override
+    @Java110Transactional
+    public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
+
+        RoomPo roomPo = BeanConvertUtil.covertBean(reqJson, RoomPo.class);
+        roomPo.setRoomId(GenerateCodeFactory.getGeneratorId(CODE_PREFIX_ID));
+        int flag = roomV1InnerServiceSMOImpl.saveRoom(roomPo);
+
+        if (flag < 1) {
+            throw new CmdException("保存数据失败");
+        }
+
+        cmdDataFlowContext.setResponseEntity(ResultVo.success());
+    }
+}

service-community/src/main/java/com/java110/community/cmd/room/UpdateRoomCmd.java

@@ -0,0 +1,75 @@
+/*
+ * 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.room;
+
+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.AbstractServiceCmdListener;
+import com.java110.core.event.cmd.CmdEvent;
+import com.java110.core.factory.GenerateCodeFactory;
+import com.java110.intf.community.IRoomV1InnerServiceSMO;
+import com.java110.po.room.RoomPo;
+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;
+
+
+/**
+ * 类表述：更新
+ * 服务编码：room.updateRoom
+ * 请求路劲：/app/room.UpdateRoom
+ * add by 吴学文 at 2021-09-14 14:28:56 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 = "room.UpdateRoom")
+public class UpdateRoomCmd extends AbstractServiceCmdListener {
+
+    private static Logger logger = LoggerFactory.getLogger(UpdateRoomCmd.class);
+
+
+    @Autowired
+    private IRoomV1InnerServiceSMO roomV1InnerServiceSMOImpl;
+
+    @Override
+    public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
+        Assert.hasKeyAndValue(reqJson, "roomId", "roomId不能为空");
+        Assert.hasKeyAndValue(reqJson, "communityId", "communityId不能为空");
+
+    }
+
+    @Override
+    @Java110Transactional
+    public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
+
+        RoomPo roomPo = BeanConvertUtil.covertBean(reqJson, RoomPo.class);
+        int flag = roomV1InnerServiceSMOImpl.updateRoom(roomPo);
+
+        if (flag < 1) {
+            throw new CmdException("更新数据失败");
+        }
+
+        cmdDataFlowContext.setResponseEntity(ResultVo.success());
+    }
+}

service-community/src/main/java/com/java110/community/dao/IRoomV1ServiceDao.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 2021-09-14 14:28:56 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 IRoomV1ServiceDao {
+
+
+    /**
+     * 保存 房屋信息
+     * @param info
+     * @throws DAOException DAO异常
+     */
+    int saveRoomInfo(Map info) throws DAOException;
+
+
+
+
+    /**
+     * 查询房屋信息（instance过程）
+     * 根据bId 查询房屋信息
+     * @param info bId 信息
+     * @return 房屋信息
+     * @throws DAOException DAO异常
+     */
+    List<Map> getRoomInfo(Map info) throws DAOException;
+
+
+
+    /**
+     * 修改房屋信息
+     * @param info 修改信息
+     * @throws DAOException DAO异常
+     */
+    int updateRoomInfo(Map info) throws DAOException;
+
+
+    /**
+     * 查询房屋总数
+     *
+     * @param info 房屋信息
+     * @return 房屋数量
+     */
+    int queryRoomsCount(Map info);
+
+}

service-community/src/main/java/com/java110/community/dao/impl/RoomV1ServiceDaoImpl.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.IRoomV1ServiceDao;
+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 2021-09-14 14:28:56 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("roomV1ServiceDaoImpl")
+public class RoomV1ServiceDaoImpl extends BaseServiceDao implements IRoomV1ServiceDao {
+
+    private static Logger logger = LoggerFactory.getLogger(RoomV1ServiceDaoImpl.class);
+
+
+
+
+
+    /**
+     * 保存房屋信息 到 instance
+     * @param info   bId 信息
+     * @throws DAOException DAO异常
+     */
+    @Override
+    public int saveRoomInfo(Map info) throws DAOException {
+        logger.debug("保存 saveRoomInfo 入参 info : {}",info);
+
+        int saveFlag = sqlSessionTemplate.insert("roomV1ServiceDaoImpl.saveRoomInfo",info);
+
+        return saveFlag;
+    }
+
+
+    /**
+     * 查询房屋信息（instance）
+     * @param info bId 信息
+     * @return List<Map>
+     * @throws DAOException DAO异常
+     */
+    @Override
+    public List<Map> getRoomInfo(Map info) throws DAOException {
+        logger.debug("查询 getRoomInfo 入参 info : {}",info);
+
+        List<Map> businessRoomInfos = sqlSessionTemplate.selectList("roomV1ServiceDaoImpl.getRoomInfo",info);
+
+        return businessRoomInfos;
+    }
+
+
+    /**
+     * 修改房屋信息
+     * @param info 修改信息
+     * @throws DAOException DAO异常
+     */
+    @Override
+    public int updateRoomInfo(Map info) throws DAOException {
+        logger.debug("修改 updateRoomInfo 入参 info : {}",info);
+
+        int saveFlag = sqlSessionTemplate.update("roomV1ServiceDaoImpl.updateRoomInfo",info);
+
+        return saveFlag;
+    }
+
+     /**
+     * 查询房屋数量
+     * @param info 房屋信息
+     * @return 房屋数量
+     */
+    @Override
+    public int queryRoomsCount(Map info) {
+        logger.debug("查询 queryRoomsCount 入参 info : {}",info);
+
+        List<Map> businessRoomInfos = sqlSessionTemplate.selectList("roomV1ServiceDaoImpl.queryRoomsCount", info);
+        if (businessRoomInfos.size() < 1) {
+            return 0;
+        }
+
+        return Integer.parseInt(businessRoomInfos.get(0).get("count").toString());
+    }
+
+
+}

service-community/src/main/java/com/java110/community/smo/impl/RoomV1InnerServiceSMOImpl.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.IRoomV1ServiceDao;
+import com.java110.dto.RoomDto;
+import com.java110.intf.community.IRoomV1InnerServiceSMO;
+import com.java110.po.room.RoomPo;
+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 2021-09-14 14:28:56 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 RoomV1InnerServiceSMOImpl extends BaseServiceSMO implements IRoomV1InnerServiceSMO {
+
+    @Autowired
+    private IRoomV1ServiceDao roomV1ServiceDaoImpl;
+
+
+    @Override
+    public int saveRoom(@RequestBody  RoomPo roomPo) {
+        int saveFlag = roomV1ServiceDaoImpl.saveRoomInfo(BeanConvertUtil.beanCovertMap(roomPo));
+        return saveFlag;
+    }
+
+     @Override
+    public int updateRoom(@RequestBody  RoomPo roomPo) {
+        int saveFlag = roomV1ServiceDaoImpl.updateRoomInfo(BeanConvertUtil.beanCovertMap(roomPo));
+        return saveFlag;
+    }
+
+     @Override
+    public int deleteRoom(@RequestBody  RoomPo roomPo) {
+       roomPo.setStatusCd("1");
+       int saveFlag = roomV1ServiceDaoImpl.updateRoomInfo(BeanConvertUtil.beanCovertMap(roomPo));
+       return saveFlag;
+    }
+
+    @Override
+    public List<RoomDto> queryRooms(@RequestBody RoomDto roomDto) {
+
+        //校验是否传了 分页信息
+
+        int page = roomDto.getPage();
+
+        if (page != PageDto.DEFAULT_PAGE) {
+            roomDto.setPage((page - 1) * roomDto.getRow());
+        }
+
+        List<RoomDto> rooms = BeanConvertUtil.covertBeanList(roomV1ServiceDaoImpl.getRoomInfo(BeanConvertUtil.beanCovertMap(roomDto)), RoomDto.class);
+
+        return rooms;
+    }
+
+
+    @Override
+    public int queryRoomsCount(@RequestBody RoomDto roomDto) {
+        return roomV1ServiceDaoImpl.queryRoomsCount(BeanConvertUtil.beanCovertMap(roomDto));    }
+
+}