✨ 指定字段查询

cas-admin/src/main/java/com/inscloudtech/web/controller/datacenter/PublicFamilyController.java

@@ -109,6 +109,7 @@ public class PublicFamilyController extends BaseController {
      */
     //"修改职工家属信息")
     @UpdateLog(title = "职工家属",mapperClass = PublicFamilyMapper.class, businessType = BusinessType.UPDATE)
+    @Log(title = "职工家属", businessType = BusinessType.UPDATE)
     @PutMapping()
     public R edit(@RequestBody PublicFamily bo) {
         return R.ok(iPublicFamilyService.updateByBo(bo));
@@ -116,6 +117,7 @@ public class PublicFamilyController extends BaseController {
 
     //"批量修改职工家属信息")
     @PutMapping("/updateBatch")
+    @Log(title = "职工家属", businessType = BusinessType.UPDATE)
     public R updateBatch(@RequestBody PublicFamily bo) {
         List<String> ids = bo.getIds();
         List<PublicFamily> list = new ArrayList<>();
@@ -130,6 +132,7 @@ public class PublicFamilyController extends BaseController {
     }
     //"批量修改职工家属信息集合")
     @PutMapping("/updateBatchByList")
+    @Log(title = "职工家属", businessType = BusinessType.UPDATE)
     public R updateBatch(@RequestBody List<PublicFamily> list) {
         list.stream().forEach(update ->{
             update.setUpdateBy(getUsername());

cas-admin/src/main/java/com/inscloudtech/web/controller/datacenter/RealEstateController.java

@@ -154,6 +154,7 @@ public class RealEstateController extends BaseController {
     }
 
     //"批量修改不动产信息")
+    @Log(title = "不动产信息", businessType = BusinessType.UPDATE)
     @PutMapping("/updateBatch")
     public R updateBatch(@RequestBody RealEstate bo) {
         List<String> ids = bo.getIds();
@@ -170,6 +171,7 @@ public class RealEstateController extends BaseController {
 
     //"批量修改不动产信息对象集合")
     @PutMapping("/updateBatchByList")
+    @Log(title = "不动产信息", businessType = BusinessType.UPDATE)
     public R updateBatch(@RequestBody List<RealEstate> list) {
         list.stream().forEach(update ->{
             update.setUpdateBy(getUsername());

cas-admin/src/main/java/com/inscloudtech/web/controller/datacenter/TransactionPartnerController.java

@@ -3,11 +3,13 @@ package com.inscloudtech.web.controller.datacenter;
 import cn.hutool.core.collection.CollectionUtil;
 import com.inscloudtech.analysiscenter.domain.AnalysisDto;
 import com.inscloudtech.bankStatementAnalysis.service.ImportService;
+import com.inscloudtech.common.annotation.Log;
 import com.inscloudtech.common.annotation.UpdateLog;
 import com.inscloudtech.common.core.controller.BaseController;
 import com.inscloudtech.common.core.domain.PageQuery;
 import com.inscloudtech.common.core.domain.R;
 import com.inscloudtech.common.core.page.TableDataInfo;
+import com.inscloudtech.common.enums.BusinessType;
 import com.inscloudtech.common.excel.ExcelResult;
 import com.inscloudtech.common.utils.BeanCopyUtils;
 import com.inscloudtech.common.utils.poi.ExcelUtil;
@@ -151,6 +153,7 @@ public class TransactionPartnerController extends BaseController {
      */
     //"修改交易对象")
     @UpdateLog(title = "交易对象", mapperClass = TransactionPartnerMapper.class)
+    @Log(title = "交易对象", businessType = BusinessType.UPDATE)
     @PutMapping()
     public R edit(@RequestBody TransactionPartner update) {
         update.setUpdateBy(getUsername());
@@ -164,6 +167,7 @@ public class TransactionPartnerController extends BaseController {
      */
     //"批量修改交易对象")
     @PutMapping("/updateBatch")
+    @Log(title = "交易对象", businessType = BusinessType.UPDATE)
     public R updateBatch(@RequestBody TransactionPartner bo) {
         List<String> ids = bo.getIds();
         List<TransactionPartner> list = new ArrayList<>();

cas-admin/src/main/resources/application-dev.yml

@@ -82,6 +82,6 @@ easy-es:
   address: 192.168.3.20:9200 #es的连接地址,必须含端口 若为集群,则可以用逗号隔开 例如:127.0.0.1:9200,127.0.0.2:9200
   global-config:
     distributed: false
-    print-dsl: true
+    print-dsl: false
   password: ly123456
   username: elastic

cas-common/src/main/java/com/inscloudtech/common/annotation/Log.java

@@ -20,7 +20,7 @@ public @interface Log {    /**
     /**
      * 功能
      */
-    BusinessType businessType() default BusinessType.OTHER;
+    BusinessType businessType() default BusinessType.UPDATE;
     /**
      * 操作人类别
      */

cas-system/src/main/java/com/inscloudtech/datacenter/service/QueryCenterService.java

@@ -506,8 +506,14 @@ public class QueryCenterService {
 //        SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder();
         SearchSourceBuilder searchSourceBuilder = buildSearchSourceBuilder(indexName,json);
         for (String field : fields) {
-            AggregationBuilder agg =
-                    AggregationBuilders.terms("groupBy_" + field).field(field+".keyword").size(10000);
+            AggregationBuilder agg;
+            //todo 暂时处理
+            if(indexName.equals("dc_collection_information")){
+                agg = AggregationBuilders.terms("groupBy_" + field).field(field).size(10000);
+            }else {
+                agg = AggregationBuilders.terms("groupBy_" + field).field(field+".keyword").size(10000);
+            }
+
             searchSourceBuilder.aggregation(agg);
         }
         SearchRequest searchRequest = new SearchRequest(indexName);