返回优化

src/main/java/com/yizhu/supervise/controllers/SuperviseController.java

@@ -28,23 +28,25 @@ public class SuperviseController {
     //专网地址
     @Value("${param.local-url}")
     private String  localUrl;
-    //外网地址
     @Value("${param.url}")
     private String  url;
-    @Value("${param.appSecret}")
-    private String  appSecret;
-    @Value("${param.appKey}")
-    private String  appKey;
     @Value("${param.listNumber}")
     private Integer  listNumber;
 
-    private HisResponseTO checkData(List<?> list ){
+    private HisResponseTO checkData(HttpServletRequest request,List<?> list ){
         HisResponseTO<?> hisResponse = new HisResponseTO();
         hisResponse.setCode(200);
         if(list.size()>listNumber){
             hisResponse.setCode(500);
             hisResponse.setMsg("错误信息: 数据一次性不能超过"+listNumber+"条");
         }
+        String appKey = request.getHeader("appKey");
+        String appSecret = request.getHeader("appSecret");
+        if(StringUtils.isEmpty(appKey)||StringUtils.isEmpty(appSecret)){
+            hisResponse.setCode(500);
+            hisResponse.setMsg("错误信息: 请检查是否配置appKey或者appSecret");
+        }
+
         return hisResponse;
     }
 
@@ -53,7 +55,9 @@ public class SuperviseController {
     @ResponseBody
     public HisResponseTO sendDrugCategory(HttpServletRequest request,@Valid  @RequestBody List<DrugCategoryReq> list) {
         String urlType = request.getHeader("urlType");
-        HisResponseTO<?> hisResponse  = this.checkData(list);
+        String appKey = request.getHeader("appKey");
+        String appSecret = request.getHeader("appSecret");
+        HisResponseTO<?> hisResponse  = this.checkData(request,list);
         if(hisResponse.getCode()!=200){
             return hisResponse;
         }
@@ -79,11 +83,13 @@ public class SuperviseController {
     @PostMapping("/sendConsultingIndicators")
     @ResponseBody
     public HisResponseTO sendConsultingIndicators(HttpServletRequest request,@Valid  @RequestBody List<ZiXunIndicatorsReq> list) {
-        HisResponseTO<?> hisResponse  = this.checkData(list);
+        HisResponseTO<?> hisResponse  =this.checkData(request,list);
         if(hisResponse.getCode()!=200){
             return hisResponse;
         }
         String urlType = request.getHeader("urlType");
+        String appKey = request.getHeader("appKey");
+        String appSecret = request.getHeader("appSecret");
         String apiUrl = url;
         if(StringUtils.isNotBlank(urlType)&&"1".equals(urlType)){
             apiUrl = localUrl;
@@ -106,11 +112,13 @@ public class SuperviseController {
     @PostMapping("/sendReferralIndicator")
     @ResponseBody
     public HisResponseTO sendReferralIndicator(HttpServletRequest request,@Valid  @RequestBody List<FuzhenIndicatorsReq> list) {
-        HisResponseTO<?> hisResponse  = this.checkData(list);
+        HisResponseTO<?> hisResponse  = this.checkData(request,list);
         if(hisResponse.getCode()!=200){
             return hisResponse;
         }
         String urlType = request.getHeader("urlType");
+        String appKey = request.getHeader("appKey");
+        String appSecret = request.getHeader("appSecret");
         String apiUrl = url;
         if(StringUtils.isNotBlank(urlType)&&"1".equals(urlType)){
             apiUrl = localUrl;
@@ -133,11 +141,13 @@ public class SuperviseController {
     @PostMapping("/sendRecipeIndicators")
     @ResponseBody
     public HisResponseTO sendRecipeIndicators(HttpServletRequest request,@Valid  @RequestBody List<RecipeIndicatorsReq> list) {
-        HisResponseTO<?> hisResponse  = this.checkData(list);
+        HisResponseTO<?> hisResponse  = this.checkData(request,list);
         if(hisResponse.getCode()!=200){
             return hisResponse;
         }
         String urlType = request.getHeader("urlType");
+        String appKey = request.getHeader("appKey");
+        String appSecret = request.getHeader("appSecret");
         String apiUrl = url;
         if(StringUtils.isNotBlank(urlType)&&"1".equals(urlType)){
             apiUrl = localUrl;
@@ -160,11 +170,13 @@ public class SuperviseController {
     @PostMapping("/sendRecipeVerificationIndicators")
     @ResponseBody
     public HisResponseTO sendRecipeVerificationIndicators(HttpServletRequest request,@Valid  @RequestBody List<RecipeVerificationIndicatorsReq> list) {
-        HisResponseTO<?> hisResponse  = this.checkData(list);
+        HisResponseTO<?> hisResponse  = this.checkData(request,list);
         if(hisResponse.getCode()!=200){
             return hisResponse;
         }
         String urlType = request.getHeader("urlType");
+        String appKey = request.getHeader("appKey");
+        String appSecret = request.getHeader("appSecret");
         String apiUrl = url;
         if(StringUtils.isNotBlank(urlType)&&"1".equals(urlType)){
             apiUrl = localUrl;
@@ -187,11 +199,13 @@ public class SuperviseController {
     @PostMapping("/sendAppointRecord")
     @ResponseBody
     public HisResponseTO sendAppointRecord(HttpServletRequest request,@Valid  @RequestBody List<AppointRecordIndicatorsReq> list) {
-        HisResponseTO<?> hisResponse  = this.checkData(list);
+        HisResponseTO<?> hisResponse  = this.checkData(request,list);
         if(hisResponse.getCode()!=200){
             return hisResponse;
         }
         String urlType = request.getHeader("urlType");
+        String appKey = request.getHeader("appKey");
+        String appSecret = request.getHeader("appSecret");
         String apiUrl = url;
         if(StringUtils.isNotBlank(urlType)&&"1".equals(urlType)){
             apiUrl = localUrl;
@@ -214,11 +228,13 @@ public class SuperviseController {
     @PostMapping("/sendElectMedicalRecord")
     @ResponseBody
     public HisResponseTO sendElectMedicalRecord(HttpServletRequest request,@Valid  @RequestBody List<uploadElectMedicalRecordReq> list) {
-        HisResponseTO<?> hisResponse  = this.checkData(list);
+        HisResponseTO<?> hisResponse  = this.checkData(request,list);
         if(hisResponse.getCode()!=200){
             return hisResponse;
         }
         String urlType = request.getHeader("urlType");
+        String appKey = request.getHeader("appKey");
+        String appSecret = request.getHeader("appSecret");
         String apiUrl = url;
         if(StringUtils.isNotBlank(urlType)&&"1".equals(urlType)){
             apiUrl = localUrl;
@@ -241,11 +257,13 @@ public class SuperviseController {
     @PostMapping("/sendCloudAppointRecordIndicators")
     @ResponseBody
     public HisResponseTO sendCloudAppointRecordIndicators(HttpServletRequest request,@Valid  @RequestBody List<uploadCloudAppointRecordIndicatorsReq> list) {
-        HisResponseTO<?> hisResponse  = this.checkData(list);
+        HisResponseTO<?> hisResponse  = this.checkData(request,list);
         if(hisResponse.getCode()!=200){
             return hisResponse;
         }
         String urlType = request.getHeader("urlType");
+        String appKey = request.getHeader("appKey");
+        String appSecret = request.getHeader("appSecret");
         String apiUrl = url;
         if(StringUtils.isNotBlank(urlType)&&"1".equals(urlType)){
             apiUrl = localUrl;
@@ -269,11 +287,13 @@ public class SuperviseController {
     @PostMapping("/sendMeetClinicIndicators")
     @ResponseBody
     public HisResponseTO sendMeetClinicIndicators(HttpServletRequest request,@Valid  @RequestBody List<MeetClinicIndicatorsReq> list) {
-        HisResponseTO<?> hisResponse  = this.checkData(list);
+        HisResponseTO<?> hisResponse  = this.checkData(request,list);
         if(hisResponse.getCode()!=200){
             return hisResponse;
         }
         String urlType = request.getHeader("urlType");
+        String appKey = request.getHeader("appKey");
+        String appSecret = request.getHeader("appSecret");
         String apiUrl = url;
         if(StringUtils.isNotBlank(urlType)&&"1".equals(urlType)){
             apiUrl = localUrl;
@@ -297,11 +317,13 @@ public class SuperviseController {
     @PostMapping("/pushRemoteRadiology")
     @ResponseBody
     public HisResponseTO pushRemoteRadiology(HttpServletRequest request,@Valid  @RequestBody List<pushRemoteRadiologyReq> list) {
-        HisResponseTO<?> hisResponse  = this.checkData(list);
+        HisResponseTO<?> hisResponse  = this.checkData(request,list);
         if(hisResponse.getCode()!=200){
             return hisResponse;
         }
         String urlType = request.getHeader("urlType");
+        String appKey = request.getHeader("appKey");
+        String appSecret = request.getHeader("appSecret");
         String apiUrl = url;
         if(StringUtils.isNotBlank(urlType)&&"1".equals(urlType)){
             apiUrl = localUrl;
@@ -324,11 +346,13 @@ public class SuperviseController {
     @PostMapping("/pushRemoteECG")
     @ResponseBody
     public HisResponseTO pushRemoteECG(HttpServletRequest request,@Valid  @RequestBody List<pushRemoteECGReq> list) {
-        HisResponseTO<?> hisResponse  = this.checkData(list);
+        HisResponseTO<?> hisResponse  = this.checkData(request,list);
         if(hisResponse.getCode()!=200){
             return hisResponse;
         }
         String urlType = request.getHeader("urlType");
+        String appKey = request.getHeader("appKey");
+        String appSecret = request.getHeader("appSecret");
         String apiUrl = url;
         if(StringUtils.isNotBlank(urlType)&&"1".equals(urlType)){
             apiUrl = localUrl;
@@ -352,11 +376,13 @@ public class SuperviseController {
     @PostMapping("/pushRemotePathology")
     @ResponseBody
     public HisResponseTO pushRemotePathology(HttpServletRequest request,@Valid  @RequestBody List<pushRemotePathologyReq> list) {
-        HisResponseTO<?> hisResponse  = this.checkData(list);
+        HisResponseTO<?> hisResponse  = this.checkData(request,list);
         if(hisResponse.getCode()!=200){
             return hisResponse;
         }
         String urlType = request.getHeader("urlType");
+        String appKey = request.getHeader("appKey");
+        String appSecret = request.getHeader("appSecret");
         String apiUrl = url;
         if(StringUtils.isNotBlank(urlType)&&"1".equals(urlType)){
             apiUrl = localUrl;
@@ -380,7 +406,9 @@ public class SuperviseController {
     @PostMapping("/pushRemoteTransfer")
     @ResponseBody
     public HisResponseTO pushRemoteTransfer(HttpServletRequest request,@Valid  @RequestBody List<pushRemoteTransferReq> list) {
-        HisResponseTO<?> hisResponse  = this.checkData(list);
+        HisResponseTO<?> hisResponse  = this.checkData(request,list);
+        String appKey = request.getHeader("appKey");
+        String appSecret = request.getHeader("appSecret");
         if(hisResponse.getCode()!=200){
             return hisResponse;
         }
@@ -406,7 +434,9 @@ public class SuperviseController {
     @PostMapping("/sendBusinessInfoAfter")
     @ResponseBody
     public HisResponseTO sendBusinessInfoAfter(HttpServletRequest request,@Valid  @RequestBody List<BussAfterInfoReq> list) {
-        HisResponseTO<?> hisResponse  = this.checkData(list);
+        HisResponseTO<?> hisResponse  = this.checkData(request,list);
+        String appKey = request.getHeader("appKey");
+        String appSecret = request.getHeader("appSecret");
         if(hisResponse.getCode()!=200){
             return hisResponse;
         }
@@ -432,7 +462,9 @@ public class SuperviseController {
     @PostMapping("/pushMedicalDispute")
     @ResponseBody
     public HisResponseTO pushMedicalDispute(HttpServletRequest request,@Valid  @RequestBody List<MedicalDisputeReq> list) {
-        HisResponseTO<?> hisResponse  = this.checkData(list);
+        HisResponseTO<?> hisResponse  = this.checkData(request,list);
+        String appKey = request.getHeader("appKey");
+        String appSecret = request.getHeader("appSecret");
         if(hisResponse.getCode()!=200){
             return hisResponse;
         }

src/main/resources/application-dev.yml

@@ -28,9 +28,5 @@ param:
   local-url: http://10.152.101.6:8080/net-diag-service/test-openapi/api
   #外网地址
   url: https://imssp.wsjk.tj.gov.cn/net-diag-service/test-openapi/api
-  #测试appSecret
-  appSecret: 26b0e2f6efb44017bd03d53eb5505fcf
-  #测试appKey
-  appKey: 9a35011886154dc3
   #一次性数据提交限制的数量
   listNumber: 1000

src/main/resources/application-pro.yml

@@ -32,9 +32,5 @@ param:
   local-url: http://10.152.101.6:8080/net-diag-service/openapi/api
   #外网地址
   url: https://imssp.wsjk.tj.gov.cn/net-diag-service/openapi/api
-  #测试appSecret
-  appSecret: 3d268ad353c9471b8fd07f19116156bc
-  #测试appKey
-  appKey: 6fd7d5a1d1584348
   #一次性数据提交限制的数量
   listNumber: 1000

src/main/resources/application-test.yml

@@ -27,9 +27,5 @@ param:
   local-url: http://10.152.101.6:8080/net-diag-service/test-openapi/api
   #外网地址
   url: https://imssp.wsjk.tj.gov.cn/net-diag-service/test-openapi/api
-  #测试appSecret
-  appSecret: 26b0e2f6efb44017bd03d53eb5505fcf
-  #测试appKey
-  appKey: 9a35011886154dc3
   #一次性数据提交限制的数量
   listNumber: 1000