From 1b05642457ddf77d05e076c5d88f2611e3b8ff1a Mon Sep 17 00:00:00 2001 From: wangxiang <1827945911@qq.com> Date: Thu, 18 Aug 2022 17:54:37 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=A7=AC=E6=9B=B4=E6=96=B0=E8=8F=9C?= =?UTF-8?q?=E5=8D=95=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cloud/kicc/commonbiz/api/entity/Org.java | 4 +-- .../system/api/feign/RemoteRegionService.java | 33 +++++++++++++++++++ .../system/api/feign/RemoteUserService.java | 7 ---- .../commonbiz/controller/OrgController.java | 18 ++++++++-- .../service/impl/EquipBoxUserServiceImpl.java | 8 ++--- .../system/controller/RegionController.java | 11 +++++-- 6 files changed, 63 insertions(+), 18 deletions(-) create mode 100644 kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/feign/RemoteRegionService.java diff --git a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/Org.java b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/Org.java index 7b9ae5c0..70cddacb 100644 --- a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/Org.java +++ b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/Org.java @@ -36,9 +36,7 @@ public class Org extends CommonEntity { private String contactTitle; - private String addressIds; - - private String addressNames; + private String regionIds; private String detailAddress; diff --git a/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/feign/RemoteRegionService.java b/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/feign/RemoteRegionService.java new file mode 100644 index 00000000..70320833 --- /dev/null +++ b/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/feign/RemoteRegionService.java @@ -0,0 +1,33 @@ +package com.cloud.kicc.system.api.feign; +import com.cloud.kicc.common.core.api.R; +import com.cloud.kicc.common.core.constant.AppConstants; +import com.cloud.kicc.common.core.constant.SecurityConstants; +import com.cloud.kicc.common.core.constant.ServiceNameConstants; +import com.cloud.kicc.system.api.entity.Region; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestHeader; +import java.util.List; + +/** + *

+ * 远程区域api + *

+ * + * @Author: entfrm开发团队-王翔 + * @Date: 2022/2/17 + */ +@FeignClient(contextId = "remoteRegionService", value = ServiceNameConstants.SYSTEM_SERVICE) +public interface RemoteRegionService { + + /** + * 通过区域id查询区域信息 + * @param regionIds 区域id + * @param from 调用标志 + * @return R + */ + @GetMapping(AppConstants.APP_SYSTEM + "/region/selectByRegionIds/{regionIds}") + R> selectByRegionIds(@PathVariable("regionIds") String[] regionIds, @RequestHeader(SecurityConstants.FROM) String from); + +} diff --git a/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/feign/RemoteUserService.java b/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/feign/RemoteUserService.java index a105e9c5..e329d75b 100644 --- a/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/feign/RemoteUserService.java +++ b/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/feign/RemoteUserService.java @@ -39,11 +39,4 @@ public interface RemoteUserService { @GetMapping(AppConstants.APP_SYSTEM + "/user/selectByPhone/{phone}") R selectByPhone(@PathVariable("phone") String phone, @RequestHeader(SecurityConstants.FROM) String from); - /** - * 通过id查询 - * @param userId - * @return - */ - @GetMapping(AppConstants.APP_SYSTEM + "/user/selectByUserName/{userId}") - R getById(@PathVariable("userId") String userId); } diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/OrgController.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/OrgController.java index 6f9b0e9b..6b05d471 100644 --- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/OrgController.java +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/OrgController.java @@ -7,13 +7,19 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.cloud.kicc.common.core.api.R; import com.cloud.kicc.common.core.constant.AppConstants; +import com.cloud.kicc.common.core.constant.SecurityConstants; import com.cloud.kicc.commonbiz.api.entity.Org; import com.cloud.kicc.commonbiz.service.OrgService; +import com.cloud.kicc.system.api.entity.Region; +import com.cloud.kicc.system.api.feign.RemoteRegionService; +import com.cloud.kicc.system.api.vo.ResultVo; import io.swagger.annotations.Api; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; import java.util.Arrays; +import java.util.List; +import java.util.stream.Collectors; /** *

@@ -31,6 +37,8 @@ public class OrgController { private final OrgService orgService; + private final RemoteRegionService remoteRegionService; + private LambdaQueryWrapper getQueryWrapper(Org org) { return Wrappers.lambdaQuery() .like(StrUtil.isNotBlank(org.getName()), Org::getName, org.getName()) @@ -45,9 +53,15 @@ public class OrgController { return R.ok(result.getRecords(), result.getTotal()); } - @GetMapping("{id}") + @GetMapping("/{id}") public R getById(@PathVariable String id) { - return R.ok(orgService.getById(id)); + ResultVo resultVo = new ResultVo(); + Org org = orgService.getById(id); + resultVo.setResult(org); + // 查询省市级联名称数据 + R> result = remoteRegionService.selectByRegionIds(StrUtil.splitToArray(org.getRegionIds(),","), SecurityConstants.FROM_IN); + resultVo.setExtend(result.getData().stream().map(item -> item.getName()).collect(Collectors.toList())); + return R.ok(resultVo); } @PostMapping("/save") diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/EquipBoxUserServiceImpl.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/EquipBoxUserServiceImpl.java index ab1f3006..fa66eefc 100644 --- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/EquipBoxUserServiceImpl.java +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/EquipBoxUserServiceImpl.java @@ -33,10 +33,10 @@ public class EquipBoxUserServiceImpl extends ServiceImpl byId = remoteUserService.getById(param.getUserId()); - if (byId.getCode() == 200) { - param.setUserName(byId.getData().getUserName()); - } + //R byId = remoteUserService.getById(param.getUserId()); + //if (byId.getCode() == 200) { + // param.setUserName(byId.getData().getUserName()); + //} } return this.save(param); } diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/RegionController.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/RegionController.java index 2857f5b8..bb6aec56 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/RegionController.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/RegionController.java @@ -4,7 +4,7 @@ import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.cloud.kicc.common.core.api.R; import com.cloud.kicc.common.core.constant.AppConstants; -import com.cloud.kicc.system.api.entity.Menu; +import com.cloud.kicc.common.security.annotation.Inner; import com.cloud.kicc.system.api.entity.Region; import com.cloud.kicc.system.api.vo.ResultVo; import com.cloud.kicc.system.service.RegionService; @@ -49,8 +49,15 @@ public class RegionController { return R.ok(regionService.lazyList(parentId)); } + @Inner + @GetMapping("/selectByRegionIds/{regionIds}") + public R selectByRegionIds(@PathVariable String[] regionIds) { + List result = regionService.list(new LambdaQueryWrapper().in(Region::getId, regionIds)); + return R.ok(result, result.size()); + } + @GetMapping("/{id:\\w+}") - public R getById(@PathVariable("id") String id) { + public R getById(@PathVariable String id) { ResultVo resultVo = new ResultVo(); Region region = regionService.getById(id); resultVo.setResult(region);