feat:merge

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

@@ -15,6 +15,9 @@ public interface PatHealthPackClient {
     @GetMapping(value = "/account/pat-health/acctId/unionId/{unionId}")
     PicaResponse<Integer> getAcctIdByUnionId(@PathVariable("unionId") String unionId);
 
+    @GetMapping(value = "/account/pat-health/unionId/acctId/{acctId}")
+    PicaResponse<Integer> getUnionIdByAcctId(@PathVariable("acctId") Integer acctId);
+
     @GetMapping(value = "/account/pat-health/acctId/patId/{patientId}")
     PicaResponse<Integer> getAcctIdByPatId(@PathVariable("patientId") Integer patientId);
 

server/c:/tomcat-log/-1-pica-cloud-account/info.log

+[2023-05-26 11:10:42.328] [INFO ] [main] org.springframework.context.support.AbstractApplicationContext.prepareRefresh - Refreshing org.springframework.context.annotation.AnnotationConfigApplicationContext@48c4245d: startup date [Fri May 26 11:10:42 CST 2023]; root of context hierarchy
+[2023-05-26 11:10:42.635] [INFO ] [main] org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor.<init> - JSR-330 'javax.inject.Inject' annotation found and supported for autowiring
+[2023-05-26 11:10:42.671] [INFO ] [main] org.springframework.context.support.PostProcessorRegistrationDelegate$BeanPostProcessorChecker.postProcessAfterInitialization - Bean 'configurationPropertiesRebinderAutoConfiguration' of type [org.springframework.cloud.autoconfigure.ConfigurationPropertiesRebinderAutoConfiguration$$EnhancerBySpringCGLIB$$f6c6f5d1] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+[2023-05-26 11:10:42.957] [INFO ] [main] org.springframework.cloud.netflix.eureka.InstanceInfoFactory.create - Setting initial instance status as: STARTING
+[2023-05-26 11:10:43.082] [INFO ] [main] com.netflix.discovery.DiscoveryClient.<init> - Initializing Eureka in region us-east-1
+[2023-05-26 11:10:43.258] [INFO ] [main] com.netflix.discovery.provider.DiscoveryJerseyProvider.<init> - Using JSON encoding codec LegacyJacksonJson
+[2023-05-26 11:10:43.258] [INFO ] [main] com.netflix.discovery.provider.DiscoveryJerseyProvider.<init> - Using JSON decoding codec LegacyJacksonJson
+[2023-05-26 11:10:43.423] [INFO ] [main] com.netflix.discovery.provider.DiscoveryJerseyProvider.<init> - Using XML encoding codec XStreamXml
+[2023-05-26 11:10:43.423] [INFO ] [main] com.netflix.discovery.provider.DiscoveryJerseyProvider.<init> - Using XML decoding codec XStreamXml
+[2023-05-26 11:10:43.697] [INFO ] [main] com.netflix.discovery.shared.resolver.aws.ConfigClusterResolver.getClusterEndpoints - Resolving eureka endpoints via configuration
+[2023-05-26 11:10:43.726] [INFO ] [main] com.netflix.discovery.DiscoveryClient.fetchRegistry - Disable delta property : false
+[2023-05-26 11:10:43.726] [INFO ] [main] com.netflix.discovery.DiscoveryClient.fetchRegistry - Single vip registry refresh property : null
+[2023-05-26 11:10:43.726] [INFO ] [main] com.netflix.discovery.DiscoveryClient.fetchRegistry - Force full registry fetch : false
+[2023-05-26 11:10:43.727] [INFO ] [main] com.netflix.discovery.DiscoveryClient.fetchRegistry - Application is null : false
+[2023-05-26 11:10:43.727] [INFO ] [main] com.netflix.discovery.DiscoveryClient.fetchRegistry - Registered Applications size is zero : true
+[2023-05-26 11:10:43.727] [INFO ] [main] com.netflix.discovery.DiscoveryClient.fetchRegistry - Application version is -1: true
+[2023-05-26 11:10:43.727] [INFO ] [main] com.netflix.discovery.DiscoveryClient.getAndStoreFullRegistry - Getting all instance registry info from the eureka server
+[2023-05-26 11:10:43.932] [INFO ] [main] com.netflix.discovery.DiscoveryClient.getAndStoreFullRegistry - The response status is 200
+[2023-05-26 11:10:43.935] [INFO ] [main] com.netflix.discovery.DiscoveryClient.initScheduledTasks - Not registering with Eureka server per configuration
+[2023-05-26 11:10:43.941] [INFO ] [main] com.netflix.discovery.DiscoveryClient.<init> - Discovery Client initialized at timestamp 1685070643941 with initial instances count: 90
+[2023-05-26 11:10:44.219] [INFO ] [main] org.springframework.cloud.config.client.ConfigServicePropertySourceLocator.locate - Fetching config from server at: http://192.168.110.122:7892/
+[2023-05-26 11:10:45.415] [INFO ] [main] org.springframework.cloud.config.client.ConfigServicePropertySourceLocator.locate - Located environment: name=com.pica.cloud.account, profiles=[dev], label=publish, version=d0099e1dcf49dd68033b50965489f3dce8498752, state=null
+[2023-05-26 11:10:45.416] [INFO ] [main] org.springframework.cloud.bootstrap.config.PropertySourceBootstrapConfiguration.initialize - Located property source: CompositePropertySource [name='configService', propertySources=[MapPropertySource {name='configClient'}, MapPropertySource {name='http://192.168.110.53/com.pica.cloud.account/pica-cloud-configuration.git/application-dev.properties'}]]

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

@@ -38,6 +38,12 @@ public class PatHealthPackController {
         return PicaResponse.toResponse(packService.getAcctIdByUnionId(unionId));
     }
 
+    @ApiOperation("获取unionId-根据主账户ID")
+    @GetMapping(value = "/unionId/acctId/{acctId}")
+    public PicaResponse<Integer> getUnionIdByAcctId(@PathVariable("acctId") Integer acctId) throws Exception {
+        return PicaResponse.toResponse(packService.getUnionIdByAcctId(acctId));
+    }
+
     @ApiOperation("获取主账户ID-作为监护人自身patientId")
     @GetMapping(value = "/acctId/patId/{patientId}")
     public PicaResponse<Integer> getAcctIdByPatId(@PathVariable("patientId") Integer patientId) throws Exception {

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

@@ -19,6 +19,8 @@ public interface PatHealthPackService {
 
     Integer getAcctIdByUnionId(String unionId);
 
+    String getUnionIdByAcctId(Integer acctId);
+
     Integer getAcctIdByPatId(Integer patientId);
 
     List<Integer> getDirectPatIdsByPatId(Integer patientId);

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

@@ -62,6 +62,12 @@ public class PatHealthPackServiceIml implements PatHealthPackService {
         return patUnion == null ? 0 : patUnion.getAcctId();
     }
 
+    @Override
+    public String getUnionIdByAcctId(Integer acctId) {
+        AcctPatUnion patUnion = patUnionMapper.selectByAcctId(acctId);
+        return patUnion == null ? "" : patUnion.getUnionId();
+    }
+
     /**
      * @Description 获取居民id是本人的家庭组记录-
      * 作为家庭主账户、本人居民id，单条ok 多条异常数据