diff --git a/readme.md b/readme.md index ab84abf..2e9ef07 100644 --- a/readme.md +++ b/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迭代`已上线` ## 表结构调整 diff --git a/src/main/java/com/cm/systemcity/controller/apis/community/CommunityController.java b/src/main/java/com/cm/systemcity/controller/apis/community/CommunityController.java index 44fb9a4..f799598 100755 --- a/src/main/java/com/cm/systemcity/controller/apis/community/CommunityController.java +++ b/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 = "社区列表接口") diff --git a/src/main/java/com/cm/systemcity/pojo/dtos/community/CommunityDTO.java b/src/main/java/com/cm/systemcity/pojo/dtos/community/CommunityDTO.java index 802747d..dcf465a 100755 --- a/src/main/java/com/cm/systemcity/pojo/dtos/community/CommunityDTO.java +++ b/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; + } } \ No newline at end of file diff --git a/src/main/java/com/cm/systemcity/pojo/vos/community/CommunityVO.java b/src/main/java/com/cm/systemcity/pojo/vos/community/CommunityVO.java index 8ca86cf..8e71a78 100755 --- a/src/main/java/com/cm/systemcity/pojo/vos/community/CommunityVO.java +++ b/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; + } } \ No newline at end of file diff --git a/src/main/resources/application-btgxq.yml b/src/main/resources/application-btgxq.yml index 01e44be..361e8e8 100644 --- a/src/main/resources/application-btgxq.yml +++ b/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: diff --git a/src/main/resources/mybatis/mapper/community/community-mapper.xml b/src/main/resources/mybatis/mapper/community/community-mapper.xml index ff57247..a9eac0e 100755 --- a/src/main/resources/mybatis/mapper/community/community-mapper.xml +++ b/src/main/resources/mybatis/mapper/community/community-mapper.xml @@ -10,6 +10,10 @@ + + + + @@ -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 @@ jump_system_url = #{jumpSystemUrl}, + + + base_grid_count = #{baseGridCount}, + + + base_community_boss_count = #{baseCommunityBossCount}, + + + base_house_count = #{baseHouseCount}, + + + base_population_count = #{basePopulationCount}, modifier = #{modifier}, gmt_modified = #{gmtModified} diff --git a/src/main/resources/static/route/community/list.html b/src/main/resources/static/route/community/list.html index 63c7f7d..9b9faa5 100755 --- a/src/main/resources/static/route/community/list.html +++ b/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 diff --git a/src/main/resources/static/route/community/save.html b/src/main/resources/static/route/community/save.html index 36cb456..c310e9f 100755 --- a/src/main/resources/static/route/community/save.html +++ b/src/main/resources/static/route/community/save.html @@ -46,6 +46,33 @@ +
+ +
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
diff --git a/src/main/resources/static/route/community/update.html b/src/main/resources/static/route/community/update.html index 45b5e20..c2bf12b 100755 --- a/src/main/resources/static/route/community/update.html +++ b/src/main/resources/static/route/community/update.html @@ -46,6 +46,33 @@
+
+ +
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
@@ -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) {