From bb51816f8e62eb2fb20d112eb8b31542bb31c37e Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 9 Nov 2022 10:54:43 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/controller/IcFollowUpRecordController.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcFollowUpRecordController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcFollowUpRecordController.java index 7428da58be..b3b5d05816 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcFollowUpRecordController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcFollowUpRecordController.java @@ -56,6 +56,11 @@ public class IcFollowUpRecordController { return new Result>().ok(page); } + /** + * 随访记录，查看详情 + * @param id + * @return + */ @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET}) public Result get(@PathVariable("id") String id){ IcFollowUpRecordDTO data = icFollowUpRecordService.get(id); @@ -86,6 +91,11 @@ public class IcFollowUpRecordController { return new Result(); } + /** + * 随访记录删除 + * @param ids + * @return + */ @PostMapping("delete") public Result delete(@RequestBody String[] ids){ //效验数据 From 8f187adf0e2434adeae7b8c6a0c7c3b97c5d45ef Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 9 Nov 2022 11:04:52 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=85=9A=E5=91=98?= =?UTF-8?q?=E9=A3=8E=E9=87=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/IcPartymemberStyleController.java | 11 +++++++++++ .../service/impl/IcPartymemberStyleServiceImpl.java | 6 ++++++ 2 files changed, 17 insertions(+) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartymemberStyleController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartymemberStyleController.java index 786f22d542..9f23510fa6 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartymemberStyleController.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartymemberStyleController.java @@ -89,6 +89,12 @@ public class IcPartymemberStyleController { return new Result().ok(data); } + /** + * 党员风采-新增 + * @param tokenDto + * @param dto + * @return + */ @PostMapping("save") @NoRepeatSubmit public Result save(@LoginUser TokenDto tokenDto, @RequestBody IcPartymemberStyleDTO dto) { @@ -98,6 +104,11 @@ public class IcPartymemberStyleController { return new Result(); } + /** + * 党员风采-删除 + * @param dto + * @return + */ @PostMapping("delete") public Result delete(@RequestBody IcPartymemberStyleDTO dto) { //效验数据 diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartymemberStyleServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartymemberStyleServiceImpl.java index 435038822f..b7299c3ad8 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartymemberStyleServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartymemberStyleServiceImpl.java @@ -208,11 +208,17 @@ public class IcPartymemberStyleServiceImpl extends BaseServiceImpl Date: Wed, 9 Nov 2022 11:15:03 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E6=B2=A1=E4=BB=80=E4=B9=88=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/controller/IcPartyActivityController.java | 6 ++++++ .../java/com/epmet/controller/IcPartyUnitController.java | 6 ++++++ .../com/epmet/service/impl/IcFollowUpRecordServiceImpl.java | 4 ++++ 3 files changed, 16 insertions(+) diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyActivityController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyActivityController.java index 67b3c5da5a..38b63b836d 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyActivityController.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyActivityController.java @@ -89,6 +89,12 @@ public class IcPartyActivityController { return new Result().ok(data); } + /** + * 联建活动-新增 + * @param tokenDto + * @param dto + * @return + */ @PostMapping("save") @NoRepeatSubmit public Result save(@LoginUser TokenDto tokenDto, @RequestBody IcPartyActivityDTO dto){ diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyUnitController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyUnitController.java index 8a0ba036ff..4545cb226b 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyUnitController.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyUnitController.java @@ -90,6 +90,12 @@ public class IcPartyUnitController { return new Result().ok(data); } + /** + * 联建单位新增 + * @param tokenDto + * @param dto + * @return + */ @PostMapping("save") @NoRepeatSubmit public Result save(@LoginUser TokenDto tokenDto, @RequestBody IcPartyUnitDTO dto) { diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcFollowUpRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcFollowUpRecordServiceImpl.java index 451271fd6a..3628786d60 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcFollowUpRecordServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcFollowUpRecordServiceImpl.java @@ -76,6 +76,10 @@ public class IcFollowUpRecordServiceImpl extends BaseServiceImpl Date: Wed, 9 Nov 2022 13:33:40 +0800 Subject: [PATCH 4/7] =?UTF-8?q?/gov/org/agency/maporg=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=E5=87=BA=E6=9D=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/service/impl/AgencyServiceImpl.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java index 10499f4b52..3cf98078f5 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java @@ -766,6 +766,9 @@ public class AgencyServiceImpl implements AgencyService { } if (formDTO.getLevel().equals(OrgInfoConstant.AGENCY)) { CustomerAgencyEntity entity = customerAgencyDao.selectById(formDTO.getOrgId()); + if (null == entity) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "customer_agency is null orgId:" + formDTO.getOrgId(), "组织信息查询为空orgId:" + formDTO.getOrgId()); + } result = ConvertUtils.sourceToTarget(entity, MapOrgResultDTO.class); result.setName(entity.getOrganizationName()); result.setLevel(formDTO.getLevel()); From 84861a2d7248c6d29a7e1d088350bdaa4abfca82 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Wed, 9 Nov 2022 14:03:04 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E9=87=8D=E7=82=B9=E8=A1=8C=E7=A8=8B?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=92=8C=E9=A5=BC=E5=9B=BE=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E4=BC=A0=E5=8F=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/dto/form/EmphasisTripListFormDTO.java | 1 + .../com/epmet/dto/form/EmphasisTripPieDetailFormDTO.java | 1 + .../src/main/resources/mapper/IcTripReportRecordDao.xml | 8 ++++---- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EmphasisTripListFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EmphasisTripListFormDTO.java index 3539affe85..5f338be962 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EmphasisTripListFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EmphasisTripListFormDTO.java @@ -14,6 +14,7 @@ public class EmphasisTripListFormDTO extends PageFormDTO implements Serializable private static final long serialVersionUID = 5850717233738956442L; private String code; + private String name; private String dangerLevel; diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EmphasisTripPieDetailFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EmphasisTripPieDetailFormDTO.java index 96a5ed7399..a6bc94b2ed 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EmphasisTripPieDetailFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EmphasisTripPieDetailFormDTO.java @@ -17,6 +17,7 @@ public class EmphasisTripPieDetailFormDTO implements Serializable { // @NotBlank(message = "code不能为空",groups = {EmphasisTripPieDetailForm.class}) private String code; + private String name; private String customerId; diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcTripReportRecordDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcTripReportRecordDao.xml index 490810a020..b9f942b776 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcTripReportRecordDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcTripReportRecordDao.xml @@ -98,8 +98,8 @@ AND CONCAT(PIDS,':',AGENCY_ID) LIKE CONCAT('%',#{agencyId},'%') - - AND SOURCE_ADDRESS_PATH_CODE LIKE CONCAT('%',#{code},'%') + + AND SOURCE_ADDRESS LIKE CONCAT('%',#{name},'%') @@ -120,8 +120,8 @@ FROM ic_trip_report_record WHERE DEL_FLAG = '0' AND CONCAT(PIDS,':',AGENCY_ID) LIKE CONCAT('%',#{agencyId},'%') - - AND SOURCE_ADDRESS_PATH_CODE LIKE CONCAT('%',#{code},'%') + + AND SOURCE_ADDRESS LIKE CONCAT('%',#{name},'%') AND sojourn_history != '3' group by dangerLevel From a11c7f920761cc382ce2ee30b361b0761baa0df7 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 9 Nov 2022 15:34:49 +0800 Subject: [PATCH 6/7] =?UTF-8?q?gov/access/govrole/page=E5=88=86=E4=B9=9F?= =?UTF-8?q?=E4=B8=8D=E5=A5=BD=E4=BD=BF=E4=B9=9F=E6=B2=A1=E4=BA=BA=E5=8F=91?= =?UTF-8?q?=E7=8E=B0=E5=93=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/GovRoleServiceImpl.java | 40 ++++++++++++------- 1 file changed, 25 insertions(+), 15 deletions(-) diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/GovRoleServiceImpl.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/GovRoleServiceImpl.java index 3f7bae6b47..5b3be75aa5 100644 --- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/GovRoleServiceImpl.java +++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/GovRoleServiceImpl.java @@ -18,7 +18,6 @@ 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.exception.EpmetErrorCode; @@ -34,6 +33,8 @@ import com.epmet.redis.GovRoleRedis; import com.epmet.service.GovRoleMenuService; import com.epmet.service.GovRoleService; import com.epmet.service.GovRoleUserService; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -64,11 +65,20 @@ public class GovRoleServiceImpl extends BaseServiceImpl page(Map params) { - IPage page = baseDao.selectPage( - getPage(params, FieldConstant.CREATED_TIME, false), - getWrapper(params) - ); - return getPageData(page, GovRoleDTO.class); + Integer pageNo = Integer.valueOf((String) params.get("pageNo")); + Integer pageSize = Integer.valueOf((String) params.get("pageSize")); + String id = (String) params.get(FieldConstant.ID_HUMP); + String name = (String) params.get(FieldConstant.NAME_HUMP); + String customerId = (String) params.get(FieldConstant.CUSTOMER_ID_HUMP); + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id) + .like(StringUtils.isNotBlank(name), FieldConstant.NAME, name) + .eq(StringUtils.isNotBlank(customerId), FieldConstant.CUSTOMER_ID, customerId); + PageHelper.startPage(pageNo, pageSize); + List list = baseDao.selectList(wrapper); + List resList = ConvertUtils.sourceToTarget(list, GovRoleDTO.class); + PageInfo pageInfo = new PageInfo<>(resList); + return new PageData<>(resList, pageInfo.getTotal()); } @Override @@ -79,10 +89,10 @@ public class GovRoleServiceImpl extends BaseServiceImpl getWrapper(Map params){ - String id = (String)params.get(FieldConstant.ID_HUMP); - String name = (String)params.get(FieldConstant.NAME_HUMP); - String customerId = (String)params.get(FieldConstant.CUSTOMER_ID_HUMP); + private QueryWrapper getWrapper(Map params) { + String id = (String) params.get(FieldConstant.ID_HUMP); + String name = (String) params.get(FieldConstant.NAME_HUMP); + String customerId = (String) params.get(FieldConstant.CUSTOMER_ID_HUMP); QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id).like(StringUtils.isNotBlank(name), FieldConstant.NAME, name) .eq(StringUtils.isNotBlank(customerId), FieldConstant.CUSTOMER_ID, customerId); @@ -101,7 +111,7 @@ public class GovRoleServiceImpl extends BaseServiceImpl Date: Thu, 10 Nov 2022 23:30:33 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E7=BB=99=E8=AE=B8=E5=A4=9Aoptions=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E5=8A=A0=E7=BC=93=E5=AD=98=EF=BC=8C10s=E6=9C=89?= =?UTF-8?q?=E6=95=88=E6=9C=9F=EF=BC=8C=E6=98=8E=E5=A4=A9=E5=BA=94=E8=AF=A5?= =?UTF-8?q?=E6=9C=89=E8=B5=B7=E6=95=88=E3=80=82=E6=89=80=E4=BB=A5=EF=BC=8C?= =?UTF-8?q?=E6=9C=89=E4=BA=9B=E4=B8=9C=E8=A5=BF=EF=BC=8C=E6=AF=94=E5=A6=82?= =?UTF-8?q?=E7=BD=91=E6=A0=BC=EF=BC=8C=E5=B0=8F=E5=8C=BA=EF=BC=8C=E5=AD=97?= =?UTF-8?q?=E5=85=B8=E8=A1=A8=EF=BC=8C=E5=A6=82=E6=9E=9C=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E3=80=81=E5=88=A0=E9=99=A4=E3=80=81=E4=BF=AE=E6=94=B9=E4=BA=86?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=EF=BC=8C=E5=8F=AF=E8=83=BD=E8=A6=81=E8=BF=87?= =?UTF-8?q?=E4=B8=AA=E5=87=A0=E7=A7=92=E9=92=9F=EF=BC=8C=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E4=B8=AD=E7=9A=84=E6=96=B0=E6=95=B0=E6=8D=AE=E6=89=8D=E4=BC=9A?= =?UTF-8?q?=E7=94=9F=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SysDictDataServiceImpl.java | 64 ++++++++- .../epmet/commons/tools/redis/RedisKeys.java | 129 ++++++++++++++++++ .../epmet/commons/tools/redis/RedisUtils.java | 17 +++ .../service/impl/CustomerGridServiceImpl.java | 16 ++- .../service/impl/IcBuildingServiceImpl.java | 26 +++- .../impl/IcBuildingUnitServiceImpl.java | 26 +++- .../service/impl/IcHouseServiceImpl.java | 25 +++- .../impl/IcNeighborHoodServiceImpl.java | 21 ++- 8 files changed, 314 insertions(+), 10 deletions(-) diff --git a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/impl/SysDictDataServiceImpl.java b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/impl/SysDictDataServiceImpl.java index a7b6bff903..75eab372eb 100644 --- a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/impl/SysDictDataServiceImpl.java +++ b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/impl/SysDictDataServiceImpl.java @@ -8,6 +8,8 @@ package com.epmet.service.impl; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.TypeReference; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -16,6 +18,8 @@ import com.epmet.commons.tools.dto.result.DictListResultDTO; import com.epmet.commons.tools.dto.result.DictTreeResultDTO; import com.epmet.commons.tools.dto.result.OptionResultDTO; import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.redis.RedisKeys; +import com.epmet.commons.tools.redis.RedisUtils; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.TreeUtils; import com.epmet.dao.SysDictDataDao; @@ -23,6 +27,7 @@ import com.epmet.dto.SysDictDataDTO; import com.epmet.entity.SysDictDataEntity; import com.epmet.service.SysDictDataService; import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -39,6 +44,9 @@ import java.util.stream.Collectors; @Service public class SysDictDataServiceImpl extends BaseServiceImpl implements SysDictDataService { + @Autowired + private RedisUtils redisUtils; + @Override public PageData page(Map params) { IPage page = baseDao.selectPage( @@ -102,17 +110,26 @@ public class SysDictDataServiceImpl extends BaseServiceImpl getNineSmallPlacesOption() { + String cacheKey = RedisKeys.getNineSmallPlacesOptions(); + List cachedDatas = JSON.parseObject(redisUtils.getString(cacheKey), new TypeReference>(){}); + if (cachedDatas != null) { + return cachedDatas; + } + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); wrapper.eq(SysDictDataEntity::getDictTypeId, 1000000000000000001L); wrapper.orderByAsc(SysDictDataEntity::getSort); List list = baseDao.selectList(wrapper); - return list.stream().map(item -> { + List datas = list.stream().map(item -> { OptionResultDTO dto = new OptionResultDTO(); dto.setValue(item.getDictValue()); dto.setLabel(item.getDictLabel()); dto.setSysDictDataId(item.getId().toString()); return dto; }).collect(Collectors.toList()); + + redisUtils.setString(cacheKey, JSON.toJSONString(datas), 10); + return datas; } /** @@ -125,16 +142,25 @@ public class SysDictDataServiceImpl extends BaseServiceImpl getEducationOption() { + String cacheKey = RedisKeys.getEducationOptions(); + List cachedDatas = JSON.parseObject(redisUtils.getString(cacheKey), new TypeReference>(){}); + if (cachedDatas != null) { + return cachedDatas; + } + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); wrapper.eq(SysDictDataEntity::getDictTypeId, 1000000000000000002L); wrapper.orderByAsc(SysDictDataEntity::getSort); List list = baseDao.selectList(wrapper); - return list.stream().map(item -> { + List datas = list.stream().map(item -> { OptionResultDTO dto = new OptionResultDTO(); dto.setValue(item.getDictValue()); dto.setLabel(item.getDictLabel()); return dto; }).collect(Collectors.toList()); + + redisUtils.setString(cacheKey, JSON.toJSONString(datas), 10); + return datas; } /** @@ -147,16 +173,25 @@ public class SysDictDataServiceImpl extends BaseServiceImpl getNationOption() { + String cacheKey = RedisKeys.getEducationOptions(); + List cachedDatas = JSON.parseObject(redisUtils.getString(cacheKey), new TypeReference>(){}); + if (cachedDatas != null) { + return cachedDatas; + } + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); wrapper.eq(SysDictDataEntity::getDictTypeId, 1000000000000000003L); wrapper.orderByAsc(SysDictDataEntity::getSort); List list = baseDao.selectList(wrapper); - return list.stream().map(item -> { + List datas = list.stream().map(item -> { OptionResultDTO dto = new OptionResultDTO(); dto.setValue(item.getDictValue()); dto.setLabel(item.getDictLabel()); return dto; }).collect(Collectors.toList()); + + redisUtils.setString(cacheKey, JSON.toJSONString(datas), 10); + return datas; } /** @@ -169,16 +204,25 @@ public class SysDictDataServiceImpl extends BaseServiceImpl getRelationshipOption() { + String cacheKey = RedisKeys.getRelationshipOptions(); + List cachedDatas = JSON.parseObject(redisUtils.getString(cacheKey), new TypeReference>(){}); + if (cachedDatas != null) { + return cachedDatas; + } + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); wrapper.eq(SysDictDataEntity::getDictTypeId, 1000000000000000004L); wrapper.orderByAsc(SysDictDataEntity::getSort); List list = baseDao.selectList(wrapper); - return list.stream().map(item -> { + List datas = list.stream().map(item -> { OptionResultDTO dto = new OptionResultDTO(); dto.setValue(item.getDictValue()); dto.setLabel(item.getDictLabel()); return dto; }).collect(Collectors.toList()); + + redisUtils.setString(cacheKey, JSON.toJSONString(datas), 10); + return datas; } /** @@ -191,16 +235,26 @@ public class SysDictDataServiceImpl extends BaseServiceImpl getHouseOption() { + + String cacheKey = RedisKeys.getHouseOptions(); + List cachedDatas = JSON.parseObject(redisUtils.getString(cacheKey), new TypeReference>(){}); + if (cachedDatas != null) { + return cachedDatas; + } + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); wrapper.eq(SysDictDataEntity::getDictTypeId, 1000000000000000005L); wrapper.orderByAsc(SysDictDataEntity::getSort); List list = baseDao.selectList(wrapper); - return list.stream().map(item -> { + List datas = list.stream().map(item -> { OptionResultDTO dto = new OptionResultDTO(); dto.setValue(item.getDictValue()); dto.setLabel(item.getDictLabel()); return dto; }).collect(Collectors.toList()); + + redisUtils.setString(cacheKey, JSON.toJSONString(datas), 10); + return datas; } /** diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java index 63f27f195b..2f57333c45 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java @@ -922,4 +922,133 @@ public class RedisKeys { public static String getOperExamineResourceUrls() { return rootPrefix.concat("oper:access:examineresources"); } + + /** + * 查询某个组织下的直属网格options + * @author wxz + * @date 2022/11/10 下午9:19 + * @param agencyId + * @return String + */ + public static String getGridOptionsKey(String agencyId) { + return rootPrefix.concat("icform:options:grids:" + agencyId); + } + + /** + * 查询某个小区下的楼栋列表 + * @author wxz + * @date 2022/11/10 下午9:42 + * @param neighborHoodId + * @return String + */ + public static String getBuildingOptionsKey(String neighborHoodId) { + return rootPrefix.concat("icform:options:buildings:" + neighborHoodId); + } + + /** + * 查询某个楼栋下的单元 + * @author wxz + * @date 2022/11/10 下午9:50 + * @param buildingId + * @return String + */ + public static String getUnitOptionsKey(String buildingId) { + return rootPrefix.concat("icform:options:units:" + buildingId); + } + + /** + * 房屋options选项 + * @author wxz + * @date 2022/11/10 下午10:00 + * @param buildingId + * @param unitId + * @return String + */ + public static String getHouseOptionsKey(String buildingId, String unitId) { + StringBuilder sb = new StringBuilder(rootPrefix.concat("icform:options:houses")); + if (StringUtils.isNotBlank(buildingId)) { + sb.append(":").append(buildingId); + } + + if (StringUtils.isNotBlank(unitId)) { + sb.append(":").append(unitId); + } + + return sb.toString(); + } + + /** + * 党支部options + * @author wxz + * @date 2022/11/10 下午10:52 + * @param gridId + * @return String + */ + public static String getBranchOptionsKey(String gridId) { + return rootPrefix.concat("icform:options:branches:" + gridId); + } + + /** + * 小区options + * @author wxz + * @date 2022/11/10 下午11:00 + * @param agencyId + * @param gridId + * @return String + */ + public static String getNeighborhoodOptions(String agencyId, String gridId) { + StringBuilder sb = new StringBuilder(rootPrefix.concat("icform:options:neighborhoods:")); + if (StringUtils.isNotBlank(agencyId)) { + sb.append(agencyId); + } + if (StringUtils.isNotBlank(gridId)) { + sb.append(gridId); + } + + return sb.toString(); + } + + /** + * 文化程度 + * @author wxz + * @date 2022/11/10 下午11:04 + + * @return String + */ + public static String getEducationOptions() { + return rootPrefix.concat("icform:options:education"); + } + + /** + * 住房性质 + * @author wxz + * @date 2022/11/10 下午11:07 + + * @return String + */ + public static String getHouseOptions() { + return rootPrefix.concat("icform:options:housetype"); + } + + /** + * 9小场所 + * @author wxz + * @date 2022/11/10 下午11:10 + + * @return String + */ + public static String getNineSmallPlacesOptions() { + return rootPrefix.concat("icform:options:ninesmallplaces"); + } + + /** + * 人员关系 + * @author wxz + * @date 2022/11/10 下午11:12 + + * @return String + */ + public static String getRelationshipOptions() { + return rootPrefix.concat("icform:options:relationship"); + } } diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisUtils.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisUtils.java index 311830ae9f..39a01db85f 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisUtils.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisUtils.java @@ -10,6 +10,7 @@ package com.epmet.commons.tools.redis; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.exception.RenException; +import com.epmet.commons.tools.utils.ConvertUtils; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory; @@ -482,4 +483,20 @@ public class RedisUtils { redisTemplate.delete(keys); } } + + /** + * hash查询并且转化为对象 + * @author wxz + * @date 2022/11/10 下午8:57 + * @param key + * @param targetClass + * @return T + */ + public T hGetAllAndConvertToBean(String key, Class targetClass) { + Map map = hGetAll(key); + if (map != null && map.size() > 0) { + return ConvertUtils.sourceToTarget(map, targetClass); + } + return null; + } } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java index df84bed116..dd1f8866fd 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java @@ -19,6 +19,7 @@ package com.epmet.service.impl; import cn.hutool.core.bean.BeanUtil; import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.TypeReference; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; @@ -939,6 +940,15 @@ public class CustomerGridServiceImpl extends BaseServiceImpl cachedDatas = JSON.parseObject(redisUtils.getString(cachedKey), new TypeReference>() {}); + if (cachedDatas != null) { + return cachedDatas; + } + + // 再查db LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); wrapper.eq(CustomerGridEntity::getPid, agencyId); wrapper.last("ORDER BY sort,CONVERT ( GRID_NAME USING gbk ) desc"); @@ -946,13 +956,17 @@ public class CustomerGridServiceImpl extends BaseServiceImpl { + List grids = list.stream().map(item -> { OptionResultDTO dto = new OptionResultDTO(); dto.setLabel(item.getGridName()); dto.setValue(item.getId()); dto.setPid(item.getPid()); return dto; }).collect(Collectors.toList()); + + //加入缓存(10秒有效期)，并且返回数据 + redisUtils.setString(cachedKey, JSON.toJSONString(grids), 10); + return grids; } /** diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcBuildingServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcBuildingServiceImpl.java index 577e77c787..b08b903120 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcBuildingServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcBuildingServiceImpl.java @@ -17,6 +17,8 @@ package com.epmet.service.impl; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.TypeReference; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -24,6 +26,8 @@ import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.dto.result.OptionResultDTO; import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.redis.RedisKeys; +import com.epmet.commons.tools.redis.RedisUtils; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.dao.IcBuildingDao; @@ -35,6 +39,7 @@ import com.epmet.service.IcBuildingService; 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 org.springframework.transaction.annotation.Transactional; @@ -54,6 +59,8 @@ import java.util.stream.Collectors; @Service public class IcBuildingServiceImpl extends BaseServiceImpl implements IcBuildingService { + @Autowired + private RedisUtils redisUtils; @Override public PageData page(Map params) { @@ -121,6 +128,16 @@ public class IcBuildingServiceImpl extends BaseServiceImpl cachedBuildings = JSON.parseObject(redisUtils.getString(cachedKey), new TypeReference>() { + }); + if (cachedBuildings != null) { + // 即便是查询到了[]空列表，也要返回，说明该小区下没有漏洞 + return cachedBuildings; + } + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); wrapper.eq(IcBuildingEntity::getNeighborHoodId, neighborHoodId); wrapper.last("ORDER BY SORT ASC, BUILDING_NAME+0 ASC"); @@ -128,12 +145,19 @@ public class IcBuildingServiceImpl extends BaseServiceImpl { + List gridsFromDb = list.stream().map(item -> { OptionResultDTO dto = new OptionResultDTO(); dto.setValue(item.getId()); dto.setLabel(item.getBuildingName()); return dto; }).collect(Collectors.toList()); + + if (gridsFromDb != null) { + // 设置缓存 + redisUtils.setString(cachedKey, JSON.toJSONString(gridsFromDb), 10); + } + + return gridsFromDb; } /** diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcBuildingUnitServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcBuildingUnitServiceImpl.java index 6b55f20cfd..1c52252802 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcBuildingUnitServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcBuildingUnitServiceImpl.java @@ -17,6 +17,8 @@ package com.epmet.service.impl; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.TypeReference; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -24,6 +26,8 @@ import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.dto.result.OptionResultDTO; import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.redis.RedisKeys; +import com.epmet.commons.tools.redis.RedisUtils; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.dao.IcBuildingUnitDao; @@ -35,6 +39,7 @@ import com.epmet.service.IcBuildingUnitService; 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 org.springframework.transaction.annotation.Transactional; @@ -54,6 +59,8 @@ import java.util.stream.Collectors; @Service public class IcBuildingUnitServiceImpl extends BaseServiceImpl implements IcBuildingUnitService { + @Autowired + private RedisUtils redisUtils; @Override public PageData page(Map params) { @@ -121,6 +128,17 @@ public class IcBuildingUnitServiceImpl extends BaseServiceImpl cachedUnits = JSON.parseObject(redisUtils.getString(cachedKey), new TypeReference>() { + }); + + if (cachedUnits != null) { + return cachedUnits; + } + + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); wrapper.eq(IcBuildingUnitEntity::getBuildingId, buildingId); wrapper.last("ORDER BY CONVERT ( UNIT_NAME USING gbk ) ASC"); @@ -128,13 +146,19 @@ public class IcBuildingUnitServiceImpl extends BaseServiceImpl { + List units = list.stream().map(item -> { OptionResultDTO dto = new OptionResultDTO(); dto.setValue(item.getId()); dto.setCode(item.getUnitNum()); dto.setLabel(item.getUnitName()); return dto; }).collect(Collectors.toList()); + + if (units != null) { + redisUtils.setString(cachedKey, JSON.toJSONString(units), 10); + } + + return units; } /** diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java index 943d6f9eee..b0cb25ce3e 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java @@ -1,5 +1,7 @@ package com.epmet.service.impl; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.TypeReference; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; @@ -11,6 +13,8 @@ import com.epmet.commons.tools.dto.result.OptionResultDTO; 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.redis.RedisKeys; +import com.epmet.commons.tools.redis.RedisUtils; import com.epmet.commons.tools.redis.common.CustomerIcHouseRedis; import com.epmet.commons.tools.redis.common.CustomerResiUserRedis; import com.epmet.commons.tools.redis.common.bean.HouseInfoCache; @@ -84,6 +88,8 @@ public class IcHouseServiceImpl extends BaseServiceImpl cachedHouses = JSON.parseObject(redisUtils.getString(cachedKey), new TypeReference>() { + }); + + if (cachedHouses != null) { + return cachedHouses; + } + + // 查db LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); wrapper.eq(StringUtils.isNotBlank(formDTO.getBuildingId()), IcHouseEntity::getBuildingId, formDTO.getBuildingId()); wrapper.eq(StringUtils.isNotBlank(formDTO.getUnitId()), IcHouseEntity::getBuildingUnitId, formDTO.getUnitId()); @@ -142,13 +159,19 @@ public class IcHouseServiceImpl extends BaseServiceImpl { + List houses = list.stream().map(item -> { OptionResultDTO dto = new OptionResultDTO(); dto.setValue(item.getId()); dto.setLabel(item.getDoorName()); dto.setType(item.getRentFlag().toString()); return dto; }).collect(Collectors.toList()); + + if (houses != null) { + redisUtils.setString(cachedKey, JSON.toJSONString(houses), 10); + } + + return houses; } /** diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java index 56e473038d..2d677b5217 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java @@ -23,6 +23,7 @@ import com.alibaba.excel.EasyExcel; import com.alibaba.excel.ExcelReader; import com.alibaba.excel.read.metadata.ReadSheet; import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.TypeReference; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -37,6 +38,8 @@ import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.exception.ExceptionUtils; import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.redis.RedisKeys; +import com.epmet.commons.tools.redis.RedisUtils; import com.epmet.commons.tools.redis.common.CustomerOrgRedis; import com.epmet.commons.tools.redis.common.CustomerStaffRedis; import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache; @@ -123,6 +126,8 @@ public class IcNeighborHoodServiceImpl extends BaseServiceImpl page(Map params) { @@ -195,6 +200,17 @@ public class IcNeighborHoodServiceImpl extends BaseServiceImpl cachedKeys = JSON.parseObject(redisUtils.getString(cacheKey), new TypeReference>() { + }); + + if (cachedKeys != null) { + return cachedKeys; + } + + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); wrapper.eq(StringUtils.isNotBlank(agencyId),IcNeighborHoodEntity::getAgencyId, agencyId); wrapper.eq(StringUtils.isNotBlank(gridId), IcNeighborHoodEntity::getGridId, gridId); @@ -203,12 +219,15 @@ public class IcNeighborHoodServiceImpl extends BaseServiceImpl { + List datas = list.stream().map(item -> { OptionResultDTO dto = new OptionResultDTO(); dto.setValue(item.getId()); dto.setLabel(item.getNeighborHoodName()); return dto; }).collect(Collectors.toList()); + + redisUtils.setString(cacheKey, JSON.toJSONString(datas), 10); + return datas; } public List getNeighborhoodList(TokenDto tokenDto, IcNeighborHoodDTO dto) {