12.20 陈宇

.idea/workspace.xml

@@ -7,44 +7,12 @@
     <list default="true" id="e7cd156b-23fc-410f-9ecc-be34a2e87174" name="Default Changelist" comment="12.20 陈宇">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/controller/ProductController.java" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/controller/ProductController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/mapper/ProductMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/mapper/ProductMapper.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/pojo/entity/AssoProductFile.java" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/pojo/entity/AssoProductFile.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/pojo/entity/Product.java" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/pojo/entity/Product.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/pojo/vo/ProductStandardVO.java" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/pojo/vo/ProductStandardVO.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/pojo/vo/ReportFileStandardVO.java" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/pojo/vo/ReportFileStandardVO.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/service/IAssoProductFileService.java" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/service/IAssoProductFileService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/service/IProductService.java" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/service/IProductService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/service/impl/AssoProductFileServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/service/impl/AssoProductFileServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/service/impl/ProductServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/service/impl/ProductServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/src/main/resources/mapper/ProductMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/src/main/resources/mapper/ProductMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/model/vo/PatentQueryFieldSourceVO.class" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/model/vo/PatentQueryFieldSourceVO.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/model/vo/TaskVO$personPatents.class" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/model/vo/TaskVO$personPatents.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/model/vo/TaskVO.class" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/model/vo/TaskVO.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/controller/CompareController.class" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/controller/CompareController.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/controller/FeatureController.class" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/controller/FeatureController.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/controller/PatentFiledController.class" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/controller/PatentFiledController.class" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/controller/ProductController.class" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/controller/ProductController.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/controller/TaskController.class" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/controller/TaskController.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/entity/Features.class" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/entity/Features.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/entity/Task.class" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/entity/Task.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/mapper/ProductMapper.class" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/mapper/ProductMapper.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/mapper/TaskMapper.class" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/mapper/TaskMapper.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/pojo/vo/ProductListItemVO.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/pojo/vo/ProductStandardVO.class" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/pojo/vo/ProductStandardVO.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/service/BaseService.class" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/service/BaseService.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/service/IAssoProductFileService.class" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/service/IAssoProductFileService.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/service/IProductService.class" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/service/IProductService.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/service/business/CompareFilesService.class" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/service/business/CompareFilesService.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/service/business/FeatureService.class" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/service/business/FeatureService.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/service/business/ReportDocumentService.class" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/service/business/ReportDocumentService.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/service/business/ReportFieldPatentLinkService.class" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/service/business/ReportFieldPatentLinkService.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/service/business/ReportFieldService.class" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/service/business/ReportFieldService.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/service/business/ReportService.class" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/service/business/ReportService.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/service/business/TaskService.class" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/service/business/TaskService.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/service/impl/AssoProductFileServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/service/impl/AssoProductFileServiceImpl.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/service/impl/ProductServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/service/impl/ProductServiceImpl.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/mapper/ProductMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/target/classes/mapper/ProductMapper.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/logs/rms/rms-debug.2022-12-12.0.log" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/logs/rms/rms-debug.2022-12-13.0.log" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/logs/rms/rms-debug.log" beforeDir="false" afterPath="$PROJECT_DIR$/logs/rms/rms-debug.log" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/logs/rms/rms-info.2022-12-12.0.log" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/logs/rms/rms-info.2022-12-13.0.log" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/logs/rms/rms-info.log" beforeDir="false" afterPath="$PROJECT_DIR$/logs/rms/rms-info.log" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
@@ -83,7 +51,7 @@
     <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$/../Wispro-CodeWarehouse-BackEnd" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report" />
     <property name="settings.editor.selected.configurable" value="project.propVCSSupport.Mappings" />
   </component>
   <component name="ReactorSettings">
@@ -102,15 +70,13 @@
     </key>
   </component>
   <component name="RunManager">
-    <configuration default="true" type="ArquillianTestNG" factoryName="" nameIsGenerated="true">
+    <configuration default="true" type="ArquillianJUnit" factoryName="" nameIsGenerated="true">
       <option name="arquillianRunConfiguration">
         <value>
           <option name="containerStateName" value="" />
         </value>
       </option>
-      <option name="TEST_OBJECT" value="CLASS" />
-      <properties />
-      <listeners />
+      <option name="TEST_OBJECT" value="class" />
       <method v="2">
         <option name="Make" enabled="true" />
       </method>
@@ -132,7 +98,8 @@
       <option name="presentableId" value="Default" />
       <updated>1671511900387</updated>
       <workItem from="1671511902044" duration="19866000" />
-      <workItem from="1671539384819" duration="6359000" />
+      <workItem from="1671539384819" duration="6630000" />
+      <workItem from="1671585394564" duration="1889000" />
     </task>
     <task id="LOCAL-00001" summary="12.20 陈宇">
       <created>1671533439152</created>
@@ -148,7 +115,14 @@
       <option name="project" value="LOCAL" />
       <updated>1671539621936</updated>
     </task>
-    <option name="localTasksCounter" value="3" />
+    <task id="LOCAL-00003" summary="12.20 陈宇">
+      <created>1671546004898</created>
+      <option name="number" value="00003" />
+      <option name="presentableId" value="LOCAL-00003" />
+      <option name="project" value="LOCAL" />
+      <updated>1671546004898</updated>
+    </task>
+    <option name="localTasksCounter" value="4" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">

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

@@ -5,6 +5,8 @@ import cn.cslg.report.common.utils.Response;
 import cn.cslg.report.pojo.dto.ProductDTO;
 import cn.cslg.report.pojo.vo.ProductStandardVO;
 import cn.cslg.report.service.impl.ProductServiceImpl;
+import cn.cslg.report.web.JsonResult;
+import cn.cslg.report.web.ServiceCode;
 import com.alibaba.fastjson.JSONObject;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -48,13 +50,16 @@ public class ProductController {
 
     @Operation(summary = "根据报告id查询产品数据信息")
     @GetMapping("/getProduct")
-    public String getProduct(Integer reportId) {
+    public JsonResult getProduct(Integer reportId) {
         log.info("开始处理【根据报告id查询产品数据信息】的请求，参数为：{}", reportId);
         if (reportId != null) {
-            ProductStandardVO product = productService.getProduct(reportId);
-            return Response.success(product);
+            ProductStandardVO queryResult = productService.getProduct(reportId);
+            if (queryResult == null) {
+                return JsonResult.fail(ServiceCode.ERROR_NOT_FOUND, "报告id不存在");
+            }
+            return JsonResult.ok(queryResult);
         } else {
-            return Response.error("报告id不能为空");
+            return JsonResult.fail(ServiceCode.ERROR_BAD_REQUEST, "报告id不能为空");
         }
 
     }