From 2c7766863195459c93d306d99beb5ecaa4327f2b Mon Sep 17 00:00:00 2001 From: zhangchenbiao Date: Thu, 20 Jul 2023 16:16:47 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=87=E6=BB=A4=E9=9D=9E=E5=8F=B6=E5=AD=90?= =?UTF-8?q?=E8=8A=82=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/cool/store/enums/ErrorCodeEnum.java | 3 ++- .../java/com/cool/store/dao/HyOpenAreaInfoDAO.java | 13 +++++++++++++ .../com/cool/store/mapper/HyOpenAreaInfoMapper.java | 6 ++++++ .../main/resources/mapper/HyOpenAreaInfoMapper.xml | 9 +++++++++ .../service/impl/InspectionSettingServiceImpl.java | 10 ++++++++-- 5 files changed, 38 insertions(+), 3 deletions(-) diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java index 34a46bbcf..69ec9e182 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java @@ -83,7 +83,8 @@ public enum ErrorCodeEnum { GET_ACCESSTOKEN_ERROR(600001, "获取小程序TOKEN错误！", null), NEW_MOBILE_HAS_EXIST(600002,"加盟商用户信息已存在",null), INSPECTION_USER_OCCUPY(600002,"当前稽核人已经配置其他战区",null), - INSPECTION_INFO_NOT_EXIST(600005, "稽核信息不存在！", null) + INSPECTION_INFO_NOT_EXIST(600005, "稽核信息不存在！", null), + OPEN_AREA_NULL(600006,"归属地区不能为空",null), ; diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyOpenAreaInfoDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyOpenAreaInfoDAO.java index 008db64d9..27f801750 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyOpenAreaInfoDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyOpenAreaInfoDAO.java @@ -116,4 +116,17 @@ public class HyOpenAreaInfoDAO { public List getAllOpenArea(){ return hyOpenAreaInfoMapper.getAllOpenArea(); } + + /** + * 过滤叶子节点 + * @param openAreaIds + * @return 叶子节点id + */ + public List filterLeafNode(List openAreaIds){ + if(CollectionUtils.isEmpty(openAreaIds)){ + return Lists.newArrayList(); + } + return hyOpenAreaInfoMapper.filterLeafNode(openAreaIds); + } + } diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyOpenAreaInfoMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyOpenAreaInfoMapper.java index d85690aba..a3a5eef01 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyOpenAreaInfoMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyOpenAreaInfoMapper.java @@ -111,5 +111,11 @@ public interface HyOpenAreaInfoMapper { */ List getAllOpenArea(); + /** + * 过滤叶子节点 + * @param openAreaIds + * @return + */ + List filterLeafNode(@Param("openAreaIds") List openAreaIds); } \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyOpenAreaInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyOpenAreaInfoMapper.xml index a67cf9950..d6611c821 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyOpenAreaInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyOpenAreaInfoMapper.xml @@ -285,4 +285,13 @@ select from hy_open_area_info + + \ No newline at end of file diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/InspectionSettingServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/InspectionSettingServiceImpl.java index d88b3fc03..0d731f65b 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/InspectionSettingServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/InspectionSettingServiceImpl.java @@ -79,13 +79,16 @@ public class InspectionSettingServiceImpl implements InspectionSettingService { if(CollectionUtils.isNotEmpty(inspectionUserSetting)){ throw new ServiceException(ErrorCodeEnum.INSPECTION_USER_OCCUPY); } + List openAreaMappingIds = hyOpenAreaInfoDAO.filterLeafNode(param.getOpenAreaMappingIds()); + if(CollectionUtils.isEmpty(openAreaMappingIds)){ + throw new ServiceException(ErrorCodeEnum.OPEN_AREA_NULL); + } HyInspectionSettingDO inspectionSetting = new HyInspectionSettingDO(); inspectionSetting.setInspectionUserId(param.getInspectionUserId()); inspectionSetting.setZoneName(param.getZoneName()); inspectionSetting.setCreateUserId(userId); inspectionSetting.setCreateTime(new Date()); Long inspectionSettingId = hyInspectionSettingDAO.addInspectionSetting(inspectionSetting); - List openAreaMappingIds = param.getOpenAreaMappingIds(); hyInspectionSettingMappingDAO.addInspectionSettingMapping(inspectionSettingId, openAreaMappingIds); return inspectionSettingId; } @@ -97,6 +100,10 @@ public class InspectionSettingServiceImpl implements InspectionSettingService { if(CollectionUtils.isNotEmpty(inspectionUserSetting)){ throw new ServiceException(ErrorCodeEnum.INSPECTION_USER_OCCUPY); } + List openAreaMappingIds = hyOpenAreaInfoDAO.filterLeafNode(param.getOpenAreaMappingIds()); + if(CollectionUtils.isEmpty(openAreaMappingIds)){ + throw new ServiceException(ErrorCodeEnum.OPEN_AREA_NULL); + } HyInspectionSettingDO inspectionSetting = new HyInspectionSettingDO(); inspectionSetting.setId(param.getInspectionSettingId()); inspectionSetting.setInspectionUserId(param.getInspectionUserId()); @@ -104,7 +111,6 @@ public class InspectionSettingServiceImpl implements InspectionSettingService { inspectionSetting.setUpdateUserId(userId); inspectionSetting.setUpdateTime(new Date()); hyInspectionSettingDAO.updateInspectionSetting(inspectionSetting); - List openAreaMappingIds = param.getOpenAreaMappingIds(); return hyInspectionSettingMappingDAO.updateInspectionSettingMapping(param.getInspectionSettingId(), openAreaMappingIds); }