fixed

src/main/java/cn/cslg/pas/controller/CustomAnalyseController.java

@@ -28,7 +28,12 @@ public class CustomAnalyseController {
     @Operation(summary = "查询组别/分析项")
     @PostMapping("/queryAnalyseGroup")
     public Response queryAnalyseGroup(@RequestBody SelectCustomAnalyseVO vo) {
-        List<SelectCustomAnalyseListDTO> list = customAnalyseService.queryAnalyseGroup(vo);
+        List<SelectCustomAnalyseListDTO> list = null;
+        try {
+            list = customAnalyseService.queryAnalyseGroup(vo);
+        } catch (Exception e) {
+            return Response.success(e.getMessage());
+        }
         return Response.success(list);
     }
 
@@ -49,21 +54,36 @@ public class CustomAnalyseController {
     @Operation(summary = "添加组别/分析项")
     @PostMapping("/addAnalyseGroup")
     public Response addAnalyseGroup(@RequestBody CustomAnalyseDTO vo) throws Exception {
-        Integer groupId = customAnalyseService.addAnalyseGroup(vo);
+        Integer groupId = null;
+        try {
+            groupId = customAnalyseService.addAnalyseGroup(vo);
+        } catch (Exception e) {
+            return Response.success(e.getMessage());
+        }
         return Response.success(groupId);
     }
 
     @Operation(summary = "编辑组别")
     @PostMapping("/editAnalyseGroup")
     public Response editAnalyseGroup(@RequestBody CustomAnalyseDTO vo) throws Exception {
-        Integer groupId = customAnalyseService.editAnalyseGroup(vo);
+        Integer groupId = null;
+        try {
+            groupId = customAnalyseService.editAnalyseGroup(vo);
+        } catch (Exception e) {
+            return Response.success(e.getMessage());
+        }
         return Response.success(groupId);
     }
 
     @Operation(summary = "删除组别/分析项")
     @PostMapping("/delAnalyseGroup")
     public Response delAnalyseGroup(@RequestBody CustomAnalyseIdVO vo) throws Exception {
-        Integer groupId = customAnalyseService.delAnalyseGroup(vo);
+        Integer groupId = null;
+        try {
+            groupId = customAnalyseService.delAnalyseGroup(vo);
+        } catch (Exception e) {
+            return Response.success(e.getMessage());
+        }
         return Response.success(groupId);
     }
 }

src/main/java/cn/cslg/pas/controller/PatentController.java

@@ -176,7 +176,12 @@ public class PatentController {
     @Operation(summary = "专利列表上新增发明人/权利人/申请人合并")
     @PostMapping("/mergePerson")
     public Response mergePerson(@RequestBody MergePersonVO personVO) throws Exception {
-        Integer personId = mergePersonService.mergePerson(personVO);
+        Integer personId = null;
+        try {
+            personId = mergePersonService.mergePerson(personVO);
+        } catch (Exception e) {
+            return Response.success(e.getMessage());
+        }
         return Response.success(personId);
     }
 
@@ -190,7 +195,12 @@ public class PatentController {
     @Operation(summary = "专利列表上编辑发明人/权利人/申请人合并")
     @PostMapping("/updateMergePerson")
     public Response updateMergePerson(@RequestBody MergePersonVO personVO) throws Exception{
-        Integer personId = mergePersonService.updateMergePerson(personVO);
+        Integer personId = null;
+        try {
+            personId = mergePersonService.updateMergePerson(personVO);
+        } catch (Exception e) {
+            return Response.success(e.getMessage());
+        }
         return Response.success(personId);
     }
 

src/main/java/cn/cslg/pas/service/business/es/EsScratchWordsService.java

@@ -256,12 +256,12 @@ public class EsScratchWordsService {
         Aggregation hits = AggregationBuilders.bucketSort(i -> i.size(size.intValue()).from((current.intValue() - 1) * size.intValue()));
         Aggregation aggregation = null;
         if (esGroupFiled.equals("mark_time")) {
-            aggregation =
-                    new Aggregation.Builder().dateHistogram(new DateHistogramAggregation.Builder().field(esGroupFiled).calendarInterval(CalendarInterval.Day).format("yyyy-MM-dd").build()).aggregations(new HashMap() {{
+            aggregation = new Aggregation.Builder().dateHistogram(new DateHistogramAggregation.Builder().field(esGroupFiled)
+                            .calendarInterval(CalendarInterval.Day).format("yyyy-MM-dd").build())
+                    .aggregations(new HashMap() {{
                         put("pageAgg", hits);
                     }}).build();
-        }
-        else {
+        } else {
            aggregation = new Aggregation.Builder().terms(new TermsAggregation.Builder()
                     .field(esGroupFiled).build()).aggregations(new HashMap() {{
                 put("pageAgg", hits);
@@ -271,6 +271,18 @@ public class EsScratchWordsService {
         builder.size(0);
 
         //查询总数聚合
+        /*Aggregation totalAggregation = null;
+        if (esGroupFiled.equals("mark_time")) {
+            Aggregation finalAggregation = aggregation;
+            Aggregation statsAgg = new Aggregation.Builder().statsBucket(new StatsBucketAggregation.Builder()
+                    .bucketsPath(m -> m.single("statsAgg._count")).build())
+                    .aggregations(new HashMap() {{
+                        put("statsAgg", finalAggregation);
+                    }}).build();
+            totalAggregation.aggregations().put("id", statsAgg);
+        } else {
+            totalAggregation = AggregationBuilders.cardinality(i -> i.field(esGroupFiled));
+        }*/
         Aggregation totalAggregation = AggregationBuilders.cardinality(i -> i.field(esGroupFiled));
         builder.aggregations("total", totalAggregation);
         try {