社区管理增加基础人口字段

readme.md

@@ -1,3 +1,16 @@
+# 20231206迭代`未上线`
+
+## 表结构调整
+
+### city_community
+
+| 字段                        | 类型      | 默认值 | 描述      | 操作 |
+|---------------------------|---------|-----|---------|----|
+| base_grid_count           | int(11) |     | 基础网格数量  | 新增 |
+| base_community_boss_count | int(11) |     | 基础网格员数量 | 新增 |
+| base_house_count          | int(11) |     | 基础户数    | 新增 |
+| base_population_count     | int(11) |     | 基础人口数量  | 新增 |
+
 # 20231023迭代`已上线`
 
 ## 表结构调整

src/main/java/com/cm/systemcity/controller/apis/community/CommunityController.java

@@ -98,6 +98,10 @@ public class CommunityController extends AbstractController {
         params.put("areaName", communityVO.getAreaName());
         params.put("communitySummary", communityVO.getCommunitySummary());
         params.put("jumpSystemUrl", communityVO.getJumpSystemUrl());
+        params.put("baseGridCount", communityVO.getBaseGridCount());
+        params.put("baseCommunityBossCount", communityVO.getBaseCommunityBossCount());
+        params.put("baseHouseCount", communityVO.getBaseHouseCount());
+        params.put("basePopulationCount", communityVO.getBasePopulationCount());
     }
 
     @ApiOperation(value = "社区列表", notes = "社区列表接口")

src/main/java/com/cm/systemcity/pojo/dtos/community/CommunityDTO.java

@@ -32,6 +32,15 @@ public class CommunityDTO implements Serializable {
     @ApiModelProperty(name = "jumpSystemUrl", value = "跳转地址")
     private String jumpSystemUrl;
 
+    @ApiModelProperty(name = "baseGridCount", value = "基础网格数量")
+    private Integer baseGridCount;
+    @ApiModelProperty(name = "baseCommunityBossCount", value = "基础网格员数量")
+    private Integer baseCommunityBossCount;
+    @ApiModelProperty(name = "baseHouseCount", value = "基础户数")
+    private Integer baseHouseCount;
+    @ApiModelProperty(name = "basePopulationCount", value = "基础人口数量")
+    private Integer basePopulationCount;
+
     public String getCommunityId() {
         return communityId;
     }
@@ -96,4 +105,35 @@ public class CommunityDTO implements Serializable {
         this.jumpSystemUrl = jumpSystemUrl;
     }
 
+    public Integer getBaseGridCount() {
+        return baseGridCount;
+    }
+
+    public void setBaseGridCount(Integer baseGridCount) {
+        this.baseGridCount = baseGridCount;
+    }
+
+    public Integer getBaseCommunityBossCount() {
+        return baseCommunityBossCount;
+    }
+
+    public void setBaseCommunityBossCount(Integer baseCommunityBossCount) {
+        this.baseCommunityBossCount = baseCommunityBossCount;
+    }
+
+    public Integer getBaseHouseCount() {
+        return baseHouseCount;
+    }
+
+    public void setBaseHouseCount(Integer baseHouseCount) {
+        this.baseHouseCount = baseHouseCount;
+    }
+
+    public Integer getBasePopulationCount() {
+        return basePopulationCount;
+    }
+
+    public void setBasePopulationCount(Integer basePopulationCount) {
+        this.basePopulationCount = basePopulationCount;
+    }
 }

src/main/java/com/cm/systemcity/pojo/vos/community/CommunityVO.java

@@ -26,6 +26,14 @@ public class CommunityVO {
     private String areaName;
     @ApiModelProperty(name = "jumpSystemUrl", value = "跳转地址")
     private String jumpSystemUrl;
+    @ApiModelProperty(name = "baseGridCount", value = "基础网格数量")
+    private Integer baseGridCount;
+    @ApiModelProperty(name = "baseCommunityBossCount", value = "基础网格员数量")
+    private Integer baseCommunityBossCount;
+    @ApiModelProperty(name = "baseHouseCount", value = "基础户数")
+    private Integer baseHouseCount;
+    @ApiModelProperty(name = "basePopulationCount", value = "基础人口数量")
+    private Integer basePopulationCount;
 
     public String getCommunityName() {
         return communityName;
@@ -75,4 +83,35 @@ public class CommunityVO {
         this.jumpSystemUrl = jumpSystemUrl;
     }
 
+    public Integer getBaseGridCount() {
+        return baseGridCount;
+    }
+
+    public void setBaseGridCount(Integer baseGridCount) {
+        this.baseGridCount = baseGridCount;
+    }
+
+    public Integer getBaseCommunityBossCount() {
+        return baseCommunityBossCount;
+    }
+
+    public void setBaseCommunityBossCount(Integer baseCommunityBossCount) {
+        this.baseCommunityBossCount = baseCommunityBossCount;
+    }
+
+    public Integer getBaseHouseCount() {
+        return baseHouseCount;
+    }
+
+    public void setBaseHouseCount(Integer baseHouseCount) {
+        this.baseHouseCount = baseHouseCount;
+    }
+
+    public Integer getBasePopulationCount() {
+        return basePopulationCount;
+    }
+
+    public void setBasePopulationCount(Integer basePopulationCount) {
+        this.basePopulationCount = basePopulationCount;
+    }
 }

src/main/resources/application-btgxq.yml

@@ -24,7 +24,7 @@ spring:
       max-request-size: 1GB
   datasource:
     druid:
-      url: jdbc:mysql://127.0.0.1:3306/db_btgxq_city?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&autoReconnect=true&failOverReadOnly=false&useSSL=false
+      url: jdbc:mysql://192.168.0.151:3306/db_btgxq_city?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&autoReconnect=true&failOverReadOnly=false&useSSL=false
       db-type: mysql
       driver-class-name: com.mysql.jdbc.Driver
       username: root
@@ -55,7 +55,7 @@ spring:
       config: classpath:ehcache.xml
   data:
     mongodb:
-      uri: mongodb://city:city@127.0.0.1:27017/systemcity
+      uri: mongodb://city:city@192.168.0.156:27017/systemcity
 
 # 数据库
 mybatis:

src/main/resources/mybatis/mapper/community/community-mapper.xml

@@ -10,6 +10,10 @@
         <result property="areaId" column="area_id"/>
         <result property="areaName" column="area_name"/>
         <result property="jumpSystemUrl" column="jump_system_url"/>
+        <result property="baseGridCount" column="base_grid_count"/>
+        <result property="baseCommunityBossCount" column="base_community_boss_count"/>
+        <result property="baseHouseCount" column="base_house_count"/>
+        <result property="basePopulationCount" column="base_population_count"/>
     </resultMap>
 
     <!-- 新增社区 -->
@@ -22,6 +26,10 @@
             area_id,
             area_name,
             jump_system_url,
+            base_grid_count,
+            base_community_boss_count,
+            base_house_count,
+            base_population_count,
             creator,
             gmt_create,
             modifier,
@@ -35,6 +43,10 @@
             #{areaId},
             #{areaName},
             #{jumpSystemUrl},
+            #{baseGridCount},
+            #{baseCommunityBossCount},
+            #{baseHouseCount},
+            #{basePopulationCount},
             #{creator},
             #{gmtCreate},
             #{modifier},
@@ -80,6 +92,18 @@
         </if>
         <if test="jumpSystemUrl != null and jumpSystemUrl != ''">
             jump_system_url = #{jumpSystemUrl},
+        </if>
+        <if test="baseGridCount != null">
+            base_grid_count = #{baseGridCount},
+        </if>
+        <if test="baseCommunityBossCount != null">
+            base_community_boss_count = #{baseCommunityBossCount},
+        </if>
+        <if test="baseHouseCount != null">
+            base_house_count = #{baseHouseCount},
+        </if>
+        <if test="basePopulationCount != null">
+            base_population_count = #{basePopulationCount},
         </if>
             modifier = #{modifier},
             gmt_modified = #{gmtModified}

src/main/resources/static/route/community/list.html

@@ -101,6 +101,10 @@
                                 return '-';
                             }
                         },
+                        {field: 'baseGridCount', width: 150, title: '网格数量', align: 'center'},
+                        {field: 'baseCommunityBossCount', width: 150, title: '网格员数量', align: 'center'},
+                        {field: 'baseHouseCount', width: 150, title: '户数', align: 'center'},
+                        {field: 'basePopulationCount', width: 150, title: '人口数量', align: 'center'},
                     ]
                 ],
                 page: true,
@@ -122,7 +126,7 @@
                 url: top.restAjax.path(tableUrl, []),
                 where: {
                     keywords: $('#keywords').val(),
-                    areaId : $('#area').val()
+                    areaId : areaId
                 },
                 page: {
                     curr: currentPage

src/main/resources/static/route/community/save.html

@@ -46,6 +46,33 @@
                         <input type="text" name="communityOrder" id="communityOrder" placeholder="请输入排序" value="1" class="layui-input">
                     </div>
                 </div>
+                <div class="layui-form-item">
+                    <label class="layui-form-label" style="font-weight: bold;">基础信息</label>
+                </div>
+                <div class="layui-form-item">
+                    <label class="layui-form-label">网格数量</label>
+                    <div class="layui-input-block">
+                        <input type="text" name="baseGridCount" placeholder="请输入基础网格数量" class="layui-input">
+                    </div>
+                </div>
+                <div class="layui-form-item">
+                    <label class="layui-form-label">网格员数量</label>
+                    <div class="layui-input-block">
+                        <input type="text" name="baseCommunityBossCount" placeholder="请输入基础网格员数量" class="layui-input">
+                    </div>
+                </div>
+                <div class="layui-form-item">
+                    <label class="layui-form-label">户数</label>
+                    <div class="layui-input-block">
+                        <input type="text" name="baseHouseCount" placeholder="请输入基础户数" class="layui-input">
+                    </div>
+                </div>
+                <div class="layui-form-item">
+                    <label class="layui-form-label">人口数量</label>
+                    <div class="layui-input-block">
+                        <input type="text" name="basePopulationCount" placeholder="请输入基础人口数量" class="layui-input">
+                    </div>
+                </div>
 
                 <div class="layui-form-item layui-layout-admin">
                     <div class="layui-input-block">

src/main/resources/static/route/community/update.html

@@ -46,6 +46,33 @@
                         <input type="text" name="communityOrder" id="communityOrder" placeholder="请输入排序" value="1" class="layui-input">
                     </div>
                 </div>
+                <div class="layui-form-item">
+                    <label class="layui-form-label" style="font-weight: bold;">基础信息</label>
+                </div>
+                <div class="layui-form-item">
+                    <label class="layui-form-label">网格数量</label>
+                    <div class="layui-input-block">
+                        <input type="text" name="baseGridCount" placeholder="请输入基础网格数量" class="layui-input">
+                    </div>
+                </div>
+                <div class="layui-form-item">
+                    <label class="layui-form-label">网格员数量</label>
+                    <div class="layui-input-block">
+                        <input type="text" name="baseCommunityBossCount" placeholder="请输入基础网格员数量" class="layui-input">
+                    </div>
+                </div>
+                <div class="layui-form-item">
+                    <label class="layui-form-label">户数</label>
+                    <div class="layui-input-block">
+                        <input type="text" name="baseHouseCount" placeholder="请输入基础户数" class="layui-input">
+                    </div>
+                </div>
+                <div class="layui-form-item">
+                    <label class="layui-form-label">人口数量</label>
+                    <div class="layui-input-block">
+                        <input type="text" name="basePopulationCount" placeholder="请输入基础人口数量" class="layui-input">
+                    </div>
+                </div>
 
                 <div class="layui-form-item layui-layout-admin">
                     <div class="layui-input-block">
@@ -83,7 +110,11 @@
                     communitySummary : data.communitySummary,
                     communityOrder : data.communityOrder,
                     areaId : data.areaId,
-                    areaName : data.areaName
+                    areaName : data.areaName,
+                    baseGridCount: data.baseGridCount,
+                    baseCommunityBossCount: data.baseCommunityBossCount,
+                    baseHouseCount: data.baseHouseCount,
+                    basePopulationCount: data.basePopulationCount,
                 });
                 form.render(null, 'dataForm');
             }, function(code, data) {