From a13af4841ef52992e5f0503486026bc924d7f6ff Mon Sep 17 00:00:00 2001 From: wen <1455474577@qq.com> Date: Sat, 12 Feb 2022 15:53:27 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E6=AF=8F=E4=B8=AA=E5=B9=B3?= =?UTF-8?q?=E5=8F=B0=E7=A7=9F=E6=88=B7=E6=9F=A5=E8=AF=A2=E5=85=B6=E6=89=80?= =?UTF-8?q?=E5=B1=9E=E7=9A=84=E6=8E=88=E6=9D=83=E8=BF=90=E8=90=A5=E5=95=86?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../card/controller/XhpcCardController.java | 16 +++++++++++++ .../xhpc/card/mapper/XhpcOperatorMapper.java | 11 +++++++++ .../xhpc/card/service/IXhpcCardService.java | 13 ++++++++++ .../service/impl/XhpcCardServiceImpl.java | 24 +++++++++++++++++++ .../resources/mapper/XhpcOperatorMapper.xml | 6 +++++ 5 files changed, 70 insertions(+) diff --git a/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/controller/XhpcCardController.java b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/controller/XhpcCardController.java index 13b27ab2..40bc8679 100644 --- a/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/controller/XhpcCardController.java +++ b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/controller/XhpcCardController.java @@ -9,6 +9,9 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; +import java.util.List; +import java.util.Map; + /** * @author yuyang * @date 2022/1/20 11:33 @@ -120,5 +123,18 @@ public class XhpcCardController extends BaseController { return xhpcCardService.queryWholeUserInfo(userAccount, userType); } + /** + * According tenant id of platform query that it own all grantOperators + * + * @author WH + * @date 2022/2/12 15:12 + * @since version-1.0 + */ + @GetMapping("/grantOperatorUser") + public R>> queryOperatorUser() { + + return xhpcCardService.queryOperatorUser(); + } + } diff --git a/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/mapper/XhpcOperatorMapper.java b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/mapper/XhpcOperatorMapper.java index 46475a7b..8172891c 100644 --- a/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/mapper/XhpcOperatorMapper.java +++ b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/mapper/XhpcOperatorMapper.java @@ -2,6 +2,8 @@ package com.xhpc.card.mapper; import com.xhpc.card.pojo.XhpcOperator; +import java.util.List; + public interface XhpcOperatorMapper { int deleteByPrimaryKey(Long operatorId); @@ -25,4 +27,13 @@ public interface XhpcOperatorMapper { */ XhpcOperator selectByName(String grantOperatorName); + /** + * according tenant id of platform query id and name of every operator + * + * @author WH + * @date 2022/2/12 15:23 + * @since version-1.0 + */ + List selectAll(String tenantId); + } \ No newline at end of file diff --git a/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/service/IXhpcCardService.java b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/service/IXhpcCardService.java index c2a9832f..34969c7f 100644 --- a/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/service/IXhpcCardService.java +++ b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/service/IXhpcCardService.java @@ -3,6 +3,9 @@ package com.xhpc.card.service; import com.xhpc.card.domain.*; import com.xhpc.common.core.domain.R; +import java.util.List; +import java.util.Map; + /** * @author yuyang * @date 2022/1/20 13:44 @@ -97,4 +100,14 @@ public interface IXhpcCardService { */ R queryWholeUserInfo(String userAccount, Integer userType); + /** + * Platform query that it own all grantOperators + * + * @return infos of all grantOperator + * @author WH + * @date 2022/2/12 15:14 + * @since version-1.0 + */ + R>> queryOperatorUser(); + } diff --git a/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/service/impl/XhpcCardServiceImpl.java b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/service/impl/XhpcCardServiceImpl.java index e20aba7f..3f5f1a5a 100644 --- a/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/service/impl/XhpcCardServiceImpl.java +++ b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/service/impl/XhpcCardServiceImpl.java @@ -362,6 +362,30 @@ public class XhpcCardServiceImpl implements IXhpcCardService { } + @Override + public R>> queryOperatorUser() { + + LoginUser loginUser = tokenService.getLoginUser(); + SysUser sysUser = loginUser.getSysUser(); + String userType = sysUser.getUserType(); + if (!UserTypeUtil.SYS_USER_TYPE_ZERO.equals(userType)) { + R.fail("该用户不是平台，不能调用此接口"); + } + String tenantId = sysUser.getTenantId(); + List xhpcOperators = xhpcOperatorMapper.selectAll(tenantId); + ArrayList> dataList = new ArrayList<>(); + if (xhpcOperators.isEmpty()) { + return R.ok(dataList); + } + for (XhpcOperator xhpcOperator : xhpcOperators) { + HashMap map = new HashMap<>(); + map.put("id", xhpcOperator.getOperatorId()); + map.put("name", xhpcOperator.getName()); + dataList.add(map); + } + return R.ok(dataList); + } + private void fillUserInfo(CardUserInfo cardUserInfo, Map userData) { cardUserInfo.setCardSerialNumber((String) userData.get("cardID")); diff --git a/xhpc-modules/xhpc-card/src/main/resources/mapper/XhpcOperatorMapper.xml b/xhpc-modules/xhpc-card/src/main/resources/mapper/XhpcOperatorMapper.xml index 46095e5d..32b40468 100644 --- a/xhpc-modules/xhpc-card/src/main/resources/mapper/XhpcOperatorMapper.xml +++ b/xhpc-modules/xhpc-card/src/main/resources/mapper/XhpcOperatorMapper.xml @@ -54,6 +54,12 @@ from xhpc_operator where name = #{grantOperatorName} + delete from xhpc_operator