From 84d7edadeb61f9cdda458d9dcbd4418938552cac Mon Sep 17 00:00:00 2001
From: "583641232@qq.com" <583641232@qq.com>
Date: Tue, 30 Jul 2024 17:43:55 +0800
Subject: [PATCH] =?UTF-8?q?:sparkles:=20=E6=97=A5=E5=B8=B8=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CollectionInformationController.java      | 24 +++++++------------
 .../service/QueryCenterService.java           |  2 +-
 2 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/cas-admin/src/main/java/com/inscloudtech/web/controller/datacenter/CollectionInformationController.java b/cas-admin/src/main/java/com/inscloudtech/web/controller/datacenter/CollectionInformationController.java
index c9c538d..49fb863 100644
--- a/cas-admin/src/main/java/com/inscloudtech/web/controller/datacenter/CollectionInformationController.java
+++ b/cas-admin/src/main/java/com/inscloudtech/web/controller/datacenter/CollectionInformationController.java
@@ -41,7 +41,9 @@ public class CollectionInformationController extends BaseController {
 
     private final ISysOssService iSysOssService;
 
-    //"保存至分析成果")
+    /**
+     * 保存至分析成果
+     */
     @PostMapping("/save2AnalysisResult")
     public R save2AnalysisResult(@RequestBody AnalysisDto dto) {
         collectionInformationService.save2AnalysisResult(dto);
@@ -61,7 +63,6 @@ public class CollectionInformationController extends BaseController {
      *
      * @param id 主键
      */
-    //"获取日常收集信息")
     @GetMapping("/{id}")
     public R<CollectionInformation> getInfo(@NotNull(message = "主键不能为空")
                               @PathVariable String id) {
@@ -101,7 +102,9 @@ public class CollectionInformationController extends BaseController {
         return R.ok(collectionInformationService.deleteWithValidByIds(Arrays.asList(ids), true));
     }
 
-    //"批量修改日常收集信息")
+    /**
+     * 批量修改日常收集信息
+     */
     @PutMapping("/updateBatch")
     public R updateBatch(@RequestBody CollectionInformation bo) {
         List<String> ids = bo.getIds();
@@ -116,16 +119,6 @@ public class CollectionInformationController extends BaseController {
         return R.ok(collectionInformationService.updateBatch(list));
     }
 
-    //"批量修改日常收集信息对象集合")
-    @PutMapping("/updateBatchByList")
-    public R updateBatch(@RequestBody List<CollectionInformation> list) {
-        list.stream().forEach(update ->{
-            update.setUpdateBy(getUsername());
-            update.setUpdateTime(new Date());
-        });
-        return R.ok(collectionInformationService.updateBatch(list));
-    }
-
     /**
      * 导入日常收集信息
      */
@@ -151,7 +144,9 @@ public class CollectionInformationController extends BaseController {
         return result ? R.ok() : R.fail(importResultStr);
     }
 
-    //"分析成果-日常收集信息导入")
+    /**
+     * 分析成果-日常收集信息导入
+     */
     @PostMapping(value = "/import4AnalysisResult", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
     public R importAnalysisResult(@RequestPart("file") MultipartFile file, String caseId, String analysisResultId) {
         boolean result = false;
@@ -178,7 +173,6 @@ public class CollectionInformationController extends BaseController {
     /**
      * 导出交易对象列表
      */
-    //"导出日常收集信息")
     @PostMapping("/export")
     public void export(CollectionInformation bo, HttpServletResponse response) {
         List<CollectionInformation> list = Collections.EMPTY_LIST;
diff --git a/cas-system/src/main/java/com/inscloudtech/datacenter/service/QueryCenterService.java b/cas-system/src/main/java/com/inscloudtech/datacenter/service/QueryCenterService.java
index 4bb4b89..631ea60 100644
--- a/cas-system/src/main/java/com/inscloudtech/datacenter/service/QueryCenterService.java
+++ b/cas-system/src/main/java/com/inscloudtech/datacenter/service/QueryCenterService.java
@@ -156,7 +156,7 @@ public class QueryCenterService {
             CarInfo.class,
             BankStatement.class,PlateNumberInfo.class);
 
-    private static final List<Class<?>> OTHER_INDEX = Arrays.asList(OtherAssets.class, OtherInformation.class);
+    private static final List<Class<?>> OTHER_INDEX = Arrays.asList(OtherAssets.class, OtherInformation.class,CollectionInformation.class);
 
     public List<Class<?>> initQueryIndex(Integer isOther) {
         List<Class<?>> willSearch = new ArrayList<>(INDEX);