From c65eb4ee87824a570627758e0173e539a63ded27 Mon Sep 17 00:00:00 2001 From: Jackwang Date: Thu, 9 Jun 2022 17:36:55 +0800 Subject: [PATCH 01/16] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=AB=AF-=E6=88=91?= =?UTF-8?q?=E7=9A=84=E5=AE=B6=E5=BA=AD=E7=9B=B8=E5=85=B3=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/form/HouseInfoFormDTO.java | 19 ++++ .../epmet/dto/result/HouseInfoResultDTO.java | 105 ++++++++++++++++++ .../com/epmet/controller/HouseController.java | 15 +++ .../main/java/com/epmet/dao/IcHouseDao.java | 9 ++ .../java/com/epmet/service/HouseService.java | 10 ++ .../epmet/service/impl/HouseServiceImpl.java | 25 +++++ .../src/main/resources/mapper/IcHouseDao.xml | 21 ++++ 7 files changed, 204 insertions(+) create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/HouseInfoFormDTO.java create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HouseInfoResultDTO.java diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/HouseInfoFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/HouseInfoFormDTO.java new file mode 100644 index 0000000000..e1dd0ea53d --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/HouseInfoFormDTO.java @@ -0,0 +1,19 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + * @program: epmet-cloud + * @description: + * @author: wangtong + * @create: 2022-06-09 15:12 + **/ +@Data +public class HouseInfoFormDTO implements Serializable { + + @NotNull(message = "房屋编码不可为空") + private String houseCode; +} diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HouseInfoResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HouseInfoResultDTO.java new file mode 100644 index 0000000000..2275b09a78 --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HouseInfoResultDTO.java @@ -0,0 +1,105 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @program: epmet-cloud + * @description: + * @author: wangtong + * @create: 2022-06-09 15:22 + **/ +@Data +public class HouseInfoResultDTO implements Serializable { + + private String houseId; + + private String houseName; + + private String houseCode; + + private String houseQrcodeUrl; + + private String customerId; + + /** + * 所属行政组织 + */ + private String agencyId; + private String agencyName; + + /** + * eg：市北区-阜新路街道-南宁社区 + */ + private String agencyPathName; + /** + * 组织的area_code + */ + private String areaCode; + + /** + * 所属网格 + */ + private String gridName; + private String gridId; + + /** + * 所属小区 + */ + private String neighborHoodId; + private String neighborHoodName; + + /** + * 所属楼栋 + */ + private String buildingId; + private String buildingName; + + /** + * 所属单元id + */ + private String buildingUnitId; + private String unitName; + + /** + * 门牌号 + */ + private String doorName; + + /** + * 房屋类型，这里存储字典value就可以 + */ + private String houseType; + private String houseTypeName; + /** + * 存储字典value + */ + private String purpose; + private String purposeName; + /** + * 1出租；0未出租 + */ + private Integer rentFlag; + private String rentName; + + /** + * 房主姓名 + */ + private String ownerName; + + /** + * 房主电话 + */ + private String ownerPhone; + + /** + * 房主身份证号 + */ + private String ownerIdCard; + + /** + * 备注 + */ + private String remark; +} diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java index ebe0a4ae1e..a649016e97 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java @@ -551,6 +551,21 @@ public class HouseController implements ResultDataResolver { @PostMapping("createHouseQrcodeUrl") public String createHouseQrcodeUrl(@RequestBody TestFormDTO formDTO) throws Exception { return houseService.createHouseQrcodeUrl(formDTO.getHouseId(),null); + } + + /** + * @describe: 工作端-通过房屋编码获取房屋信息 + * @author wangtong + * @date 2022/6/9 14:48 + * @params [tokenDto] + * @return com.epmet.commons.tools.utils.Result + */ + @PostMapping("getHomeInfoByHouseCode") + public Result getHomeInfoByHouseCode(@RequestBody HouseInfoFormDTO dto) { + //效验数据 + ValidatorUtils.validateEntity(dto); + return houseService.getHomeInfoByHouseCode(dto); } + } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java index f1636d2f91..24852bfa47 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java @@ -138,4 +138,13 @@ public interface IcHouseDao extends BaseDao { * @return com.epmet.dto.result.IcHouseQrcodeConfigDTO */ CustomerOrgParameterEntity selectByCustomerId(@Param("customerId") String customerId, @Param("preKey") String preKey); + + /** + * @describe: 工作端-通过房屋编码获取房屋信息 + * @author wangtong + * @date 2022/6/9 15:23 + * @params [houseCode] + * @return com.epmet.dto.result.HouseInfoResultDTO + */ + HouseInfoResultDTO selectHomeInfoByHouseCode(@Param("houseCode") String houseCode); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/HouseService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/HouseService.java index 6316690b89..04c0fc819c 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/HouseService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/HouseService.java @@ -163,4 +163,14 @@ public interface HouseService { * @return com.epmet.commons.tools.utils.Result */ Result createBatchHouseCodeAndUrl(String customerId); + + + /** + * @describe: 通过房屋编码获取房屋信息 + * @author wangtong + * @date 2022/6/9 14:51 + * @params [tokenDto] + * @return com.epmet.commons.tools.utils.Result + */ + Result getHomeInfoByHouseCode(HouseInfoFormDTO dto); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java index 1bacf11513..adc259d0bb 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java @@ -55,6 +55,7 @@ import org.apache.commons.fileupload.FileItem; import org.apache.commons.fileupload.disk.DiskFileItemFactory; import org.apache.commons.lang3.StringUtils; import org.apache.http.entity.ContentType; +import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -1035,4 +1036,28 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver { return buffer.toString(); } + @Override + public Result getHomeInfoByHouseCode(HouseInfoFormDTO dto) { + HouseInfoResultDTO house = icHouseDao.selectHomeInfoByHouseCode(dto.getHouseCode()); + + HouseInfoCache cache = CustomerIcHouseRedis.getHouseInfo(house.getCustomerId(), house.getHouseId()); + BeanUtils.copyProperties(cache,house); + + if (null != house && StringUtils.isNotBlank(house.getAgencyId())) { + AgencyInfoCache agencyInfoCache = CustomerOrgRedis.getAgencyInfo(house.getAgencyId()); + house.setAgencyPathName(StringUtils.isNotBlank(agencyInfoCache.getAllParentName()) ? agencyInfoCache.getAllParentName().concat(StrConstant.HYPHEN).concat(agencyInfoCache.getOrganizationName()) : agencyInfoCache.getOrganizationName()); + house.setAreaCode(StringUtils.isNotBlank(agencyInfoCache.getAreaCode()) ? agencyInfoCache.getAreaCode() : StrConstant.EPMETY_STR); + house.setAgencyName(StringUtils.isNotBlank(agencyInfoCache.getOrganizationName()) ? agencyInfoCache.getOrganizationName() : StrConstant.EPMETY_STR); + } else { + house.setAgencyPathName(StrConstant.EPMETY_STR); + house.setAgencyName(StrConstant.EPMETY_STR); + } + + house.setHouseTypeName(HouseTypeEnums.getTypeValue(house.getHouseType())); + house.setRentName(HouseRentFlagEnums.getTypeValue(house.getRentFlag())); + house.setPurposeName(HousePurposeEnums.getTypeValue(house.getPurpose())); + return new Result().ok(house); + } + + } diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml index 4fdd9a67ca..a7608a632a 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml @@ -421,5 +421,26 @@ and PARAMETER_KEY=#{preKey} and DEL_FLAG='0' + From d519a2b3400af046a4e4bffbb94ec28e3c1d93f3 Mon Sep 17 00:00:00 2001 From: HAHA Date: Fri, 10 Jun 2022 11:10:26 +0800 Subject: [PATCH 02/16] =?UTF-8?q?=E3=80=90=E6=88=91=E7=9A=84=E5=AE=B6?= =?UTF-8?q?=E5=BA=AD=E3=80=91=E8=BF=81=E5=87=BA=E5=AE=B6=E5=BA=AD=E6=88=90?= =?UTF-8?q?=E5=91=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dto/form/MoveOutMemberFormDTO.java | 136 ++++++++++++++++++ .../epmet/controller/MyHomeController.java | 56 +++++--- .../com/epmet/dao/IcResiUserConfirmDao.java | 38 ++++- .../java/com/epmet/dao/IcResiUserDao.java | 43 ++++-- .../service/IcResiUserConfirmService.java | 59 ++++---- .../impl/IcResiUserConfirmServiceImpl.java | 24 ++++ .../resources/mapper/IcResiUserConfirmDao.xml | 20 +++ .../main/resources/mapper/IcResiUserDao.xml | 21 +++ 8 files changed, 335 insertions(+), 62 deletions(-) create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/MoveOutMemberFormDTO.java diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/MoveOutMemberFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/MoveOutMemberFormDTO.java new file mode 100644 index 0000000000..18bc3cc7c8 --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/MoveOutMemberFormDTO.java @@ -0,0 +1,136 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import java.io.Serializable; + +@Data +public class MoveOutMemberFormDTO implements Serializable { + + private static final long serialVersionUID = 7059338517023959372L; + + /** + * 客户id + */ + private String customerId; + + /** + * 居民信息ID + */ + private String icResiUserId; + + /** + * 居民所在网格ID + */ + private String gridId; + + /** + * 迁出到网格名 迁出类型为in时必填 + */ + private String gridName; + + /** + * 迁出到小区名 迁出类型为in时必填 + */ + private String villageName; + + /** + * 迁出到楼栋名 迁出类型为in时必填 + */ + private String buildName; + + /** + * 迁出到单元名 迁出类型为in时必填 + */ + private String unitName; + + /** + * 迁出到房屋名 迁出类型为in时必填 + */ + private String homeName; + + /** + * 外迁详细地址 迁出类型为out时必填 + */ + private String xxdz; + + /** + * 迁出类型 迁出客户外out 迁出客户内in + */ + private String submitType; + + /** + * 迁出原因 + */ + private String deleteReason; + + /** + * 组织id + */ + private String agencyId; + + /** + * 组织的pids + */ + private String pids; + + /** + * 房屋ID + */ + private String houseId; + + /** + * 名字 + */ + private String allName; + + /** + * 姓 + */ + private String surname; + + /** + * 名 + */ + private String name; + + /** + * 手机号 + */ + private String mobile; + + /** + * 性别 + */ + private String gender; + + /** + * 身份证号 + */ + private String idCard; + + /** + * 出生日期 + */ + private String birthday; + + /** + * 户籍所在地 + */ + private String hjszd; + + /** + * 现居住地 + */ + private String xjzd; + + /** + * 民族 + */ + private String mz; + + /** + * 与户主关系 + */ + private String yhzgx; +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/MyHomeController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/MyHomeController.java index 4b28ce6ac2..fc5e8a86e3 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/MyHomeController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/MyHomeController.java @@ -11,6 +11,7 @@ import com.epmet.commons.tools.validator.group.DefaultGroup; import com.epmet.dto.IcResiUserConfirmDTO; import com.epmet.dto.form.IcResiUserConfirmGetDTO; import com.epmet.dto.form.IcResiUserConfirmSubmitDTO; +import com.epmet.dto.form.MoveOutMemberFormDTO; import com.epmet.dto.form.RegisterAndBindFormDTO; import com.epmet.dto.result.HomeInfoResultDTO; import com.epmet.dto.result.HomeUserBriefResultDTO; @@ -80,15 +81,16 @@ public class MyHomeController { // return icResiUserConfirmService.editMember(dto); // } // + /** - * @describe: 删除家庭成员 - * @author wangtong - * @date 2022/6/1 16:10 - * @params [dto] - * @return com.epmet.commons.tools.utils.Result - */ + * @return com.epmet.commons.tools.utils.Result + * @describe: 删除家庭成员 + * @author wangtong + * @date 2022/6/1 16:10 + * @params [dto] + */ @PostMapping("delMember") - public Result delMember(@RequestBody IcResiUserConfirmSubmitDTO dto){ + public Result delMember(@RequestBody IcResiUserConfirmSubmitDTO dto) { //效验数据 ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); dto.setSubmitType(HomeMemberOperationEnum.DELETE.getCode()); @@ -96,44 +98,43 @@ public class MyHomeController { } /** + * @return com.epmet.commons.tools.utils.Result * @describe: 新增家庭成员 * @author wangtong * @date 2022/6/1 15:50 * @params [dto] - * @return com.epmet.commons.tools.utils.Result */ @PostMapping("addMember") - public Result addMember(@RequestBody IcResiUserConfirmSubmitDTO dto){ + public Result addMember(@RequestBody IcResiUserConfirmSubmitDTO dto) { //效验数据 ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); return icResiUserService.addMember(dto); } /** + * @return com.epmet.commons.tools.utils.Result * @describe: 修改家庭成员 * @author wangtong * @date 2022/6/1 15:27 * @params [dto] - * @return com.epmet.commons.tools.utils.Result */ @PostMapping("editMember") - public Result editMember(@RequestBody IcResiUserConfirmSubmitDTO dto){ + public Result editMember(@RequestBody IcResiUserConfirmSubmitDTO dto) { //效验数据 ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); return icResiUserService.editMember(dto); } - /** - * @describe: 查询家庭成员信息 - * @author wangtong - * @date 2022/6/1 16:14 - * @params [dto] - * @return com.epmet.commons.tools.utils.Result - */ + * @return com.epmet.commons.tools.utils.Result + * @describe: 查询家庭成员信息 + * @author wangtong + * @date 2022/6/1 16:14 + * @params [dto] + */ @PostMapping("getMemberDetail") - public Result getMemberDetail(@RequestBody IcResiUserConfirmGetDTO dto){ + public Result getMemberDetail(@RequestBody IcResiUserConfirmGetDTO dto) { //效验数据 ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); return icResiUserConfirmService.getMemberDetail(dto); @@ -161,4 +162,21 @@ public class MyHomeController { HomeInfoResultDTO result = myHomeService.getHomeInfo(tokenDto); return new Result().ok(result); } + + /** + * 【我的家庭】迁出家庭成员 + * + * @param form + * @param tokenDto + * @return com.epmet.commons.tools.utils.Result + * @author LZN + * @date 2022/6/10 11:06 + */ + @PostMapping("/moveOutMember") + public Result moveOutMember(@RequestBody MoveOutMemberFormDTO form, @LoginUser TokenDto tokenDto) { + form.setCustomerId(tokenDto.getCustomerId()); + icResiUserConfirmService.moveOutMember(form); + return new Result(); + } + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserConfirmDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserConfirmDao.java index beb7ae9d77..03704abd4b 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserConfirmDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserConfirmDao.java @@ -15,11 +15,37 @@ import org.apache.ibatis.annotations.Param; public interface IcResiUserConfirmDao extends BaseDao { /** - * @describe: 根据icResiUserId查询 - * @author wangtong - * @date 2022/6/1 16:01 - * @params [icResiUserId] - * @return com.epmet.entity.IcResiUserConfirmEntity - */ + * @return com.epmet.entity.IcResiUserConfirmEntity + * @describe: 根据icResiUserId查询 + * @author wangtong + * @date 2022/6/1 16:01 + * @params [icResiUserId] + */ IcResiUserConfirmEntity selectByIcResiUserId(@Param("icResiUserId") String icResiUserId); + + /** + * 【我的家庭】迁出家庭成员 根据身份证号查询是否已提交 + * + * @param idCard + * @param customerId + * @param submitType + * @return int + * @author LZN + * @date 2022/6/10 11:04 + */ + int selectByIdCard(@Param("idCard") String idCard, @Param("customerId") String customerId, + @Param("submitType") String submitType); + + /** + * 【我的家庭】迁出家庭成员 先删后添 + * + * @param idCard + * @param customerId + * @param submitType + * @return void + * @author LZN + * @date 2022/6/10 11:04 + */ + void deleteByIdCard(@Param("idCard") String idCard, @Param("customerId") String customerId, + @Param("submitType") String submitType); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java index 73a3f48cdb..446491eb5e 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java @@ -23,6 +23,7 @@ import com.epmet.dto.IcResiUserConfirmDTO; import com.epmet.dto.IcResiUserDTO; import com.epmet.dto.IcVolunteerPolyDTO; import com.epmet.dto.form.EpidemicPreventionFormDTO; +import com.epmet.dto.form.MoveOutMemberFormDTO; import com.epmet.dto.form.RentTenantDataFormDTO; import com.epmet.dto.form.ResiUserQueryValueDTO; import com.epmet.dto.result.*; @@ -66,7 +67,7 @@ public interface IcResiUserDao extends BaseDao { @Param("staffOrgPath") String staffOrgPath, @Param("resultTableName") String resultTableName, @Param("keyword") String keyword, - @Param("groupByTables")Set groupByTables); + @Param("groupByTables") Set groupByTables); /** * 查询主表 @@ -132,10 +133,10 @@ public interface IcResiUserDao extends BaseDao { */ List searchByName(@Param("name") String name, @Param("columnName") String columnName, - @Param("level")String level, - @Param("id")String id, + @Param("level") String level, + @Param("id") String id, @Param("agencyId") String agencyId, - @Param("pageNo") Integer pageNo,@Param("customerId") String customerId); + @Param("pageNo") Integer pageNo, @Param("customerId") String customerId); Set selectUserDemandCode(String icResiUserId); @@ -163,11 +164,12 @@ public interface IcResiUserDao extends BaseDao { /** * desc:根据身份证号获取居民信息 + * * @param idCard * @param customerId * @return */ - IcResiUserDTO getResiUserByIdCard(@Param("idCard") String idCard,@Param("customerId") String customerId); + IcResiUserDTO getResiUserByIdCard(@Param("idCard") String idCard, @Param("customerId") String customerId); /** * @param agencyId @@ -274,7 +276,8 @@ public interface IcResiUserDao extends BaseDao { */ Map getDataAnalyseCount(@Param("customerId") String customerId, @Param("tableName") String tableName, @Param("columnList") List columnList, @Param("id") String id, @Param("level") String level); - List> getIcUserList(@Param("customerId") String customerId, @Param("columns")List columns); + + List> getIcUserList(@Param("customerId") String customerId, @Param("columns") List columns); /** * Desc: 根据房屋IDs查询房屋下是否有存在居民的 @@ -305,6 +308,7 @@ public interface IcResiUserDao extends BaseDao { /** * desc:根据维度获取居民信息表的数据[正常状态的居民] + * * @param formDTO * @return */ @@ -319,10 +323,11 @@ public interface IcResiUserDao extends BaseDao { */ List listUserIds(@Param("customerId") String customerId, @Param("gridId") String gridId); - List getAllUserIds(@Param("idCard") String idCard, @Param("customerId")String customerId); + List getAllUserIds(@Param("idCard") String idCard, @Param("customerId") String customerId); /** * 获取客户下志愿者信息 + * * @Param customerId * @Return {@link List< IcVolunteerPolyDTO>} * @Author zhaoqifeng @@ -331,11 +336,23 @@ public interface IcResiUserDao extends BaseDao { List getVolunteerList(@Param("customerId") String customerId, @Param("userId") String userId); /** - * @describe: 查询家庭成员信息 - * @author wangtong - * @date 2022/6/1 16:16 - * @params [icResiUserId] - * @return com.epmet.dto.IcResiUserConfirmDTO - */ + * @return com.epmet.dto.IcResiUserConfirmDTO + * @describe: 查询家庭成员信息 + * @author wangtong + * @date 2022/6/1 16:16 + * @params [icResiUserId] + */ IcResiUserConfirmDTO selectMemberDetail(@Param("icResiUserId") String icResiUserId); + + /** + * 【我的家庭】迁出家庭成员 查询缺失字段 + * + * @param icResiUserId + * @param customerId + * @return com.epmet.dto.form.MoveOutMemberFormDTO + * @author LZN + * @date 2022/6/10 11:03 + */ + MoveOutMemberFormDTO moveOutMember(@Param("icResiUserId") String icResiUserId, + @Param("customerId") String customerId); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserConfirmService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserConfirmService.java index 692b12e514..202964eca1 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserConfirmService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserConfirmService.java @@ -6,6 +6,7 @@ import com.epmet.commons.tools.utils.Result; import com.epmet.dto.IcResiUserConfirmDTO; import com.epmet.dto.form.IcResiUserConfirmGetDTO; import com.epmet.dto.form.IcResiUserConfirmSubmitDTO; +import com.epmet.dto.form.MoveOutMemberFormDTO; import com.epmet.entity.IcResiUserConfirmEntity; import java.util.List; @@ -80,39 +81,39 @@ public interface IcResiUserConfirmService extends BaseService getMemberDetail(IcResiUserConfirmGetDTO dto); /** @@ -124,4 +125,14 @@ public interface IcResiUserConfirmService extends BaseService page(Map params) { IPage page = baseDao.selectPage( @@ -175,4 +179,24 @@ public class IcResiUserConfirmServiceImpl extends BaseServiceImpl 0) { + icResiUserConfirmDao.deleteByIdCard(form.getIdCard(), form.getCustomerId(), form.getSubmitType()); + } + IcResiUserConfirmEntity entity = ConvertUtils.sourceToTarget(form, IcResiUserConfirmEntity.class); + icResiUserConfirmDao.insert(entity); + } + } diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserConfirmDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserConfirmDao.xml index 4c46257dc1..30c3baca88 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserConfirmDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserConfirmDao.xml @@ -34,11 +34,31 @@ + + delete from ic_resi_user_confirm + where + id_card = #{idCard} + AND customer_id = #{customerId} + AND CONFIRM_RESULT = '0' + AND SUBMIT_TYPE = #{submitType} + + diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml index 39a54f02b2..270a25b3ff 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml @@ -1075,5 +1075,26 @@ where DEL_FLAG='0' and id=#{icResiUserId} + From 917a95a7b670c880636d75425f365357524910e0 Mon Sep 17 00:00:00 2001 From: Jackwang Date: Fri, 10 Jun 2022 13:55:46 +0800 Subject: [PATCH 03/16] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=AB=AF-=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E5=AE=B6=E5=BA=AD=E7=94=A8=E6=88=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dto/form/CommonHouseFormDTO.java | 17 +++++++ .../epmet/dto/result/HouseInfoResultDTO.java | 1 + .../epmet/feign/GovOrgOpenFeignClient.java | 11 +++++ .../GovOrgOpenFeignClientFallback.java | 6 +++ .../src/main/resources/mapper/IcHouseDao.xml | 3 +- .../dto/form/IcResiUserConfirmSubmitDTO.java | 2 + .../epmet/controller/MyHomeController.java | 14 ++++++ .../com/epmet/service/IcResiUserService.java | 9 ++++ .../service/impl/IcResiUserServiceImpl.java | 46 +++++++++++++++++++ 9 files changed, 108 insertions(+), 1 deletion(-) create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/CommonHouseFormDTO.java diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/CommonHouseFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/CommonHouseFormDTO.java new file mode 100644 index 0000000000..f56f003137 --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/CommonHouseFormDTO.java @@ -0,0 +1,17 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @program: epmet-cloud + * @description: + * @author: wangtong + * @create: 2022-06-10 13:26 + **/ +@Data +public class CommonHouseFormDTO implements Serializable { + + private String houseCode; +} diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HouseInfoResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HouseInfoResultDTO.java index 2275b09a78..e83ec67bf4 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HouseInfoResultDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HouseInfoResultDTO.java @@ -27,6 +27,7 @@ public class HouseInfoResultDTO implements Serializable { * 所属行政组织 */ private String agencyId; + private String agencyPids; private String agencyName; /** diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java index 30fd05cc68..cf4a5f184f 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java @@ -650,4 +650,15 @@ public interface GovOrgOpenFeignClient { */ @GetMapping("/gov/org/ichouse/getbyhousecode/{houseCode}") Result getByHouseCode(@PathVariable("houseCode") String houseCode); + + + /** + * @describe: 工作端-通过房屋编码获取房屋信息 + * @author wangtong + * @date 2022/6/10 13:27 + * @params [dto] + * @return com.epmet.commons.tools.utils.Result + */ + @PostMapping("/gov/org/house/getHomeInfoByHouseCode") + Result getHomeInfoByHouseCode(CommonHouseFormDTO dto); } diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java index 8f0cab1bb1..cbf4e635d7 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java @@ -420,4 +420,10 @@ public class GovOrgOpenFeignClientFallback implements GovOrgOpenFeignClient { public Result getByHouseCode(String houseCode) { return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getByHouseCode", houseCode); } + + @Override + public Result getHomeInfoByHouseCode(CommonHouseFormDTO dto) { + return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getHomeInfoByHouseCode", dto); + } + } diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml index a7608a632a..432aadf799 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml @@ -434,7 +434,8 @@ a.OWNER_NAME, a.OWNER_PHONE, a.OWNER_ID_CARD, - a.REMARK + a.REMARK, + c.AGENCY_PIDS from ic_house a LEFT JOIN ic_building b on a.BUILDING_ID = b.ID and b.DEL_FLAG = '0' LEFT JOIN ic_neighbor_hood c on a.NEIGHBOR_HOOD_ID = c.ID and c.DEL_FLAG = '0' diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcResiUserConfirmSubmitDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcResiUserConfirmSubmitDTO.java index 429852ff04..771733caab 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcResiUserConfirmSubmitDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcResiUserConfirmSubmitDTO.java @@ -207,4 +207,6 @@ public class IcResiUserConfirmSubmitDTO implements Serializable { */ private String operationDescribe; + private String houseCode; + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/MyHomeController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/MyHomeController.java index fc5e8a86e3..7757c2bf8d 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/MyHomeController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/MyHomeController.java @@ -111,6 +111,20 @@ public class MyHomeController { return icResiUserService.addMember(dto); } + /** + * @describe: 工作端-新增家庭成员 + * @author wangtong + * @date 2022/6/1 15:50 + * @params [dto] + * @return com.epmet.commons.tools.utils.Result + */ + @PostMapping("addWorkMember") + public Result addWorkMember(@RequestBody IcResiUserConfirmSubmitDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + return icResiUserService.addWorkMember(dto); + } + /** * @return com.epmet.commons.tools.utils.Result * @describe: 修改家庭成员 diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java index 4452769f21..7cb268a6c2 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java @@ -393,4 +393,13 @@ public interface IcResiUserService extends BaseService { * @return com.epmet.commons.tools.utils.Result */ Result editMember(IcResiUserConfirmSubmitDTO dto); + + /** + * @describe: 工作端-新增家庭成员 + * @author wangtong + * @date 2022/6/10 13:32 + * @params [dto] + * @return com.epmet.commons.tools.utils.Result + */ + Result addWorkMember(IcResiUserConfirmSubmitDTO dto); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java index 5319171d16..e440ef322c 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java @@ -2330,6 +2330,52 @@ public class IcResiUserServiceImpl extends BaseServiceImpl houseResult = govOrgOpenFeignClient.getHomeInfoByHouseCode(formDto); + if (!houseResult.success() || null == houseResult || null == houseResult.getData()) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "查询房屋信息失败", "查询房屋信息失败"); + } + HouseInfoResultDTO houseInfo = houseResult.getData(); + + IcResiUserDTO userDTO = baseDao.getResiUserByIdCard(dto.getIdCard(), houseInfo.getCustomerId()); + if (null != userDTO && null != userDTO.getIdCard()) { + String errorMsg = "新增居民信息失败，身份证号已存在!"; + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), errorMsg, errorMsg); + } + //这个房屋下已经设置了户主后，再次选择户主时提示提示“房屋下已存在户主” PS.户主指与户主关系是本人的用户 + if (RelationshipEnum.SELF.getCode().equals(dto.getYhzgx())) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(IcResiUserEntity::getHomeId, houseInfo.getHouseId()); + wrapper.eq(IcResiUserEntity::getYhzgx, RelationshipEnum.SELF.getCode()); + List entityList = baseDao.selectList(wrapper); + if (CollectionUtils.isNotEmpty(entityList)) { + String errorMsg = "房屋下已存在户主"; + throw new EpmetException(EpmetErrorCode.ORG_ADD_FAILED.getCode(), errorMsg, errorMsg); + } + } + + + dto.setCustomerId(houseInfo.getCustomerId()); + dto.setAgencyId(houseInfo.getAgencyId()); + dto.setPids(houseInfo.getAgencyPids()); + dto.setGridId(houseInfo.getGridId()); + dto.setVillageId(houseInfo.getNeighborHoodId()); + dto.setBuildId(houseInfo.getBuildingId()); + dto.setUnitId(houseInfo.getBuildingUnitId()); + dto.setHomeId(houseInfo.getHouseId()); + + IcResiUserEntity entity = ConvertUtils.sourceToTarget(dto, IcResiUserEntity.class); + insert(entity); + + return new Result().ok("新增成功"); + } + /** * desc:根据字段值获取 options * @param customerId From 7bd5d2bb4f6941127d646b73e737a61c4f84186e Mon Sep 17 00:00:00 2001 From: YUJT Date: Mon, 13 Jun 2022 14:37:22 +0800 Subject: [PATCH 04/16] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=97=A0=E6=95=88?= =?UTF-8?q?=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/result/IcEventMonthlyCountResultDTO.java | 2 -- .../controller/IcPartyMemberPointController.java | 12 ------------ .../service/impl/IcPartyMemberPointServiceImpl.java | 1 - 3 files changed, 15 deletions(-) diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/IcEventMonthlyCountResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/IcEventMonthlyCountResultDTO.java index 724a39a79b..bf1a15c05d 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/IcEventMonthlyCountResultDTO.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/IcEventMonthlyCountResultDTO.java @@ -1,9 +1,7 @@ package com.epmet.dto.result; -import jdk.nashorn.internal.ir.debug.PrintVisitor; import lombok.Data; -import java.util.Date; @Data public class IcEventMonthlyCountResultDTO { diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartyMemberPointController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartyMemberPointController.java index 07af853ce1..5d32013fbb 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartyMemberPointController.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartyMemberPointController.java @@ -12,7 +12,6 @@ import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.ConvertUtils; -import com.epmet.commons.tools.utils.DateUtils; import com.epmet.commons.tools.utils.ExcelUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.utils.poi.excel.handler.FreezeAndFilter; @@ -21,23 +20,13 @@ import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.commons.tools.validator.group.AddGroup; import com.epmet.commons.tools.validator.group.DefaultGroup; import com.epmet.commons.tools.validator.group.UpdateGroup; -import com.epmet.dto.IcFollowUpRecordDTO; -import com.epmet.dto.result.IcMoveInListResultDTO; -import com.epmet.dto.result.IcVaccineListResultDTO; -import com.epmet.modules.partymember.entity.IcPartyMemberPointEntity; -import com.epmet.modules.partymember.excel.IcPartyMemberExcel; import com.epmet.modules.partymember.excel.IcPartyMemberPointExcel; import com.epmet.modules.partymember.service.IcPartyMemberPointService; import com.epmet.resi.partymember.dto.partymember.IcPartyMemberPointDTO; -import com.epmet.resi.partymember.dto.partymember.PartyMemberPointListCountDTO; -import com.epmet.resi.partymember.dto.partymember.form.PartyMemberExportFormDTO; import com.epmet.resi.partymember.dto.partymember.form.PartyMemberPointEchoFormDTO; import com.epmet.resi.partymember.dto.partymember.form.PartyMemberPointListFormDTO; -import com.epmet.resi.partymember.dto.partymember.result.IcPartyMemberResultDTO; import com.epmet.resi.partymember.dto.partymember.result.PartyMemberPointEchoResultDTO; -import com.epmet.resi.partymember.dto.partymember.result.PartyMemberPointExportResultDTO; import com.epmet.resi.partymember.dto.partymember.result.PartyMemberPointListResultDTO; -import jdk.nashorn.internal.parser.Token; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -45,7 +34,6 @@ import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; import java.io.PrintWriter; -import java.util.Date; import java.util.List; import java.util.Map; import java.util.concurrent.atomic.AtomicInteger; diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberPointServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberPointServiceImpl.java index b5e7471213..cc644274f7 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberPointServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberPointServiceImpl.java @@ -24,7 +24,6 @@ import com.epmet.resi.partymember.dto.partymember.result.PartyMemberPointExportR import com.epmet.resi.partymember.dto.partymember.result.PartyMemberPointListResultDTO; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; -import jdk.nashorn.internal.parser.Token; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; From d5c8d9af52556fcbcf0fc060bbe158be34054a6d Mon Sep 17 00:00:00 2001 From: Jackwang Date: Mon, 13 Jun 2022 17:15:01 +0800 Subject: [PATCH 05/16] =?UTF-8?q?=E4=B8=8B=E8=BD=BDzip=E6=8C=89=E7=85=A7?= =?UTF-8?q?=E7=A4=BE=E5=8C=BA=E3=80=81=E5=B0=8F=E5=8C=BA=E3=80=81=E6=A5=BC?= =?UTF-8?q?=E6=A0=8B=E5=8C=BA=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dto/form/IcHouseListFormDTO.java | 5 ++ .../main/java/com/epmet/dao/IcHouseDao.java | 9 +++ .../epmet/service/impl/HouseServiceImpl.java | 26 ++++++--- .../src/main/resources/mapper/IcHouseDao.xml | 55 +++++++++++++++++++ 4 files changed, 86 insertions(+), 9 deletions(-) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcHouseListFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcHouseListFormDTO.java index 166511d55f..e170ac2e78 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcHouseListFormDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcHouseListFormDTO.java @@ -81,4 +81,9 @@ public class IcHouseListFormDTO extends PageFormDTO { private String remark; private String customerId; + + /** + * 楼栋ID + */ + private String unitId; } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java index 24852bfa47..bfaca05fd1 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java @@ -147,4 +147,13 @@ public interface IcHouseDao extends BaseDao { * @return com.epmet.dto.result.HouseInfoResultDTO */ HouseInfoResultDTO selectHomeInfoByHouseCode(@Param("houseCode") String houseCode); + + /** + * @describe: 根据天剑获取需要下载的一户一码信息 + * @author wangtong + * @date 2022/6/13 16:34 + * @params [formDTO] + * @return java.util.List + */ + List searchHouseZipList(IcHouseListFormDTO formDTO); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java index adc259d0bb..fa362f1c8b 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java @@ -27,6 +27,7 @@ import com.epmet.commons.tools.utils.FileUtils; import com.epmet.commons.tools.utils.HouseQRcodeUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.constant.CustomerGridConstant; +import com.epmet.constant.NeighborhoodConstant; import com.epmet.constants.ImportTaskConstants; import com.epmet.dao.*; import com.epmet.dto.*; @@ -807,15 +808,22 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver { @Override public void downloadZip(HttpServletResponse response, IcHouseListFormDTO formDTO) throws Exception { - // 查询pids - String pids = null; - if (StringUtils.isNotBlank(formDTO.getAgencyId())) { - pids = getPids(formDTO.getAgencyId()); + if(NeighborhoodConstant.GRID.equals(formDTO.getLevel())){ + //根据网格过滤 + formDTO.setGridId(formDTO.getId()); + }else if(StringUtils.isNotBlank(formDTO.getId())){ + //根据组织过滤 + formDTO.setAgencyId(formDTO.getId()); } - if (StringUtils.isNotBlank(formDTO.getLevel()) && OrgTypeEnum.AGENCY.getCode().equals(formDTO.getLevel())) { - pids = getPids(formDTO.getAgencyId()); - } - formDTO.setPids(pids); + // 查询pids +// String pids = null; +// if (StringUtils.isNotBlank(formDTO.getAgencyId())) { +// pids = getPids(formDTO.getAgencyId()); +// } +// if (StringUtils.isNotBlank(formDTO.getLevel()) && OrgTypeEnum.AGENCY.getCode().equals(formDTO.getLevel())) { +// pids = getPids(formDTO.getAgencyId()); +// } +// formDTO.setPids(pids); //response response.reset(); @@ -829,7 +837,7 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver { response.setHeader("Content-Disposition", "attachment;filename=" + downloadFilename); ZipOutputStream zip = new ZipOutputStream(response.getOutputStream()); - List houseList = icHouseDao.searchHouseByPage(formDTO); + List houseList = icHouseDao.searchHouseZipList(formDTO); //获取一户一码前缀地址 CustomerOrgParameterEntity codePre = icHouseDao.selectByCustomerId(formDTO.getCustomerId(), HouseQrcodeEnum.PREFIX_KEY.getCode()); diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml index 432aadf799..2a4a2c7ee3 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml @@ -443,5 +443,60 @@ where a.HOUSE_CODE=#{houseCode} and a.del_flag = '0' + From d284393ed71102fc6685741becce09eeb2a643bd Mon Sep 17 00:00:00 2001 From: Jackwang Date: Mon, 13 Jun 2022 17:41:09 +0800 Subject: [PATCH 06/16] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AE=B6=E5=BA=AD?= =?UTF-8?q?=E6=88=90=E5=91=98=E6=B7=BB=E5=8A=A0=E6=9B=B4=E6=96=B0=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/dao/IcResiUserDao.java | 9 +++++++ .../service/impl/IcResiUserServiceImpl.java | 27 ++++++++++++++----- .../main/resources/mapper/IcResiUserDao.xml | 8 +++++- 3 files changed, 37 insertions(+), 7 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java index 446491eb5e..79b2b57f0c 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java @@ -355,4 +355,13 @@ public interface IcResiUserDao extends BaseDao { */ MoveOutMemberFormDTO moveOutMember(@Param("icResiUserId") String icResiUserId, @Param("customerId") String customerId); + + /** + * @describe: 通过身份证号查询实体类 + * @author wangtong + * @date 2022/6/13 17:32 + * @params [idCard, customerId] + * @return com.epmet.entity.IcResiUserEntity + */ + IcResiUserEntity selectResiUserEntityByIdCard(@Param("idCard") String idCard,@Param("customerId") String customerId); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java index e440ef322c..dc2a41e96b 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java @@ -2343,11 +2343,6 @@ public class IcResiUserServiceImpl extends BaseServiceImpl wrapper = new LambdaQueryWrapper<>(); @@ -2360,7 +2355,6 @@ public class IcResiUserServiceImpl extends BaseServiceImpl - + From bbce407053999ce00dbe8d6e80d7a2f7dae13d8f Mon Sep 17 00:00:00 2001 From: Jackwang Date: Mon, 13 Jun 2022 17:50:24 +0800 Subject: [PATCH 07/16] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8F=8F=E8=BF=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java index bfaca05fd1..1bca972c74 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java @@ -149,7 +149,7 @@ public interface IcHouseDao extends BaseDao { HouseInfoResultDTO selectHomeInfoByHouseCode(@Param("houseCode") String houseCode); /** - * @describe: 根据天剑获取需要下载的一户一码信息 + * @describe: 根据筛选获取需要下载的一户一码信息 * @author wangtong * @date 2022/6/13 16:34 * @params [formDTO] From c5d5fde7b1ccfb270d0fbbae85dc57ff731b0e41 Mon Sep 17 00:00:00 2001 From: Jackwang Date: Tue, 14 Jun 2022 09:32:19 +0800 Subject: [PATCH 08/16] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AE=B6=E5=BA=AD?= =?UTF-8?q?=E6=88=90=E5=91=98=E6=B7=BB=E5=8A=A0=E6=9B=B4=E6=96=B0=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/service/impl/IcResiUserServiceImpl.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java index dc2a41e96b..dc6a209be3 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java @@ -2378,6 +2378,15 @@ public class IcResiUserServiceImpl extends BaseServiceImpl Date: Tue, 14 Jun 2022 13:30:00 +0800 Subject: [PATCH 09/16] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AE=B6=E5=BA=AD?= =?UTF-8?q?=E6=88=90=E5=91=98=E6=B7=BB=E5=8A=A0=E6=9B=B4=E6=96=B0=E4=BF=A1?= =?UTF-8?q?=E6=81=AF-=E6=B7=BB=E5=8A=A0=E8=B0=83=E5=8A=A8=E8=AE=B0?= =?UTF-8?q?=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/form/IcResiUserConfirmSubmitDTO.java | 2 ++ .../epmet/controller/MyHomeController.java | 4 ++- .../service/impl/IcResiUserServiceImpl.java | 35 ++++++++++++++----- 3 files changed, 31 insertions(+), 10 deletions(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcResiUserConfirmSubmitDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcResiUserConfirmSubmitDTO.java index 771733caab..ea119fbd80 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcResiUserConfirmSubmitDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcResiUserConfirmSubmitDTO.java @@ -27,6 +27,8 @@ public class IcResiUserConfirmSubmitDTO implements Serializable { */ private String customerId; + private String staffId; + /** * 组织Id */ diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/MyHomeController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/MyHomeController.java index 7757c2bf8d..0e595cc96f 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/MyHomeController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/MyHomeController.java @@ -119,9 +119,11 @@ public class MyHomeController { * @return com.epmet.commons.tools.utils.Result */ @PostMapping("addWorkMember") - public Result addWorkMember(@RequestBody IcResiUserConfirmSubmitDTO dto){ + public Result addWorkMember(@LoginUser TokenDto tokenDto,@RequestBody IcResiUserConfirmSubmitDTO dto){ //效验数据 ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + dto.setCustomerId(tokenDto.getCustomerId()); + dto.setStaffId(tokenDto.getUserId()); return icResiUserService.addWorkMember(dto); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java index dc6a209be3..b8eadddcd3 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java @@ -2366,7 +2366,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl Date: Tue, 14 Jun 2022 13:51:21 +0800 Subject: [PATCH 10/16] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AE=B6=E5=BA=AD?= =?UTF-8?q?=E6=88=90=E5=91=98=E6=B7=BB=E5=8A=A0=E6=9B=B4=E6=96=B0=E4=BF=A1?= =?UTF-8?q?=E6=81=AF-=E6=B7=BB=E5=8A=A0=E8=B0=83=E5=8A=A8=E8=AE=B0?= =?UTF-8?q?=E5=BD=95-=E8=A1=A5=E5=85=85=E5=AE=A2=E6=88=B7id=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/service/impl/IcResiUserServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java index b8eadddcd3..fe9e4b17eb 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java @@ -2400,6 +2400,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl Date: Tue, 14 Jun 2022 14:12:21 +0800 Subject: [PATCH 11/16] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AE=B6=E5=BA=AD?= =?UTF-8?q?=E6=88=90=E5=91=98=E6=B7=BB=E5=8A=A0=E6=9B=B4=E6=96=B0=E4=BF=A1?= =?UTF-8?q?=E6=81=AF-=E6=B7=BB=E5=8A=A0=E8=B0=83=E5=8A=A8=E8=AE=B0?= =?UTF-8?q?=E5=BD=95-=E8=A1=A5=E5=85=85staffId=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/service/impl/IcResiUserServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java index fe9e4b17eb..2b7ff14091 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java @@ -2401,6 +2401,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl Date: Tue, 14 Jun 2022 14:25:02 +0800 Subject: [PATCH 12/16] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AE=B6=E5=BA=AD?= =?UTF-8?q?=E6=88=90=E5=91=98=E6=B7=BB=E5=8A=A0=E6=9B=B4=E6=96=B0=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/IcResiUserServiceImpl.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java index 2b7ff14091..0ad7275af4 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java @@ -2379,14 +2379,14 @@ public class IcResiUserServiceImpl extends BaseServiceImpl Date: Tue, 14 Jun 2022 16:56:12 +0800 Subject: [PATCH 13/16] =?UTF-8?q?=E7=94=B3=E8=AF=B7=E7=A7=AF=E5=88=86?= =?UTF-8?q?=EF=BC=8C=E6=80=BB=E5=88=86=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../redis/common/bean/ResiUserInfoCache.java | 99 ++++++++++ .../com/epmet/dto/PointAditiveCalcDTO.java | 79 ++++++++ .../com/epmet/dto/PointAditiveRecordDTO.java | 95 ++++++++++ .../java/com/epmet/dto/PointAnnexDTO.java | 80 ++++++++ .../java/com/epmet/dto/PointApplyDTO.java | 174 ++++++++++++++++++ .../com/epmet/dto/form/PointApplyFormDTO.java | 32 ++++ .../dto/result/MyTotalPointResultDTO.java | 37 ++++ .../java/com/epmet/common/CommonConstant.java | 48 +++++ .../com/epmet/common/enu/ApplyStatusEnum.java | 49 +++++ .../controller/PointApplyController.java | 84 +++++++++ .../epmet/controller/ResiPointController.java | 5 + .../com/epmet/dao/PointAditiveCalcDao.java | 16 ++ .../com/epmet/dao/PointAditiveRecordDao.java | 16 ++ .../java/com/epmet/dao/PointAnnexDao.java | 16 ++ .../java/com/epmet/dao/PointApplyDao.java | 16 ++ .../epmet/entity/PointAditiveCalcEntity.java | 46 +++++ .../entity/PointAditiveRecordEntity.java | 61 ++++++ .../com/epmet/entity/PointAnnexEntity.java | 45 +++++ .../com/epmet/entity/PointApplyEntity.java | 144 +++++++++++++++ .../service/PointAditiveCalcService.java | 78 ++++++++ .../service/PointAditiveRecordService.java | 78 ++++++++ .../com/epmet/service/PointAnnexService.java | 78 ++++++++ .../com/epmet/service/PointApplyService.java | 88 +++++++++ .../epmet/service/UserPointTotalService.java | 12 ++ .../impl/PointAditiveCalcServiceImpl.java | 82 +++++++++ .../impl/PointAditiveRecordServiceImpl.java | 84 +++++++++ .../service/impl/PointAnnexServiceImpl.java | 83 +++++++++ .../service/impl/PointApplyServiceImpl.java | 153 +++++++++++++++ .../impl/UserPointTotalServiceImpl.java | 77 +++++++- .../resources/mapper/PointAditiveCalcDao.xml | 22 +++ .../mapper/PointAditiveRecordDao.xml | 25 +++ .../main/resources/mapper/PointAnnexDao.xml | 21 +++ .../main/resources/mapper/PointApplyDao.xml | 41 +++++ .../epmet/dto/result/HomeInfoResultDTO.java | 1 + .../epmet/feign/EpmetUserOpenFeignClient.java | 3 + .../EpmetUserOpenFeignClientFallback.java | 5 + .../epmet/service/impl/MyHomeServiceImpl.java | 1 + 37 files changed, 2071 insertions(+), 3 deletions(-) create mode 100644 epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/bean/ResiUserInfoCache.java create mode 100644 epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/PointAditiveCalcDTO.java create mode 100644 epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/PointAditiveRecordDTO.java create mode 100644 epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/PointAnnexDTO.java create mode 100644 epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/PointApplyDTO.java create mode 100644 epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/PointApplyFormDTO.java create mode 100644 epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/MyTotalPointResultDTO.java create mode 100644 epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/common/CommonConstant.java create mode 100644 epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/common/enu/ApplyStatusEnum.java create mode 100644 epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/PointApplyController.java create mode 100644 epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/PointAditiveCalcDao.java create mode 100644 epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/PointAditiveRecordDao.java create mode 100644 epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/PointAnnexDao.java create mode 100644 epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/PointApplyDao.java create mode 100644 epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/entity/PointAditiveCalcEntity.java create mode 100644 epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/entity/PointAditiveRecordEntity.java create mode 100644 epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/entity/PointAnnexEntity.java create mode 100644 epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/entity/PointApplyEntity.java create mode 100644 epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/PointAditiveCalcService.java create mode 100644 epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/PointAditiveRecordService.java create mode 100644 epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/PointAnnexService.java create mode 100644 epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/PointApplyService.java create mode 100644 epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAditiveCalcServiceImpl.java create mode 100644 epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAditiveRecordServiceImpl.java create mode 100644 epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAnnexServiceImpl.java create mode 100644 epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointApplyServiceImpl.java create mode 100644 epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointAditiveCalcDao.xml create mode 100644 epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointAditiveRecordDao.xml create mode 100644 epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointAnnexDao.xml create mode 100644 epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointApplyDao.xml diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/bean/ResiUserInfoCache.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/bean/ResiUserInfoCache.java new file mode 100644 index 0000000000..6cba629aca --- /dev/null +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/bean/ResiUserInfoCache.java @@ -0,0 +1,99 @@ +package com.epmet.commons.tools.redis.common.bean; + +import lombok.Data; + +import java.io.Serializable; + +/** + * 房屋信息缓存 + * @author Administrator + */ +@Data +public class ResiUserInfoCache implements Serializable { + private String id; + + /** + * 客户Id + * */ + private String customerId; + + /** + * 用户id + */ + private String userId; + + /** + * 手机号(注册手机号) + */ + private String mobile; + + /** + * 姓氏 + */ + private String surname; + + /** + * 名 + */ + private String name; + + /** + * 姓名 + */ + private String realName; + + /** + * 身份证号 + */ + private String idNum; + + /** + * 性别（1男2女0未知） + */ + private String gender; + + /** + * 街道 + */ + private String street; + + /** + * 小区名称 + */ + private String district; + + /** + * 楼栋单元 + */ + private String buildingAddress; + + /** + * 昵称(目前来源于微信昵称，后续系统可支持用户有昵称) + */ + private String nickname; + + /** + * 头像（目前来源于微信，后续系统顾客支持上传头像） + */ + private String headImgUrl; + + /** + * 网格Id + * */ + private String registeredGridId; + + /** + * xx机关-yy网格 + * */ + private String registeredGridName; + + /** + * 显示昵称 xx网格-y先生/女士 + * */ + private String showName; + + /** + * xxx街道-尹女士 + */ + private String userShowName; +} diff --git a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/PointAditiveCalcDTO.java b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/PointAditiveCalcDTO.java new file mode 100644 index 0000000000..dd61db0db7 --- /dev/null +++ b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/PointAditiveCalcDTO.java @@ -0,0 +1,79 @@ +package com.epmet.dto; + +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + + +/** + * 附加积分计算 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Data +public class PointAditiveCalcDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + private String id; + + /** + * 客户ID + */ + private String customerId; + + /** + * 积分类别;德育积分moral_education；党建积分party_building + */ + private String categoryCode; + + /** + * 积分主体ID;居民端用户ID或房屋ID + */ + private String subjectId; + + /** + * 已用积分;累计已花费 + */ + private Integer spend; + + /** + * 总分;累计积分 + */ + private Integer total; + + /** + * 删除标识;0.未删除 1.已删除 + */ + private String delFlag; + + /** + * 乐观锁 + */ + private Integer revision; + + /** + * 创建人 + */ + private String createdBy; + + /** + * 创建时间 + */ + private Date createdTime; + + /** + * 更新人 + */ + private String updatedBy; + + /** + * 更新时间 + */ + private Date updatedTime; + +} \ No newline at end of file diff --git a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/PointAditiveRecordDTO.java b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/PointAditiveRecordDTO.java new file mode 100644 index 0000000000..b72fe77a08 --- /dev/null +++ b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/PointAditiveRecordDTO.java @@ -0,0 +1,95 @@ +package com.epmet.dto; + +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + + +/** + * 附加积分记录 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Data +public class PointAditiveRecordDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + private String id; + + /** + * 客户ID + */ + private String customerId; + + /** + * 标题;积分变动标题或业务场景标题 + */ + private String title; + + /** + * 说明;积分变动的说明 + */ + private String statement; + + /** + * 分值 + */ + private Integer pointValue; + + /** + * 积分类别;德育积分moral_education；党建积分party_building + */ + private String categoryCode; + + /** + * 积分主体ID;居民端用户ID或房屋ID + */ + private String subjectId; + + /** + * 业务主键 + */ + private String businessId; + + /** + * 业务编码;积分申请point_apply；积分奖励point_reward；积分扣罚point_fine；积分花费point_cost；驳回积分申请point_reject + */ + private String businessCode; + + /** + * 删除标识;0.未删除 1.已删除 + */ + private String delFlag; + + /** + * 乐观锁 + */ + private Integer revision; + + /** + * 创建人 + */ + private String createdBy; + + /** + * 创建时间 + */ + private Date createdTime; + + /** + * 更新人 + */ + private String updatedBy; + + /** + * 更新时间 + */ + private Date updatedTime; + +} \ No newline at end of file diff --git a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/PointAnnexDTO.java b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/PointAnnexDTO.java new file mode 100644 index 0000000000..db0bcc7e16 --- /dev/null +++ b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/PointAnnexDTO.java @@ -0,0 +1,80 @@ +package com.epmet.dto; + +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + + +/** + * 积分相关附件表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Data +public class PointAnnexDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + private String id; + + /** + * 客户ID + */ + private String customerId; + + /** + * 业务ID;业务主键，包括积分申请、奖扣等业务 + */ + private String businessId; + + /** + * 业务编码;积分申请point_apply，积分奖励point_reward，积分扣罚point_fine，积分花费point_cost + */ + private String businessCode; + + /** + * 附件访问地址 + */ + private String url; + + /** + * 排序 + */ + private Integer sort; + + /** + * 删除标识;0.未删除 1.已删除 + */ + private String delFlag; + + /** + * 乐观锁 + */ + private Integer revision; + + /** + * 创建人 + */ + private String createdBy; + + /** + * 创建时间 + */ + private Date createdTime; + + /** + * 更新人 + */ + private String updatedBy; + + /** + * 更新时间 + */ + private Date updatedTime; + +} \ No newline at end of file diff --git a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/PointApplyDTO.java b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/PointApplyDTO.java new file mode 100644 index 0000000000..459447f84c --- /dev/null +++ b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/PointApplyDTO.java @@ -0,0 +1,174 @@ +package com.epmet.dto; + +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + + +/** + * 积分申请 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Data +public class PointApplyDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + private String id; + + /** + * 客户ID + */ + private String customerId; + + /** + * 类别ID + */ + private String categoryId; + + /** + * 类别名称 + */ + private String categoryName; + + /** + * 类别编码;德育积分moral_education；党建积分party_building + */ + private String categoryCode; + + /** + * 积分规则ID + */ + private String ruleId; + + /** + * 积分规则名称 + */ + private String ruleName; + + /** + * 申请标题;30字内 + */ + private String title; + + /** + * 申请内容说明;1000字内 + */ + private String statement; + + /** + * 申请状态;0已提交；1已驳回；2已通过 + */ + private String status; + + /** + * 申请人所属网格名称 + */ + private String gridName; + + /** + * 申请人所属网格ID + */ + private String gridId; + + /** + * 申请人所属组织ID + */ + private String agencyId; + + /** + * 上级组织ID路径 + */ + private String agencyPids; + + /** + * 用户ID;申请人ID（居民端用户ID） + */ + private String userId; + + /** + * 居民ID;申请人居民ID（IC_RESI_USER表主键） + */ + private String icResiUser; + + /** + * 房屋ID;房屋或家庭ID + */ + private String houseId; + + /** + * 房屋名称;完整拼接的名称 + */ + private String houseAllName; + + /** + * 头像 + */ + private String headImgUrl; + + /** + * 昵称 + */ + private String nickname; + + /** + * 性别;未知0；男1；女2 + */ + private String gender; + + /** + * 姓名 + */ + private String name; + + /** + * 身份证号 + */ + private String idCard; + + /** + * 手机号 + */ + private String mobile; + + /** + * 审核备注 + */ + private String remark; + + /** + * 删除标识;0.未删除 1.已删除 + */ + private String delFlag; + + /** + * 乐观锁 + */ + private Integer revision; + + /** + * 创建人 + */ + private String createdBy; + + /** + * 创建时间 + */ + private Date createdTime; + + /** + * 更新人 + */ + private String updatedBy; + + /** + * 更新时间 + */ + private Date updatedTime; + +} \ No newline at end of file diff --git a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/PointApplyFormDTO.java b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/PointApplyFormDTO.java new file mode 100644 index 0000000000..2d46dca728 --- /dev/null +++ b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/PointApplyFormDTO.java @@ -0,0 +1,32 @@ +package com.epmet.dto.form; + +import com.epmet.commons.tools.validator.group.AddGroup; +import lombok.Data; +import lombok.NoArgsConstructor; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; +import java.util.List; + +/** + * @Description + * @Author zhaoqifeng + * @Date 2022/6/14 14:08 + */ +@NoArgsConstructor +@Data +public class PointApplyFormDTO implements Serializable { + private static final long serialVersionUID = 4850146857511834988L; + private String customerId; + private String userId; + @NotBlank(message = "申请类别不能为空", groups = {AddGroup.class}) + private String ruleId; + @NotBlank(message = "标题不能为空", groups = {AddGroup.class}) + private String title; + @NotBlank(message = "申请内容不能为空", groups = {AddGroup.class}) + private String statement; + @NotBlank(message = "分类不能为空", groups = {AddGroup.class}) + private String categoryCode; + private List annexList; + private String gridId; +} diff --git a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/MyTotalPointResultDTO.java b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/MyTotalPointResultDTO.java new file mode 100644 index 0000000000..81d70ffd3c --- /dev/null +++ b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/MyTotalPointResultDTO.java @@ -0,0 +1,37 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description + * @Author zhaoqifeng + * @Date 2022/6/14 15:39 + */ +@Data +public class MyTotalPointResultDTO implements Serializable { + private static final long serialVersionUID = 15299506166024546L; + /** + * 德育积分moral_education；党建积分party_building；活跃积分active + */ + private String categoryCode; + /** + * 总积分 + */ + private Integer total; + /** + * 已花费积分 + */ + private Integer spend; + /** + * 可用积分 + */ + private Integer usable; + + public MyTotalPointResultDTO() { + this.total = 0; + this.spend = 0; + this.usable = 0; + } +} diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/common/CommonConstant.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/common/CommonConstant.java new file mode 100644 index 0000000000..9f8a8786d9 --- /dev/null +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/common/CommonConstant.java @@ -0,0 +1,48 @@ +/** + * Copyright (c) 2018 人人开源 All rights reserved. + * + * https://www.renren.io + * + * 版权所有，侵权必究！ + */ + +package com.epmet.common; + +import com.epmet.commons.tools.constant.Constant; + +/** + * 身边党员-积分排行 入参常量 + * + * @author Mark sunlightcs@gmail.com + * @since 1.1.0 + */ +public interface CommonConstant extends Constant { + /** + * 德育积分 + */ + String MORAL_EDUCATION = "moral_education"; + /** + * 党建积分 + */ + String PARTY_BUILDING = "party_building"; + /** + * 活跃积分 + */ + String ACTIVE = "active"; + /** + * 积分申请 + */ + String POINT_APPLY = "point_apply"; + /** + * 积分奖励 + */ + String POINT_REWARD = "point_reward"; + /** + * 积分扣罚 + */ + String POINT_FINE = "point_fine"; + /** + * 积分花费 + */ + String POINT_COST = "point_cost"; +} diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/common/enu/ApplyStatusEnum.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/common/enu/ApplyStatusEnum.java new file mode 100644 index 0000000000..5db66d452b --- /dev/null +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/common/enu/ApplyStatusEnum.java @@ -0,0 +1,49 @@ +package com.epmet.common.enu; + +import java.util.Objects; + +/** + * @author Administrator + */ + +public enum ApplyStatusEnum { + //审核状态 + AUDITING("0", "未审核"), + REJECT("1", "未通过"), + PASSED("2", "已通过"); + + private String code; + private String name; + + + ApplyStatusEnum(String code, String name) { + this.code = code; + this.name = name; + } + + public static String getName(String code) { + ApplyStatusEnum[] applyStatusEnums = values(); + for (ApplyStatusEnum applyStatusEnum : applyStatusEnums) { + if (Objects.equals(applyStatusEnum.getCode(), code)) { + return applyStatusEnum.getName(); + } + } + return null; + } + + public String getCode() { + return code; + } + + public void setCode(String code) { + this.code = code; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } +} diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/PointApplyController.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/PointApplyController.java new file mode 100644 index 0000000000..4f7ba03a07 --- /dev/null +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/PointApplyController.java @@ -0,0 +1,84 @@ +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.AssertUtils; +import com.epmet.commons.tools.validator.ValidatorUtils; +import com.epmet.commons.tools.validator.group.AddGroup; +import com.epmet.commons.tools.validator.group.DefaultGroup; +import com.epmet.commons.tools.validator.group.UpdateGroup; +import com.epmet.dto.PointApplyDTO; +import com.epmet.dto.form.PointApplyFormDTO; +import com.epmet.service.PointApplyService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.Map; + + +/** + * 积分申请 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@RestController +@RequestMapping("apply") +public class PointApplyController { + + @Autowired + private PointApplyService pointApplyService; + + @RequestMapping("page") + public Result> page(@RequestParam Map params){ + PageData page = pointApplyService.page(params); + return new Result>().ok(page); + } + + @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET}) + public Result get(@PathVariable("id") String id){ + PointApplyDTO data = pointApplyService.get(id); + return new Result().ok(data); + } + + @NoRepeatSubmit + @PostMapping("save") + public Result save(@RequestBody PointApplyDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + pointApplyService.save(dto); + return new Result(); + } + + @NoRepeatSubmit + @PostMapping("update") + public Result update(@RequestBody PointApplyDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + pointApplyService.update(dto); + return new Result(); + } + + @PostMapping("delete") + public Result delete(@RequestBody String[] ids){ + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + pointApplyService.delete(ids); + return new Result(); + } + + @NoRepeatSubmit + @PostMapping("submit") + public Result submit(@LoginUser TokenDto tokenDto, @RequestBody PointApplyFormDTO formDTO){ + //效验数据 + ValidatorUtils.validateEntity(formDTO, AddGroup.class, DefaultGroup.class); + formDTO.setCustomerId(tokenDto.getCustomerId()); + formDTO.setUserId(tokenDto.getUserId()); + pointApplyService.submit(formDTO); + return new Result(); + } + +} diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/ResiPointController.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/ResiPointController.java index 0b19244e0a..05b37956d2 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/ResiPointController.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/ResiPointController.java @@ -232,5 +232,10 @@ public class ResiPointController { return new Result().ok(userPointStatisticalDailyService.gridPointRank(tokenDto, formDTO)); } + @PostMapping("total") + public Result> totalPoint(@LoginUser TokenDto tokenDto) { + return new Result>().ok(userPointTotalService.totalPoint(tokenDto)); + } + } diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/PointAditiveCalcDao.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/PointAditiveCalcDao.java new file mode 100644 index 0000000000..b5410693e5 --- /dev/null +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/PointAditiveCalcDao.java @@ -0,0 +1,16 @@ +package com.epmet.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.entity.PointAditiveCalcEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 附加积分计算 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Mapper +public interface PointAditiveCalcDao extends BaseDao { + +} \ No newline at end of file diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/PointAditiveRecordDao.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/PointAditiveRecordDao.java new file mode 100644 index 0000000000..cf95a4367c --- /dev/null +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/PointAditiveRecordDao.java @@ -0,0 +1,16 @@ +package com.epmet.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.entity.PointAditiveRecordEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 附加积分记录 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Mapper +public interface PointAditiveRecordDao extends BaseDao { + +} \ No newline at end of file diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/PointAnnexDao.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/PointAnnexDao.java new file mode 100644 index 0000000000..6d1163adc3 --- /dev/null +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/PointAnnexDao.java @@ -0,0 +1,16 @@ +package com.epmet.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.entity.PointAnnexEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 积分相关附件表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Mapper +public interface PointAnnexDao extends BaseDao { + +} \ No newline at end of file diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/PointApplyDao.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/PointApplyDao.java new file mode 100644 index 0000000000..29fd3d8c90 --- /dev/null +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/PointApplyDao.java @@ -0,0 +1,16 @@ +package com.epmet.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.entity.PointApplyEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 积分申请 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Mapper +public interface PointApplyDao extends BaseDao { + +} \ No newline at end of file diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/entity/PointAditiveCalcEntity.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/entity/PointAditiveCalcEntity.java new file mode 100644 index 0000000000..552b9e5dea --- /dev/null +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/entity/PointAditiveCalcEntity.java @@ -0,0 +1,46 @@ +package com.epmet.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.epmet.commons.mybatis.entity.BaseEpmetEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 附加积分计算 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("point_aditive_calc") +public class PointAditiveCalcEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * 客户ID + */ + private String customerId; + + /** + * 积分类别;德育积分moral_education；党建积分party_building + */ + private String categoryCode; + + /** + * 积分主体ID;居民端用户ID或房屋ID + */ + private String subjectId; + + /** + * 已用积分;累计已花费 + */ + private Integer spend; + + /** + * 总分;累计积分 + */ + private Integer total; + +} diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/entity/PointAditiveRecordEntity.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/entity/PointAditiveRecordEntity.java new file mode 100644 index 0000000000..1a3ad83056 --- /dev/null +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/entity/PointAditiveRecordEntity.java @@ -0,0 +1,61 @@ +package com.epmet.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.epmet.commons.mybatis.entity.BaseEpmetEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 附加积分记录 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("point_aditive_record") +public class PointAditiveRecordEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * 客户ID + */ + private String customerId; + + /** + * 标题;积分变动标题或业务场景标题 + */ + private String title; + + /** + * 说明;积分变动的说明 + */ + private String statement; + + /** + * 分值 + */ + private Integer pointValue; + + /** + * 积分类别;德育积分moral_education；党建积分party_building + */ + private String categoryCode; + + /** + * 积分主体ID;居民端用户ID或房屋ID + */ + private String subjectId; + + /** + * 业务主键 + */ + private String businessId; + + /** + * 业务编码;积分申请point_apply；积分奖励point_reward；积分扣罚point_fine；积分花费point_cost；驳回积分申请point_reject + */ + private String businessCode; + +} diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/entity/PointAnnexEntity.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/entity/PointAnnexEntity.java new file mode 100644 index 0000000000..b5b19d6ccb --- /dev/null +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/entity/PointAnnexEntity.java @@ -0,0 +1,45 @@ +package com.epmet.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.epmet.commons.mybatis.entity.BaseEpmetEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 积分相关附件表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("point_annex") +public class PointAnnexEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * 客户ID + */ + private String customerId; + + /** + * 业务ID;业务主键，包括积分申请、奖扣等业务 + */ + private String businessId; + + /** + * 业务编码;积分申请point_apply，积分奖励point_reward，积分扣罚point_fine，积分花费point_cost + */ + private String businessCode; + + /** + * 附件访问地址 + */ + private String url; + + /** + * 排序 + */ + private Integer sort; +} diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/entity/PointApplyEntity.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/entity/PointApplyEntity.java new file mode 100644 index 0000000000..29c2272fec --- /dev/null +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/entity/PointApplyEntity.java @@ -0,0 +1,144 @@ +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-06-14 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("point_apply") +public class PointApplyEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * 客户ID + */ + private String customerId; + + /** + * 类别ID + */ + private String categoryId; + + /** + * 类别名称 + */ + private String categoryName; + + /** + * 类别编码;德育积分moral_education；党建积分party_building + */ + private String categoryCode; + + /** + * 积分规则ID + */ + private String ruleId; + + /** + * 积分规则名称 + */ + private String ruleName; + + /** + * 申请标题;30字内 + */ + private String title; + + /** + * 申请内容说明;1000字内 + */ + private String statement; + + /** + * 申请状态;0已提交；1已驳回；2已通过 + */ + private String status; + + /** + * 申请人所属网格名称 + */ + private String gridName; + + /** + * 申请人所属网格ID + */ + private String gridId; + + /** + * 申请人所属组织ID + */ + private String agencyId; + + /** + * 上级组织ID路径 + */ + private String agencyPids; + + /** + * 用户ID;申请人ID（居民端用户ID） + */ + private String userId; + + /** + * 居民ID;申请人居民ID（IC_RESI_USER表主键） + */ + private String icResiUser; + + /** + * 房屋ID;房屋或家庭ID + */ + private String houseId; + + /** + * 房屋名称;完整拼接的名称 + */ + private String houseAllName; + + /** + * 头像 + */ + private String headImgUrl; + + /** + * 昵称 + */ + private String nickname; + + /** + * 性别;未知0；男1；女2 + */ + private String gender; + + /** + * 姓名 + */ + private String name; + + /** + * 身份证号 + */ + private String idCard; + + /** + * 手机号 + */ + private String mobile; + + /** + * 审核备注 + */ + private String remark; + +} diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/PointAditiveCalcService.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/PointAditiveCalcService.java new file mode 100644 index 0000000000..6b87e5cefc --- /dev/null +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/PointAditiveCalcService.java @@ -0,0 +1,78 @@ +package com.epmet.service; + +import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.commons.tools.page.PageData; +import com.epmet.dto.PointAditiveCalcDTO; +import com.epmet.entity.PointAditiveCalcEntity; + +import java.util.List; +import java.util.Map; + +/** + * 附加积分计算 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +public interface PointAditiveCalcService extends BaseService { + + /** + * 默认分页 + * + * @param params + * @return PageData + * @author generator + * @date 2022-06-14 + */ + PageData page(Map params); + + /** + * 默认查询 + * + * @param params + * @return java.util.List + * @author generator + * @date 2022-06-14 + */ + List list(Map params); + + /** + * 单条查询 + * + * @param id + * @return PointAditiveCalcDTO + * @author generator + * @date 2022-06-14 + */ + PointAditiveCalcDTO get(String id); + + /** + * 默认保存 + * + * @param dto + * @return void + * @author generator + * @date 2022-06-14 + */ + void save(PointAditiveCalcDTO dto); + + /** + * 默认更新 + * + * @param dto + * @return void + * @author generator + * @date 2022-06-14 + */ + void update(PointAditiveCalcDTO dto); + + /** + * 批量删除 + * + * @param ids + * @return void + * @author generator + * @date 2022-06-14 + */ + void delete(String[] ids); +} \ No newline at end of file diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/PointAditiveRecordService.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/PointAditiveRecordService.java new file mode 100644 index 0000000000..857d5b797d --- /dev/null +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/PointAditiveRecordService.java @@ -0,0 +1,78 @@ +package com.epmet.service; + +import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.commons.tools.page.PageData; +import com.epmet.dto.PointAditiveRecordDTO; +import com.epmet.entity.PointAditiveRecordEntity; + +import java.util.List; +import java.util.Map; + +/** + * 附加积分记录 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +public interface PointAditiveRecordService extends BaseService { + + /** + * 默认分页 + * + * @param params + * @return PageData + * @author generator + * @date 2022-06-14 + */ + PageData page(Map params); + + /** + * 默认查询 + * + * @param params + * @return java.util.List + * @author generator + * @date 2022-06-14 + */ + List list(Map params); + + /** + * 单条查询 + * + * @param id + * @return PointAditiveRecordDTO + * @author generator + * @date 2022-06-14 + */ + PointAditiveRecordDTO get(String id); + + /** + * 默认保存 + * + * @param dto + * @return void + * @author generator + * @date 2022-06-14 + */ + void save(PointAditiveRecordDTO dto); + + /** + * 默认更新 + * + * @param dto + * @return void + * @author generator + * @date 2022-06-14 + */ + void update(PointAditiveRecordDTO dto); + + /** + * 批量删除 + * + * @param ids + * @return void + * @author generator + * @date 2022-06-14 + */ + void delete(String[] ids); +} \ No newline at end of file diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/PointAnnexService.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/PointAnnexService.java new file mode 100644 index 0000000000..f2c7cdb49e --- /dev/null +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/PointAnnexService.java @@ -0,0 +1,78 @@ +package com.epmet.service; + +import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.commons.tools.page.PageData; +import com.epmet.dto.PointAnnexDTO; +import com.epmet.entity.PointAnnexEntity; + +import java.util.List; +import java.util.Map; + +/** + * 积分相关附件表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +public interface PointAnnexService extends BaseService { + + /** + * 默认分页 + * + * @param params + * @return PageData + * @author generator + * @date 2022-06-14 + */ + PageData page(Map params); + + /** + * 默认查询 + * + * @param params + * @return java.util.List + * @author generator + * @date 2022-06-14 + */ + List list(Map params); + + /** + * 单条查询 + * + * @param id + * @return PointAnnexDTO + * @author generator + * @date 2022-06-14 + */ + PointAnnexDTO get(String id); + + /** + * 默认保存 + * + * @param dto + * @return void + * @author generator + * @date 2022-06-14 + */ + void save(PointAnnexDTO dto); + + /** + * 默认更新 + * + * @param dto + * @return void + * @author generator + * @date 2022-06-14 + */ + void update(PointAnnexDTO dto); + + /** + * 批量删除 + * + * @param ids + * @return void + * @author generator + * @date 2022-06-14 + */ + void delete(String[] ids); +} \ No newline at end of file diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/PointApplyService.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/PointApplyService.java new file mode 100644 index 0000000000..7988b94f26 --- /dev/null +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/PointApplyService.java @@ -0,0 +1,88 @@ +package com.epmet.service; + +import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.commons.tools.page.PageData; +import com.epmet.dto.PointApplyDTO; +import com.epmet.dto.form.PointApplyFormDTO; +import com.epmet.entity.PointApplyEntity; + +import java.util.List; +import java.util.Map; + +/** + * 积分申请 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +public interface PointApplyService extends BaseService { + + /** + * 默认分页 + * + * @param params + * @return PageData + * @author generator + * @date 2022-06-14 + */ + PageData page(Map params); + + /** + * 默认查询 + * + * @param params + * @return java.util.List + * @author generator + * @date 2022-06-14 + */ + List list(Map params); + + /** + * 单条查询 + * + * @param id + * @return PointApplyDTO + * @author generator + * @date 2022-06-14 + */ + PointApplyDTO get(String id); + + /** + * 默认保存 + * + * @param dto + * @return void + * @author generator + * @date 2022-06-14 + */ + void save(PointApplyDTO dto); + + /** + * 默认更新 + * + * @param dto + * @return void + * @author generator + * @date 2022-06-14 + */ + void update(PointApplyDTO dto); + + /** + * 批量删除 + * + * @param ids + * @return void + * @author generator + * @date 2022-06-14 + */ + void delete(String[] ids); + + /** + * 申请德育积分/党建积分 + * @Param formDTO + * @Return + * @Author zhaoqifeng + * @Date 2022/6/14 14:14 + */ + void submit(PointApplyFormDTO formDTO); +} \ No newline at end of file diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/UserPointTotalService.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/UserPointTotalService.java index 8c9977dce8..07bc0b77e1 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/UserPointTotalService.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/UserPointTotalService.java @@ -18,8 +18,10 @@ package com.epmet.service; import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.dto.form.CommonUserFormDTO; import com.epmet.dto.form.ResiPointRankFormDTO; +import com.epmet.dto.result.MyTotalPointResultDTO; import com.epmet.dto.result.ResiPointDetailResultDTO; import com.epmet.dto.result.ResiPointRankListResultDTO; import com.epmet.entity.UserPointTotalEntity; @@ -69,4 +71,14 @@ public interface UserPointTotalService extends BaseService * @date 2020.07.22 15:58 **/ ResiPointDetailResultDTO getMyPointGroupByCustomer(CommonUserFormDTO customerUserParam); + + /** + * 积分总分 + * + * @Param tokenDto + * @Return {@link MyTotalPointResultDTO} + * @Author zhaoqifeng + * @Date 2022/6/14 15:46 + */ + List totalPoint(TokenDto tokenDto); } diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAditiveCalcServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAditiveCalcServiceImpl.java new file mode 100644 index 0000000000..2b8bc7ed16 --- /dev/null +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAditiveCalcServiceImpl.java @@ -0,0 +1,82 @@ +package com.epmet.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.dao.PointAditiveCalcDao; +import com.epmet.dto.PointAditiveCalcDTO; +import com.epmet.entity.PointAditiveCalcEntity; +import com.epmet.service.PointAditiveCalcService; +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; + +/** + * 附加积分计算 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Service +public class PointAditiveCalcServiceImpl extends BaseServiceImpl implements PointAditiveCalcService { + + @Override + public PageData page(Map params) { + IPage page = baseDao.selectPage( + getPage(params, FieldConstant.CREATED_TIME, false), + getWrapper(params) + ); + return getPageData(page, PointAditiveCalcDTO.class); + } + + @Override + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); + + return ConvertUtils.sourceToTarget(entityList, PointAditiveCalcDTO.class); + } + + private QueryWrapper getWrapper(Map params){ + String id = (String)params.get(FieldConstant.ID_HUMP); + + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); + + return wrapper; + } + + @Override + public PointAditiveCalcDTO get(String id) { + PointAditiveCalcEntity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, PointAditiveCalcDTO.class); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void save(PointAditiveCalcDTO dto) { + PointAditiveCalcEntity entity = ConvertUtils.sourceToTarget(dto, PointAditiveCalcEntity.class); + insert(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(PointAditiveCalcDTO dto) { + PointAditiveCalcEntity entity = ConvertUtils.sourceToTarget(dto, PointAditiveCalcEntity.class); + updateById(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void delete(String[] ids) { + // 逻辑删除（@TableLogic 注解） + baseDao.deleteBatchIds(Arrays.asList(ids)); + } + +} \ No newline at end of file diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAditiveRecordServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAditiveRecordServiceImpl.java new file mode 100644 index 0000000000..6ca0fb5f22 --- /dev/null +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAditiveRecordServiceImpl.java @@ -0,0 +1,84 @@ +package com.epmet.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.dao.PointAditiveRecordDao; +import com.epmet.dto.PointAditiveRecordDTO; +import com.epmet.entity.PointAditiveRecordEntity; +import com.epmet.service.PointAditiveRecordService; +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.Arrays; +import java.util.List; +import java.util.Map; + +/** + * 附加积分记录 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Service +public class PointAditiveRecordServiceImpl extends BaseServiceImpl implements PointAditiveRecordService { + + + @Override + public PageData page(Map params) { + IPage page = baseDao.selectPage( + getPage(params, FieldConstant.CREATED_TIME, false), + getWrapper(params) + ); + return getPageData(page, PointAditiveRecordDTO.class); + } + + @Override + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); + + return ConvertUtils.sourceToTarget(entityList, PointAditiveRecordDTO.class); + } + + private QueryWrapper getWrapper(Map params){ + String id = (String)params.get(FieldConstant.ID_HUMP); + + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); + + return wrapper; + } + + @Override + public PointAditiveRecordDTO get(String id) { + PointAditiveRecordEntity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, PointAditiveRecordDTO.class); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void save(PointAditiveRecordDTO dto) { + PointAditiveRecordEntity entity = ConvertUtils.sourceToTarget(dto, PointAditiveRecordEntity.class); + insert(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(PointAditiveRecordDTO dto) { + PointAditiveRecordEntity entity = ConvertUtils.sourceToTarget(dto, PointAditiveRecordEntity.class); + updateById(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void delete(String[] ids) { + // 逻辑删除（@TableLogic 注解） + baseDao.deleteBatchIds(Arrays.asList(ids)); + } + +} \ No newline at end of file diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAnnexServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAnnexServiceImpl.java new file mode 100644 index 0000000000..fdfd83e9fd --- /dev/null +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAnnexServiceImpl.java @@ -0,0 +1,83 @@ +package com.epmet.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.dao.PointAnnexDao; +import com.epmet.dto.PointAnnexDTO; +import com.epmet.entity.PointAnnexEntity; +import com.epmet.service.PointAnnexService; +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.Arrays; +import java.util.List; +import java.util.Map; + +/** + * 积分相关附件表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Service +public class PointAnnexServiceImpl extends BaseServiceImpl implements PointAnnexService { + + @Override + public PageData page(Map params) { + IPage page = baseDao.selectPage( + getPage(params, FieldConstant.CREATED_TIME, false), + getWrapper(params) + ); + return getPageData(page, PointAnnexDTO.class); + } + + @Override + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); + + return ConvertUtils.sourceToTarget(entityList, PointAnnexDTO.class); + } + + private QueryWrapper getWrapper(Map params){ + String id = (String)params.get(FieldConstant.ID_HUMP); + + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); + + return wrapper; + } + + @Override + public PointAnnexDTO get(String id) { + PointAnnexEntity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, PointAnnexDTO.class); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void save(PointAnnexDTO dto) { + PointAnnexEntity entity = ConvertUtils.sourceToTarget(dto, PointAnnexEntity.class); + insert(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(PointAnnexDTO dto) { + PointAnnexEntity entity = ConvertUtils.sourceToTarget(dto, PointAnnexEntity.class); + updateById(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void delete(String[] ids) { + // 逻辑删除（@TableLogic 注解） + baseDao.deleteBatchIds(Arrays.asList(ids)); + } + +} \ No newline at end of file diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointApplyServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointApplyServiceImpl.java new file mode 100644 index 0000000000..4827ab4d2d --- /dev/null +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointApplyServiceImpl.java @@ -0,0 +1,153 @@ +package com.epmet.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.epmet.common.CommonConstant; +import com.epmet.common.enu.ApplyStatusEnum; +import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.commons.tools.constant.NumConstant; +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.CustomerOrgRedis; +import com.epmet.commons.tools.redis.common.bean.GridInfoCache; +import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.commons.tools.utils.Result; +import com.epmet.dao.PointAnnexDao; +import com.epmet.dao.PointApplyDao; +import com.epmet.dto.PointApplyDTO; +import com.epmet.dto.form.PointApplyFormDTO; +import com.epmet.dto.result.HomeInfoResultDTO; +import com.epmet.entity.PointAnnexEntity; +import com.epmet.entity.PointApplyEntity; +import com.epmet.feign.EpmetUserOpenFeignClient; +import com.epmet.service.PointApplyService; +import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.concurrent.atomic.AtomicInteger; + +/** + * 积分申请 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Service +public class PointApplyServiceImpl extends BaseServiceImpl implements PointApplyService { + + @Resource + private EpmetUserOpenFeignClient epmetUserOpenFeignClient; + @Resource + private PointAnnexDao pointAnnexDao; + + @Override + public PageData page(Map params) { + IPage page = baseDao.selectPage( + getPage(params, FieldConstant.CREATED_TIME, false), + getWrapper(params) + ); + return getPageData(page, PointApplyDTO.class); + } + + @Override + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); + + return ConvertUtils.sourceToTarget(entityList, PointApplyDTO.class); + } + + private QueryWrapper getWrapper(Map params){ + String id = (String)params.get(FieldConstant.ID_HUMP); + + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); + + return wrapper; + } + + @Override + public PointApplyDTO get(String id) { + PointApplyEntity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, PointApplyDTO.class); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void save(PointApplyDTO dto) { + PointApplyEntity entity = ConvertUtils.sourceToTarget(dto, PointApplyEntity.class); + insert(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(PointApplyDTO dto) { + PointApplyEntity entity = ConvertUtils.sourceToTarget(dto, PointApplyEntity.class); + updateById(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void delete(String[] ids) { + // 逻辑删除（@TableLogic 注解） + baseDao.deleteBatchIds(Arrays.asList(ids)); + } + + /** + * 申请德育积分/党建积分 + * + * @param formDTO + * @Param formDTO + * @Return + * @Author zhaoqifeng + * @Date 2022/6/14 14:14 + */ + @Override + public void submit(PointApplyFormDTO formDTO) { + PointApplyEntity entity = ConvertUtils.sourceToTarget(formDTO, PointApplyEntity.class); + //从缓存获取网格信息 + GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(formDTO.getGridId()); + if (null == gridInfo) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取网格缓存失败", "获取网格缓存失败"); + } + //如果申请类型为德育积分，需要获取用户所在房屋 + if (CommonConstant.MORAL_EDUCATION.equals(formDTO.getCategoryCode())) { + Result result = epmetUserOpenFeignClient.getHomeInfo(); + if (!result.success() || null == result.getData()) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取居民所在家庭信息失败", "获取居民所在家庭信息失败"); + } + if (StringUtils.isBlank(result.getData().getHouseId())) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "无法申请", "没有绑定家庭，无法申请德育积分"); + } + entity.setHouseId(result.getData().getHouseId()); + } + + entity.setAgencyId(gridInfo.getPid()); + entity.setAgencyPids(gridInfo.getPids()); + entity.setStatus(ApplyStatusEnum.AUDITING.getCode()); + baseDao.insert(entity); + + //保存附件 + if (CollectionUtils.isNotEmpty(formDTO.getAnnexList())) { + AtomicInteger i = new AtomicInteger(NumConstant.ONE); + formDTO.getAnnexList().forEach(url -> { + PointAnnexEntity annex = new PointAnnexEntity(); + annex.setCustomerId(formDTO.getCustomerId()); + annex.setBusinessId(entity.getId()); + annex.setBusinessCode(CommonConstant.POINT_APPLY); + annex.setUrl(url); + annex.setSort(i.getAndIncrement()); + pointAnnexDao.insert(annex); + }); + } + + } + +} \ No newline at end of file diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointTotalServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointTotalServiceImpl.java index 66f83715c8..4dbda58db2 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointTotalServiceImpl.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointTotalServiceImpl.java @@ -17,15 +17,22 @@ package com.epmet.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.epmet.common.CommonConstant; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.constant.StrConstant; +import com.epmet.commons.tools.exception.EpmetErrorCode; +import com.epmet.commons.tools.exception.EpmetException; +import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.Result; +import com.epmet.dao.PointAditiveCalcDao; import com.epmet.dao.UserPointTotalDao; import com.epmet.dto.form.CommonUserFormDTO; import com.epmet.dto.form.ResiPointRankFormDTO; import com.epmet.dto.result.*; +import com.epmet.entity.PointAditiveCalcEntity; import com.epmet.entity.UserPointTotalEntity; import com.epmet.feign.EpmetUserOpenFeignClient; import com.epmet.service.UserPointTotalService; @@ -33,9 +40,9 @@ import com.github.pagehelper.PageHelper; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import javax.annotation.Resource; import java.util.*; import java.util.function.Function; import java.util.stream.Collectors; @@ -50,8 +57,10 @@ import java.util.stream.Collectors; @Slf4j public class UserPointTotalServiceImpl extends BaseServiceImpl implements UserPointTotalService { - @Autowired - EpmetUserOpenFeignClient epmetUserOpenFeignClient; + @Resource + private EpmetUserOpenFeignClient epmetUserOpenFeignClient; + @Resource + private PointAditiveCalcDao pointAditiveCalcDao; /** * @Description 获取指定居民的积分信息 @@ -203,4 +212,66 @@ public class UserPointTotalServiceImpl extends BaseServiceImpl totalPoint(TokenDto tokenDto) { + List list = new ArrayList(); + //活跃度积分 + MyTotalPointResultDTO active = new MyTotalPointResultDTO(); + active.setCategoryCode(CommonConstant.ACTIVE); + ResiPointDetailResultDTO activeTotal = baseDao.selectPointByCustomerUserId(tokenDto.getUserId(), tokenDto.getCustomerId()); + if (null != activeTotal) { + active.setTotal(activeTotal.getAccumulatedPoint()); + active.setUsable(activeTotal.getUsablePoint()); + active.setSpend(activeTotal.getAccumulatedPoint() - activeTotal.getUsablePoint()); + } + list.add(active); + //德育积分 + MyTotalPointResultDTO education = new MyTotalPointResultDTO(); + education.setCategoryCode(CommonConstant.MORAL_EDUCATION); + //获取居民绑定的家庭 + Result result = epmetUserOpenFeignClient.getHomeInfo(); + if (!result.success() || null == result.getData()) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取居民绑定家庭信息失败", "获取居民绑定家庭信息失败"); + } + if (StringUtils.isNotBlank(result.getData().getHouseId())) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(PointAditiveCalcEntity::getCustomerId, tokenDto.getCustomerId()); + wrapper.eq(PointAditiveCalcEntity::getSubjectId, result.getData().getHouseId()); + wrapper.eq(PointAditiveCalcEntity::getCategoryCode, CommonConstant.MORAL_EDUCATION); + PointAditiveCalcEntity entity = pointAditiveCalcDao.selectOne(wrapper); + if (null != entity) { + education.setTotal(entity.getTotal()); + education.setSpend(entity.getSpend()); + education.setUsable(entity.getTotal() - entity.getSpend()); + } + } + list.add(education); + + //党建积分 + MyTotalPointResultDTO party = new MyTotalPointResultDTO(); + party.setCategoryCode(CommonConstant.PARTY_BUILDING); + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(PointAditiveCalcEntity::getCustomerId, tokenDto.getCustomerId()); + wrapper.eq(PointAditiveCalcEntity::getSubjectId, tokenDto.getUserId()); + wrapper.eq(PointAditiveCalcEntity::getCategoryCode, CommonConstant.PARTY_BUILDING); + PointAditiveCalcEntity entity = pointAditiveCalcDao.selectOne(wrapper); + if (null != entity) { + party.setTotal(entity.getTotal()); + party.setSpend(entity.getSpend()); + party.setUsable(entity.getTotal() - entity.getSpend()); + } + list.add(party); + + return list; + } + } diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointAditiveCalcDao.xml b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointAditiveCalcDao.xml new file mode 100644 index 0000000000..c015362019 --- /dev/null +++ b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointAditiveCalcDao.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointAditiveRecordDao.xml b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointAditiveRecordDao.xml new file mode 100644 index 0000000000..4839dd26fa --- /dev/null +++ b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointAditiveRecordDao.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointAnnexDao.xml b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointAnnexDao.xml new file mode 100644 index 0000000000..b53f102654 --- /dev/null +++ b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointAnnexDao.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointApplyDao.xml b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointApplyDao.xml new file mode 100644 index 0000000000..6daa8936d8 --- /dev/null +++ b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointApplyDao.xml @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/HomeInfoResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/HomeInfoResultDTO.java index 5ff591455f..e890aa3092 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/HomeInfoResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/HomeInfoResultDTO.java @@ -16,6 +16,7 @@ public class HomeInfoResultDTO implements Serializable { private static final long serialVersionUID = -6109420020924607393L; private String icResiUserId; + private String houseId; private String houseName; private String houseCode; private String qrCodeUrl; diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java index e5952a2726..2071c9f904 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java @@ -806,4 +806,7 @@ public interface EpmetUserOpenFeignClient { @PostMapping("/epmetuser/icVolunteerPoly/volunteerDataExtraction/{customerId}") Result volunteerDataExtraction(@PathVariable("customerId") String customerId); + + @PostMapping("/epmetuser/myHome/homeInfo") + Result getHomeInfo(); } diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java index 404ba7d0c3..23554e16d4 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java @@ -595,4 +595,9 @@ public class EpmetUserOpenFeignClientFallback implements EpmetUserOpenFeignClien return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "volunteerDataExtraction", customerId); } + @Override + public Result getHomeInfo() { + return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getHomeInfo"); + } + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/MyHomeServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/MyHomeServiceImpl.java index 6fb98f8b7a..9ae1bba783 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/MyHomeServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/MyHomeServiceImpl.java @@ -183,6 +183,7 @@ public class MyHomeServiceImpl implements MyHomeService { if (null == houseInfo) { throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取房屋信息失败", "获取房屋信息失败"); } + resultDto.setHouseId(houseInfo.getHomeId()); resultDto.setHouseName(houseInfo.getAllName()); resultDto.setHouseCode(houseInfo.getHouseCode()); resultDto.setQrCodeUrl(houseInfo.getHouseQrcodeUrl()); From a92ee36a15cb1f478ef7da4f25fab0b12c1b30f4 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Tue, 14 Jun 2022 22:06:36 +0800 Subject: [PATCH 14/16] =?UTF-8?q?=E5=B1=85=E6=B0=91=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=EF=BC=8C=E6=9F=A5=E8=AF=A2remote=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E7=9A=84=E6=97=B6=E5=80=99=E5=85=88=E5=88=A4=E6=96=AD?= =?UTF-8?q?=EF=BC=8C=E6=B2=A1=E5=A1=AB=E5=B0=B1=E4=B8=8D=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/IcResiUserImportServiceImpl.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java index 8562af6077..c74466fcd1 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java @@ -72,6 +72,7 @@ import java.io.File; import java.io.IOException; import java.io.OutputStream; import java.nio.file.Path; +import java.time.DateTimeException; import java.time.LocalDate; import java.time.Period; import java.util.*; @@ -647,7 +648,12 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res } // 出生日期 & 年龄 - LocalDate birthday = LocalDate.of(Integer.parseInt(year), Integer.parseInt(month), Integer.parseInt(day)); + LocalDate birthday = null; + try { + birthday = LocalDate.of(Integer.parseInt(year), Integer.parseInt(month), Integer.parseInt(day)); + } catch (DateTimeException e) { + throw new EpmetException("身份证号中日期信息错误"); + } int age = Period.between(birthday, LocalDate.now()).getYears(); // 性别 & 生日 & 老年人 @@ -910,7 +916,7 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res Map itemOptions = columnWrapper.getOptions(); String colValue = itemOptions.get(cellContent); columnWrapper.setColValue(colValue); - } else { + } else if (StringUtils.isNotBlank(cellContent)) { String fullUri = columnWrapper.getOptionSourceValue(); String[] uriParts = splitOptionSourceUrl(fullUri); String pureUri = uriParts[0]; From cd79bec6d5a7ec0e16c54a66aae8c5722b7a89dd Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Tue, 14 Jun 2022 23:07:33 +0800 Subject: [PATCH 15/16] =?UTF-8?q?=E5=B1=85=E6=B0=91=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=EF=BC=8C=E4=BB=8E=E8=A1=A8=E5=8E=BB=E6=8E=89?= =?UTF-8?q?REMARKS=E5=AD=97=E6=AE=B5insert=EF=BC=8C=E9=98=B2=E6=AD=A2?= =?UTF-8?q?=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/service/impl/IcResiUserImportServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java index c74466fcd1..6901fd27b1 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java @@ -822,7 +822,7 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res private LinkedHashMap removeNeedlessColumns(LinkedHashMap originColumnAndValues) { List needlessColumns = Arrays.asList("GRID_ID", "VILLAGE_ID", "BUILD_ID", "UNIT_ID", "HOME_ID", "IS_BDHJ", "NAME", "MOBILE", "GENDER", "ID_CARD", - "BIRTHDAY", "CONTACTS", "CONTACTS_MOBILE"); + "BIRTHDAY", "CONTACTS", "CONTACTS_MOBILE", "REMARKS"); LinkedHashMap newMap = new LinkedHashMap(); From 3417f431ad0a58c958006781a23e10dbdc99d458 Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 15 Jun 2022 09:00:54 +0800 Subject: [PATCH 16/16] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E5=B0=8F=E7=A8=8B?= =?UTF-8?q?=E5=BA=8F=E6=8F=90=E5=AE=A1=E5=89=8D=E6=A0=A1=E9=AA=8C=E5=B9=B6?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E7=94=A8=E6=88=B7=E9=9A=90=E7=A7=81=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/service/impl/CodeServiceImpl.java | 10 ++++ .../wxapi/constant/WxMaCodeConstant.java | 12 +++++ .../epmet/wxapi/service/WxMaCodeService.java | 20 +++++++- .../service/impl/WxMaCodeServiceImpl.java | 47 +++++++++++++++++++ 4 files changed, 87 insertions(+), 2 deletions(-) diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CodeServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CodeServiceImpl.java index c5845d11c8..899a40c76b 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CodeServiceImpl.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CodeServiceImpl.java @@ -3,6 +3,8 @@ package com.epmet.service.impl; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.epmet.commons.tools.constant.NumConstant; +import com.epmet.commons.tools.exception.EpmetErrorCode; +import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.ConvertUtils; @@ -309,6 +311,14 @@ public class CodeServiceImpl implements CodeService { if (null == authInfo) { throw new RenException("未授权"); } + //校验小程序是否设置了用户隐私 如果没有设置则执行设置后 再发布 + WxResult privacySetting = wxMaCodeService.getPrivacySetting(authInfo.getAuthorizerAccessToken()); + if (!privacySetting.success()){ + WxResult stringWxResult = wxMaCodeService.setPrivacySetting(authInfo.getAuthorizerAccessToken()); + if (!stringWxResult.success()){ + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),stringWxResult.getErrorMsg(),"用户隐私权限设置失败"); + } + } //获取上传代码信息 CodeCustomerDTO uploadCode = codeCustomerService.getUploadCodeByCustomer(formDTO.getCodeId(), codeCustomerDTO.getCustomerId(), codeCustomerDTO.getClientType()); diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/constant/WxMaCodeConstant.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/constant/WxMaCodeConstant.java index 7d1263e3b3..735a3b4569 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/constant/WxMaCodeConstant.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/constant/WxMaCodeConstant.java @@ -200,4 +200,16 @@ public interface WxMaCodeConstant { * 获取代码草稿列表 */ String DELETE_TEMPLATE_URL = "https://api.weixin.qq.com/wxa/deletetemplate"; + + /** + * 获取用户隐私地址 + * @see https://developers.weixin.qq.com/doc/oplatform/Third-party_Platforms/2.0/api/privacy_config/set_privacy_setting.html + */ + String GET_PRIVACY_SETTING_URL = "https://api.weixin.qq.com/cgi-bin/component/getprivacysetting"; + + /** + * 设置用户隐私地址 + * @see https://developers.weixin.qq.com/doc/oplatform/Third-party_Platforms/2.0/api/privacy_config/set_privacy_setting.html + */ + String SET_PRIVACY_SETTING_URL = "https://api.weixin.qq.com/cgi-bin/component/setprivacysetting"; } diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/service/WxMaCodeService.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/service/WxMaCodeService.java index 452ad866e1..e116eca160 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/service/WxMaCodeService.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/service/WxMaCodeService.java @@ -72,6 +72,22 @@ public interface WxMaCodeService { */ WxResult submitAudit(String accessToken, WxMaCodeSubmitAuditRequest auditRequest); + /** + * 获取用户隐私接口权限. + * + * @param accessToken 小程序对应的accessToken + * @return 审核编号 + */ + WxResult getPrivacySetting(String accessToken); + + /** + * 设置用户隐私接口权限. + * + * @param accessToken 小程序对应的accessToken + * @return 审核编号 + */ + WxResult setPrivacySetting(String accessToken); + /** * 加急审核申请 * @author zhaoqifeng @@ -197,7 +213,7 @@ public interface WxMaCodeService { /** * 版本退回 * @author zhaoqifeng - * @date 2020/8/10 15:41 + * @date 2020/8/10 15:41 * @param accessToken * @return com.epmet.wxapi.result.WxResult */ @@ -215,7 +231,7 @@ public interface WxMaCodeService { /** * 将草稿添加到代码模板库 * @author zhaoqifeng - * @date 2020/10/28 10:23 + * @date 2020/10/28 10:23 * @param accessToken * @param request * @return com.epmet.wxapi.result.WxResult diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/service/impl/WxMaCodeServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/service/impl/WxMaCodeServiceImpl.java index ecf30738c8..b7a6a6374b 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/service/impl/WxMaCodeServiceImpl.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/service/impl/WxMaCodeServiceImpl.java @@ -1,5 +1,7 @@ package com.epmet.wxapi.service.impl; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.utils.HttpClientManager; @@ -36,6 +38,7 @@ import java.util.Map; public class WxMaCodeServiceImpl implements WxMaCodeService { private static final String ERR_CODE = "errcode"; private static final String ERR_MSG = "errmsg"; + private static final String SETTING_LIST = "setting_list"; @Autowired private WxMaDomainDTO wxMaDomainDTO; @@ -150,6 +153,50 @@ public class WxMaCodeServiceImpl implements WxMaCodeService { return result; } + @Override + public WxResult getPrivacySetting(String accessToken) { + WxResult result = new WxResult<>(); + String url = WxMaCodeConstant.SET_PRIVACY_SETTING_URL + "?" + "access_token=" + accessToken; + Result submitResult = HttpClientManager.getInstance().sendPostByJSON(url, "{}"); + log.info("getPrivacySetting result:{}", JSON.toJSONString(submitResult)); + if (!submitResult.success()) { + result.setErrorCode(submitResult.getCode()); + result.setErrorMsg(submitResult.getMsg()); + return result; + } + JSONObject jsonObject = JSONObject.parseObject(submitResult.getData()); + + + JSONArray jsonArray = jsonObject.getJSONArray(SETTING_LIST); + if (jsonArray.size() == 9){ + result.setErrorCode(9999); + result.setErrorMsg("用户隐私权限未设置或设置不完整"); + return result; + } + result.setErrorCode(jsonObject.getInteger(ERR_CODE)); + result.setErrorMsg(WxMaErrorMsgEnum.findMsgByCode(jsonObject.getInteger(ERR_CODE))); + return result; + } + + @Override + public WxResult setPrivacySetting(String accessToken) { + //todo 目前设置9个隐私权限 + String param = "{\"owner_setting\":{\"contact_email\":\"eshitong@elink-cn.com\",\"contact_phone\":\"\",\"contact_qq\":\"\",\"contact_weixin\":\"\",\"ext_file_media_id\":\"\",\"notice_method\":\"通知\",\"store_expire_timestamp\":\"\"},\"setting_list\":[{\"privacy_key\":\"UserInfo\",\"privacy_text\":\"用户个人中心显示用户头像及昵称等\"},{\"privacy_key\":\"Location\",\"privacy_text\":\"发表话题等功能时获取位置信息\"},{\"privacy_key\":\"Record\",\"privacy_text\":\"录音发话题等\"},{\"privacy_key\":\"Album\",\"privacy_text\":\"上传照片发话题等\"},{\"privacy_key\":\"AlbumWriteOnly\",\"privacy_text\":\"下载党建声音图片或项目附近等\"},{\"privacy_key\":\"Camera\",\"privacy_text\":\"通过相机拍照发话题反应问题等\"},{\"privacy_key\":\"PhoneNumber\",\"privacy_text\":\"通过手机号为用户开通账号，更新用户基础信息\"},{\"privacy_key\":\"MessageFile\",\"privacy_text\":\"发表话题等可以选择文件上传\"},{\"privacy_key\":\"ChooseLocation\",\"privacy_text\":\"用户巡查上报\"}],\"privacy_ver\":2}\n"; + WxResult result = new WxResult<>(); + String url = WxMaCodeConstant.SET_PRIVACY_SETTING_URL + "?" + "access_token=" + accessToken; + Result submitResult = HttpClientManager.getInstance().sendPostByJSON(url, param); + log.info("setPrivacySetting param:{}, result:{}", param, JSON.toJSONString(submitResult)); + if (!submitResult.success()) { + result.setErrorCode(submitResult.getCode()); + result.setErrorMsg(submitResult.getMsg()); + return result; + } + JSONObject jsonObject = JSONObject.parseObject(submitResult.getData()); + result.setErrorCode(jsonObject.getInteger(ERR_CODE)); + result.setErrorMsg(WxMaErrorMsgEnum.findMsgByCode(jsonObject.getInteger(ERR_CODE))); + return result; + } + @Override public WxResult speedUpAudit(String accessToken, WxMaSpeedUpAuditReq request) { WxResult result = new WxResult();