1

pro-base/src/main/java/com/idea/buildManage/model/ParkRoom.java

@@ -8,10 +8,16 @@ public class ParkRoom implements Serializable {
 
     private String buildId;
 
+    private String buildName;
+
     private String discId;
 
+    private String discName;
+
     private String groupId;
 
+    private String groupName;
+
     private String roomNo;
 
     private String nature;
@@ -66,17 +72,9 @@ public class ParkRoom implements Serializable {
 
     private String ncCode;
 
-    private String remark;
-
     private String delFlag;
 
-    public String getDelFlag() {
-        return delFlag;
-    }
-
-    public void setDelFlag(String delFlag) {
-        this.delFlag = delFlag;
-    }
+    private String remark;
 
     private static final long serialVersionUID = 1L;
 
@@ -96,6 +94,14 @@ public class ParkRoom implements Serializable {
         this.buildId = buildId == null ? null : buildId.trim();
     }
 
+    public String getBuildName() {
+        return buildName;
+    }
+
+    public void setBuildName(String buildName) {
+        this.buildName = buildName == null ? null : buildName.trim();
+    }
+
     public String getDiscId() {
         return discId;
     }
@@ -104,6 +110,14 @@ public class ParkRoom implements Serializable {
         this.discId = discId == null ? null : discId.trim();
     }
 
+    public String getDiscName() {
+        return discName;
+    }
+
+    public void setDiscName(String discName) {
+        this.discName = discName == null ? null : discName.trim();
+    }
+
     public String getGroupId() {
         return groupId;
     }
@@ -112,6 +126,14 @@ public class ParkRoom implements Serializable {
         this.groupId = groupId == null ? null : groupId.trim();
     }
 
+    public String getGroupName() {
+        return groupName;
+    }
+
+    public void setGroupName(String groupName) {
+        this.groupName = groupName == null ? null : groupName.trim();
+    }
+
     public String getRoomNo() {
         return roomNo;
     }
@@ -120,6 +142,14 @@ public class ParkRoom implements Serializable {
         this.roomNo = roomNo == null ? null : roomNo.trim();
     }
 
+    public String getNature() {
+        return nature;
+    }
+
+    public void setNature(String nature) {
+        this.nature = nature == null ? null : nature.trim();
+    }
+
     public String getFloor() {
         return floor;
     }
@@ -320,19 +350,19 @@ public class ParkRoom implements Serializable {
         this.ncCode = ncCode == null ? null : ncCode.trim();
     }
 
-    public String getRemark() {
-        return remark;
+    public String getDelFlag() {
+        return delFlag;
     }
 
-    public void setRemark(String remark) {
-        this.remark = remark == null ? null : remark.trim();
+    public void setDelFlag(String delFlag) {
+        this.delFlag = delFlag == null ? null : delFlag.trim();
     }
 
-    public String getNature() {
-        return nature;
+    public String getRemark() {
+        return remark;
     }
 
-    public void setNature(String nature) {
-        this.nature = nature;
+    public void setRemark(String remark) {
+        this.remark = remark == null ? null : remark.trim();
     }
 }

pro-base/src/main/java/com/idea/buildManage/model/ParkRoomExample.java

@@ -245,6 +245,76 @@ public class ParkRoomExample {
             return (Criteria) this;
         }
 
+        public Criteria andBuildNameIsNull() {
+            addCriterion("build_name is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andBuildNameIsNotNull() {
+            addCriterion("build_name is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andBuildNameEqualTo(String value) {
+            addCriterion("build_name =", value, "buildName");
+            return (Criteria) this;
+        }
+
+        public Criteria andBuildNameNotEqualTo(String value) {
+            addCriterion("build_name <>", value, "buildName");
+            return (Criteria) this;
+        }
+
+        public Criteria andBuildNameGreaterThan(String value) {
+            addCriterion("build_name >", value, "buildName");
+            return (Criteria) this;
+        }
+
+        public Criteria andBuildNameGreaterThanOrEqualTo(String value) {
+            addCriterion("build_name >=", value, "buildName");
+            return (Criteria) this;
+        }
+
+        public Criteria andBuildNameLessThan(String value) {
+            addCriterion("build_name <", value, "buildName");
+            return (Criteria) this;
+        }
+
+        public Criteria andBuildNameLessThanOrEqualTo(String value) {
+            addCriterion("build_name <=", value, "buildName");
+            return (Criteria) this;
+        }
+
+        public Criteria andBuildNameLike(String value) {
+            addCriterion("build_name like", value, "buildName");
+            return (Criteria) this;
+        }
+
+        public Criteria andBuildNameNotLike(String value) {
+            addCriterion("build_name not like", value, "buildName");
+            return (Criteria) this;
+        }
+
+        public Criteria andBuildNameIn(List<String> values) {
+            addCriterion("build_name in", values, "buildName");
+            return (Criteria) this;
+        }
+
+        public Criteria andBuildNameNotIn(List<String> values) {
+            addCriterion("build_name not in", values, "buildName");
+            return (Criteria) this;
+        }
+
+        public Criteria andBuildNameBetween(String value1, String value2) {
+            addCriterion("build_name between", value1, value2, "buildName");
+            return (Criteria) this;
+        }
+
+        public Criteria andBuildNameNotBetween(String value1, String value2) {
+            addCriterion("build_name not between", value1, value2, "buildName");
+            return (Criteria) this;
+        }
+
         public Criteria andDiscIdIsNull() {
             addCriterion("disc_id is null");
             return (Criteria) this;
@@ -315,6 +385,76 @@ public class ParkRoomExample {
             return (Criteria) this;
         }
 
+        public Criteria andDiscNameIsNull() {
+            addCriterion("disc_name is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDiscNameIsNotNull() {
+            addCriterion("disc_name is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDiscNameEqualTo(String value) {
+            addCriterion("disc_name =", value, "discName");
+            return (Criteria) this;
+        }
+
+        public Criteria andDiscNameNotEqualTo(String value) {
+            addCriterion("disc_name <>", value, "discName");
+            return (Criteria) this;
+        }
+
+        public Criteria andDiscNameGreaterThan(String value) {
+            addCriterion("disc_name >", value, "discName");
+            return (Criteria) this;
+        }
+
+        public Criteria andDiscNameGreaterThanOrEqualTo(String value) {
+            addCriterion("disc_name >=", value, "discName");
+            return (Criteria) this;
+        }
+
+        public Criteria andDiscNameLessThan(String value) {
+            addCriterion("disc_name <", value, "discName");
+            return (Criteria) this;
+        }
+
+        public Criteria andDiscNameLessThanOrEqualTo(String value) {
+            addCriterion("disc_name <=", value, "discName");
+            return (Criteria) this;
+        }
+
+        public Criteria andDiscNameLike(String value) {
+            addCriterion("disc_name like", value, "discName");
+            return (Criteria) this;
+        }
+
+        public Criteria andDiscNameNotLike(String value) {
+            addCriterion("disc_name not like", value, "discName");
+            return (Criteria) this;
+        }
+
+        public Criteria andDiscNameIn(List<String> values) {
+            addCriterion("disc_name in", values, "discName");
+            return (Criteria) this;
+        }
+
+        public Criteria andDiscNameNotIn(List<String> values) {
+            addCriterion("disc_name not in", values, "discName");
+            return (Criteria) this;
+        }
+
+        public Criteria andDiscNameBetween(String value1, String value2) {
+            addCriterion("disc_name between", value1, value2, "discName");
+            return (Criteria) this;
+        }
+
+        public Criteria andDiscNameNotBetween(String value1, String value2) {
+            addCriterion("disc_name not between", value1, value2, "discName");
+            return (Criteria) this;
+        }
+
         public Criteria andGroupIdIsNull() {
             addCriterion("group_id is null");
             return (Criteria) this;
@@ -385,6 +525,76 @@ public class ParkRoomExample {
             return (Criteria) this;
         }
 
+        public Criteria andGroupNameIsNull() {
+            addCriterion("group_name is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andGroupNameIsNotNull() {
+            addCriterion("group_name is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andGroupNameEqualTo(String value) {
+            addCriterion("group_name =", value, "groupName");
+            return (Criteria) this;
+        }
+
+        public Criteria andGroupNameNotEqualTo(String value) {
+            addCriterion("group_name <>", value, "groupName");
+            return (Criteria) this;
+        }
+
+        public Criteria andGroupNameGreaterThan(String value) {
+            addCriterion("group_name >", value, "groupName");
+            return (Criteria) this;
+        }
+
+        public Criteria andGroupNameGreaterThanOrEqualTo(String value) {
+            addCriterion("group_name >=", value, "groupName");
+            return (Criteria) this;
+        }
+
+        public Criteria andGroupNameLessThan(String value) {
+            addCriterion("group_name <", value, "groupName");
+            return (Criteria) this;
+        }
+
+        public Criteria andGroupNameLessThanOrEqualTo(String value) {
+            addCriterion("group_name <=", value, "groupName");
+            return (Criteria) this;
+        }
+
+        public Criteria andGroupNameLike(String value) {
+            addCriterion("group_name like", value, "groupName");
+            return (Criteria) this;
+        }
+
+        public Criteria andGroupNameNotLike(String value) {
+            addCriterion("group_name not like", value, "groupName");
+            return (Criteria) this;
+        }
+
+        public Criteria andGroupNameIn(List<String> values) {
+            addCriterion("group_name in", values, "groupName");
+            return (Criteria) this;
+        }
+
+        public Criteria andGroupNameNotIn(List<String> values) {
+            addCriterion("group_name not in", values, "groupName");
+            return (Criteria) this;
+        }
+
+        public Criteria andGroupNameBetween(String value1, String value2) {
+            addCriterion("group_name between", value1, value2, "groupName");
+            return (Criteria) this;
+        }
+
+        public Criteria andGroupNameNotBetween(String value1, String value2) {
+            addCriterion("group_name not between", value1, value2, "groupName");
+            return (Criteria) this;
+        }
+
         public Criteria andRoomNoIsNull() {
             addCriterion("room_no is null");
             return (Criteria) this;

pro-base/src/main/java/com/idea/buildManage/service/MnpBuildingService.java

@@ -312,6 +312,13 @@ public class MnpBuildingService implements BaseService<MnpBuilding, MnpBuildingE
 
         int result = updateByPrimaryKeySelective(model);
 
+        // 更新房间信息
+        ParkRoomExample roomExample = new ParkRoomExample();
+        roomExample.createCriteria().andBuildIdEqualTo(model.getId());
+        ParkRoom room = new ParkRoom();
+        room.setBuildName(model.getBuildNum());
+        parkRoomService.updateByExampleSelective(room, roomExample);
+
         try {
             MnpBuilding building = selectByPrimaryKey(model.getId());
             JSONObject json = new JSONObject();

pro-base/src/main/java/com/idea/buildManage/service/ParkFloorDiscService.java

@@ -49,6 +49,8 @@ public class ParkFloorDiscService implements BaseService<ParkFloorDisc, ParkFloo
     private ParkFloorDiscExtendMapper extendMapper;
     @Autowired
     private HouseTypeService houseTypeService;
+    @Autowired
+    private ParkRoomService roomService;
 
     /**
      * 分页查询
@@ -214,6 +216,22 @@ public class ParkFloorDiscService implements BaseService<ParkFloorDisc, ParkFloo
             houseTypeService.insertWithoutId(houseType);
         }
         int result = updateByPrimaryKeySelective(model);
+
+        // 更新楼栋信息
+        MnpBuildingExample buildingExample = new MnpBuildingExample();
+        buildingExample.createCriteria().andDiscIdEqualTo(model.getId());
+        MnpBuilding building = new MnpBuilding();
+        building.setDiscName(model.getName());
+        buildingService.updateByExampleSelective(building, buildingExample);
+
+        // 更新房间信息
+        ParkRoomExample roomExample = new ParkRoomExample();
+        roomExample.createCriteria().andDiscIdEqualTo(model.getId());
+        ParkRoom room = new ParkRoom();
+        room.setDiscName(model.getName());
+        roomService.updateByExampleSelective(room, roomExample);
+
+
         return result;
     }
 

pro-base/src/main/java/com/idea/buildManage/service/ParkInfoService.java

@@ -30,6 +30,7 @@ import com.rockstar.util.StringUtils;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import javax.servlet.http.HttpServletResponse;
 import java.beans.Transient;
@@ -176,31 +177,36 @@ public class ParkInfoService implements BaseService<ParkInfo, ParkInfoExample> {
         return modelMapper.insertSelective(record);
     }
 
-    @Transient
+    @Transactional
     public int insertModel(ParkInfo record) {
         if (StringUtils.isNotEmpty(record.getId())) {
             record.setUpdatedAt(new Date());
             modelMapper.updateByPrimaryKeyWithBLOBs(record);
-            SysGroup group = sysGroupMapper.selectByPrimaryKey(record.getGroupId());
-            group.setName(record.getGroupName());
-            group.setUpdatedAt(new Date());
-            sysGroupMapper.updateByPrimaryKey(group);
+
+            // 更新楼栋信息
+            MnpBuildingExample buildingExample = new MnpBuildingExample();
+            buildingExample.createCriteria().andGroupIdEqualTo(record.getId());
+            MnpBuilding building = new MnpBuilding();
+            building.setGroupName(record.getGroupName());
+            mnpBuildingService.updateByExampleSelective(building, buildingExample);
+
+            // 更新房间信息
+            ParkRoomExample roomExample = new ParkRoomExample();
+            roomExample.createCriteria().andGroupIdEqualTo(record.getId());
+            ParkRoom room = new ParkRoom();
+            room.setGroupName(record.getGroupName());
+            parkRoomService.updateByExampleSelective(room, roomExample);
+
+
         } else {
-            FrameUser user = ShiroUtils.getUser();
             String id = SnowflakeIdWorker.getUUID();
-            SysGroup group = new SysGroup();
-            group.setId(id);
-            group.setCreatedBy(user.getId());
-            group.setName(record.getGroupName());
-            group.setCreatedAt(new Date());
-            sysGroupMapper.insert(group);
             record.setId(id);
             record.setGroupId(id);
-            record.setCreatedId(user.getId());
+            record.setCreatedId(ShiroUtils.getUserId());
             String orderNum = getOrderNum(record);
             record.setOrderNum(orderNum);
-            record.setUpdatedAt(new Date());
-            insertWithoutId(record);
+            record.setCreatedAt(new Date());
+            modelMapper.insert(record);
         }
         return 1;
     }

pro-base/src/main/resources/mybatis/buildManage/ParkRoomMapper.xml

@@ -4,8 +4,11 @@
     <resultMap id="BaseResultMap" type="com.idea.buildManage.model.ParkRoom">
         <id column="id" jdbcType="VARCHAR" property="id" />
         <result column="build_id" jdbcType="VARCHAR" property="buildId" />
+        <result column="build_name" jdbcType="VARCHAR" property="buildName" />
         <result column="disc_id" jdbcType="VARCHAR" property="discId" />
+        <result column="disc_name" jdbcType="VARCHAR" property="discName" />
         <result column="group_id" jdbcType="VARCHAR" property="groupId" />
+        <result column="group_name" jdbcType="VARCHAR" property="groupName" />
         <result column="room_no" jdbcType="VARCHAR" property="roomNo" />
         <result column="nature" jdbcType="VARCHAR" property="nature" />
         <result column="floor" jdbcType="VARCHAR" property="floor" />
@@ -97,11 +100,12 @@
         </where>
     </sql>
     <sql id="Base_Column_List">
-        id, build_id, disc_id, group_id, room_no, nature, floor, prediction_internal_area,
-    prediction_share_area, prediction_build_area, prediction_land_area, actual_internal_area,
-    actual_share_area, actual_build_area, actual_land_area, room_use, room_number, decoration_situation,
-    house_type_id, house_type_picture, created_id, created_at, updated_at, updated_id,
-    sale_status, sold_status, two_point_two, order_num, is_choose, ncid, nc_code, del_flag
+        id, build_id, build_name, disc_id, disc_name, group_id, group_name, room_no, nature,
+    floor, prediction_internal_area, prediction_share_area, prediction_build_area, prediction_land_area,
+    actual_internal_area, actual_share_area, actual_build_area, actual_land_area, room_use,
+    room_number, decoration_situation, house_type_id, house_type_picture, created_id,
+    created_at, updated_at, updated_id, sale_status, sold_status, two_point_two, order_num,
+    is_choose, ncid, nc_code, del_flag
     </sql>
     <sql id="Blob_Column_List">
         remark
@@ -155,8 +159,9 @@
         </if>
     </delete>
     <insert id="insert" parameterType="com.idea.buildManage.model.ParkRoom">
-        insert into park_room (id, build_id, disc_id,
-                               group_id, room_no, nature,
+        insert into park_room (id, build_id, build_name,
+                               disc_id, disc_name, group_id,
+                               group_name, room_no, nature,
                                floor, prediction_internal_area, prediction_share_area,
                                prediction_build_area, prediction_land_area,
                                actual_internal_area, actual_share_area, actual_build_area,
@@ -167,8 +172,9 @@
                                two_point_two, order_num, is_choose,
                                ncid, nc_code, del_flag,
                                remark)
-        values (#{id,jdbcType=VARCHAR}, #{buildId,jdbcType=VARCHAR}, #{discId,jdbcType=VARCHAR},
-                #{groupId,jdbcType=VARCHAR}, #{roomNo,jdbcType=VARCHAR}, #{nature,jdbcType=VARCHAR},
+        values (#{id,jdbcType=VARCHAR}, #{buildId,jdbcType=VARCHAR}, #{buildName,jdbcType=VARCHAR},
+                #{discId,jdbcType=VARCHAR}, #{discName,jdbcType=VARCHAR}, #{groupId,jdbcType=VARCHAR},
+                #{groupName,jdbcType=VARCHAR}, #{roomNo,jdbcType=VARCHAR}, #{nature,jdbcType=VARCHAR},
                 #{floor,jdbcType=VARCHAR}, #{predictionInternalArea,jdbcType=DOUBLE}, #{predictionShareArea,jdbcType=DOUBLE},
                 #{predictionBuildArea,jdbcType=DOUBLE}, #{predictionLandArea,jdbcType=DOUBLE},
                 #{actualInternalArea,jdbcType=DOUBLE}, #{actualShareArea,jdbcType=DOUBLE}, #{actualBuildArea,jdbcType=DOUBLE},
@@ -189,12 +195,21 @@
             <if test="buildId != null">
                 build_id,
             </if>
+            <if test="buildName != null">
+                build_name,
+            </if>
             <if test="discId != null">
                 disc_id,
             </if>
+            <if test="discName != null">
+                disc_name,
+            </if>
             <if test="groupId != null">
                 group_id,
             </if>
+            <if test="groupName != null">
+                group_name,
+            </if>
             <if test="roomNo != null">
                 room_no,
             </if>
@@ -290,12 +305,21 @@
             <if test="buildId != null">
                 #{buildId,jdbcType=VARCHAR},
             </if>
+            <if test="buildName != null">
+                #{buildName,jdbcType=VARCHAR},
+            </if>
             <if test="discId != null">
                 #{discId,jdbcType=VARCHAR},
             </if>
+            <if test="discName != null">
+                #{discName,jdbcType=VARCHAR},
+            </if>
             <if test="groupId != null">
                 #{groupId,jdbcType=VARCHAR},
             </if>
+            <if test="groupName != null">
+                #{groupName,jdbcType=VARCHAR},
+            </if>
             <if test="roomNo != null">
                 #{roomNo,jdbcType=VARCHAR},
             </if>
@@ -400,12 +424,21 @@
             <if test="record.buildId != null">
                 build_id = #{record.buildId,jdbcType=VARCHAR},
             </if>
+            <if test="record.buildName != null">
+                build_name = #{record.buildName,jdbcType=VARCHAR},
+            </if>
             <if test="record.discId != null">
                 disc_id = #{record.discId,jdbcType=VARCHAR},
             </if>
+            <if test="record.discName != null">
+                disc_name = #{record.discName,jdbcType=VARCHAR},
+            </if>
             <if test="record.groupId != null">
                 group_id = #{record.groupId,jdbcType=VARCHAR},
             </if>
+            <if test="record.groupName != null">
+                group_name = #{record.groupName,jdbcType=VARCHAR},
+            </if>
             <if test="record.roomNo != null">
                 room_no = #{record.roomNo,jdbcType=VARCHAR},
             </if>
@@ -502,8 +535,11 @@
         update park_room
         set id = #{record.id,jdbcType=VARCHAR},
         build_id = #{record.buildId,jdbcType=VARCHAR},
+        build_name = #{record.buildName,jdbcType=VARCHAR},
         disc_id = #{record.discId,jdbcType=VARCHAR},
+        disc_name = #{record.discName,jdbcType=VARCHAR},
         group_id = #{record.groupId,jdbcType=VARCHAR},
+        group_name = #{record.groupName,jdbcType=VARCHAR},
         room_no = #{record.roomNo,jdbcType=VARCHAR},
         nature = #{record.nature,jdbcType=VARCHAR},
         floor = #{record.floor,jdbcType=VARCHAR},
@@ -541,8 +577,11 @@
         update park_room
         set id = #{record.id,jdbcType=VARCHAR},
         build_id = #{record.buildId,jdbcType=VARCHAR},
+        build_name = #{record.buildName,jdbcType=VARCHAR},
         disc_id = #{record.discId,jdbcType=VARCHAR},
+        disc_name = #{record.discName,jdbcType=VARCHAR},
         group_id = #{record.groupId,jdbcType=VARCHAR},
+        group_name = #{record.groupName,jdbcType=VARCHAR},
         room_no = #{record.roomNo,jdbcType=VARCHAR},
         nature = #{record.nature,jdbcType=VARCHAR},
         floor = #{record.floor,jdbcType=VARCHAR},
@@ -581,12 +620,21 @@
             <if test="buildId != null">
                 build_id = #{buildId,jdbcType=VARCHAR},
             </if>
+            <if test="buildName != null">
+                build_name = #{buildName,jdbcType=VARCHAR},
+            </if>
             <if test="discId != null">
                 disc_id = #{discId,jdbcType=VARCHAR},
             </if>
+            <if test="discName != null">
+                disc_name = #{discName,jdbcType=VARCHAR},
+            </if>
             <if test="groupId != null">
                 group_id = #{groupId,jdbcType=VARCHAR},
             </if>
+            <if test="groupName != null">
+                group_name = #{groupName,jdbcType=VARCHAR},
+            </if>
             <if test="roomNo != null">
                 room_no = #{roomNo,jdbcType=VARCHAR},
             </if>
@@ -680,8 +728,11 @@
     <update id="updateByPrimaryKeyWithBLOBs" parameterType="com.idea.buildManage.model.ParkRoom">
         update park_room
         set build_id = #{buildId,jdbcType=VARCHAR},
+            build_name = #{buildName,jdbcType=VARCHAR},
             disc_id = #{discId,jdbcType=VARCHAR},
+            disc_name = #{discName,jdbcType=VARCHAR},
             group_id = #{groupId,jdbcType=VARCHAR},
+            group_name = #{groupName,jdbcType=VARCHAR},
             room_no = #{roomNo,jdbcType=VARCHAR},
             nature = #{nature,jdbcType=VARCHAR},
             floor = #{floor,jdbcType=VARCHAR},
@@ -716,8 +767,11 @@
     <update id="updateByPrimaryKey" parameterType="com.idea.buildManage.model.ParkRoom">
         update park_room
         set build_id = #{buildId,jdbcType=VARCHAR},
+            build_name = #{buildName,jdbcType=VARCHAR},
             disc_id = #{discId,jdbcType=VARCHAR},
+            disc_name = #{discName,jdbcType=VARCHAR},
             group_id = #{groupId,jdbcType=VARCHAR},
+            group_name = #{groupName,jdbcType=VARCHAR},
             room_no = #{roomNo,jdbcType=VARCHAR},
             nature = #{nature,jdbcType=VARCHAR},
             floor = #{floor,jdbcType=VARCHAR},