From 7e4e183993e80aec6b72e9d334615d7e8867ea2e Mon Sep 17 00:00:00 2001 From: zhangheng <3226558941@qq.com> Date: Tue, 27 Feb 2024 18:03:31 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8C=BA=E5=9F=9F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/agency/AgencyController.java | 4 +- .../AgencyCategoryController.java | 4 +- .../department/DepartmentController.java | 4 +- .../DepartmentDiseaseTypeController.java | 4 +- .../manage/mapper/sysarea/SysAreaMapper.java | 10 ++++ .../agency/impl/AgencyServiceImpl.java | 20 +++++-- .../com/xinelu/manage/vo/agency/AgencyVO.java | 41 +++++++++++++ .../xinelu/manage/vo/sysarea/SysAreaVO.java | 60 +++++++++++++++++++ .../mapper/manage/agency/AgencyMapper.xml | 9 ++- .../mapper/manage/sysarea/SysAreaMapper.xml | 35 +++++++++++ 10 files changed, 176 insertions(+), 15 deletions(-) create mode 100644 postdischarge-manage/src/main/java/com/xinelu/manage/vo/sysarea/SysAreaVO.java diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/agency/AgencyController.java b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/agency/AgencyController.java index bf4c094b..6a2eba1b 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/agency/AgencyController.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/agency/AgencyController.java @@ -68,7 +68,7 @@ public class AgencyController extends BaseController { */ @PreAuthorize("@ss.hasPermi('system:agency:add')") @Log(title = "机构信息", businessType = BusinessType.INSERT) - @PostMapping + @PostMapping("/add") public AjaxResult add(@RequestBody Agency agency) { return toAjax(agencyService.insertAgency(agency)); } @@ -78,7 +78,7 @@ public class AgencyController extends BaseController { */ @PreAuthorize("@ss.hasPermi('system:agency:edit')") @Log(title = "机构信息", businessType = BusinessType.UPDATE) - @PutMapping + @PutMapping("/edit") public AjaxResult edit(@RequestBody Agency agency) { return toAjax(agencyService.updateAgency(agency)); } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/agencycategory/AgencyCategoryController.java b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/agencycategory/AgencyCategoryController.java index 5ab43fad..8cd58b46 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/agencycategory/AgencyCategoryController.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/agencycategory/AgencyCategoryController.java @@ -65,7 +65,7 @@ public class AgencyCategoryController extends BaseController { */ @PreAuthorize("@ss.hasPermi('system:agencyCategory:add')") @Log(title = "机构类别", businessType = BusinessType.INSERT) - @PostMapping + @PostMapping("/add") public AjaxResult add(@RequestBody AgencyCategory agencyCategory) { if (Objects.isNull(agencyCategory)) { return AjaxResult.success(); @@ -78,7 +78,7 @@ public class AgencyCategoryController extends BaseController { */ @PreAuthorize("@ss.hasPermi('system:agencyCategory:edit')") @Log(title = "机构类别", businessType = BusinessType.UPDATE) - @PutMapping + @PutMapping("/edit") public AjaxResult edit(@RequestBody AgencyCategory agencyCategory) { return toAjax(agencyCategoryService.updateAgencyCategory(agencyCategory)); } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/department/DepartmentController.java b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/department/DepartmentController.java index 7aa57024..dbbbfa14 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/department/DepartmentController.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/department/DepartmentController.java @@ -69,7 +69,7 @@ public class DepartmentController extends BaseController { */ @PreAuthorize("@ss.hasPermi('system:department:add')") @Log(title = "科室信息", businessType = BusinessType.INSERT) - @PostMapping + @PostMapping("/add") public AjaxResult add(@RequestBody Department department) { return toAjax(departmentService.insertDepartment(department)); } @@ -79,7 +79,7 @@ public class DepartmentController extends BaseController { */ @PreAuthorize("@ss.hasPermi('system:department:edit')") @Log(title = "科室信息", businessType = BusinessType.UPDATE) - @PutMapping + @PutMapping("/edit") public AjaxResult edit(@RequestBody Department department) { return toAjax(departmentService.updateDepartment(department)); } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/departmentdiseasetype/DepartmentDiseaseTypeController.java b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/departmentdiseasetype/DepartmentDiseaseTypeController.java index 513d1c6a..f1e504f4 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/departmentdiseasetype/DepartmentDiseaseTypeController.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/departmentdiseasetype/DepartmentDiseaseTypeController.java @@ -64,7 +64,7 @@ public class DepartmentDiseaseTypeController extends BaseController { */ @PreAuthorize("@ss.hasPermi('system:departmentDisease:add')") @Log(title = "科室病种信息", businessType = BusinessType.INSERT) - @PostMapping + @PostMapping("/add") public AjaxResult add(@RequestBody DepartmentDiseaseType departmentDiseaseType) { return toAjax(departmentDiseaseTypeService.insertDepartmentDiseaseType(departmentDiseaseType)); } @@ -74,7 +74,7 @@ public class DepartmentDiseaseTypeController extends BaseController { */ @PreAuthorize("@ss.hasPermi('system:departmentDisease:edit')") @Log(title = "科室病种信息", businessType = BusinessType.UPDATE) - @PutMapping + @PutMapping("/edit") public AjaxResult edit(@RequestBody DepartmentDiseaseType departmentDiseaseType) { return toAjax(departmentDiseaseTypeService.updateDepartmentDiseaseType(departmentDiseaseType)); } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/sysarea/SysAreaMapper.java b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/sysarea/SysAreaMapper.java index c1d50226..e3027ba4 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/sysarea/SysAreaMapper.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/sysarea/SysAreaMapper.java @@ -1,6 +1,8 @@ package com.xinelu.manage.mapper.sysarea; import com.xinelu.manage.domain.sysarea.SysArea; +import com.xinelu.manage.vo.sysarea.SysAreaVO; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -19,4 +21,12 @@ public interface SysAreaMapper { * @return 区域集合 */ List selectSysAreaList(SysArea sysArea); + + /** + * 下级区域寻找上级区域 + * + * @param areaCode 区域编码 + * @return com.xinyilu.base.domain.vo.sysarea.SysAreaVO + **/ + SysAreaVO getSubordinateRegionsFindSuperiorRegions(@Param("areaCode") String areaCode); } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/agency/impl/AgencyServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/agency/impl/AgencyServiceImpl.java index d361ff8a..180cb455 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/agency/impl/AgencyServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/agency/impl/AgencyServiceImpl.java @@ -1,19 +1,19 @@ package com.xinelu.manage.service.agency.impl; -import com.xinelu.common.constant.Constants; import com.xinelu.common.core.domain.AjaxResult; import com.xinelu.common.exception.ServiceException; import com.xinelu.common.utils.DateUtils; import com.xinelu.common.utils.SecurityUtils; import com.xinelu.common.utils.StringUtils; import com.xinelu.common.utils.bean.BeanUtils; -import com.xinelu.common.utils.codes.GenerateSystemCodeUtil; import com.xinelu.common.utils.regex.RegexUtil; import com.xinelu.manage.domain.agency.Agency; import com.xinelu.manage.mapper.agency.AgencyMapper; +import com.xinelu.manage.mapper.sysarea.SysAreaMapper; import com.xinelu.manage.service.agency.IAgencyService; import com.xinelu.manage.vo.agency.AgencyTreeVO; import com.xinelu.manage.vo.agency.AgencyVO; +import com.xinelu.manage.vo.sysarea.SysAreaVO; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.BooleanUtils; import org.springframework.stereotype.Service; @@ -40,7 +40,7 @@ public class AgencyServiceImpl implements IAgencyService { @Resource private RegexUtil regexUtil; @Resource - private GenerateSystemCodeUtil generateSystemCodeUtil; + private SysAreaMapper sysAreaMapper; /** * 查询机构信息 @@ -50,7 +50,19 @@ public class AgencyServiceImpl implements IAgencyService { */ @Override public AgencyVO selectAgencyById(Long id) { - return agencyMapper.selectAgencyVOById(id); + AgencyVO agency = agencyMapper.selectAgencyVOById(id); + if (StringUtils.isNotBlank(agency.getAreaCode())) { + SysAreaVO nurseStationAndAreaCode = sysAreaMapper.getSubordinateRegionsFindSuperiorRegions(agency.getAreaCode()); + agency.setProvinceCode(StringUtils.isBlank(nurseStationAndAreaCode.getProvinceCode()) ? "" : nurseStationAndAreaCode.getProvinceCode()); + agency.setProvinceName(StringUtils.isBlank(nurseStationAndAreaCode.getProvinceName()) ? "" : nurseStationAndAreaCode.getProvinceName()); + agency.setCityCode(StringUtils.isBlank(nurseStationAndAreaCode.getCityCode()) ? "" : nurseStationAndAreaCode.getCityCode()); + agency.setCityName(StringUtils.isBlank(nurseStationAndAreaCode.getCityName()) ? "" : nurseStationAndAreaCode.getCityName()); + agency.setRegionCode(StringUtils.isBlank(nurseStationAndAreaCode.getRegionCode()) ? "" : nurseStationAndAreaCode.getRegionCode()); + agency.setRegionName(StringUtils.isBlank(nurseStationAndAreaCode.getRegionName()) ? "" : nurseStationAndAreaCode.getRegionName()); + agency.setStreetCode(StringUtils.isBlank(nurseStationAndAreaCode.getStreetCode()) ? "" : nurseStationAndAreaCode.getStreetCode()); + agency.setStreetName(StringUtils.isBlank(nurseStationAndAreaCode.getStreetName()) ? "" : nurseStationAndAreaCode.getStreetName()); + } + return agency; } /** diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/agency/AgencyVO.java b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/agency/AgencyVO.java index 010a5e19..64ec09b9 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/agency/AgencyVO.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/agency/AgencyVO.java @@ -18,6 +18,47 @@ import java.util.List; @Data public class AgencyVO extends Agency { + + /** + * 主键id + */ + private String provinceName; + + /** + * 父级id + */ + private String provinceCode; + + /** + * 主键id + */ + private String cityName; + + /** + * 父级id + */ + private String cityCode; + + /** + * 主键id + */ + private String regionName; + + /** + * 父级id + */ + private String regionCode; + + /** + * 主键id + */ + private String streetName; + + /** + * 父级id + */ + private String streetCode; + /** * 上级机构 */ diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/sysarea/SysAreaVO.java b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/sysarea/SysAreaVO.java new file mode 100644 index 00000000..84c659ae --- /dev/null +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/sysarea/SysAreaVO.java @@ -0,0 +1,60 @@ +package com.xinelu.manage.vo.sysarea; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @author ljh + * @version 1.0 + * Create by 2022/9/20 17:58 + */ +@Data +public class SysAreaVO implements Serializable { + private static final long serialVersionUID = -6098312186830650793L; + + /** + * 省名称 + */ + private String provinceName; + + /** + * 省区域编码 + */ + private String provinceCode; + + /** + * 市名称 + */ + private String cityName; + + /** + * 市区域编码 + */ + private String cityCode; + + /** + * 区域名称 + */ + private String regionName; + + /** + * 区区域编码 + */ + private String regionCode; + + /** + * 街道名称 + */ + private String streetName; + + /** + * 街道区域编码 + */ + private String streetCode; + + /** + * 街道区域编码 + */ + private String areaCode; +} diff --git a/postdischarge-manage/src/main/resources/mapper/manage/agency/AgencyMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/agency/AgencyMapper.xml index 9b6b96c8..6e853e80 100644 --- a/postdischarge-manage/src/main/resources/mapper/manage/agency/AgencyMapper.xml +++ b/postdischarge-manage/src/main/resources/mapper/manage/agency/AgencyMapper.xml @@ -366,7 +366,6 @@ insert into agency( - select parent_id, agency_category_id, agency_category_name, @@ -383,7 +382,9 @@ agency_phone, agency_address, agency_remark, - agency_sort + agency_sort, + create_by, + create_time ) values ( @@ -403,7 +404,9 @@ #{Agency.agencyPhone}, #{Agency.agencyAddress}, #{Agency.agencyRemark}, - #{Agency.agencySort} + #{Agency.agencySort}, + #{Agency.createBy}, + #{Agency.createTime} ) diff --git a/postdischarge-manage/src/main/resources/mapper/manage/sysarea/SysAreaMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/sysarea/SysAreaMapper.xml index a1024c61..2511fb4a 100644 --- a/postdischarge-manage/src/main/resources/mapper/manage/sysarea/SysAreaMapper.xml +++ b/postdischarge-manage/src/main/resources/mapper/manage/sysarea/SysAreaMapper.xml @@ -57,4 +57,39 @@ order by sort + +