From 2ca2e51f3a838252ed9cd8989f4f5d6fe35d468c Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期三, 30 六月 2021 18:02:00 +0800
Subject: [PATCH] Merge branch 'test' into 'master'
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationServeExcelListen.java | 2
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PageComMngPopulationDTO.java | 28 +
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComMngPopulationHouseService.java | 15
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationHouseUserDAO.java | 6
springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/java/com/panzhihua/grid_backstage/api/EventGridMemberRelationApi.java | 10
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java | 2
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/AddComMngHousePopulationDTO.java | 38 +
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/PopulationApi.java | 10
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java | 12
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/EventVisitingTasksApi.java | 16
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComMngPopulationService.java | 8
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngVillageServiceImpl.java | 38 +
springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/java/com/panzhihua/grid_backstage/api/EventApi.java | 2
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationHouseDAO.java | 68 +++
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationHouseUserServiceImpl.java | 68 +++
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/EventMapper.xml | 18
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/query/visit/EventTasksQuery.java | 2
springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/java/com/panzhihua/grid_backstage/api/EasyPhotoApi.java | 6
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationDAO.java | 30 +
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/DelComMngHousePopulationDTO.java | 36 +
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/PopulationListVO.java | 7
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java | 36 +
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActVillageDAO.java | 45 ++
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/ComMngVillageBuildingHouseVO.java | 30 +
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComMngVillageApi.java | 66 +++
springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/VillageApi.java | 70 +++
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComMngVillageService.java | 18
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/grid/GridService.java | 14
springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/java/com/panzhihua/grid_backstage/api/EventVisitingTasksApi.java | 19
springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/java/com/panzhihua/grid_backstage/api/EventManageApi.java | 4
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java | 74 +++
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/PageComMngVillageVO.java | 49 ++
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/ComMngVillageListAppDTO.java | 52 ++
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngPopulationHouseUserDO.java | 20
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/query/visit/EventVisitListQuery.java | 2
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/ComMngVillageBuildingHouseDetailVO.java | 52 ++
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationHouseServiceImpl.java | 86 ++++
springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/java/com/panzhihua/grid_backstage/api/PublicityEventApi.java | 2
springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/java/com/panzhihua/grid_backstage/api/EventGridDataApi.java | 6
springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/java/com/panzhihua/grid_backstage/api/StatisticsApi.java | 6
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/admin/ComMngPopulationListVO.java | 3
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/EventVisitingTasksService.java | 8
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventVisitingTasksServiceImpl.java | 16
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PageComMngVillageBuildHouseAppDTO.java | 39 +
springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/java/com/panzhihua/grid_backstage/api/SystemApi.java | 34 +
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/IdDTO.java | 5
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/ComMngVillageBuildingVO.java | 30 +
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/EventGridDataMapper.xml | 2
springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/java/com/panzhihua/grid_backstage/api/PopulationApi.java | 19
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComMngPopulationHouseUserService.java | 7
50 files changed, 1,152 insertions(+), 84 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationServeExcelListen.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationServeExcelListen.java
index 31c2d97..0ec4042 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationServeExcelListen.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationServeExcelListen.java
@@ -333,7 +333,7 @@
vo.setHouseHold(oneData.get(27).trim());
}
if(StringUtils.isEmpty(oneData.get(28))){
- vo.setHouseHold(oneData.get(28).trim());
+ vo.setIsResidence(0);
}else{
vo.setIsResidence(PopulIsOkEnum.getCodeByName(oneData.get(28).trim()));
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/IdDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/IdDTO.java
index f0fdc5e..e785cea 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/IdDTO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/IdDTO.java
@@ -1,6 +1,9 @@
package com.panzhihua.common.model.dtos;
import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import javax.validation.constraints.NotNull;
/**
* @author xyh
@@ -9,6 +12,8 @@
@ApiModel("id参数")
public class IdDTO {
+ @NotNull(message = "id不能为空")
+ @ApiModelProperty("id")
private String id;
public String getId() {
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/AddComMngHousePopulationDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/AddComMngHousePopulationDTO.java
new file mode 100644
index 0000000..e73cd72
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/AddComMngHousePopulationDTO.java
@@ -0,0 +1,38 @@
+package com.panzhihua.common.model.dtos.grid;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 向房屋添加人员请求参数
+ *
+ * @author lyq
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ * */
+@Data
+@ApiModel("向房屋添加人员请求参数")
+public class AddComMngHousePopulationDTO {
+
+ @ApiModelProperty(value = "房屋id",required = true)
+ private Long houseId;
+
+ @ApiModelProperty(value = "人员id集合",required = true)
+ private List<Long> populationIds;
+
+ @ApiModelProperty(value = "添加类型（1.户主 2.住户）",required = true)
+ private Integer type;
+
+ /**
+ * 添加类型（1.户主 2.住户）
+ */
+ public interface type{
+ int hz = 1;
+ int zh = 2;
+ }
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/ComMngVillageListAppDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/ComMngVillageListAppDTO.java
new file mode 100644
index 0000000..94531f4
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/ComMngVillageListAppDTO.java
@@ -0,0 +1,52 @@
+package com.panzhihua.common.model.dtos.grid;
+
+import com.google.common.base.CaseFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.hibernate.validator.constraints.Length;
+
+import javax.validation.constraints.Max;
+import javax.validation.constraints.Pattern;
+
+/**
+ * 小区列表-请求参数
+ *
+ * @author lyq
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ * */
+@Data
+@ApiModel("小区列表-请求参数")
+public class ComMngVillageListAppDTO {
+
+ @ApiModelProperty(value = "分页-当前页数", example = "1")
+ private Long pageNum = 1L;
+
+ @ApiModelProperty(value = "分页-每页记录数", example = "10")
+ private Long pageSize = 10L;
+
+ @ApiModelProperty(value = "小区名称")
+ private String name;
+
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "社区id", hidden = true, example = "1")
+ private Long communityId;
+
+ @ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")
+ private Long userId;
+
+ @ApiModelProperty(value = "排序字段, 默认 创建时间：createAt(在住居民数：userSum，楼栋数：buildSum，总户数：houseNum，户籍人口：registerNum)", example = "createAt")
+ private String sortAttr="createAt";
+
+ @ApiModelProperty(value = "排序方式: asc/desc(默认)", example = "desc")
+ @Pattern(regexp = "asc|desc|ASC|DESC")
+ private String sortType="desc";
+
+ public String getSortColumns(){
+// String dbColumn = CaseFormat.LOWER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE, sortAttr);
+ return sortAttr;
+ }
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/DelComMngHousePopulationDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/DelComMngHousePopulationDTO.java
new file mode 100644
index 0000000..3911a0e
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/DelComMngHousePopulationDTO.java
@@ -0,0 +1,36 @@
+package com.panzhihua.common.model.dtos.grid;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 向房屋删除人员请求参数
+ *
+ * @author lyq
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ * */
+@Data
+@ApiModel("向房屋删除人员请求参数")
+public class DelComMngHousePopulationDTO {
+
+
+ @ApiModelProperty(value = "房屋人员关联id",required = true)
+ private Long housePopulationId;
+
+ @ApiModelProperty(value = "添加类型（1.户主 2.住户）",required = true)
+ private Integer type;
+
+ /**
+ * 添加类型（1.户主 2.住户）
+ */
+ public interface type{
+ int hz = 1;
+ int zh = 2;
+ }
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PageComMngPopulationDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PageComMngPopulationDTO.java
new file mode 100644
index 0000000..00360f5
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PageComMngPopulationDTO.java
@@ -0,0 +1,28 @@
+package com.panzhihua.common.model.dtos.grid;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 分页查询表单
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ * */
+@Data
+@ApiModel("查询人员列表请求参数")
+public class PageComMngPopulationDTO {
+
+ @ApiModelProperty(value = "分页-当前页数", example = "1")
+ private Long pageNum = 1L;
+
+ @ApiModelProperty(value = "分页-每页记录数", example = "10")
+ private Long pageSize = 10L;
+
+ @ApiModelProperty(value = "关键词")
+ private String keyWord;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PageComMngVillageBuildHouseAppDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PageComMngVillageBuildHouseAppDTO.java
new file mode 100644
index 0000000..2bcd140
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PageComMngVillageBuildHouseAppDTO.java
@@ -0,0 +1,39 @@
+package com.panzhihua.common.model.dtos.grid;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.Max;
+
+/**
+ * 小区楼栋下房屋列表-请求参数
+ *
+ * @author lyq
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ * */
+@Data
+@ApiModel("小区楼栋下房屋列表-请求参数")
+public class PageComMngVillageBuildHouseAppDTO {
+
+ @ApiModelProperty(value = "分页-当前页数", example = "1")
+ private Long pageNum = 1L;
+
+ @ApiModelProperty(value = "分页-每页记录数", example = "10")
+ private Long pageSize = 10L;
+
+ @ApiModelProperty(value = "小区id",required = true)
+ private Long villageId;
+
+ @ApiModelProperty(value = "楼栋号",required = true)
+ private String floor;
+
+ @ApiModelProperty(value = "单元号",required = true)
+ private String unitNo;
+
+ @ApiModelProperty(value = "户室号")
+ private String houseNo;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/query/visit/EventTasksQuery.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/query/visit/EventTasksQuery.java
index fd07593..d39aecc 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/query/visit/EventTasksQuery.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/query/visit/EventTasksQuery.java
@@ -22,7 +22,7 @@
private Integer eventStatus;
@ApiModelProperty("人员标签")
- private Integer tag;
+ private String tag;
@ApiModelProperty("是否异常")
private Integer isExp;
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/query/visit/EventVisitListQuery.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/query/visit/EventVisitListQuery.java
index 0a189b1..b2a33c6 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/query/visit/EventVisitListQuery.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/query/visit/EventVisitListQuery.java
@@ -19,7 +19,7 @@
private Integer status;
@ApiModelProperty("人员标签")
- private Integer tag;
+ private String tag;
@ApiModelProperty("性别")
private Integer sex;
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/ComMngVillageBuildingHouseDetailVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/ComMngVillageBuildingHouseDetailVO.java
new file mode 100644
index 0000000..0d8f488
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/ComMngVillageBuildingHouseDetailVO.java
@@ -0,0 +1,52 @@
+package com.panzhihua.common.model.vos.grid;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 小区下楼栋单元房间详情返回参数
+ */
+@Data
+@ApiModel("小区下楼栋单元房间详情返回参数")
+public class ComMngVillageBuildingHouseDetailVO {
+
+ @ApiModelProperty("房屋id")
+ private Long id;
+
+ @ApiModelProperty("小区名称")
+ private String villageName;
+
+ @ApiModelProperty("楼栋号")
+ private String floor;
+
+ @ApiModelProperty("单元号")
+ private String unitNo;
+
+ @ApiModelProperty("楼层数")
+ private String buildingNum;
+
+ @ApiModelProperty("户室号")
+ private String houseNo;
+
+ @ApiModelProperty("房屋地址")
+ private String address;
+
+ @ApiModelProperty("房屋状态(1.自住 2.租住 3.其他)")
+ private Integer status;
+
+ @ApiModelProperty("纬度")
+ private String lat;
+
+ @ApiModelProperty("经度")
+ private String lng;
+
+ @ApiModelProperty("户主列表")
+ private List<PopulationListVO> householderList;
+
+ @ApiModelProperty("居民列表")
+ private List<PopulationListVO> populationList;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/ComMngVillageBuildingHouseVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/ComMngVillageBuildingHouseVO.java
new file mode 100644
index 0000000..4e4dcca
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/ComMngVillageBuildingHouseVO.java
@@ -0,0 +1,30 @@
+package com.panzhihua.common.model.vos.grid;
+
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 小区下楼栋单元列表返回参数
+ */
+@Data
+@ApiModel("小区下楼栋单元房间列表返回参数")
+public class ComMngVillageBuildingHouseVO {
+
+ @ApiModelProperty("房屋id")
+ private Long id;
+
+ @ApiModelProperty("户室号")
+ private String houseNo;
+
+ @ApiModelProperty("房屋状态(1.自住 2.租住 3.其他)")
+ private Integer status;
+
+ @ApiModelProperty("在住居民数")
+ private Integer userNum;
+
+ @ApiModelProperty("楼层数")
+ private String buildingNum;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/ComMngVillageBuildingVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/ComMngVillageBuildingVO.java
new file mode 100644
index 0000000..489d469
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/ComMngVillageBuildingVO.java
@@ -0,0 +1,30 @@
+package com.panzhihua.common.model.vos.grid;
+
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 小区下楼栋单元列表返回参数
+ */
+@Data
+@ApiModel("小区下楼栋单元列表返回参数")
+public class ComMngVillageBuildingVO {
+
+ @ApiModelProperty("自增id")
+ private Long villageId;
+
+ @ApiModelProperty("楼栋号")
+ private String floor;
+
+ @ApiModelProperty("单元号")
+ private String unitNo;
+
+ @ApiModelProperty("拼接好楼栋号")
+ private String floorString;
+
+ @ApiModelProperty("拼接好单元号")
+ private String unitNoString;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/PageComMngVillageVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/PageComMngVillageVO.java
new file mode 100644
index 0000000..510bbf4
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/PageComMngVillageVO.java
@@ -0,0 +1,49 @@
+package com.panzhihua.common.model.vos.grid;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 居民管理-列表返回参数
+ */
+@Data
+@ApiModel("居民管理列表返回参数")
+@EncryptDecryptClass
+public class PageComMngVillageVO {
+
+ @ApiModelProperty("自增id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long villageId;
+
+ @ApiModelProperty("姓名")
+ private String userName;
+
+ @ApiModelProperty("楼栋数")
+ private Integer buildSum;
+
+ @ApiModelProperty("地址")
+ private String address;
+
+ @ApiModelProperty("用户数")
+ private Integer userSum;
+
+ @ApiModelProperty("房屋数")
+ private Integer houseNum;
+
+ @ApiModelProperty("户籍人口数")
+ private Integer registerNum;
+
+ @ApiModelProperty("租户数量")
+ private Integer rentNum;
+
+ @ApiModelProperty("纬度")
+ private String lat;
+
+ @ApiModelProperty("经度")
+ private String lng;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/PopulationListVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/PopulationListVO.java
index 93ded29..ff7b291 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/PopulationListVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/PopulationListVO.java
@@ -56,4 +56,11 @@
@ApiModelProperty(value = "性别（1.男 2.女）")
private String sex;
+ @ApiModelProperty(value = "时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
+
+ @ApiModelProperty(value = "房屋人口关联id")
+ private Long housePopulationId;
+
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/admin/ComMngPopulationListVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/admin/ComMngPopulationListVO.java
index d950b1d..45f4760 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/admin/ComMngPopulationListVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/admin/ComMngPopulationListVO.java
@@ -1,6 +1,8 @@
package com.panzhihua.common.model.vos.grid.admin;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
import io.swagger.annotations.ApiModel;
@@ -19,6 +21,7 @@
public class ComMngPopulationListVO {
@ApiModelProperty("自增id")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long id;
@ApiModelProperty("姓名")
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
index f10e3cd..c449e01 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
@@ -19,7 +19,7 @@
import com.panzhihua.common.model.dtos.elders.ComEldersAuthGetResultDTO;
import com.panzhihua.common.model.dtos.elders.ComEldersAuthPageDTO;
import com.panzhihua.common.model.dtos.elders.ComEldersAuthUserAddAppDTO;
-import com.panzhihua.common.model.dtos.grid.PagePopulationListDTO;
+import com.panzhihua.common.model.dtos.grid.*;
import com.panzhihua.common.model.dtos.grid.admin.ComMngPopulationListDTO;
import com.panzhihua.common.model.dtos.neighbor.*;
import com.panzhihua.common.model.dtos.neighbor.*;
@@ -3150,4 +3150,76 @@
*/
@PostMapping("/population/grid/list")
R getGridPopulationList(@RequestBody ComMngPopulationListDTO populationListDTO);
+
+ /**
+ * 综治后台-删除居民
+ * @param ids 居民id集合
+ * @return 删除结果
+ */
+ @PostMapping("/population/grid/del")
+ R delGridPopulation(@RequestBody List<Long> ids);
+
+ /**
+ * 综治后台-居民详情
+ * @param populationId 居民id
+ * @return 居民详情
+ */
+ @GetMapping("/population/grid/get")
+ R getGridPopulationDetail(@RequestParam("populationId")Long populationId);
+
+ /**
+ * 综治app-小区列表
+ * @param villageListAppDTO 请求参数
+ * @return 小区列表
+ */
+ @PostMapping("/village/grid/list")
+ R getGridVillageList(@RequestBody ComMngVillageListAppDTO villageListAppDTO);
+
+ /**
+ * 综治app-根据小区id查询小区下楼栋列表
+ * @param villageId 小区id
+ * @return 楼栋列表
+ */
+ @PostMapping("/village/grid/building/list")
+ R getGridVillageBuildingList(@RequestParam("villageId")Long villageId);
+
+ /**
+ * 小区楼栋下房屋列表
+ * @param buildHouseAppDTO 请求参数
+ * @return 房屋列表
+ */
+ @PostMapping("/village/grid/building/house/list")
+ R getGridVillageBuildingHouseList(@RequestBody PageComMngVillageBuildHouseAppDTO buildHouseAppDTO);
+
+ /**
+ * 小区楼栋下房屋信息
+ * @param houseId 房屋id
+ * @return 房屋信息
+ */
+ @PostMapping("/village/grid/building/house/detail")
+ R getGridVillageBuildingHouseDetail(@RequestParam("houseId")Long houseId);
+
+ /**
+ * 查询平台人口列表
+ * @param populationDTO 请求参数
+ * @return 人口列表
+ */
+ @PostMapping("/village/grid/building/house/population/list")
+ R getBuildingHousePopulationList(@RequestBody PageComMngPopulationDTO populationDTO);
+
+ /**
+ * 批量向房屋新增人员
+ * @param housePopulationDTO 请求参数
+ * @return 添加结果
+ */
+ @PostMapping("/village/grid/building/house/add/population")
+ R addBuildingHousePopulation(@RequestBody AddComMngHousePopulationDTO housePopulationDTO);
+
+ /**
+ * 批量删除房屋内人员
+ * @param housePopulationDTO 请求参数
+ * @return 删除结果
+ */
+ @PostMapping("/village/grid/building/house/del/population")
+ R delBuildingHousePopulation(@RequestBody DelComMngHousePopulationDTO housePopulationDTO);
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/grid/GridService.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/grid/GridService.java
index d3a4309..bda05bc 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/grid/GridService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/grid/GridService.java
@@ -1158,25 +1158,25 @@
/**
* 撤销走访
*
- * @param id
+ * @param idDTO
* @return
*/
- @PostMapping("/eventvisitingtasks/cancel/{id}")
- R cancel(@PathVariable("id") Long id);
+ @PostMapping("/eventvisitingtasks/cancel")
+ R cancel(@RequestBody IdDTO idDTO);
/**
* 恢复走访
*
- * @param id
+ * @param idDTO
* @return
*/
- @PostMapping("/eventvisitingtasks/reset/{id}")
- R reset(@PathVariable("id") Long id);
+ @PostMapping("/eventvisitingtasks/reset")
+ R reset(@RequestBody IdDTO idDTO);
/**
* 新增走访
*
- * @param ids
+ * @param idDTO
* @param communityId
* @param userId
* @return
diff --git a/springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/VillageApi.java b/springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/VillageApi.java
new file mode 100644
index 0000000..8d3947f
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/VillageApi.java
@@ -0,0 +1,70 @@
+package com.panzhihua.grid_app.api;
+
+import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.dtos.grid.*;
+import com.panzhihua.common.model.vos.LoginUserInfoVO;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.grid.*;
+import com.panzhihua.common.service.community.CommunityService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@Slf4j
+@Api(tags = {"小区模块"})
+@RestController
+@RequestMapping("/village/")
+public class VillageApi extends BaseController {
+
+ @Resource
+ private CommunityService communityService;
+
+ @ApiOperation(value = "小区列表@lyq",response = PageComMngVillageVO.class)
+ @PostMapping("/list")
+ public R list(@RequestBody ComMngVillageListAppDTO villageListAppDTO){
+ LoginUserInfoVO loginUserInfoVO = this.getLoginUserInfo();
+ villageListAppDTO.setCommunityId(loginUserInfoVO.getCommunityId());
+ return communityService.getGridVillageList(villageListAppDTO);
+ }
+
+ @ApiOperation(value = "小区楼栋列表@lyq",response = ComMngVillageBuildingVO.class)
+ @PostMapping("/building/list")
+ public R buildingList(@RequestParam("villageId")Long villageId){
+ return communityService.getGridVillageBuildingList(villageId);
+ }
+
+ @ApiOperation(value = "小区楼栋下房屋列表@lyq",response = ComMngVillageBuildingHouseVO.class)
+ @PostMapping("/building/house/list")
+ public R buildingHouseList(@RequestBody PageComMngVillageBuildHouseAppDTO buildHouseAppDTO){
+ return communityService.getGridVillageBuildingHouseList(buildHouseAppDTO);
+ }
+
+ @ApiOperation(value = "房屋详情@lyq",response = ComMngVillageBuildingHouseDetailVO.class)
+ @PostMapping("/building/house/detail")
+ public R buildingHouseDetail(@RequestParam("houseId")Long houseId){
+ return communityService.getGridVillageBuildingHouseDetail(houseId);
+ }
+
+ @ApiOperation(value = "查询人口列表", response = EventSpecialPopulationVO.class)
+ @PostMapping("/building/house/population/list")
+ public R getBuildingHousePopulationList(@RequestBody PageComMngPopulationDTO populationDTO){
+ return communityService.getBuildingHousePopulationList(populationDTO);
+ }
+
+ @ApiOperation(value = "房屋添加人员")
+ @PostMapping("/building/house/add/population")
+ public R addBuildingHousePopulation(@RequestBody AddComMngHousePopulationDTO housePopulationDTO){
+ return communityService.addBuildingHousePopulation(housePopulationDTO);
+ }
+
+ @ApiOperation(value = "房屋删除人员")
+ @PostMapping("/building/house/del/population")
+ public R delBuildingHousePopulation(@RequestBody DelComMngHousePopulationDTO housePopulationDTO){
+ return communityService.delBuildingHousePopulation(housePopulationDTO);
+ }
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/java/com/panzhihua/grid_backstage/api/EasyPhotoApi.java b/springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/java/com/panzhihua/grid_backstage/api/EasyPhotoApi.java
index ae5546f..518b6ab 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/java/com/panzhihua/grid_backstage/api/EasyPhotoApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/java/com/panzhihua/grid_backstage/api/EasyPhotoApi.java
@@ -34,9 +34,9 @@
if(userInfoVO == null){
return R.fail("请先登录");
}
- if(easyAppDTO.getCommunityId() == null){
- easyAppDTO.setCommunityId(userInfoVO.getCommunityId());
- }
+// if(easyAppDTO.getCommunityId() == null){
+// easyAppDTO.setCommunityId(userInfoVO.getCommunityId());
+// }
return gridService.easyListByAdmin(easyAppDTO);
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/java/com/panzhihua/grid_backstage/api/EventApi.java b/springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/java/com/panzhihua/grid_backstage/api/EventApi.java
index 9da9d9a..3a2e61f 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/java/com/panzhihua/grid_backstage/api/EventApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/java/com/panzhihua/grid_backstage/api/EventApi.java
@@ -78,7 +78,7 @@
eventBatchRevokeDTO.setUserId(loginUserInfoVO.getUserId());
eventBatchRevokeDTO.setUserName(loginUserInfoVO.getName());
eventBatchRevokeDTO.setCommunityName(loginUserInfoVO.getCommunityName());
- eventBatchRevokeDTO.setCommunityId(loginUserInfoVO.getCommunityId());
+// eventBatchRevokeDTO.setCommunityId(loginUserInfoVO.getCommunityId());
eventBatchRevokeDTO.setRevokeType(2);
eventBatchRevokeDTO.setRevokeId(loginUserInfoVO.getCommunityId());
return gridService.batchMarkEventInvalid(eventBatchRevokeDTO);
diff --git a/springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/java/com/panzhihua/grid_backstage/api/EventGridDataApi.java b/springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/java/com/panzhihua/grid_backstage/api/EventGridDataApi.java
index e348470..d388c1e 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/java/com/panzhihua/grid_backstage/api/EventGridDataApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/java/com/panzhihua/grid_backstage/api/EventGridDataApi.java
@@ -52,9 +52,9 @@
if(loginUserInfo == null){
return R.fail("请先登录");
}
- if(loginUserInfo.getCommunityId() != 0){
- memberRelationDTO.setGridCommunityId(loginUserInfo.getCommunityId());
- }
+// if(loginUserInfo.getCommunityId() != 0){
+// memberRelationDTO.setGridCommunityId(loginUserInfo.getCommunityId());
+// }
return userService.getGridMemberList(memberRelationDTO);
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/java/com/panzhihua/grid_backstage/api/EventGridMemberRelationApi.java b/springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/java/com/panzhihua/grid_backstage/api/EventGridMemberRelationApi.java
index ad9a701..a094bb2 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/java/com/panzhihua/grid_backstage/api/EventGridMemberRelationApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/java/com/panzhihua/grid_backstage/api/EventGridMemberRelationApi.java
@@ -38,11 +38,11 @@
@PostMapping("/event/list")
public R getGridDataList(@Validated @RequestBody PageEventGridDataAdminDTO eventGridDataDTO){
ClazzUtils.setIfStringIsEmpty(eventGridDataDTO);
- Long communityId = this.getCommunityId();
- if(communityId == null){
- return R.fail("请先登录");
- }
- eventGridDataDTO.setGridCommunityId(communityId);
+// Long communityId = this.getCommunityId();
+// if(communityId == null){
+// return R.fail("请先登录");
+// }
+// eventGridDataDTO.setGridCommunityId(communityId);
return gridService.getGridDataList(eventGridDataDTO);
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/java/com/panzhihua/grid_backstage/api/EventManageApi.java b/springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/java/com/panzhihua/grid_backstage/api/EventManageApi.java
index c1d7190..47df2b9 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/java/com/panzhihua/grid_backstage/api/EventManageApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/java/com/panzhihua/grid_backstage/api/EventManageApi.java
@@ -56,7 +56,7 @@
ClazzUtils.setIfStringIsEmpty(pageEventManageDTO);
LoginUserInfoVO loginUserInfoVO = this.getLoginUserInfo();
pageEventManageDTO.setUserId(loginUserInfoVO.getUserId());
- pageEventManageDTO.setCommunityId(loginUserInfoVO.getCommunityId());
+// pageEventManageDTO.setCommunityId(loginUserInfoVO.getCommunityId());
pageEventManageDTO.setRevokeType(1);
return gridService.queryEventToManage(pageEventManageDTO);
}
@@ -164,7 +164,7 @@
commonEventDealDTO.setUserId(loginUserInfoVO.getUserId());
commonEventDealDTO.setUserName(loginUserInfoVO.getNickName());
commonEventDealDTO.setOperateType(1);
- commonEventDealDTO.setCommunityId(loginUserInfoVO.getCommunityId());
+// commonEventDealDTO.setCommunityId(loginUserInfoVO.getCommunityId());
commonEventDealDTO.setCommunityName(loginUserInfoVO.getCommunityName());
return gridService.dealEvent(commonEventDealDTO);
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/java/com/panzhihua/grid_backstage/api/EventVisitingTasksApi.java b/springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/java/com/panzhihua/grid_backstage/api/EventVisitingTasksApi.java
index 5b27419..5c75864 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/java/com/panzhihua/grid_backstage/api/EventVisitingTasksApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/java/com/panzhihua/grid_backstage/api/EventVisitingTasksApi.java
@@ -4,10 +4,8 @@
import com.alibaba.excel.EasyExcel;
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.IdDTO;
-import com.panzhihua.common.model.dtos.grid.EventVisitingTasksAddDTO;
import com.panzhihua.common.model.query.visit.EventTasksQuery;
import com.panzhihua.common.model.query.visit.EventVisitListQuery;
-import com.panzhihua.common.model.vos.IPageVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.visit.*;
import com.panzhihua.common.service.grid.GridService;
@@ -19,6 +17,7 @@
import javax.annotation.Resource;
import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
import java.io.IOException;
import java.net.URLEncoder;
import java.util.Date;
@@ -78,7 +77,7 @@
*/
@PostMapping("/delete")
@ApiOperation(value = "删除走访任务")
- public R delete(@RequestBody IdDTO idDTO){
+ public R delete(@RequestBody @Valid IdDTO idDTO){
return gridService.delete(idDTO,this.getCommunityId());
}
@@ -144,30 +143,30 @@
*/
@PostMapping("/add")
@ApiOperation(value = "新增走访任务")
- public R add(@RequestBody IdDTO idDTO){
+ public R add(@RequestBody @Valid IdDTO idDTO){
return gridService.addVisitingTask(idDTO,this.getCommunityId(),this.getUserId());
}
/**
* 撤销走访任务
- * @param id
+ * @param idDTO
* @return
*/
@PostMapping("/cancel")
@ApiOperation(value = "撤销走访任务")
- public R cancel(@RequestParam("id") Long id){
- return gridService.cancel(id);
+ public R cancel(@RequestBody @Valid IdDTO idDTO){
+ return gridService.cancel(idDTO);
}
/**
* 恢复走访任务
- * @param id
+ * @param idDTO
* @return
*/
@PostMapping("/reset")
@ApiOperation(value = "新增走访任务")
- public R reset(@RequestParam("id") Long id){
- return gridService.reset(id);
+ public R reset(@RequestBody @Valid IdDTO idDTO){
+ return gridService.reset(idDTO);
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/java/com/panzhihua/grid_backstage/api/PopulationApi.java b/springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/java/com/panzhihua/grid_backstage/api/PopulationApi.java
index 1a7a6e6..cc38fed 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/java/com/panzhihua/grid_backstage/api/PopulationApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/java/com/panzhihua/grid_backstage/api/PopulationApi.java
@@ -4,6 +4,7 @@
import com.panzhihua.common.model.dtos.grid.admin.ComMngPopulationListDTO;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.grid.PopulationDetailVO;
import com.panzhihua.common.model.vos.grid.admin.ComMngPopulationListVO;
import com.panzhihua.common.model.vos.screen.ComActPopulationScreenVO;
import com.panzhihua.common.service.community.CommunityService;
@@ -14,6 +15,7 @@
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import java.util.List;
@Slf4j
@Api(tags = {"居民模块"})
@@ -23,15 +25,24 @@
@Resource
private CommunityService communityService;
- @Resource
- private GridService gridService;
@ApiOperation(value = "居民列表@lyq",response = ComMngPopulationListVO.class)
@PostMapping("/list")
public R list(@RequestBody ComMngPopulationListDTO populationListDTO){
- LoginUserInfoVO loginUserInfoVO = this.getLoginUserInfo();
- populationListDTO.setCommunityId(loginUserInfoVO.getCommunityId());
+// LoginUserInfoVO loginUserInfoVO = this.getLoginUserInfo();
+// populationListDTO.setCommunityId(loginUserInfoVO.getCommunityId());
return communityService.getGridPopulationList(populationListDTO);
}
+ @ApiOperation(value = "居民删除@lyq")
+ @PostMapping("/del")
+ public R del(@RequestBody List<Long> ids){
+ return communityService.delGridPopulation(ids);
+ }
+
+ @ApiOperation(value = "居民查看@lyq",response = PopulationDetailVO.class)
+ @GetMapping("/get")
+ public R get(@RequestParam("populationId")Long populationId){
+ return communityService.getGridPopulationDetail(populationId);
+ }
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/java/com/panzhihua/grid_backstage/api/PublicityEventApi.java b/springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/java/com/panzhihua/grid_backstage/api/PublicityEventApi.java
index 6228bee..f9ff8c2 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/java/com/panzhihua/grid_backstage/api/PublicityEventApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/java/com/panzhihua/grid_backstage/api/PublicityEventApi.java
@@ -47,7 +47,7 @@
ClazzUtils.setIfStringIsEmpty(pagePublicityEventDTO);
LoginUserInfoVO loginUserInfoVO = this.getLoginUserInfo();
pagePublicityEventDTO.setUserId(loginUserInfoVO.getUserId());
- pagePublicityEventDTO.setCommunityId(loginUserInfoVO.getCommunityId());
+// pagePublicityEventDTO.setCommunityId(loginUserInfoVO.getCommunityId());
pagePublicityEventDTO.setRevokeType(2);
return gridService.queryPublicityCommunity(pagePublicityEventDTO);
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/java/com/panzhihua/grid_backstage/api/StatisticsApi.java b/springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/java/com/panzhihua/grid_backstage/api/StatisticsApi.java
index a981084..5f7fa90 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/java/com/panzhihua/grid_backstage/api/StatisticsApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/java/com/panzhihua/grid_backstage/api/StatisticsApi.java
@@ -47,9 +47,9 @@
if(loginUserInfoVO == null){
return R.fail("请先登录");
}
- if(statisticsAdminDTO.getCommunityId() == null){
- statisticsAdminDTO.setCommunityId(loginUserInfoVO.getCommunityId());
- }
+// if(statisticsAdminDTO.getCommunityId() == null){
+// statisticsAdminDTO.setCommunityId(loginUserInfoVO.getCommunityId());
+// }
return gridService.gridMemberStatistics(statisticsAdminDTO);
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/java/com/panzhihua/grid_backstage/api/SystemApi.java b/springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/java/com/panzhihua/grid_backstage/api/SystemApi.java
new file mode 100644
index 0000000..397380b
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/java/com/panzhihua/grid_backstage/api/SystemApi.java
@@ -0,0 +1,34 @@
+package com.panzhihua.grid_backstage.api;
+
+import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.user.ComMngUserTagVO;
+import com.panzhihua.common.service.user.UserService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+/**
+ * @author xyh
+ * @date 2021/6/29 14:45
+ */
+@Api(tags = {"系统管理"})
+@Slf4j
+@RequestMapping("/system")
+@RestController
+public class SystemApi extends BaseController {
+
+ @Resource
+ private UserService userService;
+
+ @ApiOperation(value = "获取用户标签",response = ComMngUserTagVO.class)
+ @GetMapping("/tags")
+ public R config(){
+ return userService.listComMngUserTag(this.getCommunityId());
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComMngVillageApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComMngVillageApi.java
index 28f80e6..4050c0a 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComMngVillageApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComMngVillageApi.java
@@ -1,9 +1,14 @@
package com.panzhihua.service_community.api;
import com.panzhihua.common.model.dtos.community.PageComMngVillageDTO;
+import com.panzhihua.common.model.dtos.grid.*;
+import com.panzhihua.common.model.dtos.grid.admin.ComMngPopulationListDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComMngVillageServeExcelVO;
import com.panzhihua.common.model.vos.community.ComMngVillageVO;
+import com.panzhihua.service_community.service.ComMngPopulationHouseService;
+import com.panzhihua.service_community.service.ComMngPopulationHouseUserService;
+import com.panzhihua.service_community.service.ComMngPopulationService;
import com.panzhihua.service_community.service.ComMngVillageService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.transaction.annotation.Transactional;
@@ -23,6 +28,12 @@
public class ComMngVillageApi {
@Resource
private ComMngVillageService comMngVillageService;
+ @Resource
+ private ComMngPopulationHouseService comMngPopulationHouseService;
+ @Resource
+ private ComMngPopulationHouseUserService comMngPopulationHouseUserService;
+ @Resource
+ private ComMngPopulationService comMngPopulationService;
/**
* 新增实有房屋
@@ -105,5 +116,60 @@
return comMngVillageService.getVillage(villageId);
}
+ /**
+ * 综治app-小区列表
+ * @param villageListAppDTO 请求参数
+ * @return 小区列表
+ */
+ @PostMapping("/village/grid/list")
+ public R getGridPopulationAdminList(@RequestBody ComMngVillageListAppDTO villageListAppDTO) {
+ return comMngVillageService.getGridVillageList(villageListAppDTO);
+ }
+
+ /**
+ * 综治app-根据小区id查询小区下楼栋列表
+ * @param villageId 小区id
+ * @return 楼栋列表
+ */
+ @PostMapping("/village/grid/building/list")
+ public R getGridVillageBuildingList(@RequestParam("villageId")Long villageId) {
+ return comMngVillageService.getGridVillageBuildingList(villageId);
+ }
+
+ /**
+ * 小区楼栋下房屋列表
+ * @param buildHouseAppDTO 请求参数
+ * @return 房屋列表
+ */
+ @PostMapping("/village/grid/building/house/list")
+ public R getGridVillageBuildingHouseList(@RequestBody PageComMngVillageBuildHouseAppDTO buildHouseAppDTO) {
+ return comMngPopulationHouseService.getGridVillageBuildingHouseList(buildHouseAppDTO);
+ }
+
+ /**
+ * 小区楼栋下房屋信息
+ * @param houseId 房屋id
+ * @return 房屋信息
+ */
+ @PostMapping("/village/grid/building/house/detail")
+ public R getGridVillageBuildingHouseDetail(@RequestParam("houseId")Long houseId) {
+ return comMngPopulationHouseService.getGridVillageBuildingHouseDetail(houseId);
+ }
+
+ @PostMapping("/village/grid/building/house/population/list")
+ public R getBuildingHousePopulationList(@RequestBody PageComMngPopulationDTO populationDTO) {
+ return comMngPopulationService.getBuildingHousePopulationList(populationDTO);
+ }
+
+ @PostMapping("/village/grid/building/house/add/population")
+ public R addBuildingHousePopulation(@RequestBody AddComMngHousePopulationDTO housePopulationDTO) {
+ return comMngPopulationHouseUserService.addBuildingHousePopulation(housePopulationDTO);
+ }
+
+ @PostMapping("/village/grid/building/house/del/population")
+ public R delBuildingHousePopulation(@RequestBody DelComMngHousePopulationDTO housePopulationDTO) {
+ return comMngPopulationHouseUserService.delBuildingHousePopulation(housePopulationDTO);
+ }
+
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/PopulationApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/PopulationApi.java
index 59a19bc..fa4d280 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/PopulationApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/PopulationApi.java
@@ -9,6 +9,7 @@
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import java.util.List;
@Slf4j
@RestController
@@ -43,6 +44,15 @@
return comMngPopulationService.getGridPopulationAdminList(populationListDTO);
}
+ @PostMapping("/grid/del")
+ public R delGridPopulationAdmin(@RequestBody List<Long> ids) {
+ return comMngPopulationService.delGridPopulationAdmin(ids);
+ }
+
+ @GetMapping("/grid/get")
+ public R getGridPopulationAdminDetail(@RequestParam("populationId")Long populationId) {
+ return comMngPopulationService.getPopulationDetailApp(populationId);
+ }
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActVillageDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActVillageDAO.java
index 697428e..50411e8 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActVillageDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActVillageDAO.java
@@ -1,11 +1,22 @@
package com.panzhihua.service_community.dao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.panzhihua.common.model.dtos.grid.ComMngVillageListAppDTO;
+import com.panzhihua.common.model.dtos.grid.PageComMngVillageBuildHouseAppDTO;
+import com.panzhihua.common.model.dtos.grid.admin.ComMngPopulationListDTO;
import com.panzhihua.common.model.vos.community.ComMngVillageTotalVO;
import com.panzhihua.common.model.vos.community.ComMngVillageVO;
+import com.panzhihua.common.model.vos.grid.ComMngVillageBuildingHouseVO;
+import com.panzhihua.common.model.vos.grid.ComMngVillageBuildingVO;
+import com.panzhihua.common.model.vos.grid.PageComMngVillageVO;
+import com.panzhihua.common.model.vos.grid.PopulationDetailVO;
import com.panzhihua.service_community.model.dos.ComMngVillageDO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
/**
@@ -30,4 +41,38 @@
@Select("select village_id,alley,house_num,group_at,type,address,update_at from com_mng_village where village_id = #{villageId}")
ComMngVillageVO getVillageById(@Param("villageId") Long villageId);
+
+ @Select("<script> " +
+ "SELECT " +
+ " village_id, " +
+ " `name` AS userName, " +
+ " build_sum, " +
+ " address, " +
+ " create_at as createAt, " +
+ " lng, " +
+ " lat, " +
+ " ( SELECT count( id ) FROM com_mng_population WHERE village_id = cmv.village_id ) AS userSum, " +
+ " ( SELECT count( id ) FROM com_mng_population_house WHERE village_id = cmv.village_id ) AS houseNum, " +
+ " ( SELECT count( id ) FROM com_mng_population WHERE village_id = cmv.village_id AND out_or_local = 1 ) AS registerNum, " +
+ " ( SELECT count( id ) FROM com_mng_population WHERE village_id = cmv.village_id AND is_rent = 2 ) AS rentNum " +
+ "FROM " +
+ " com_mng_village AS cmv where cmv.community_id = #{villageListAppDTO.communityId} " +
+ "<if test='villageListAppDTO.name != null and villageListAppDTO.name != ""'>" +
+ " and cmv.name like concat(#{villageListAppDTO.name},'%')"+
+ " </if> " +
+ "<if test='villageListAppDTO.sortColumns!=null'>" +
+ " ORDER BY ${villageListAppDTO.sortColumns} ${villageListAppDTO.sortType} " +
+ " </if>" +
+ " </script>")
+ IPage<PageComMngVillageVO> getGridVillageList(Page page, @Param("villageListAppDTO") ComMngVillageListAppDTO villageListAppDTO);
+
+ @Select("SELECT DISTINCT " +
+ " village_id," +
+ " floor, " +
+ " unit_no " +
+ "FROM " +
+ " com_mng_population_house AS cmph " +
+ "WHERE " +
+ " village_id = #{villageId}")
+ List<ComMngVillageBuildingVO> getGridVillageBuildingList(@Param("villageId") Long villageId);
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationDAO.java
index 68829d7..43cb68f 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationDAO.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.dtos.community.ComMngPopulationDTO;
+import com.panzhihua.common.model.dtos.grid.PageComMngPopulationDTO;
import com.panzhihua.common.model.dtos.grid.PagePopulationListDTO;
import com.panzhihua.common.model.dtos.grid.admin.ComMngPopulationListDTO;
import com.panzhihua.common.model.dtos.user.PageInputUserDTO;
@@ -16,6 +17,7 @@
import com.panzhihua.common.model.vos.community.screen.event.*;
import com.panzhihua.common.model.vos.community.screen.index.*;
import com.panzhihua.common.model.vos.grid.EventGridDataVO;
+import com.panzhihua.common.model.vos.grid.EventSpecialPopulationVO;
import com.panzhihua.common.model.vos.grid.PopulationDetailVO;
import com.panzhihua.common.model.vos.grid.PopulationListVO;
import com.panzhihua.common.model.vos.grid.admin.ComMngPopulationListVO;
@@ -950,7 +952,7 @@
"AND cmp.house_id is null " +
" </if> " +
"<if test='populationListDTO.communityId != null'>" +
- "AND cmp.community_id = #{populationListDTO.communityId} " +
+ "AND cmp.act_id = #{populationListDTO.communityId} " +
" </if> " +
"<if test='populationListDTO.politicalOutlook != null'>" +
"AND cmp.political_outlook = #{populationListDTO.politicalOutlook} " +
@@ -965,4 +967,30 @@
@Select("select relation from com_mng_population_house_user where house_id = #{houseId} and popul_id = #{populationId}")
Integer getPopulationRelationByHouseId(@Param("houseId") Long houseId, @Param("populationId") Long populationId);
+ @Select("<script>" +
+ " select count(id) from event_visiting_tasks as evt where visiter_id in " +
+ "<foreach collection='ids' item='id' index='index' open='(' close=')' separator=',' >" +
+ "#{id}" +
+ "</foreach>" +
+ " </script>")
+ Integer getPopulationVisitingCount(@Param("ids") List<Long> ids);
+
+ @Select("<script> " +
+ "SELECT " +
+ " cmp.id, " +
+ " cmp.`name`, " +
+ " cmp.card_no as idCard, " +
+ " cmp.label, " +
+ " cmp.sex, " +
+ " IFNULL( cmp.phone, '暂无' ) as phone, " +
+ " cmp.address, " +
+ " cmp.political_outlook " +
+ " FROM " +
+ " com_mng_population AS cmp where 1=1 " +
+ "<if test='populationDTO.keyWord != null'>" +
+ " AND (cmp.name like concat(#{populationDTO.keyWord},'%') or cmp.card_no_str like concat(#{populationDTO.keyWord},'%')) " +
+ " </if> " +
+ " </script>")
+ IPage<EventSpecialPopulationVO> getBuildingHousePopulationList(Page page,@Param("populationDTO") PageComMngPopulationDTO populationDTO);
+
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationHouseDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationHouseDAO.java
index 36c98bd..5f7fcc0 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationHouseDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationHouseDAO.java
@@ -4,7 +4,11 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.dtos.community.ComMngPopulationHouseAdminDTO;
+import com.panzhihua.common.model.dtos.grid.PageComMngVillageBuildHouseAppDTO;
import com.panzhihua.common.model.vos.community.*;
+import com.panzhihua.common.model.vos.grid.ComMngVillageBuildingHouseDetailVO;
+import com.panzhihua.common.model.vos.grid.ComMngVillageBuildingHouseVO;
+import com.panzhihua.common.model.vos.grid.PopulationListVO;
import com.panzhihua.common.model.vos.user.ComMngHouseVo;
import com.panzhihua.service_community.model.dos.ComMngPopulationHouseDO;
import org.apache.ibatis.annotations.Mapper;
@@ -173,5 +177,69 @@
" from com_act as ca where ca.community_id = #{communityId}")
ComMngVillageRegionVO getRegion(@Param("communityId") Long communityId);
+ @Select("<script> " +
+ "SELECT id, floor, unit_no, house_no, `status`,( SELECT count( id ) FROM com_mng_population_house_user WHERE house_id = cmph.id ) AS userNum " +
+ " FROM " +
+ " com_mng_population_house AS cmph " +
+ " <where> " +
+ "<if test='buildHouseAppDTO.villageId != null '>" +
+ " and cmph.village_id = #{buildHouseAppDTO.villageId} " +
+ " </if> " +
+ "<if test='buildHouseAppDTO.floor != null and buildHouseAppDTO.floor !="" '>" +
+ " and cmph.floor = #{buildHouseAppDTO.floor} " +
+ " </if> " +
+ "<if test='buildHouseAppDTO.unitNo != null and buildHouseAppDTO.unitNo !="" '>" +
+ " and cmph.unit_no = #{buildHouseAppDTO.unitNo} " +
+ " </if> " +
+ "<if test='buildHouseAppDTO.houseNo != null and buildHouseAppDTO.houseNo !="" '>" +
+ " and cmph.house_no like concat(#{buildHouseAppDTO.houseNo},'%') " +
+ " </if> " +
+ " </where>" +
+ " </script>")
+ IPage<ComMngVillageBuildingHouseVO> getGridVillageBuildingHouseList(Page page, @Param("buildHouseAppDTO") PageComMngVillageBuildHouseAppDTO buildHouseAppDTO);
+
+ @Select("SELECT " +
+ " cmph.id, " +
+ " cmv.`name` AS villageName, " +
+ " cmph.floor, " +
+ " cmph.unit_no, " +
+ " cmph.house_no, " +
+ " cmph.address, " +
+ " cmph.`status`, " +
+ " cmv.lat, " +
+ " cmv.lng " +
+ "FROM " +
+ " com_mng_population_house AS cmph " +
+ " LEFT JOIN com_mng_village AS cmv ON cmv.village_id = cmph.village_id " +
+ "WHERE " +
+ " cmph.id = #{houseId}")
+ ComMngVillageBuildingHouseDetailVO getGridVillageBuildingHouseDetail(@Param("houseId") Long houseId);
+
+ @Select("<script> " +
+ "SELECT " +
+ " cmp.id, " +
+ " cmphu.id as housePopulationId, " +
+ " cmp.sex, " +
+ " cmp.`name`, " +
+ " IFNULL( cmp.phone, '暂无' ) as phone, " +
+ " cmp.card_no, " +
+ " cmp.label, " +
+ " cmp.address, " +
+ " cmp.nation, " +
+ " cmphu.create_at, " +
+ " cmp.political_outlook " +
+ "FROM " +
+ " com_mng_population_house_user AS cmphu " +
+ " LEFT JOIN com_mng_population AS cmp ON cmp.id = cmphu.popul_id " +
+ "WHERE " +
+ " cmphu.house_id = #{houseId} " +
+ "<if test='relation != null '>" +
+ " AND cmphu.relation = #{relation} " +
+ " </if> " +
+ "<if test='relationId != null '>" +
+ " AND cmphu.relation_id = #{relationId} " +
+ " </if> " +
+ " </script>")
+ List<PopulationListVO> getGridVillageBuildingPopulationList(@Param("houseId") Long houseId,@Param("relation") Integer relation,@Param("relationId") Integer relationId);
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationHouseUserDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationHouseUserDAO.java
index 3f8aec2..4546106 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationHouseUserDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationHouseUserDAO.java
@@ -30,4 +30,10 @@
"left join com_mng_population as cmp on cmp.id = cmphu.popul_id where cmphu.house_id = #{houseId}")
List<ComMngPopulationHouseUserAdminVO> getHouseUserByHouseId(@Param("houseId") Long houseId);
+ @Select("update com_mng_population_house_user set relation = null where id = #{id}")
+ Integer delBuildingHousePopulationRelation(@Param("id") Long id);
+
+ @Select("update com_mng_population_house_user set relation_id = null where id = #{id}")
+ Integer delBuildingHousePopulationRelationId(@Param("id") Long id);
+
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngPopulationHouseUserDO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngPopulationHouseUserDO.java
index a80a039..5b8f3fc 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngPopulationHouseUserDO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngPopulationHouseUserDO.java
@@ -62,6 +62,26 @@
@TableField(fill = FieldFill.INSERT)
private Date createAt;
+ /**
+ * 与户主关系(1.户主 2.配偶 3.子女 4.孙女 5.父母 6.其他)
+ */
+ public interface relation{
+ int hz = 1;
+ int po = 2;
+ int zn = 3;
+ int sn = 4;
+ int fm = 5;
+ int qt = 6;
+ }
+
+ /**
+ * 人和房屋关系’ (1.自住2、租住)
+ */
+ public interface relationId{
+ int zizhu = 1;
+ int zuzhu = 2;
+ }
+
@Override
public String toString() {
return "ComMngPopulationHouseUserDO{" +
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComMngPopulationHouseService.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComMngPopulationHouseService.java
index 03e5467..b2ef20e 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComMngPopulationHouseService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComMngPopulationHouseService.java
@@ -4,6 +4,7 @@
import com.panzhihua.common.model.dtos.community.CascadeHouseDTO;
import com.panzhihua.common.model.dtos.community.ComMngPopulationHouseAdminDTO;
import com.panzhihua.common.model.dtos.community.ComMngPopulationHouseEditAdminDTO;
+import com.panzhihua.common.model.dtos.grid.PageComMngVillageBuildHouseAppDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.service_community.model.dos.ComMngPopulationHouseDO;
@@ -65,4 +66,18 @@
*/
R getRegion(Long communityId);
+ /**
+ * 小区楼栋下房屋列表
+ * @param buildHouseAppDTO 请求参数
+ * @return 房屋列表
+ */
+ R getGridVillageBuildingHouseList(PageComMngVillageBuildHouseAppDTO buildHouseAppDTO);
+
+ /**
+ * 小区楼栋下房屋详情
+ * @param houseId 房屋id
+ * @return 房屋详情
+ */
+ R getGridVillageBuildingHouseDetail(Long houseId);
+
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComMngPopulationHouseUserService.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComMngPopulationHouseUserService.java
index 0b8b9a1..7e21c53 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComMngPopulationHouseUserService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComMngPopulationHouseUserService.java
@@ -1,6 +1,9 @@
package com.panzhihua.service_community.service;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.panzhihua.common.model.dtos.grid.AddComMngHousePopulationDTO;
+import com.panzhihua.common.model.dtos.grid.DelComMngHousePopulationDTO;
+import com.panzhihua.common.model.vos.R;
import com.panzhihua.service_community.model.dos.ComMngPopulationHouseUserDO;
/**
@@ -10,4 +13,8 @@
*/
public interface ComMngPopulationHouseUserService extends IService<ComMngPopulationHouseUserDO> {
+ R addBuildingHousePopulation(AddComMngHousePopulationDTO housePopulationDTO);
+
+ R delBuildingHousePopulation(DelComMngHousePopulationDTO housePopulationDTO);
+
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComMngPopulationService.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComMngPopulationService.java
index d6061e1..7d75782 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComMngPopulationService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComMngPopulationService.java
@@ -5,6 +5,8 @@
import com.panzhihua.common.model.dtos.community.ComMngPopulationTagCardNoDTO;
import com.panzhihua.common.model.dtos.community.ComMngPopulationTagDTO;
import com.panzhihua.common.model.dtos.community.bigscreen.BigScreenEventDetailDTO;
+import com.panzhihua.common.model.dtos.grid.AddComMngHousePopulationDTO;
+import com.panzhihua.common.model.dtos.grid.PageComMngPopulationDTO;
import com.panzhihua.common.model.dtos.grid.PagePopulationListDTO;
import com.panzhihua.common.model.dtos.grid.admin.ComMngPopulationListDTO;
import com.panzhihua.common.model.dtos.user.PageInputUserDTO;
@@ -217,4 +219,10 @@
R getPopulationRepairByApp();
R getGridPopulationAdminList(ComMngPopulationListDTO populationListDTO);
+
+ R delGridPopulationAdmin(List<Long> ids);
+
+ R getBuildingHousePopulationList(PageComMngPopulationDTO populationDTO);
+
+
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComMngVillageService.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComMngVillageService.java
index 2694f0f..58d0263 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComMngVillageService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComMngVillageService.java
@@ -1,6 +1,9 @@
package com.panzhihua.service_community.service;
import com.panzhihua.common.model.dtos.community.PageComMngVillageDTO;
+import com.panzhihua.common.model.dtos.grid.ComMngVillageListAppDTO;
+import com.panzhihua.common.model.dtos.grid.PageComMngVillageBuildHouseAppDTO;
+import com.panzhihua.common.model.dtos.grid.admin.ComMngPopulationListDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComMngVillageServeExcelVO;
import com.panzhihua.common.model.vos.community.ComMngVillageVO;
@@ -69,4 +72,19 @@
* @return 小区详情
*/
R getVillage(Long villageId);
+
+ /**
+ * 小区列表
+ * @param villageListAppDTO 请求参数
+ * @return 小区列表
+ */
+ R getGridVillageList(ComMngVillageListAppDTO villageListAppDTO);
+
+ /**
+ * 小区下楼栋列表
+ * @param villageId 小区id
+ * @return 小区下楼栋列表
+ */
+ R getGridVillageBuildingList(Long villageId);
+
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationHouseServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationHouseServiceImpl.java
index 313be0f..a55c36a 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationHouseServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationHouseServiceImpl.java
@@ -1,17 +1,23 @@
package com.panzhihua.service_community.service.impl;
+import cn.hutool.core.util.IdcardUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.common.model.dtos.community.CascadeHouseDTO;
import com.panzhihua.common.model.dtos.community.ComMngPopulationHouseAdminDTO;
import com.panzhihua.common.model.dtos.community.ComMngPopulationHouseEditAdminDTO;
+import com.panzhihua.common.model.dtos.grid.PageComMngVillageBuildHouseAppDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComMngCascadeHouseVO;
import com.panzhihua.common.model.vos.community.ComMngPopulationHouseDetailAdminVO;
import com.panzhihua.common.model.vos.community.ComMngPopulationHouseTotalVO;
import com.panzhihua.common.model.vos.community.ComMngPopulationHouseUserAdminVO;
+import com.panzhihua.common.model.vos.grid.ComMngVillageBuildingHouseDetailVO;
+import com.panzhihua.common.model.vos.grid.ComMngVillageBuildingHouseVO;
+import com.panzhihua.common.model.vos.grid.PopulationListVO;
import com.panzhihua.service_community.dao.ComActVillageDAO;
import com.panzhihua.service_community.dao.ComMngPopulationDAO;
import com.panzhihua.service_community.dao.ComMngPopulationHouseDAO;
@@ -246,4 +252,84 @@
return R.ok(this.baseMapper.getRegion(communityId));
}
+ /**
+ * 小区楼栋下房屋列表
+ * @param buildHouseAppDTO 请求参数
+ * @return 房屋列表
+ */
+ @Override
+ public R getGridVillageBuildingHouseList(PageComMngVillageBuildHouseAppDTO buildHouseAppDTO){
+
+ IPage<ComMngVillageBuildingHouseVO> buildingHouseVOIPage = this.baseMapper.getGridVillageBuildingHouseList(new Page(buildHouseAppDTO.getPageNum(),buildHouseAppDTO.getPageSize()),buildHouseAppDTO);
+ if(!buildingHouseVOIPage.getRecords().isEmpty()){
+ buildingHouseVOIPage.getRecords().forEach(house ->{
+ boolean result=house.getHouseNo().matches("[0-9]+");
+ if(result){//该字段为纯数字
+ if(house.getHouseNo().length() == 4){
+ house.setBuildingNum(house.getHouseNo().substring(0,2).replaceAll("^(0+)", ""));
+ }else if(house.getHouseNo().length() == 3){
+ house.setBuildingNum(house.getHouseNo().substring(0,1).replaceAll("^(0+)", ""));
+ }
+ }else{
+ house.setBuildingNum("-");
+ }
+ });
+ }
+ return R.ok(buildingHouseVOIPage);
+ }
+
+ /**
+ * 小区楼栋下房屋信息
+ * @param houseId 房屋id
+ * @return 房屋信息
+ */
+ @Override
+ public R getGridVillageBuildingHouseDetail(Long houseId){
+
+ ComMngVillageBuildingHouseDetailVO buildingHouseDetailVO = this.baseMapper.getGridVillageBuildingHouseDetail(houseId);
+ if(buildingHouseDetailVO != null){
+
+ //转换楼层数
+ String houseNo = buildingHouseDetailVO.getHouseNo();
+ boolean result = houseNo.matches("[0-9]+");
+ if(result){//该字段为纯数字
+ if(houseNo.length() == 4){
+ buildingHouseDetailVO.setBuildingNum(houseNo.substring(0,2).replaceAll("^(0+)", ""));
+ }else if(houseNo.length() == 3){
+ buildingHouseDetailVO.setBuildingNum(houseNo.substring(0,1).replaceAll("^(0+)", ""));
+ }
+ }else{
+ buildingHouseDetailVO.setBuildingNum("-");
+ }
+
+ //查询该房屋的户主信息
+ List<PopulationListVO> householderList = this.baseMapper.getGridVillageBuildingPopulationList(buildingHouseDetailVO.getId(),1,null);
+ if(!householderList.isEmpty()){
+ householderList.forEach(householder -> {
+ try {
+ Integer age = IdcardUtil.getAgeByIdCard(householder.getCardNo());
+ householder.setAge(age);
+ }catch (Exception e){
+ log.error("身份证号码转换年龄失败，人员id：" + householder.getId());
+ }
+ });
+ buildingHouseDetailVO.setHouseholderList(householderList);
+ }
+ //查询该房屋的住户信息
+ List<PopulationListVO> populationList = this.baseMapper.getGridVillageBuildingPopulationList(buildingHouseDetailVO.getId(),null,1);
+ if(!populationList.isEmpty()){
+ populationList.forEach(population -> {
+ try {
+ Integer age = IdcardUtil.getAgeByIdCard(population.getCardNo());
+ population.setAge(age);
+ }catch (Exception e){
+ log.error("身份证号码转换年龄失败，人员id：" + population.getId());
+ }
+ });
+ buildingHouseDetailVO.setPopulationList(populationList);
+ }
+ }
+ return R.ok(buildingHouseDetailVO);
+ }
+
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationHouseUserServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationHouseUserServiceImpl.java
index 23678dd..f6f48b1 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationHouseUserServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationHouseUserServiceImpl.java
@@ -1,11 +1,21 @@
package com.panzhihua.service_community.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.panzhihua.common.model.dtos.grid.AddComMngHousePopulationDTO;
+import com.panzhihua.common.model.dtos.grid.DelComMngHousePopulationDTO;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.utlis.Snowflake;
import com.panzhihua.service_community.dao.ComMngPopulationHouseUserDAO;
import com.panzhihua.service_community.model.dos.ComMngPopulationHouseUserDO;
import com.panzhihua.service_community.service.ComMngPopulationHouseUserService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
/**
* @auther lyq
@@ -16,4 +26,62 @@
@Service
public class ComMngPopulationHouseUserServiceImpl extends ServiceImpl<ComMngPopulationHouseUserDAO, ComMngPopulationHouseUserDO> implements ComMngPopulationHouseUserService {
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public R addBuildingHousePopulation(AddComMngHousePopulationDTO housePopulationDTO){
+ List<ComMngPopulationHouseUserDO> populationHouseUserDOList = new ArrayList<>();
+ if(!housePopulationDTO.getPopulationIds().isEmpty()){
+ housePopulationDTO.getPopulationIds().forEach(housePopulationId -> {
+ ComMngPopulationHouseUserDO populationHouseUserDO = this.baseMapper.selectOne(
+ new QueryWrapper<ComMngPopulationHouseUserDO>().lambda()
+ .eq(ComMngPopulationHouseUserDO::getHouseId,housePopulationDTO.getHouseId())
+ .eq(ComMngPopulationHouseUserDO::getPopulId,housePopulationId));
+ if(populationHouseUserDO == null){
+ populationHouseUserDO = new ComMngPopulationHouseUserDO();
+ populationHouseUserDO.setId(Snowflake.getId());
+ populationHouseUserDO.setHouseId(housePopulationDTO.getHouseId());
+ populationHouseUserDO.setPopulId(housePopulationId);
+ populationHouseUserDO.setRelationId(ComMngPopulationHouseUserDO.relationId.zizhu);
+ populationHouseUserDO.setStartAt(new Date());
+ populationHouseUserDO.setCreateAt(new Date());
+ if(housePopulationDTO.getType().equals(AddComMngHousePopulationDTO.type.hz)){
+ populationHouseUserDO.setRelation(ComMngPopulationHouseUserDO.relation.hz);
+ }
+ populationHouseUserDOList.add(populationHouseUserDO);
+ }else{
+ if(housePopulationDTO.getType().equals(AddComMngHousePopulationDTO.type.hz)){
+ populationHouseUserDO.setRelation(ComMngPopulationHouseUserDO.relation.hz);
+ }
+ populationHouseUserDO.setRelationId(ComMngPopulationHouseUserDO.relationId.zizhu);
+ this.baseMapper.updateById(populationHouseUserDO);
+ }
+ });
+ }
+ this.saveBatch(populationHouseUserDOList);
+ return R.ok();
+ }
+
+ @Override
+ public R delBuildingHousePopulation(DelComMngHousePopulationDTO housePopulationDTO){
+
+ ComMngPopulationHouseUserDO houseUserDO = this.baseMapper.selectById(housePopulationDTO.getHousePopulationId());
+ if(houseUserDO == null){
+ return R.fail("未查询到居住用户数据");
+ }
+ if(housePopulationDTO.getType().equals(DelComMngHousePopulationDTO.type.hz)){
+ if(houseUserDO.getRelationId() == null || !houseUserDO.getRelationId().equals(ComMngPopulationHouseUserDO.relationId.zizhu)){
+ this.baseMapper.deleteById(housePopulationDTO.getHousePopulationId());
+ }else{
+ this.baseMapper.delBuildingHousePopulationRelation(housePopulationDTO.getHousePopulationId());
+ }
+ }else{
+ if(houseUserDO.getRelation() == null || !houseUserDO.getRelation().equals(ComMngPopulationHouseUserDO.relation.hz)){
+ this.baseMapper.deleteById(housePopulationDTO.getHousePopulationId());
+ }else{
+ this.baseMapper.delBuildingHousePopulationRelationId(housePopulationDTO.getHousePopulationId());
+ }
+ }
+ return R.ok();
+ }
+
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java
index cdbf2fb..9a9786c 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java
@@ -16,6 +16,8 @@
import com.panzhihua.common.exceptions.ServiceException;
import com.panzhihua.common.model.dtos.community.*;
import com.panzhihua.common.model.dtos.community.bigscreen.BigScreenEventDetailDTO;
+import com.panzhihua.common.model.dtos.grid.AddComMngHousePopulationDTO;
+import com.panzhihua.common.model.dtos.grid.PageComMngPopulationDTO;
import com.panzhihua.common.model.dtos.grid.PagePopulationListDTO;
import com.panzhihua.common.model.dtos.grid.admin.ComMngPopulationListDTO;
import com.panzhihua.common.model.dtos.user.PageInputUserDTO;
@@ -28,11 +30,9 @@
import com.panzhihua.common.model.vos.community.screen.civil.CivilStatisticsVO;
import com.panzhihua.common.model.vos.community.screen.civil.CivilVillageStatisticsVO;
import com.panzhihua.common.model.vos.community.screen.event.*;
+import com.panzhihua.common.model.vos.community.screen.event.EventTransferRecordVO;
import com.panzhihua.common.model.vos.community.screen.index.*;
-import com.panzhihua.common.model.vos.grid.EventGridDataVO;
-import com.panzhihua.common.model.vos.grid.EventResourceVO;
-import com.panzhihua.common.model.vos.grid.PopulationDetailVO;
-import com.panzhihua.common.model.vos.grid.PopulationListVO;
+import com.panzhihua.common.model.vos.grid.*;
import com.panzhihua.common.model.vos.grid.admin.ComMngPopulationListVO;
import com.panzhihua.common.model.vos.screen.ComActPopulationCultureVO;
import com.panzhihua.common.model.vos.screen.ComActPopulationScreenVO;
@@ -463,12 +463,12 @@
populationHouseDO.setVillageId(comMngVillageDO.getVillageId());
populationHouseDO.setAlley(vo.getRoad());
populationHouseDO.setHouseNum(vo.getDoorNo());
- populationHouseDO.setCode(vo.getDoorNo());
populationHouseDO.setStatus(vo.getIsRent());
populationHouseDO.setCommunityId(communityId);
populationHouseDO.setFloor(vo.getFloor());
populationHouseDO.setUnitNo(vo.getUnitNo());
populationHouseDO.setHouseNo(vo.getHouseNo());
+ populationHouseDO.setCode(vo.getHouseNo());
populationHouseDO.setAddress(address);
populationHouseDO.setUpdateAt(new Date());
populationHouseDO.setConstructPurpose(vo.getBuildPurpose());
@@ -1528,5 +1528,31 @@
return R.ok(populationListIPage);
}
+ @Override
+ public R delGridPopulationAdmin(List<Long> ids){
+ Integer count = this.baseMapper.getPopulationVisitingCount(ids);
+ if(count > 0){
+ return R.ok("您选择的数据中存在被引用的，无法删除");
+ }
+ this.baseMapper.deleteBatchIds(ids);
+ return R.ok();
+ }
+
+ @Override
+ public R getBuildingHousePopulationList(PageComMngPopulationDTO populationDTO){
+
+ IPage<EventSpecialPopulationVO> populationVOIPage = this.baseMapper.getBuildingHousePopulationList(new Page(populationDTO.getPageNum(),populationDTO.getPageSize()),populationDTO);
+ if(!populationVOIPage.getRecords().isEmpty()){
+ populationVOIPage.getRecords().forEach(population -> {
+ try {
+ Integer age = IdcardUtil.getAgeByIdCard(population.getIdCard());
+ population.setAge(age);
+ }catch (Exception e){
+ log.error("人员身份证转换年龄失败，人员id：" + population.getId());
+ }
+ });
+ }
+ return R.ok(populationVOIPage);
+ }
}
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngVillageServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngVillageServiceImpl.java
index 6523f98..61d8044 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngVillageServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngVillageServiceImpl.java
@@ -8,9 +8,14 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.google.common.collect.Lists;
import com.panzhihua.common.model.dtos.community.PageComMngVillageDTO;
+import com.panzhihua.common.model.dtos.grid.ComMngVillageListAppDTO;
+import com.panzhihua.common.model.dtos.grid.PageComMngVillageBuildHouseAppDTO;
+import com.panzhihua.common.model.dtos.grid.admin.ComMngPopulationListDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComMngVillageServeExcelVO;
import com.panzhihua.common.model.vos.community.ComMngVillageVO;
+import com.panzhihua.common.model.vos.grid.ComMngVillageBuildingHouseVO;
+import com.panzhihua.common.model.vos.grid.ComMngVillageBuildingVO;
import com.panzhihua.common.utlis.Snowflake;
import com.panzhihua.common.utlis.StringUtils;
import com.panzhihua.service_community.dao.ComActDAO;
@@ -238,4 +243,37 @@
public R getVillage(Long villageId){
return R.ok(this.baseMapper.getVillageById(villageId));
}
+
+ /**
+ * 综治app-小区列表
+ * @param villageListAppDTO 请求参数
+ * @return 小区列表
+ */
+ @Override
+ public R getGridVillageList(ComMngVillageListAppDTO villageListAppDTO){
+ return R.ok(this.baseMapper.getGridVillageList(new Page(villageListAppDTO.getPageNum(),villageListAppDTO.getPageSize()),villageListAppDTO));
+ }
+
+ /**
+ * 综治app-根据小区id查询小区下楼栋列表
+ * @param villageId 小区id
+ * @return 楼栋列表
+ */
+ @Override
+ public R getGridVillageBuildingList(Long villageId){
+
+ List<ComMngVillageBuildingVO> villageBuildingList = this.baseMapper.getGridVillageBuildingList(villageId);
+ if(!villageBuildingList.isEmpty()){
+ villageBuildingList.forEach(villageBuilding -> {
+ if(!villageBuilding.getFloor().contains("栋")){
+ villageBuilding.setFloorString(villageBuilding.getFloor() + "栋");
+ }
+ if(!villageBuilding.getUnitNo().contains("单元")){
+ villageBuilding.setUnitNoString(villageBuilding.getUnitNo() + "单元");
+ }
+ });
+ }
+ return R.ok(villageBuildingList);
+ }
+
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/EventVisitingTasksApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/EventVisitingTasksApi.java
index c869ab3..4dcd2a2 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/EventVisitingTasksApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/EventVisitingTasksApi.java
@@ -164,22 +164,22 @@
/**
* 撤销走访
- * @param id
+ * @param idDTO
* @return
*/
- @PostMapping("/cancel/{id}")
- R cancel(@PathVariable("id") Long id){
- return eventVisitingTasksService.cancel(id);
+ @PostMapping("/cancel")
+ R cancel(@RequestBody IdDTO idDTO){
+ return eventVisitingTasksService.cancel(idDTO);
}
/**
* 恢复
- * @param id
+ * @param idDTO
* @return
*/
- @PostMapping("/reset/{id}")
- R reset(@PathVariable("id") Long id){
- return eventVisitingTasksService.reset(id);
+ @PostMapping("/reset")
+ R reset(@RequestBody IdDTO idDTO){
+ return eventVisitingTasksService.reset(idDTO);
}
/**
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/EventVisitingTasksService.java b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/EventVisitingTasksService.java
index 2167243..68d6a5d 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/EventVisitingTasksService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/EventVisitingTasksService.java
@@ -136,18 +136,18 @@
/**
* 撤销
*
- * @param id
+ * @param idDTO
* @return
*/
- R cancel(Long id);
+ R cancel(IdDTO idDTO);
/**
* 恢复
*
- * @param id
+ * @param idDTO
* @return
*/
- R reset(Long id);
+ R reset(IdDTO idDTO);
/**
* 开始
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java
index f2f11f1..87a87c6 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java
@@ -1737,7 +1737,10 @@
public R getNearByGrid(PageEventGridNearbyDTO pageEventGridNearbyDTO) {
Page page = new Page(pageEventGridNearbyDTO.getPageNum(), pageEventGridNearbyDTO.getPageSize());
String latLng = pageEventGridNearbyDTO.getHappentLatLng();
- if(!latLng.matches("^[\\-\\+]?(0(\\.\\d{1,10})?|([1-9](\\d)?)(\\.\\d{1,10})?|1[0-7]\\d{1}(\\.\\d{1,10})?|180\\.0{1,10}),[\\-\\+]?((0|([1-8]\\d?))(\\.\\d{1,10})?|90(\\.0{1,10})?)$")){
+// if(!latLng.matches("^[\\-\\+]?(0(\\.\\d{1,10})?|([1-9](\\d)?)(\\.\\d{1,10})?|1[0-7]\\d{1}(\\.\\d{1,10})?|180\\.0{1,10}),[\\-\\+]?((0|([1-8]\\d?))(\\.\\d{1,10})?|90(\\.0{1,10})?)$")){
+// return R.fail("经纬度参数错误");
+// }
+ if(!latLng.matches("[1-9][0-9](\\.[0-9]{1,6})?,[1-9][0-9]{2}(\\.[0-9]{1,6})?")){
return R.fail("经纬度参数错误");
}
String latLngArr[] = latLng.split(",");
@@ -2310,9 +2313,10 @@
}
public static void main(String[] args) {
- EventServiceImpl service = new EventServiceImpl();
- List<EventWorkVO> list = service.listHalfYearByDyn();
- System.out.println(list);
+ String content = "30,104";
+ String re = "[1-9][0-9](\\.[0-9]{1,6})?,[1-9][0-9]{2}(\\.[0-9]{1,6})?";
+
+ System.out.println(content.matches(re));
}
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventVisitingTasksServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventVisitingTasksServiceImpl.java
index a00d99b..a04c7bf 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventVisitingTasksServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventVisitingTasksServiceImpl.java
@@ -187,7 +187,6 @@
if(!StringUtils.isEmpty(error)){
rt.append(rt);
}
- eventVisitingTasksMapper.deleteById(Long.valueOf(id));
}
if(!StringUtils.isEmpty(rt)){
return R.fail("部分删除失败:"+rt.toString());
@@ -203,6 +202,7 @@
if(!Objects.equals(eventVisitingTasksDO.getEventStatus(),EventTasksStatusEnum.DZF.getCode())){
return "["+eventVisitingTasksDO.getVisiterName()+"]状态不可删除;";
}
+ eventVisitingTasksMapper.deleteById(Long.valueOf(id));
return null;
}
@@ -210,7 +210,7 @@
public R visitorList(EventVisitListQuery query) {
IPage<EventVisitListVO> page = eventVisitingTasksMapper.visitorList(new Page(query.getPageNum(),query.getPageSize()),query);
page.getRecords().stream().forEach(e->{
- List<EventVisitingTasksDO> list = eventVisitingTasksMapper.selectList(new QueryWrapper<EventVisitingTasksDO>().eq("visiter_id",e.getId()).orderByDesc("id"));
+ List<EventVisitingTasksDO> list = eventVisitingTasksMapper.selectList(new QueryWrapper<EventVisitingTasksDO>().eq("visiter_id",e.getId()).orderByDesc("id").last("limit 0,1"));
if(!CollectionUtils.isEmpty(list)){
e.setCreateAt(list.get(0).getCreateAt());
e.setEventStatus(list.get(0).getEventStatus());
@@ -354,13 +354,13 @@
@Transactional(rollbackFor = Exception.class)
@Override
- public R cancel(Long id) {
+ public R cancel(IdDTO idDTO) {
- EventVisitingTasksDO eventVisitingTasksDO = eventVisitingTasksMapper.selectById(id);
+ EventVisitingTasksDO eventVisitingTasksDO = eventVisitingTasksMapper.selectById(Long.valueOf(idDTO.getId()));
if(eventVisitingTasksDO == null || eventVisitingTasksDO.getEventStatus() != EventTasksStatusEnum.DZF.getCode()){
return R.fail("当前状态不可撤销");
}
- int rt = eventVisitingTasksMapper.cancel(id,EventTasksStatusEnum.YCX.getCode());
+ int rt = eventVisitingTasksMapper.cancel(eventVisitingTasksDO.getId(),EventTasksStatusEnum.YCX.getCode());
if(rt > 0){
return R.ok();
}
@@ -369,13 +369,13 @@
@Transactional(rollbackFor = Exception.class)
@Override
- public R reset(Long id) {
+ public R reset(IdDTO idDTO) {
- EventVisitingTasksDO eventVisitingTasksDO = eventVisitingTasksMapper.selectById(id);
+ EventVisitingTasksDO eventVisitingTasksDO = eventVisitingTasksMapper.selectById(Long.valueOf(idDTO.getId()));
if(eventVisitingTasksDO == null || eventVisitingTasksDO.getEventStatus() != EventTasksStatusEnum.YCX.getCode()){
return R.fail("当前状态不可恢复");
}
- int rt = eventVisitingTasksMapper.updateEventStatus(id,EventTasksStatusEnum.DZF.getCode());
+ int rt = eventVisitingTasksMapper.updateEventStatus(eventVisitingTasksDO.getId(),EventTasksStatusEnum.DZF.getCode());
if(rt > 0){
return R.ok();
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/EventGridDataMapper.xml b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/EventGridDataMapper.xml
index 26297ba..35cd870 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/EventGridDataMapper.xml
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/EventGridDataMapper.xml
@@ -137,7 +137,7 @@
</select>
<select id="getGridMemberLists" resultType="com.panzhihua.common.model.vos.grid.EventGridMemberAdminVO">
- select user_id,nick_name from sys_user where community_id = #{communityId} and `type` = 6
+ select user_id,nick_name from sys_user where `type` = 6
</select>
<select id="getGridMember" resultType="com.panzhihua.common.model.vos.grid.GridMemberAdminVO">
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/EventMapper.xml b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/EventMapper.xml
index 6db986d..fa2eb12 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/EventMapper.xml
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/EventMapper.xml
@@ -454,7 +454,8 @@
e.grid_member_name like concat('%', #{pageEventManageDTO.keyWord},'%') OR
e.event_title like concat('%', #{pageEventManageDTO.keyWord},'%') OR
e.happen_address like concat('%', #{pageEventManageDTO.keyWord},'%') OR
- e.order_sn like concat('%', #{pageEventManageDTO.keyWord},'%')
+ e.order_sn like concat('%', #{pageEventManageDTO.keyWord},'%') OR
+ e.event_clazz like concat('%', #{pageEventManageDTO.keyWord},'%')
)
</if>
<if test="pageEventManageDTO.revokeType!=null">
@@ -509,7 +510,9 @@
e.grid_member_name like concat('%', #{pagePublicityEventCommunityDTO.keyWord},'%') OR
e.event_title like concat('%', #{pagePublicityEventCommunityDTO.keyWord},'%') OR
e.happen_address like concat('%', #{pagePublicityEventCommunityDTO.keyWord},'%') OR
- e.order_sn like concat('%', #{pagePublicityEventCommunityDTO.keyWord},'%')
+ e.order_sn like concat('%', #{pagePublicityEventCommunityDTO.keyWord},'%') OR
+ e.propaganda_type like concat('%', #{pagePublicityEventCommunityDTO.keyWord},'%') OR
+ egd.grid_name like concat('%', #{pagePublicityEventCommunityDTO.keyWord},'%')
)
</if>
<if test="pagePublicityEventCommunityDTO.revokeType!=null">
@@ -535,8 +538,7 @@
`event` AS e
LEFT JOIN event_grid_data AS egd ON egd.id = e.grid_id
WHERE
- egd.grid_community_id = #{communityId}
- AND e.event_status = 2
+ e.event_status = 2
AND e.event_process_status = 2
) AS handleEventTotal,
(
@@ -546,17 +548,15 @@
`event` AS e
LEFT JOIN event_grid_data AS egd ON egd.id = e.grid_id
WHERE
- egd.grid_community_id = #{communityId}
- AND e.event_category = 2
+ e.event_category = 2
AND e.event_status = 2
) AS propagandaEducationTotal,
- ( SELECT count( id ) FROM com_act_easy_photo WHERE handle_status = 2 AND community_id = #{communityId} ) AS easyPhotoTotal
+ ( SELECT count( id ) FROM com_act_easy_photo WHERE handle_status = 2 ) AS easyPhotoTotal
FROM
`event` AS e
LEFT JOIN event_grid_data AS egd ON egd.id = e.grid_id
WHERE
- egd.grid_community_id = #{communityId}
- AND e.event_status = 2
+ e.event_status = 2
</select>
<select id="getEventCountByGridIds" resultType="Integer">
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
index c2d369a..41bd4a4 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
@@ -1157,7 +1157,7 @@
*/
@Override
public R listComMngUserTag(Long communityId) {
- List<ComMngUserTagDO> comMngUserTagDOS = comMngUserTagDAO.selectList(new QueryWrapper<ComMngUserTagDO>().lambda().eq(ComMngUserTagDO::getCommunityId, communityId));
+ List<ComMngUserTagDO> comMngUserTagDOS = comMngUserTagDAO.selectList(new QueryWrapper<ComMngUserTagDO>().or().lambda().eq(ComMngUserTagDO::getSysFlag,1).or().eq(ComMngUserTagDO::getCommunityId, communityId));
if (ObjectUtils.isEmpty(comMngUserTagDOS)) {
return R.fail();
}
--
Gitblit v1.7.1