feat(口腔医院): 修改返回值&添加注解

eitc-admin/src/main/java/com/eitc/web/controller/saomiaoyi/SaoMiaoYiController.java

@@ -2,6 +2,7 @@ package com.eitc.web.controller.saomiaoyi;
 
 import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.eitc.common.annotation.IgnoreReturnResultEncryption;
 import com.eitc.common.config.EitcConfig;
 import com.eitc.common.core.domain.AjaxResult;
 import com.eitc.common.utils.InterfaceVerificationUtil;
@@ -47,21 +48,22 @@ public class SaoMiaoYiController {
 
     /**
      * 慧视口腔-诊所列表
-     *
      */
     @GetMapping(value = "/clinicList")
     @ApiOperation("慧视健康-诊所列表")
-    public JSONObject clinicList() {
+    @IgnoreReturnResultEncryption
+    public AjaxResult clinicList() {
         // 这个是为了防止恶意请求来做的参数增加
         String saSignStr = InterfaceVerificationUtil.getSaSignStr(new HashMap<>());
         String url = fileUrl + "api/sys/clinict/appGetClinictList?" + saSignStr;
         String object = restTemplate.getForObject(url, String.class);
-        return JSONObject.parseObject(object);
+        return JSONObject.parseObject(object, AjaxResult.class);
     }
 
 
     @PostMapping("/uploads")
     @ApiOperation("上传影像")
+    @IgnoreReturnResultEncryption
     public AjaxResult uploadFiles(String identificationCard, List<MultipartFile> files) {
         if (StringUtils.isBlank(identificationCard)) {
             return AjaxResult.warn("请输入身份证号");
@@ -89,6 +91,7 @@ public class SaoMiaoYiController {
 
     @GetMapping("/list")
     @ApiOperation("查询影像")
+    @IgnoreReturnResultEncryption
     public AjaxResult list(ImageRecord imageRecord) {
         List<ImageRecord> list = imageRecordService.list(Wrappers.<ImageRecord>lambdaQuery()
                 .eq(StringUtils.isNotBlank(imageRecord.getIdentificationCard()), ImageRecord::getIdentificationCard, imageRecord.getIdentificationCard()));
@@ -97,6 +100,7 @@ public class SaoMiaoYiController {
 
     @DeleteMapping("/remove")
     @ApiOperation("删除影像")
+    @IgnoreReturnResultEncryption
     public AjaxResult remove(String ids) {
         List<String> idList = Arrays.asList(ids.split(","));
         return toAjax(imageRecordService.removeBatchByIds(idList));

eitc-common/src/main/java/com/eitc/common/annotation/IgnoreReturnResultEncryption.java

@@ -0,0 +1,21 @@
+package com.eitc.common.annotation;
+
+import org.springframework.stereotype.Component;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * 忽略返回结果加密
+ *
+ * @author eitc
+ */
+@Target({ ElementType.METHOD, ElementType.TYPE })
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+@Component
+public @interface IgnoreReturnResultEncryption {
+}

eitc-patient-app/src/main/java/com/eitc/patient/controller/ApiAppController.java

@@ -76,12 +76,12 @@ public class ApiAppController extends BaseController {
      */
     @GetMapping(value = "/clinicList")
     @ApiOperation("诊所列表")
-    public JSONObject clinicList() {
+    public AjaxResult clinicList() {
         // 这个是为了防止恶意请求来做的参数增加
         String saSignStr = InterfaceVerificationUtil.getSaSignStr(new HashMap<>());
         String url = fileUrl + "api/sys/clinict/appGetClinictList?" + saSignStr;
         String object = restTemplate.getForObject(url, String.class);
-        return JSONObject.parseObject(object);
+        return JSONObject.parseObject(object, AjaxResult.class);
     }
 
     /**