From 441b4f2c83180d1efba97f1765826e06370748fe Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 18 Mar 2022 18:49:50 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E5=B1=85=E6=B0=91=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E9=87=87=E9=9B=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application.yml | 2 +- .../epmet/dto/form/IcResiCollectFormDTO.java | 104 ++++++++++++++++++ .../dto/form/IcResiCollectMemFormDTO.java | 33 ++++++ .../controller/IcResiCollectController.java | 51 +++++++++ .../java/com/epmet/dao/IcResiCollectDao.java | 17 +++ .../java/com/epmet/dao/IcResiMemberDao.java | 16 +++ .../com/epmet/entity/IcResiCollectEntity.java | 89 +++++++++++++++ .../com/epmet/entity/IcResiMemberEntity.java | 59 ++++++++++ .../epmet/service/IcResiCollectService.java | 26 +++++ .../impl/IcResiCollectServiceImpl.java | 56 ++++++++++ .../resources/mapper/IcResiCollectDao.xml | 12 ++ .../main/resources/mapper/IcResiMemberDao.xml | 8 ++ 12 files changed, 472 insertions(+), 1 deletion(-) create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcResiCollectFormDTO.java create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcResiCollectMemFormDTO.java create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiCollectController.java create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiCollectDao.java create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiMemberDao.java create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiCollectEntity.java create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiMemberEntity.java create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiCollectService.java create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectServiceImpl.java create mode 100644 epmet-user/epmet-user-server/src/main/resources/mapper/IcResiCollectDao.xml create mode 100644 epmet-user/epmet-user-server/src/main/resources/mapper/IcResiMemberDao.xml diff --git a/epmet-cloud-generator/src/main/resources/application.yml b/epmet-cloud-generator/src/main/resources/application.yml index 0bd4a76f77..973eb74fe0 100644 --- a/epmet-cloud-generator/src/main/resources/application.yml +++ b/epmet-cloud-generator/src/main/resources/application.yml @@ -9,7 +9,7 @@ spring: type: com.alibaba.druid.pool.DruidDataSource #MySQL配置 driverClassName: com.mysql.jdbc.Driver - url: jdbc:mysql://192.168.1.140:3306/epmet_data_statistical?useUnicode=true&characterEncoding=UTF-8&useSSL=false + url: jdbc:mysql://118.190.150.119:43306/epmet_user?useUnicode=true&characterEncoding=UTF-8&useSSL=false username: root password: root #oracle配置 diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcResiCollectFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcResiCollectFormDTO.java new file mode 100644 index 0000000000..0e711fa667 --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcResiCollectFormDTO.java @@ -0,0 +1,104 @@ +package com.epmet.dto.form; + +import com.epmet.commons.tools.validator.group.CustomerClientShowGroup; +import lombok.Data; + +import javax.validation.Valid; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.io.Serializable; +import java.util.List; + +/** + * 收集居民信息入参 + */ +@Data +public class IcResiCollectFormDTO implements Serializable { + public interface AddUserInternalGroup { + } + + public interface InternalShowGroup extends CustomerClientShowGroup { + } + + public interface ExternalShowGroup extends CustomerClientShowGroup { + } + + /** + * 客户Id customer.id + */ + private String customerId; + + /** + * 内部：internal；外部：external + */ + @NotBlank(message = "兴德路社区：internal;其他社区：external", groups = AddUserInternalGroup.class) + private String origin; + + /** + * 网格ID_后端接口赋值 + */ + private String gridId; + + /** + * 组织Id_后端接口赋值 + */ + private String agencyId; + + /** + * 组织的pid_后端接口赋值 + */ + private String pids; + + /** + * 所属小区ID + */ + @NotBlank(message = "小区不能为空", groups = InternalShowGroup.class) + private String villageId; + + /** + * 所属楼宇Id + */ + @NotBlank(message = "楼栋不能为空", groups = InternalShowGroup.class) + private String buildId; + + /** + * 单元id + */ + @NotBlank(message = "单元不能为空", groups = InternalShowGroup.class) + private String unitId; + + /** + * 所属家庭Id + */ + @NotBlank(message = "家庭不能为空", groups = InternalShowGroup.class) + private String homeId; + + /** + * 详细地址 + */ + @NotBlank(message = "家庭地址不能为空", groups = {InternalShowGroup.class, ExternalShowGroup.class}) + private String address; + + /** + * 1自由0租住 + */ + @NotNull(message = "房子属于自由还是组织？", groups = {InternalShowGroup.class, ExternalShowGroup.class}) + private Integer houserType; + + /** + * 户主姓名 + */ + @NotBlank(message = "户主姓名不能为空", groups = {InternalShowGroup.class, ExternalShowGroup.class}) + private String houserHolerName; + + /** + * 居住成员人数 + */ + @NotNull(message = "居住成员人数不能为空", groups = {InternalShowGroup.class, ExternalShowGroup.class}) + private Integer totalResi; + + @Valid + @NotEmpty(message = "成员信息不能为空", groups = {InternalShowGroup.class, ExternalShowGroup.class}) + private List memberList; +} diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcResiCollectMemFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcResiCollectMemFormDTO.java new file mode 100644 index 0000000000..c9fd01798c --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcResiCollectMemFormDTO.java @@ -0,0 +1,33 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import java.io.Serializable; + +@Data +public class IcResiCollectMemFormDTO implements Serializable { + /** + * 居住成员1姓名 + */ + private String name; + + /** + * 居住成员1身份证号 + */ + private String idNum; + + /** + * 居住成员1手机号 + */ + private String mobile; + + /** + * 居住成员1是否参加几轮全员核算检测，数字1-10 + */ + private Integer hesuanCount; + + /** + * 居住成员1新冠疫苗接种情况;1:已全程接种；2：未全程接种；0未接种； + */ + private Integer ymjz; +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiCollectController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiCollectController.java new file mode 100644 index 0000000000..06c8f33f55 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiCollectController.java @@ -0,0 +1,51 @@ +package com.epmet.controller; + +import com.epmet.commons.tools.aop.NoRepeatSubmit; +import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.validator.ValidatorUtils; +import com.epmet.dto.form.IcResiCollectFormDTO; +import com.epmet.service.IcResiCollectService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + + +/** + * 居民信息采集表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-03-18 + */ +@RestController +@RequestMapping("icresicollect") +public class IcResiCollectController { + + @Autowired + private IcResiCollectService icResiCollectService; + + /** + * 居民信息采集_提交 + * + * @param formDTO + * @return + */ + @NoRepeatSubmit + @PostMapping("save") + public Result save(@RequestBody IcResiCollectFormDTO formDTO) { + //效验数据 + ValidatorUtils.validateEntity(formDTO, IcResiCollectFormDTO.AddUserInternalGroup.class); + // 内部：internal；外部：external + if ("internal".equals(formDTO.getOrigin())) { + ValidatorUtils.validateEntity(formDTO, IcResiCollectFormDTO.InternalShowGroup.class); + } else if ("external".equals(formDTO.getOrigin())) { + ValidatorUtils.validateEntity(formDTO, IcResiCollectFormDTO.ExternalShowGroup.class); + } + icResiCollectService.save(formDTO); + return new Result(); + } + + + +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiCollectDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiCollectDao.java new file mode 100644 index 0000000000..81779fbe2e --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiCollectDao.java @@ -0,0 +1,17 @@ +package com.epmet.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.entity.IcResiCollectEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 居民信息采集表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-03-18 + */ +@Mapper +public interface IcResiCollectDao extends BaseDao { + + IcResiCollectEntity selectByAddress(String address); +} \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiMemberDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiMemberDao.java new file mode 100644 index 0000000000..e4748e01b2 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiMemberDao.java @@ -0,0 +1,16 @@ +package com.epmet.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.entity.IcResiMemberEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 居民信息成员表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-03-18 + */ +@Mapper +public interface IcResiMemberDao extends BaseDao { + +} \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiCollectEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiCollectEntity.java new file mode 100644 index 0000000000..8cd679a259 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiCollectEntity.java @@ -0,0 +1,89 @@ +package com.epmet.entity; + +import com.baomidou.mybatisplus.annotation.TableName; + +import com.epmet.commons.mybatis.entity.BaseEpmetEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.Date; + +/** + * 居民信息采集表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-03-18 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("ic_resi_collect") +public class IcResiCollectEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * 客户Id customer.id + */ + private String customerId; + + /** + * 内部：internal；外部：external + */ + private String origin; + + /** + * 网格ID + */ + private String gridId; + + /** + * 组织Id + */ + private String agencyId; + + /** + * 组织的pids + */ + private String pids; + + /** + * 所属小区ID + */ + private String villageId; + + /** + * 所属楼宇Id + */ + private String buildId; + + /** + * 单元id + */ + private String unitId; + + /** + * 所属家庭Id + */ + private String homeId; + + /** + * 详细地址 + */ + private String address; + + /** + * 1自由0租住 + */ + private Integer houserType; + + /** + * 户主姓名 + */ + private String houserHolerName; + + /** + * 居住成员人数 + */ + private Integer totalResi; + +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiMemberEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiMemberEntity.java new file mode 100644 index 0000000000..91ac1538cb --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiMemberEntity.java @@ -0,0 +1,59 @@ +package com.epmet.entity; + +import com.baomidou.mybatisplus.annotation.TableName; + +import com.epmet.commons.mybatis.entity.BaseEpmetEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.Date; + +/** + * 居民信息成员表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-03-18 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("ic_resi_member") +public class IcResiMemberEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * 客户Id customer.id + */ + private String customerId; + + /** + * ic_resi_colllect.id + */ + private String icResiCollectId; + + /** + * 居住成员1姓名 + */ + private String name; + + /** + * 居住成员1身份证号 + */ + private String idNum; + + /** + * 居住成员1手机号 + */ + private String mobile; + + /** + * 居住成员1是否参加几轮全员核算检测，数字1-10 + */ + private Integer hesuanCount; + + /** + * 居住成员1新冠疫苗接种情况;1:已全程接种；2：未全程接种；0未接种； + */ + private Integer ymjz; + +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiCollectService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiCollectService.java new file mode 100644 index 0000000000..86d9d046e3 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiCollectService.java @@ -0,0 +1,26 @@ +package com.epmet.service; + +import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.dto.form.IcResiCollectFormDTO; +import com.epmet.entity.IcResiCollectEntity; + +/** + * 居民信息采集表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-03-18 + */ +public interface IcResiCollectService extends BaseService { + + + /** + * 默认保存 + * + * @param dto + * @return void + * @author generator + * @date 2022-03-18 + */ + void save(IcResiCollectFormDTO dto); + +} \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectServiceImpl.java new file mode 100644 index 0000000000..ebcb749e75 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectServiceImpl.java @@ -0,0 +1,56 @@ +package com.epmet.service.impl; + +import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.commons.tools.utils.Result; +import com.epmet.dao.IcResiCollectDao; +import com.epmet.dto.IcNeighborHoodDTO; +import com.epmet.dto.form.IcResiCollectFormDTO; +import com.epmet.entity.IcResiCollectEntity; +import com.epmet.entity.IcResiMemberEntity; +import com.epmet.feign.GovOrgOpenFeignClient; +import com.epmet.service.IcResiCollectService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +/** + * 居民信息采集表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-03-18 + */ +@Service +public class IcResiCollectServiceImpl extends BaseServiceImpl implements IcResiCollectService { + @Autowired + private GovOrgOpenFeignClient govOrgOpenFeignClient; + + + @Override + @Transactional(rollbackFor = Exception.class) + public void save(IcResiCollectFormDTO formDTO) { + IcResiCollectEntity origin=baseDao.selectByAddress(formDTO.getAddress()); + if(null==origin){ + //插入主表、成员表 + IcResiCollectEntity insert=ConvertUtils.sourceToTarget(formDTO,IcResiCollectEntity.class); + if("internal".equals(formDTO.getOrigin())){ + //查询楼栋个信息 + // IcNeighborHoodDTO neighborHoodDTO=query + Result res= govOrgOpenFeignClient.getIcNeighbordhoodById(formDTO.getVillageId()); + if(!res.success()||null==res.getData()){ + // todo + } + } + List memberList=ConvertUtils.sourceToTarget(formDTO.getMemberList(),IcResiMemberEntity.class); + + }else{ + //查询成员表 + + } + IcResiCollectEntity entity = ConvertUtils.sourceToTarget(dto, IcResiCollectEntity.class); + insert(entity); + } + +} \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiCollectDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiCollectDao.xml new file mode 100644 index 0000000000..bdb41a9b91 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiCollectDao.xml @@ -0,0 +1,12 @@ + + + + + + + + \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiMemberDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiMemberDao.xml new file mode 100644 index 0000000000..6423f7ecff --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiMemberDao.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file From b5f747641df20a461442f60125845376fef5fa20 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 18 Mar 2022 18:53:09 +0800 Subject: [PATCH 2/9] cuole --- .../impl/IcResiCollectServiceImpl.java | 21 ++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectServiceImpl.java index ebcb749e75..4ce02bcfcc 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectServiceImpl.java @@ -1,6 +1,8 @@ package com.epmet.service.impl; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.exception.EpmetErrorCode; +import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.dao.IcResiCollectDao; @@ -37,11 +39,8 @@ public class IcResiCollectServiceImpl extends BaseServiceImpl res= govOrgOpenFeignClient.getIcNeighbordhoodById(formDTO.getVillageId()); - if(!res.success()||null==res.getData()){ - // todo - } + IcNeighborHoodDTO neighborHoodDTO=queryIcNeighborHood(formDTO.getVillageId()); + } List memberList=ConvertUtils.sourceToTarget(formDTO.getMemberList(),IcResiMemberEntity.class); @@ -49,8 +48,16 @@ public class IcResiCollectServiceImpl extends BaseServiceImpl res = govOrgOpenFeignClient.getIcNeighbordhoodById(villageId); + if (!res.success() || null == res.getData()) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "小区信息查询异常", "小区信息查询异常"); + } + return res.getData(); } } \ No newline at end of file From 0dca863feda574dd4814d7e72b9fc76795a0dce7 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 18 Mar 2022 19:06:18 +0800 Subject: [PATCH 3/9] heSuanCount+houseType --- .../epmet/dto/form/IcResiCollectFormDTO.java | 5 ++-- .../dto/form/IcResiCollectMemFormDTO.java | 6 ++++- .../com/epmet/entity/IcResiCollectEntity.java | 7 ++---- .../com/epmet/entity/IcResiMemberEntity.java | 5 +--- .../impl/IcResiCollectServiceImpl.java | 24 ++++++++++++------- 5 files changed, 27 insertions(+), 20 deletions(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcResiCollectFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcResiCollectFormDTO.java index 0e711fa667..783343a1c4 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcResiCollectFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcResiCollectFormDTO.java @@ -27,6 +27,7 @@ public class IcResiCollectFormDTO implements Serializable { /** * 客户Id customer.id */ + @NotBlank(message = "customerId不能为空", groups = AddUserInternalGroup.class) private String customerId; /** @@ -84,13 +85,13 @@ public class IcResiCollectFormDTO implements Serializable { * 1自由0租住 */ @NotNull(message = "房子属于自由还是组织？", groups = {InternalShowGroup.class, ExternalShowGroup.class}) - private Integer houserType; + private Integer houseType; /** * 户主姓名 */ @NotBlank(message = "户主姓名不能为空", groups = {InternalShowGroup.class, ExternalShowGroup.class}) - private String houserHolerName; + private String houseHolerName; /** * 居住成员人数 diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcResiCollectMemFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcResiCollectMemFormDTO.java index c9fd01798c..9778aacb4f 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcResiCollectMemFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcResiCollectMemFormDTO.java @@ -6,6 +6,10 @@ import java.io.Serializable; @Data public class IcResiCollectMemFormDTO implements Serializable { + /** + * 客户Id customer.id + */ + private String customerId; /** * 居住成员1姓名 */ @@ -24,7 +28,7 @@ public class IcResiCollectMemFormDTO implements Serializable { /** * 居住成员1是否参加几轮全员核算检测，数字1-10 */ - private Integer hesuanCount; + private Integer heSuanCount; /** * 居住成员1新冠疫苗接种情况;1:已全程接种；2：未全程接种；0未接种； diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiCollectEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiCollectEntity.java index 8cd679a259..69efebb366 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiCollectEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiCollectEntity.java @@ -1,13 +1,10 @@ package com.epmet.entity; import com.baomidou.mybatisplus.annotation.TableName; - import com.epmet.commons.mybatis.entity.BaseEpmetEntity; import lombok.Data; import lombok.EqualsAndHashCode; -import java.util.Date; - /** * 居民信息采集表 * @@ -74,12 +71,12 @@ public class IcResiCollectEntity extends BaseEpmetEntity { /** * 1自由0租住 */ - private Integer houserType; + private Integer houseType; /** * 户主姓名 */ - private String houserHolerName; + private String houseHolerName; /** * 居住成员人数 diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiMemberEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiMemberEntity.java index 91ac1538cb..28ee2c49e4 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiMemberEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiMemberEntity.java @@ -1,13 +1,10 @@ package com.epmet.entity; import com.baomidou.mybatisplus.annotation.TableName; - import com.epmet.commons.mybatis.entity.BaseEpmetEntity; import lombok.Data; import lombok.EqualsAndHashCode; -import java.util.Date; - /** * 居民信息成员表 * @@ -49,7 +46,7 @@ public class IcResiMemberEntity extends BaseEpmetEntity { /** * 居住成员1是否参加几轮全员核算检测，数字1-10 */ - private Integer hesuanCount; + private Integer heSuanCount; /** * 居住成员1新冠疫苗接种情况;1:已全程接种；2：未全程接种；0未接种； diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectServiceImpl.java index 4ce02bcfcc..eb1a62299d 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectServiceImpl.java @@ -6,6 +6,7 @@ import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.dao.IcResiCollectDao; +import com.epmet.dao.IcResiMemberDao; import com.epmet.dto.IcNeighborHoodDTO; import com.epmet.dto.form.IcResiCollectFormDTO; import com.epmet.entity.IcResiCollectEntity; @@ -28,7 +29,8 @@ import java.util.List; public class IcResiCollectServiceImpl extends BaseServiceImpl implements IcResiCollectService { @Autowired private GovOrgOpenFeignClient govOrgOpenFeignClient; - + @Autowired + private IcResiMemberDao icResiMemberDao; @Override @Transactional(rollbackFor = Exception.class) @@ -36,14 +38,20 @@ public class IcResiCollectServiceImpl extends BaseServiceImpl memberList=ConvertUtils.sourceToTarget(formDTO.getMemberList(),IcResiMemberEntity.class); - + baseDao.insert(insert); + List memberList = ConvertUtils.sourceToTarget(formDTO.getMemberList(), IcResiMemberEntity.class); + memberList.forEach(mem -> { + mem.setIcResiCollectId(insert.getId()); + icResiMemberDao.insert(mem); + }); }else{ //查询成员表 From eae632be5df2a42c3eec857234ee4d2e5b6f0f98 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 18 Mar 2022 19:17:40 +0800 Subject: [PATCH 4/9] houseHolderName --- .../java/com/epmet/dto/form/IcResiCollectFormDTO.java | 2 +- .../src/main/java/com/epmet/dao/IcResiCollectDao.java | 6 ++++++ .../java/com/epmet/entity/IcResiCollectEntity.java | 2 +- .../epmet/service/impl/IcResiCollectServiceImpl.java | 10 +++++++--- .../src/main/resources/mapper/IcResiCollectDao.xml | 11 ++++++++++- 5 files changed, 25 insertions(+), 6 deletions(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcResiCollectFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcResiCollectFormDTO.java index 783343a1c4..c6d45ed0da 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcResiCollectFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcResiCollectFormDTO.java @@ -91,7 +91,7 @@ public class IcResiCollectFormDTO implements Serializable { * 户主姓名 */ @NotBlank(message = "户主姓名不能为空", groups = {InternalShowGroup.class, ExternalShowGroup.class}) - private String houseHolerName; + private String houseHolderName; /** * 居住成员人数 diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiCollectDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiCollectDao.java index 81779fbe2e..ffb231902a 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiCollectDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiCollectDao.java @@ -3,6 +3,7 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.entity.IcResiCollectEntity; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; /** * 居民信息采集表 @@ -14,4 +15,9 @@ import org.apache.ibatis.annotations.Mapper; public interface IcResiCollectDao extends BaseDao { IcResiCollectEntity selectByAddress(String address); + + int updateRec(@Param("id") String id, + @Param("houseType") Integer houseType, + @Param("houseHolderName") String houseHolderName, + @Param("totalResi") Integer totalResi); } \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiCollectEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiCollectEntity.java index 69efebb366..ccdbb77325 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiCollectEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiCollectEntity.java @@ -76,7 +76,7 @@ public class IcResiCollectEntity extends BaseEpmetEntity { /** * 户主姓名 */ - private String houseHolerName; + private String houseHolderName; /** * 居住成员人数 diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectServiceImpl.java index eb1a62299d..3d68a78641 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectServiceImpl.java @@ -35,8 +35,8 @@ public class IcResiCollectServiceImpl extends BaseServiceImpl res = govOrgOpenFeignClient.getIcNeighbordhoodById(villageId); if (!res.success() || null == res.getData()) { diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiCollectDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiCollectDao.xml index bdb41a9b91..48e57622dd 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiCollectDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiCollectDao.xml @@ -3,10 +3,19 @@ - select c.id from ic_resi_collect c where and c.address=#{address} and c.DEL_FLAG='0' + + UPDATE ic_resi_collect + SET UPDATED_TIME = NOW(), + HOUSE_TYPE = #{houseType}, + HOUSE_HOLER_NAME = #{houseHolderName}, + TOTAL_RESI = #{totalResi} + WHERE + id = #{id} + \ No newline at end of file From b3b1d8d6fcefcfdf99f71b27a3bbe5e0b88f7745 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 18 Mar 2022 19:42:32 +0800 Subject: [PATCH 5/9] and --- .../src/main/resources/mapper/IcResiCollectDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiCollectDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiCollectDao.xml index 48e57622dd..f2b808c911 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiCollectDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiCollectDao.xml @@ -5,7 +5,7 @@ From 2dbbab3d7ff91dcc92ba2ae648a00f93ac65d894 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 18 Mar 2022 19:54:18 +0800 Subject: [PATCH 6/9] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/IcResiCollectServiceImpl.java | 37 ++++++++++++++++--- 1 file changed, 31 insertions(+), 6 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectServiceImpl.java index 3d68a78641..57164e50c4 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectServiceImpl.java @@ -1,5 +1,6 @@ package com.epmet.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.EpmetException; @@ -13,11 +14,15 @@ import com.epmet.entity.IcResiCollectEntity; import com.epmet.entity.IcResiMemberEntity; import com.epmet.feign.GovOrgOpenFeignClient; import com.epmet.service.IcResiCollectService; +import org.apache.commons.collections4.MapUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.List; +import java.util.Map; +import java.util.function.Function; +import java.util.stream.Collectors; /** * 居民信息采集表 @@ -54,13 +59,12 @@ public class IcResiCollectServiceImpl extends BaseServiceImpl newMemberList = ConvertUtils.sourceToTarget(formDTO.getMemberList(), IcResiMemberEntity.class); + //查询之前录入的成员表 + Map memMap = queryOriginMem(origin.getId()); + saveOrUpdateMem(newMemberList, memMap,origin.getId()); } - // IcResiCollectEntity entity = ConvertUtils.sourceToTarget(dto, IcResiCollectEntity.class); - // insert(entity); } @@ -72,4 +76,25 @@ public class IcResiCollectServiceImpl extends BaseServiceImpl queryOriginMem(String icResiCollectId) { + LambdaQueryWrapper query = new LambdaQueryWrapper<>(); + query.eq(IcResiMemberEntity::getIcResiCollectId, icResiCollectId); + List originMemberList = icResiMemberDao.selectList(query); + Map memMap = originMemberList.stream().collect(Collectors.toMap(IcResiMemberEntity::getIdNum, Function.identity())); + return memMap; + } + + private void saveOrUpdateMem(List newMemberList, Map memMap, String originIcResiCollectId) { + for (IcResiMemberEntity entity : newMemberList) { + if (MapUtils.isNotEmpty(memMap) && memMap.containsKey(entity.getIdNum())) { + entity.setIcResiCollectId(originIcResiCollectId); + entity.setCustomerId(memMap.get(entity.getIdNum()).getCustomerId()); + icResiMemberDao.updateById(entity); + continue; + } + //没有插入 + entity.setIcResiCollectId(originIcResiCollectId); + icResiMemberDao.insert(entity); + } + } } \ No newline at end of file From 03db35912bf9d29524ff30875dd7c14675f9a3b6 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 18 Mar 2022 20:12:57 +0800 Subject: [PATCH 7/9] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-gateway/src/main/resources/bootstrap.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/epmet-gateway/src/main/resources/bootstrap.yml b/epmet-gateway/src/main/resources/bootstrap.yml index a17a8f9e26..83be8dc38a 100644 --- a/epmet-gateway/src/main/resources/bootstrap.yml +++ b/epmet-gateway/src/main/resources/bootstrap.yml @@ -499,11 +499,12 @@ epmet: - /oper/customize/customerstartpage/homestartpage - /epmet/point/mqCallback/** - /tduck-api/** - #查询楼栋，单元，房屋 + #居民信息采集：查询楼栋，单元，房屋，提交信息 - /gov/org/icneighborhood/open/list - /gov/org/icbuilding/buildingoption - /gov/org/icbuildingunit/unitoption - /gov/org/ichouse/houseoption + - /epmetuser/icresicollect/save # 外部应用认证，使用AccessToken等头进行认证 externalOpenUrls: - /data/report/** From dba18b4b1829371f853755fe313fdd1f5ed92c1d Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 18 Mar 2022 20:26:01 +0800 Subject: [PATCH 8/9] list --- .../epmet/dto/form/CollectListFormDTO.java | 41 +++++++++ .../dto/result/CollectListResultDTO.java | 87 +++++++++++++++++++ .../controller/IcResiCollectController.java | 23 ++++- .../java/com/epmet/dao/IcResiCollectDao.java | 13 +++ .../epmet/service/IcResiCollectService.java | 13 +++ .../impl/IcResiCollectServiceImpl.java | 37 ++++++++ .../resources/mapper/IcResiCollectDao.xml | 53 +++++++++++ 7 files changed, 266 insertions(+), 1 deletion(-) create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CollectListFormDTO.java create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CollectListResultDTO.java diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CollectListFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CollectListFormDTO.java new file mode 100644 index 0000000000..ae5ec4bacb --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CollectListFormDTO.java @@ -0,0 +1,41 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + * @Author zxc + * @DateTime 2022/3/18 19:00 + * @DESC + */ +@Data +public class CollectListFormDTO implements Serializable { + + private static final long serialVersionUID = 2106773724057183577L; + + public interface CollectListForm{} + + @NotNull(message = "pageNo不能为空", groups = CollectListForm.class) + private Integer pageNo; + + @NotNull(message = "pageSize不能为空", groups = CollectListForm.class) + private Integer pageSize; + + private String orgId; + private String neighborHoodId; + private String buildingId; + private String houseId; + private String address; + + /** + * 格式：yyyy-mm-dd + */ + private String startDate; + private String endDate; + + private String userId; + private String customerId; + +} diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CollectListResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CollectListResultDTO.java new file mode 100644 index 0000000000..dc981a1b02 --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CollectListResultDTO.java @@ -0,0 +1,87 @@ +package com.epmet.dto.result; + +import com.fasterxml.jackson.annotation.JsonIgnore; +import lombok.Data; + +import java.io.Serializable; +import java.util.ArrayList; +import java.util.List; + +/** + * @Author zxc + * @DateTime 2022/3/18 19:00 + * @DESC + */ +@Data +public class CollectListResultDTO implements Serializable { + + private static final long serialVersionUID = -6692672375850864451L; + + /** + * 户主姓名 + */ + private String houseHolderName; + + private String id; + + /** + * 居住地址 + */ + private String address; + + /** + * 房屋类型，1:自有, 0:租住 + */ + private Integer houseType; + + /** + * 居住人数 + */ + private Integer totalResi; + + private List list; + + public CollectListResultDTO() { + this.houseHolderName = ""; + this.address = ""; + this.houseType = 0; + this.totalResi = 0; + this.list = new ArrayList<>(); + } + + @Data + public static class CollectListMemberResultDTO{ + /** + * 成员名字 + */ + private String memberName; + + /** + * 成员身份证 + */ + private String memberIdNum; + + /** + * 成员电话 + */ + private String memberMobile; + + /** + * 核酸检测次数 + */ + private Integer heSuanCount; + + /** + * 疫苗是否全程接种，1：全程接种，2：未全程接种，3：为接种 + */ + private Integer ymjz; + + public CollectListMemberResultDTO() { + this.memberName = ""; + this.memberIdNum = ""; + this.memberMobile = ""; + this.heSuanCount = 0; + this.ymjz = 0; + } + } +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiCollectController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiCollectController.java index 06c8f33f55..c6bdb897ed 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiCollectController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiCollectController.java @@ -1,9 +1,14 @@ package com.epmet.controller; +import com.epmet.commons.tools.annotation.LoginUser; import com.epmet.commons.tools.aop.NoRepeatSubmit; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; +import com.epmet.dto.form.CollectListFormDTO; import com.epmet.dto.form.IcResiCollectFormDTO; +import com.epmet.dto.result.CollectListResultDTO; import com.epmet.service.IcResiCollectService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; @@ -11,6 +16,8 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.util.List; + /** * 居民信息采集表 @@ -46,6 +53,20 @@ public class IcResiCollectController { return new Result(); } - + /** + * Desc: 查询采集居民信息 + * @param formDTO + * @param tokenDto + * @author zxc + * @date 2022/3/18 19:23 + */ + @PostMapping("list") +// public Result> getCollectList(@RequestBody CollectListFormDTO formDTO, @LoginUser TokenDto tokenDto){ + public Result> getCollectList(@RequestBody CollectListFormDTO formDTO){ + ValidatorUtils.validateEntity(formDTO,CollectListFormDTO.CollectListForm.class); + formDTO.setUserId("ebcef7c1c63a87a226e59f1e0149d331"); + formDTO.setCustomerId("45687aa479955f9d06204d415238f7cc"); + return new Result>().ok(icResiCollectService.getCollectList(formDTO)); + } } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiCollectDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiCollectDao.java index ffb231902a..72f7edbc7f 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiCollectDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiCollectDao.java @@ -1,10 +1,14 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dto.form.CollectListFormDTO; +import com.epmet.dto.result.CollectListResultDTO; import com.epmet.entity.IcResiCollectEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import java.util.List; + /** * 居民信息采集表 * @@ -20,4 +24,13 @@ public interface IcResiCollectDao extends BaseDao { @Param("houseType") Integer houseType, @Param("houseHolderName") String houseHolderName, @Param("totalResi") Integer totalResi); + + /** + * Desc: 查询采集居民信息 + * @param formDTO + * @author zxc + * @date 2022/3/18 19:41 + */ + List getCollectList(CollectListFormDTO formDTO); + } \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiCollectService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiCollectService.java index 86d9d046e3..4c0bca4fa5 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiCollectService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiCollectService.java @@ -1,9 +1,14 @@ package com.epmet.service; import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.commons.tools.page.PageData; +import com.epmet.dto.form.CollectListFormDTO; import com.epmet.dto.form.IcResiCollectFormDTO; +import com.epmet.dto.result.CollectListResultDTO; import com.epmet.entity.IcResiCollectEntity; +import java.util.List; + /** * 居民信息采集表 * @@ -23,4 +28,12 @@ public interface IcResiCollectService extends BaseService { */ void save(IcResiCollectFormDTO dto); + /** + * Desc: 查询采集居民信息 + * @param formDTO + * @author zxc + * @date 2022/3/18 19:23 + */ + PageData getCollectList(CollectListFormDTO formDTO); + } \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectServiceImpl.java index 57164e50c4..eb737b7a2e 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectServiceImpl.java @@ -2,23 +2,32 @@ package com.epmet.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.EpmetException; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.redis.common.CustomerStaffRedis; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.dao.IcResiCollectDao; import com.epmet.dao.IcResiMemberDao; import com.epmet.dto.IcNeighborHoodDTO; +import com.epmet.dto.form.CollectListFormDTO; import com.epmet.dto.form.IcResiCollectFormDTO; +import com.epmet.dto.result.CollectListResultDTO; import com.epmet.entity.IcResiCollectEntity; import com.epmet.entity.IcResiMemberEntity; import com.epmet.feign.GovOrgOpenFeignClient; import com.epmet.service.IcResiCollectService; import org.apache.commons.collections4.MapUtils; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.function.Function; @@ -67,6 +76,34 @@ public class IcResiCollectServiceImpl extends BaseServiceImpl getCollectList(CollectListFormDTO formDTO) { + PageData result = new PageData<>(new ArrayList<>(), 0); + if (StringUtils.isBlank(formDTO.getOrgId()) && + StringUtils.isBlank(formDTO.getNeighborHoodId()) && + StringUtils.isBlank(formDTO.getBuildingId()) && + StringUtils.isBlank(formDTO.getHouseId()) && + StringUtils.isBlank(formDTO.getAddress()) && + StringUtils.isBlank(formDTO.getStartDate()) && + StringUtils.isBlank(formDTO.getEndDate()) ){ + CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getUserId()); + if (null == staffInfo){ + throw new EpmetException("查询人员信息失败"+formDTO.getUserId()); + } + formDTO.setOrgId(staffInfo.getAgencyId()); + } + PageInfo pageList = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.getCollectList(formDTO)); + result.setList(pageList.getList()); + result.setTotal(Integer.valueOf(String.valueOf(pageList.getTotal()))); + return result; + } + private IcNeighborHoodDTO queryIcNeighborHood(String villageId) { Result res = govOrgOpenFeignClient.getIcNeighbordhoodById(villageId); diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiCollectDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiCollectDao.xml index f2b808c911..bcd18d49c6 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiCollectDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiCollectDao.xml @@ -9,6 +9,59 @@ and c.DEL_FLAG='0' + + + + + + + + + + + + UPDATE ic_resi_collect SET UPDATED_TIME = NOW(), From 362d3cbb2a8482344e9bf695eff8e449ceb96667 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 18 Mar 2022 20:26:16 +0800 Subject: [PATCH 9/9] d --- .../src/main/resources/mapper/IcResiCollectDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiCollectDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiCollectDao.xml index f2b808c911..1a22ff5b07 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiCollectDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiCollectDao.xml @@ -13,7 +13,7 @@ UPDATE ic_resi_collect SET UPDATED_TIME = NOW(), HOUSE_TYPE = #{houseType}, - HOUSE_HOLER_NAME = #{houseHolderName}, + HOUSE_HOLDER_NAME = #{houseHolderName}, TOTAL_RESI = #{totalResi} WHERE id = #{id}