权要拆分，创建报告 2022/11/9

RMS/pom.xml

@@ -26,7 +26,7 @@
         <poi.version>4.1.2</poi.version>
         <poi-tl.version>1.10.3</poi-tl.version>
         <druid.version>1.1.10</druid.version>
-        <fastjson.version>2.0.0</fastjson.version>
+        <fastjson.version>2.0.12</fastjson.version>
         <sa-token.version>1.29.0</sa-token.version>
         <springdoc.version>1.6.6</springdoc.version>
     </properties>

RMS/src/main/java/cn/cslg/report/common/config/SpringDocConfig.java

@@ -10,6 +10,6 @@ public class SpringDocConfig {
 
     @Bean
     public OpenAPI apiInfo() {
-        return new OpenAPI().info(new Info().title("接口文档").description("接口文档").version("v1.0.0"));
+        return new OpenAPI().info(new Info().title("接口文档1").description("接口文档1").version("v1.0.01"));
     }
 }

RMS/src/main/java/cn/cslg/report/common/core/base/Constants.java

@@ -1,7 +1,7 @@
 package cn.cslg.report.common.core.base;
 
 public class Constants {
-    public static final String REPORT_API = "/report/api";
+    public static final String REPORT_API = "/api/report/api";
 
     public static final String NET_ERROR = "网络异常";
 

RMS/src/main/java/cn/cslg/report/common/model/vo/PatentRightVo.java

@@ -0,0 +1,41 @@
+package cn.cslg.report.common.model.vo;
+
+import cn.cslg.report.entity.Features;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.util.List;
+
+/**
+ * @author 李仁杰
+ * @date 2022-11-8
+ * @description  返回包含拆分好的特征的权要
+ */
+
+@Data
+@Accessors(chain = true)
+public class PatentRightVo {
+    /**
+     * 专利ID
+     */
+    private Integer patentId;
+
+    /**
+     * 内容
+     */
+    private String contentOut;
+
+    /**
+     * 内容
+     */
+    private String content;
+
+    /**
+     * 类型
+     */
+    private Integer type;
+
+    private Integer sort;
+
+    private List<Features> features;
+}

RMS/src/main/java/cn/cslg/report/common/utils/DateUtils.java

@@ -2,6 +2,7 @@ package cn.cslg.report.common.utils;
 
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
+import com.alibaba.fastjson.parser.ParserConfig;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -766,4 +767,6 @@ public class DateUtils {
         calendar.set(Calendar.SECOND, 0);
         return calendar.getTime();
     }
+
+
 }

RMS/src/main/java/cn/cslg/report/controller/BaseController.java

@@ -4,8 +4,12 @@ import cn.cslg.report.common.core.base.Constants;
 import cn.cslg.report.common.model.vo.LoginVO;
 import cn.cslg.report.common.utils.Response;
 import cn.cslg.report.service.BaseService;
+import cn.cslg.report.service.OutInterfaceService;
+import cn.cslg.report.service.business.SystemDictItemService;
 import cn.dev33.satoken.stp.StpUtil;
 import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Parameters;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import org.springframework.context.annotation.Lazy;
@@ -25,6 +29,8 @@ import java.io.IOException;
 @RequiredArgsConstructor(onConstructor_ = {@Lazy})
 public class BaseController {
     private final BaseService baseService;
+    private final SystemDictItemService systemDictItemService;
+    private final OutInterfaceService outInterfaceService;
 
     @PostMapping("/login")
     @Operation(summary = "登录")
@@ -52,7 +58,7 @@ public class BaseController {
     }
 
     @GetMapping("/getDictMessage")
-    @Operation(summary = "获取字典项信息")
+    @Operation(summary = "获取PCS字典项信息")
     public String getDictMessage() {
         return baseService.getDictMessage();
     }
@@ -98,4 +104,22 @@ public class BaseController {
     public String getPartClient() {
         return baseService.getPartClient();
     }
+    @PostMapping("/getSystemDicItem")
+    @Operation(summary = "获取本系统字典项")
+    public String getSystemDicItem() {
+        return  systemDictItemService.getSystemKey();
+    }
+
+
+    @PostMapping("/getPatentByPatentNo")
+    @Operation(summary = "根据专利号获得专利")
+    @Parameters(value = {
+            @Parameter(name = "patentNo",description = "专利号",required = true),
+
+    })
+
+    public String getSystemDicItem( String patentNo) throws IOException {
+        return  outInterfaceService.getPatentFromPAS(patentNo);
+    }
+
 }

RMS/src/main/java/cn/cslg/report/controller/FeatureController.java

@@ -1,15 +1,31 @@
 package cn.cslg.report.controller;
 
 import cn.cslg.report.common.core.base.Constants;
+import cn.cslg.report.common.utils.Response;
+import cn.cslg.report.entity.Report;
+import cn.cslg.report.service.business.FeatureService;
+import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import org.springframework.context.annotation.Lazy;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.io.IOException;
+
 @Tag(name = "特征管理")
 @RestController
 @RequestMapping(Constants.REPORT_API + "/feature")
 @RequiredArgsConstructor(onConstructor_ = {@Lazy})
 public class FeatureController {
-}
+    private final FeatureService featureService;
+
+    @RequestMapping(value = "/splitPatentRight", method = RequestMethod.POST)
+    @Operation(summary = "拆分权要")
+    public String addReport(String patentNo,Integer splitType ,Integer splitBy,Integer ReportId) throws IOException {
+     String res =   featureService.splitPatentRight(patentNo,splitType,splitBy,ReportId);
+        return Response.success(res);
+    }
+}

RMS/src/main/java/cn/cslg/report/controller/ReportController.java

@@ -8,6 +8,7 @@ import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import org.springframework.context.annotation.Lazy;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
@@ -27,7 +28,7 @@ public class ReportController {
      */
     @RequestMapping(value = "/addReport", method = RequestMethod.POST)
     @Operation(summary = "新增报告")
-    public String addReport(Report report) {
+    public String addReport(@RequestBody Report report) {
         // TODO: 2022/11/4 关于错误提示与对应的错误码还需要制定 避免前台看到失败字样 用网络异常来代替说明
         // 目前的错误说明有
         //  添加成功 是正常添加成功
@@ -53,4 +54,19 @@ public class ReportController {
             return Response.error("网络异常");
         }
     }
+
+    @RequestMapping(value = "/updateReport", method = RequestMethod.POST)
+    @Operation(summary = "修改报告")
+    public String updateReport(@RequestBody Report report) {
+        if (report != null) {
+            Boolean flag = reportService.updateById(report);
+            if(flag){
+                return Response.success("添加成功");
+            }
+         else{ return Response.error("添加失败");}
+
+        } else {
+            return Response.error("未检测到报告信息");
+        }
+    }
 }

RMS/src/main/java/cn/cslg/report/entity/Features.java

@@ -22,10 +22,15 @@ public class Features extends BaseEntity<Features> {
     private String signPatentNo;
 
     /**
-     * 特征名称
+     * 特征翻译
      */
-    @TableField(value = "FEATURES_NAME")
-    private String featuresName;
+    @TableField(value = "CONTENT_OUT")
+    private String contentOut;
+    /**
+     * 特征
+     */
+    @TableField(value = "CONTENT")
+    private String content;
 
     /**
      * 权要
@@ -37,7 +42,7 @@ public class Features extends BaseEntity<Features> {
      * 权要ID
      */
     @TableField(value = "RIGHT_ID")
-    private String rightId;
+    private Integer rightId;
 
     /**
      * 特征拆分人ID
@@ -49,11 +54,11 @@ public class Features extends BaseEntity<Features> {
      * 是否最终
      */
     @TableField(value = "IS_FINAL")
-    private String isFinal;
+    private Integer isFinal;
 
     /**
      * 所属报告
      */
     @TableField(value = "REPORT_ID")
-    private String reportId;
+    private Integer reportId;
 }

RMS/src/main/java/cn/cslg/report/entity/PatentRight.java

@@ -0,0 +1,36 @@
+package cn.cslg.report.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+/**
+ * 专利权利要求
+ * @TableName os_patent_right
+ */
+@Data
+public class PatentRight {
+
+    private Integer id;
+
+    /**
+     * 专利ID
+     */
+    private Integer patentId;
+
+    /**
+     * 内容
+     */
+    private String contentOut;
+
+    /**
+     * 内容
+     */
+    private String content;
+
+    /**
+     * 类型
+     */
+    private Integer type;
+
+    private Integer sort;
+}

RMS/src/main/java/cn/cslg/report/entity/Report.java

@@ -3,6 +3,7 @@ package cn.cslg.report.entity;
 import cn.cslg.report.common.model.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -11,101 +12,125 @@ import lombok.experimental.Accessors;
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = true)
 @TableName(value = "REPORT")
+@Schema(description="报告",required = true)
 public class Report extends BaseEntity<Report> {
     /**
      * 标的专利/产品号
      */
+    @Schema(description="标的专利号",required = true)
     @TableField(value = "SIGN_PATENT_NO")
     private String signPatentNo;
 
     /**
      * 报告名称
      */
+    @Schema(description="报告名称",required = true)
     @TableField(value = "NAME")
     private String name;
 
     /**
      * 产品/技术
      */
+    @Schema(description="产品/技术")
     @TableField(value = "PRO_TEC")
     private String proTec;
 
     /**
      * 报告类别
      */
+    @Schema(description="报告类别（0无效分析1第三方意见2稳定性分析3FTO调查4侵权分析5回避设计6图表分析）")
     @TableField(value = "TYPE")
     private String type;
 
     /**
      * 报告状态
      */
+    @Schema(description="报告状态")
     @TableField(value = "STATUS")
     private String status;
 
     /**
      * 报告生成时间
      */
+    @Schema(description="报告生成时间")
     @TableField(value = "CREATE_TIME")
     private String createTime;
 
     /**
      * 报告生成文件ID
      */
+    @Schema(description="报告生成文件ID")
     @TableField(value = "REPORT_FILE_ID")
     private String reportFileId;
 
     /**
      * 负责人ID
      */
+    @Schema(description="负责人ID")
     @TableField(value = "PERSON_ID")
     private String personId;
 
     /**
      * 委托人ID
      */
+    @Schema(description="委托人ID")
     @TableField(value = "CLIENT_ID")
     private String clientId;
 
     /**
      * 承担部门ID
      */
+    @Schema(description="承担部门ID")
     @TableField(value = "DEPARTMENT_ID")
     private String departmentId;
 
     /**
      * 承担部门名称
      */
+    @Schema(description="承担部门名称")
     @TableField(value = "DEPARTMENT_NAME")
     private String departmentName;
 
     /**
      * 关联报告ID
      */
+    @Schema(description="关联报告ID")
     @TableField(value = "ASSOCIATE_REPORT_ID")
     private String associateReportId;
 
     /**
      * 关联报告名称
      */
+    @Schema(description="关联报告名称")
     @TableField(value = "ASSOCIATE_REPORT_NAME")
     private String associateReportName;
 
     /**
      * 应用场景
      */
+    @Schema(description="应用场景")
     @TableField(value = "EAS_FLAG")
     private String easFlag;
 
     /**
      * 调查类型
      */
+    @Schema(description="调查类型")
     @TableField(value = "IT_FLAG")
     private String itFlag;
 
     /**
      * 专题库ID
      */
+    @Schema(description="专题库ID")
     @TableField(value = "THEMATIC_ID")
     private String thematicId;
 
+    /**
+     * 卷号
+     */
+    @Schema(description="卷号")
+    @TableField(value = "VOLUME_NUMBER")
+    private String volumeNumber;
+
 }

RMS/src/main/java/cn/cslg/report/entity/SysDictItem.java

@@ -0,0 +1,30 @@
+package cn.cslg.report.entity;
+
+
+import cn.cslg.report.common.model.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.util.Date;
+
+
+/**
+ * 字典表
+ */
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = true)
+@TableName(value = "SYS_DICT_ITEM")
+public class SysDictItem extends BaseEntity<SysDictItem> {
+  @TableField(value = "DICT_PARENT_KEY")
+  private String dictParentKey;
+  @TableField(value = "DICT_CHILD_LABEL")
+  private String dictChildLabel;
+  @TableField(value = "DICT_CHILD_VALUE")
+  private String dictChildValue;
+
+
+}

RMS/src/main/java/cn/cslg/report/mapper/SystemDictItemMapper.java

@@ -0,0 +1,8 @@
+package cn.cslg.report.mapper;
+
+
+import cn.cslg.report.entity.SysDictItem;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+public interface SystemDictItemMapper extends BaseMapper<SysDictItem> {
+}

RMS/src/main/java/cn/cslg/report/service/BaseService.java

@@ -212,4 +212,5 @@ public class BaseService {
         }
     }
 
+
 }

RMS/src/main/java/cn/cslg/report/service/OutInterfaceService.java

@@ -1,6 +1,7 @@
 package cn.cslg.report.service;
 
 import cn.cslg.report.common.model.vo.LoginVO;
+import cn.cslg.report.common.utils.CacheUtils;
 import cn.cslg.report.common.utils.JsonUtils;
 import cn.cslg.report.common.utils.SecurityUtils.LoginUtils;
 import com.alibaba.fastjson.JSONObject;
@@ -31,7 +32,8 @@ public class OutInterfaceService {
     @Value("${PASUrl}")
     private String PASUrl;
     public static final MediaType JSON = MediaType.parse("application/json; charset=utf-8");
-
+    private final CacheUtils cacheUtils;
+    private final  LoginUtils loginUtils;
     /**
      * @title 获取验证码
      * @description 接口来源:PCS
@@ -115,7 +117,7 @@ public class OutInterfaceService {
         OkHttpClient okHttpClient = new OkHttpClient();
         Request request = new Request.Builder()
                 .url(PCSUrl + "/permission/api/system/getPermissionList?code=" + code)
-                .addHeader("Cookie", LoginUtils.getToken())
+           .addHeader("Cookie", LoginUtils.getToken())
                 .get()
                 .build();
         return Objects.requireNonNull(okHttpClient.newCall(request).execute().body()).string();
@@ -184,7 +186,7 @@ public class OutInterfaceService {
     public String getAllClientFromPCS() throws IOException {
         OkHttpClient okHttpClient = new OkHttpClient();
         Request request = new Request.Builder()
-                .url(PASUrl + "/api/v2/client/getAllClient")
+                .url(PASUrl + "/api/v2/client/getAllClient?id="+cacheUtils.getLoginUser(loginUtils.getId()).getTenantId())
                 .get()
                 .build();
         return Objects.requireNonNull(okHttpClient.newCall(request).execute().body()).string();
@@ -204,4 +206,33 @@ public class OutInterfaceService {
                 .build();
         return Objects.requireNonNull(okHttpClient.newCall(request).execute().body()).string();
     }
+    /**
+     * @title 根据专利号获得专利信息
+     * @description 接口来源:PCS
+     */
+    public String getPatentFromPAS(String patentNo) throws IOException {
+        OkHttpClient okHttpClient = new OkHttpClient();
+        Request request = new Request.Builder()
+                .url(PASUrl + "/api/v2/patent/patentNo?patentNo=" + patentNo)
+//                .addHeader("Cookie", LoginUtils.getToken())
+                .get()
+                .build();
+        return Objects.requireNonNull(okHttpClient.newCall(request).execute().body()).string();
+    }
+    /**
+     * @title 根据专利号获得专利信息
+     * @description 接口来源:PCS
+     */
+    public String getPatentRightFromPAS(String patentNo) throws IOException {
+        OkHttpClient okHttpClient = new OkHttpClient();
+        Request request = new Request.Builder()
+                .url(PASUrl + "/api/v2/patent/right?patentNo=" + patentNo)
+//                .addHeader("Cookie", LoginUtils.getToken())
+                .get()
+                .build();
+        return Objects.requireNonNull(okHttpClient.newCall(request).execute().body()).string();
+    }
+
+
+
 }

RMS/src/main/java/cn/cslg/report/service/business/FeatureService.java

@@ -1,10 +1,131 @@
 package cn.cslg.report.service.business;
 
+import cn.cslg.report.common.model.vo.PatentRightVo;
+import cn.cslg.report.common.model.vo.PersonnelVO;
+import cn.cslg.report.common.utils.Response;
+import cn.cslg.report.common.utils.SecurityUtils.LoginUtils;
 import cn.cslg.report.entity.Features;
+import cn.cslg.report.entity.PatentRight;
 import cn.cslg.report.mapper.FeatureMapper;
+import cn.cslg.report.service.OutInterfaceService;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
 @Service
+@Slf4j
+@RequiredArgsConstructor(onConstructor_ = {@Lazy})
 public class FeatureService extends ServiceImpl<FeatureMapper, Features> {
+
+    private  final OutInterfaceService outInterfaceService;
+    //从PAS系统上获得权要并拆分
+public String splitPatentRight(String patentNo,Integer splitType ,Integer splitBy,Integer reportId) throws IOException {
+    //权要（带拆分的特征）列表
+    List<PatentRightVo> patentRightVos =new ArrayList<>();
+  String resBody=  outInterfaceService.getPatentRightFromPAS(patentNo);
+    JSONObject jsonObject = JSONObject.parseObject(resBody);
+    List<PatentRight> patentRights = JSON.parseArray(jsonObject.getString("data"),PatentRight.class);
+List<String> flags =new ArrayList<>();
+    List<PatentRight> mainRights =new ArrayList<>();
+    if(splitType==0)
+    { mainRights=patentRights.stream().filter(item->item.getType()==1).collect(Collectors.toList());
+        if(mainRights==null)
+        {
+            mainRights=new ArrayList<>();
+        }
+    }
+    else if(splitType==1)
+    {
+        mainRights=patentRights;
+    }
+    if(splitBy==0)
+    {   flags.add(",");
+
+    }
+    else if(splitBy==1)
+    {
+        flags.add(";");
+    }
+    else if(splitBy==2){
+
+        flags.add(",");
+        flags.add(";");
+    }
+    List<Features> featuresListToDb = new ArrayList<>();
+    for(int i=0;i<mainRights.size();i++) {
+        List<String> contentOuts = this.splitStringByFlags(mainRights.get(i).getContentOut(), flags);
+        List<String> contents  =this.splitStringByFlags(mainRights.get(i).getContent(),flags);
+        List<Features> featuresList = new ArrayList<>();
+        for (int t = 0; t < contentOuts.size(); t++)
+        { Features features =new Features();
+            features.setRight(mainRights.get(i).getContentOut());
+            features.setRightId(mainRights.get(i).getId());
+            features.setIsFinal(0);
+            features.setSignPatentNo(patentNo);
+            features.setReportId(reportId);
+            features.setContentOut(contentOuts.get(t));
+            String  content=  contents.size()-1>=t ? contents.get(t):"";
+            features.setContent(content);
+//            features.setPartnerId(LoginUtils.getToken());
+            featuresList.add(features);
+            featuresListToDb.add(features);
+        }
+     PatentRightVo patentRightVo =new PatentRightVo();
+        patentRightVo.setPatentId(mainRights.get(i).getPatentId());
+        patentRightVo.setFeatures(featuresList);
+        patentRightVo.setContent(mainRights.get(i).getContent());
+        patentRightVo.setSort(mainRights.get(i).getSort());
+        patentRightVo.setType(mainRights.get(i).getType());
+        patentRightVo.setContentOut(mainRights.get(i).getContentOut());
+        patentRightVos.add(patentRightVo);
+    }
+   if(splitType==0){
+       List<PatentRight> rights =patentRights.stream().filter(item->item.getType()==0).collect(Collectors.toList());
+       for(int i=0;i<rights.size();i++) {
+           PatentRightVo patentRightVo =new PatentRightVo();
+           patentRightVo.setPatentId(rights.get(i).getPatentId());
+           patentRightVo.setFeatures(null);
+           patentRightVo.setContent(rights.get(i).getContent());
+           patentRightVo.setSort(rights.get(i).getSort());
+           patentRightVo.setType(rights.get(i).getType());
+           patentRightVo.setContentOut(rights.get(i).getContentOut());
+           patentRightVos.add(patentRightVo);
+
+       }
+
+
+   }
+
+
+    return Response.success(patentRightVos);
+
+}
+
+
+public List<String> splitStringByFlags(String sentence,List<String> flags){
+List<String> sectences =new ArrayList<>();
+sectences.add(sentence);
+for(int i=0;i<flags.size();i++)
+{  List<String> tem =new ArrayList<>();
+  for(int t=0;t<sectences.size();t++)
+  {
+    tem.addAll(Arrays.asList(sentence.split(flags.get(i))));
+  }
+sectences=tem;
+
+}
+return sectences;
+
+}
+
 }

RMS/src/main/java/cn/cslg/report/service/business/SystemDictItemService.java

@@ -0,0 +1,53 @@
+package cn.cslg.report.service.business;
+
+import cn.cslg.report.common.core.base.Constants;
+import cn.cslg.report.common.utils.LogExceptionUtil;
+import cn.cslg.report.common.utils.Response;
+import cn.cslg.report.entity.Report;
+import cn.cslg.report.entity.SysDictItem;
+import cn.cslg.report.mapper.ReportMapper;
+import cn.cslg.report.mapper.SystemDictItemMapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Service;
+
+import java.util.*;
+
+@Service
+@Slf4j
+@RequiredArgsConstructor(onConstructor_ = {@Lazy})
+public class SystemDictItemService extends ServiceImpl<SystemDictItemMapper, SysDictItem> {
+    /**
+     * @return 成功返回客户列表信息 失败返回错误信息
+     * @title 获取部分客户
+     * @author 沈永艺
+     */
+    private final SystemDictItemMapper systemDictItemMapper;
+    public String getSystemKey() {
+        try {
+
+            Map<String, Object> lst = new HashMap<>();
+            //查询所有字典
+            List<SysDictItem> sysDictList = this.list();
+            for (SysDictItem sysDict : sysDictList) {
+                //用字典的KEY值去字典项表内查询对应字典项
+                LambdaQueryWrapper<SysDictItem> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+                lambdaQueryWrapper.eq(SysDictItem::getDictParentKey, sysDict.getDictParentKey());
+                //装填数据
+                //字典格式 KEY:KEY值对应的字典项
+                if(!lst.containsKey(sysDict.getDictParentKey())){
+                lst.put(sysDict.getDictParentKey(), systemDictItemMapper.selectList(lambdaQueryWrapper));}
+//                //数据字典格式 dataDict:查询的所有数据字典数据
+//                lst.put("dataDict", dataSourceService.list());
+            }
+            return Response.success(lst);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            log.error("获得字典项失败,错误信息:" + LogExceptionUtil.getMessage(ex));
+            return Response.error(Constants.NET_ERROR);
+        }
+    }
+}

RMS/src/main/resources/application.yml

@@ -30,6 +30,9 @@ spring:
   rabbitmq.port: 5672
   rabbitmq.username: admin
   rabbitmq.password: 123456
+  mvc:
+    pathmatch:
+      matching-strategy: ant_path_matcher
   aop:
     auto: true
     proxy-target-class: true