client新增接口、版本升级

client/pom.xml

@@ -11,7 +11,7 @@
 
     <groupId>com.pica.cloud.account</groupId>
     <artifactId>pica-cloud-account-client</artifactId>
-    <version>1.0.8</version>
+    <version>1.1.1</version>
     <name>pica-cloud-account-client</name>
     <packaging>jar</packaging>
 
@@ -28,7 +28,7 @@
         <dependency>
             <groupId>com.pica.cloud.account</groupId>
             <artifactId>pica-cloud-account-common</artifactId>
-            <version>1.0.8</version>
+            <version>1.1.1</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.cloud</groupId>

client/src/main/java/com/pica/cloud/account/account/client/AccountDoctorClient.java

 package com.pica.cloud.account.account.client;
 
 import com.pica.cloud.account.account.common.dto.CancelAccountDto;
+import com.pica.cloud.account.account.common.dto.QueryDoctorRole;
 import com.pica.cloud.foundation.entity.PicaResponse;
 import org.springframework.cloud.netflix.feign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -16,4 +17,7 @@ public interface AccountDoctorClient {
 
     @PostMapping("/account/doctor/cancel/account")
     PicaResponse<Void> cancelAccountByDoctorId(@RequestBody CancelAccountDto cancelAccountDto, @RequestHeader(value = "token") String token);
+
+    @PostMapping("/account/doctor/queryDoctorExistRole")
+    PicaResponse<Boolean> queryDoctorExistRole(@RequestBody QueryDoctorRole req);
 }

common/pom.xml

@@ -11,7 +11,7 @@
 
     <groupId>com.pica.cloud.account</groupId>
     <artifactId>pica-cloud-account-common</artifactId>
-    <version>1.1.0</version>
+    <version>1.1.1</version>
     <name>pica-cloud-account-common</name>
     <packaging>jar</packaging>
 

common/src/main/java/com/pica/cloud/account/account/common/dto/QueryDoctorRole.java

+package com.pica.cloud.account.account.common.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * @ClassName QueryDoctorMainRole
+ * @Description
+ * @Author wenlei.liao
+ * @Date 2022/4/11 16:52
+ */
+public class QueryDoctorRole {
+
+    @ApiModelProperty("机构id")
+    private Long hospitalId;
+
+    @ApiModelProperty("医生id")
+    private Long doctorId;
+
+    @ApiModelProperty("角色id")
+    private Long roleId;
+
+    public Long getHospitalId() {
+        return hospitalId;
+    }
+
+    public void setHospitalId(Long hospitalId) {
+        this.hospitalId = hospitalId;
+    }
+
+    public Long getDoctorId() {
+        return doctorId;
+    }
+
+    public void setDoctorId(Long doctorId) {
+        this.doctorId = doctorId;
+    }
+
+    public Long getRoleId() {
+        return roleId;
+    }
+
+    public void setRoleId(Long roleId) {
+        this.roleId = roleId;
+    }
+}

server/pom.xml

@@ -167,7 +167,7 @@
         <dependency>
             <groupId>com.pica.cloud.account</groupId>
             <artifactId>pica-cloud-account-common</artifactId>
-            <version>1.1.0</version>
+            <version>1.1.1</version>
         </dependency>
 
         <dependency>

server/src/main/java/com/pica/cloud/account/account/server/controller/DoctorController.java

 package com.pica.cloud.account.account.server.controller;
 
 import com.pica.cloud.account.account.common.dto.CancelAccountDto;
+import com.pica.cloud.account.account.common.dto.QueryDoctorRole;
 import com.pica.cloud.account.account.server.entity.AccountUser;
 import com.pica.cloud.account.account.server.entity.Doctor;
 import com.pica.cloud.account.account.server.enums.AccountExceptionEnum;
@@ -120,4 +121,11 @@ public class DoctorController extends AccountBaseController {
         doctorService.cancelAccountByDoctorId(cancelAccountDto, super.fetchPicaUser());
         return PicaResponse.toResponse();
     }
+
+    @ApiOperation(value = "查询医生是否存在机构角色")
+    @PostMapping("/queryDoctorExistRole")
+    public PicaResponse<Boolean> queryDoctorExistRole(@RequestBody QueryDoctorRole req) {
+        Boolean existMainRole = doctorService.queryDoctorExistRole(req);
+        return PicaResponse.toResponse(existMainRole);
+    }
 }

server/src/main/java/com/pica/cloud/account/account/server/mapper/PermissionDoctorRoleMapper.java

@@ -43,4 +43,6 @@ public interface PermissionDoctorRoleMapper {
     PermissionDoctorRole selectByHospitalIdRoleId(@Param("hospitalId") Integer hospitalId, @Param("roleId") Integer roleId);
 
     int batchInsert(List<PermissionDoctorRole> list);
+
+    PermissionDoctorRole selectByIdCondition(@Param("doctorId") Long doctorId,@Param("hospitalId") Long hospitalId, @Param("roleId") Long roleId);
 }
\ No newline at end of file

server/src/main/java/com/pica/cloud/account/account/server/service/DoctorService.java

 package com.pica.cloud.account.account.server.service;
 
 import com.pica.cloud.account.account.common.dto.CancelAccountDto;
+import com.pica.cloud.account.account.common.dto.QueryDoctorRole;
 import com.pica.cloud.account.account.server.entity.Doctor;
 import com.pica.cloud.account.account.server.req.DoctorReq;
 import com.pica.cloud.foundation.utils.entity.PicaUser;
@@ -64,4 +65,5 @@ public interface DoctorService {
 
     void cancelAccountByDoctorId(CancelAccountDto cancelAccountDto, PicaUser fetchPicaUser);
 
+    Boolean queryDoctorExistRole(QueryDoctorRole req);
 }

server/src/main/java/com/pica/cloud/account/account/server/service/impl/DoctorServiceImpl.java

@@ -4,11 +4,9 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.google.common.collect.Maps;
 import com.pica.cloud.account.account.common.dto.CancelAccountDto;
+import com.pica.cloud.account.account.common.dto.QueryDoctorRole;
 import com.pica.cloud.account.account.server.constants.Constants;
-import com.pica.cloud.account.account.server.entity.AccountInfoEntity;
-import com.pica.cloud.account.account.server.entity.CancelAccountLog;
-import com.pica.cloud.account.account.server.entity.Doctor;
-import com.pica.cloud.account.account.server.entity.DoctorEducation;
+import com.pica.cloud.account.account.server.entity.*;
 import com.pica.cloud.account.account.server.enums.AccountExceptionEnum;
 import com.pica.cloud.account.account.server.enums.AccountTypeEnum;
 import com.pica.cloud.account.account.server.exception.AccountException;
@@ -68,6 +66,9 @@ public class DoctorServiceImpl implements DoctorService {
     @Autowired
     private CancelAccountLogMapper cancelAccountLogMapper;
 
+    @Autowired
+    private PermissionDoctorRoleMapper permissionDoctorRoleMapper;
+
     @Autowired
     private ICacheClient cacheClient;
     @Autowired
@@ -363,6 +364,12 @@ public class DoctorServiceImpl implements DoctorService {
         simpleProducer.send(kafkaSendTopic, kafkaModel);
     }
 
+    @Override
+    public Boolean queryDoctorExistRole(QueryDoctorRole req) {
+        PermissionDoctorRole role = permissionDoctorRoleMapper.selectByIdCondition(req.getDoctorId(), req.getHospitalId(), req.getRoleId());
+        return role != null ? true : false;
+    }
+
     private void checkResponse(String checkExecute) {
         PicaResponse checkResponse = JSON.parseObject(checkExecute, PicaResponse.class);
         if (!checkResponse.getCode().equals(PicaResultCode.SUCCESS.code())) {

server/src/main/resources/mybatis/PermissionDoctorRoleMapper.xml

@@ -226,4 +226,15 @@
         where pdr.doctor_id = #{id,jdbcType=BIGINT}
           and pdr.delete_flag = 1
     </select>
+
+    <select id="selectByIdCondition" parameterType="java.lang.Long" resultMap="BaseResultMap">
+    SELECT pr.*
+    FROM permission_doctor_role pr
+    WHERE pr.hospital_id = #{hospitalId}
+    and pr.doctor_id = #{doctorId}
+    and pr.role_id = #{roleId}
+    AND pr.delete_flag = 1
+    order by pr.modified_time desc
+    limit 1
+    </select>
 </mapper>
\ No newline at end of file

server/src/test/java/com/pica/cloud/account/account/server/service/DoctorServiceTest.java

+package com.pica.cloud.account.account.server.service;
+
+import com.pica.cloud.account.account.common.dto.QueryDoctorRole;
+import com.pica.cloud.account.account.server.App;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+/**
+ * @ClassName DoctorServiceTest
+ * @Description
+ * @Author wenlei.liao
+ * @Date 2022/4/11 17:00
+ */
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = App.class)
+public class DoctorServiceTest {
+
+    @Autowired
+    private DoctorService doctorService;
+
+    @Test
+    public void queryDoctorExistMainRoleTest() {
+        QueryDoctorRole req = new QueryDoctorRole();
+        req.setDoctorId(100925427l);
+        req.setHospitalId(12746l);
+        req.setRoleId(1l);
+        Boolean aBoolean = doctorService.queryDoctorExistRole(req);
+        System.out.println(aBoolean);
+    }
+}