fixed 自定义分析项

src/main/java/cn/cslg/pas/common/dto/customAnalyse/SchemaDataDTO.java

@@ -1,26 +1,22 @@
 package cn.cslg.pas.common.dto.customAnalyse;
 
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 @Data
+@NoArgsConstructor
 public class SchemaDataDTO {
-    private Integer field;
-    private Integer expand;
+    private String field;
+    private String expand;
     private Integer ptype;
-    private Integer type;
+    private String type;
     private Integer num;
     private Integer merge;
+    private String name;
+    private String groupBy;
+    private String fieldKind;
 
-    public SchemaDataDTO() {
-        this.field = 0;
-        this.expand = 0;
-        this.type = 0;
-        this.ptype = 0;
-        this.num = 0;
-        this.merge = 0;
-    }
-
-    public SchemaDataDTO(Integer field, Integer expand) {
+    public SchemaDataDTO(String field, String expand) {
         this.field = field;
         this.expand = expand;
     }

src/main/java/cn/cslg/pas/common/vo/customAnalyse/SourceDataVO.java

@@ -7,10 +7,14 @@ import java.util.List;
 
 @Data
 public class SourceDataVO {
-    private Integer expandId;
-    private Integer fieldId;
+    private String expand;
+    private String field;
     private String uid;
     private String patentKey;
     private String dimension;
+    private Boolean selected;
+    private Integer number;
+    private Integer topN;
+    private String name;
     private List<CustomAnalysisItemSource> source;
 }

src/main/java/cn/cslg/pas/domain/business/CustomAnalysisItemSchema.java

@@ -27,13 +27,13 @@ public class CustomAnalysisItemSchema extends BaseEntity<CustomAnalysisItemSchem
     private String dimension;
 
     @TableField(value = "field")
-    private Integer field;
+    private String field;
 
     @TableField(value = "expand")
-    private Integer expand;
+    private String expand;
 
     @TableField(value = "type")
-    private Integer type;
+    private String type;
 
     @TableField(value = "ptype")
     private Integer ptype;
@@ -60,4 +60,12 @@ public class CustomAnalysisItemSchema extends BaseEntity<CustomAnalysisItemSchem
     @TableField(value = "update_time",fill = FieldFill.INSERT_UPDATE)
     private Date updateTime;
 
+    @TableField(value = "name")
+    private String name;
+
+    @TableField(value = "group_by")
+    private String groupBy;
+
+    @TableField(value = "field_kind")
+    private String fieldKind;
 }

src/main/java/cn/cslg/pas/domain/business/CustomAnalysisItemSetting.java

@@ -63,9 +63,9 @@ public class CustomAnalysisItemSetting extends BaseEntity<CustomAnalysisItemSett
         this.fontSize2 = "13";
         this.fontColor = "#000000";
         this.fontColor2 = "#000000";
-        this.show = true;
+        this.show1 = true;
         this.show2 = true;
-        this.interval = true;
+        this.interval1 = true;
         this.interval2 = true;
         this.rotate = "0";
         this.rotate2 = "0";
@@ -303,7 +303,10 @@ public class CustomAnalysisItemSetting extends BaseEntity<CustomAnalysisItemSett
     /**
      * 坐标轴（X）显示
      */
-    @TableField(value = "show")
+    @TableField(value = "show1")
+    private Boolean show1;
+
+    @TableField(exist = false)
     private Boolean show;
 
     /**
@@ -318,7 +321,10 @@ public class CustomAnalysisItemSetting extends BaseEntity<CustomAnalysisItemSett
     /**
      * X轴信息全部显示
      */
-    @TableField(value = "interval")
+    @TableField(value = "interval1")
+    private Boolean interval1;
+
+    @TableField(exist = false)
     private Boolean interval;
 
     /**

src/main/java/cn/cslg/pas/domain/business/CustomAnalysisItemSource.java

@@ -45,14 +45,14 @@ public class CustomAnalysisItemSource extends BaseEntity<CustomAnalysisItemSourc
     /**
      * 字段ID
      */
-    @TableField(value = "field_id")
-    private Integer fieldId;
+    @TableField(value = "field")
+    private String field;
 
     /**
      * 拓展ID
      */
-    @TableField(value = "expand_id")
-    private Integer expandId;
+    @TableField(value = "expand")
+    private String expand;
 
     /**
      * 开始时间
@@ -98,6 +98,12 @@ public class CustomAnalysisItemSource extends BaseEntity<CustomAnalysisItemSourc
     @TableField(value = "update_time",fill = FieldFill.INSERT_UPDATE)
     private Date updateTime;
 
+    @TableField(value = "number")
+    private Integer number;
+
+    @TableField(value = "topN")
+    private Integer topN;
+
     /**
      * 大于
      */

src/main/java/cn/cslg/pas/service/business/CustomAnalyseService.java

@@ -20,6 +20,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -127,8 +128,8 @@ public class CustomAnalyseService extends ServiceImpl<CustomAnalysisItemMapper,
             throw new UnLoginException("未登录");
         }
         CustomAnalysisItem item = new CustomAnalysisItem();
-        item.setUid(uid);
         BeanUtils.copyProperties(vo, item);
+        item.setUid(uid);
         if (vo.getType() == 1) {
             item.setParentId(0);
         } else {
@@ -140,9 +141,12 @@ public class CustomAnalyseService extends ServiceImpl<CustomAnalysisItemMapper,
         item.setCreateTime(new Date());
         item.setUpdateTime(new Date());
         item.insert();
+        if (StringUtils.isEmpty(vo.getUid())) {
+            vo.setUid(item.getUid());
+        }
         if (item.getType().equals(2)) {
-            itemSettingService.add(vo.getSetting(), uid);
             itemSchemaService.add(vo.getSchema(), uid);
+            itemSettingService.add(vo.getSetting(), uid);
             itemSourceService.edit(vo);
         }
         return item.getId();

src/main/java/cn/cslg/pas/service/business/CustomAnalysisItemSchemaService.java

@@ -16,6 +16,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -53,11 +54,17 @@ public class CustomAnalysisItemSchemaService extends ServiceImpl<CustomAnalysisI
         x.setPtype(d1.getPtype());
         x.setNum(d1.getNum());
         x.setType(d1.getType());
+        x.setGroupBy(d1.getGroupBy());
+        x.setFieldKind(d1.getFieldKind());
+        x.setName(d1.getName());
         y.setField(d2.getField());
         y.setExpand(d2.getExpand());
         y.setPtype(d2.getPtype());
         y.setNum(d2.getNum());
         y.setType(d2.getType());
+        y.setName(d2.getName());
+        y.setGroupBy(d2.getGroupBy());
+        y.setFieldKind(d2.getFieldKind());
         dto.setX(x);
         dto.setY(y);
         return dto;
@@ -82,8 +89,13 @@ public class CustomAnalysisItemSchemaService extends ServiceImpl<CustomAnalysisI
         d1.setPtype(dto.getX().getPtype());
         d1.setType(dto.getX().getType());
         d1.setNum(dto.getX().getNum());
+        d1.setName(dto.getX().getName());
+        d1.setGroupBy(dto.getX().getGroupBy());
+        d1.setFieldKind(dto.getX().getFieldKind());
         d1.setCreateId(personnelVO.getId());
         d1.setCreateName(personnelVO.getName());
+        d1.setCreateTime(new Date());
+        d1.setUpdateTime(new Date());
         d2.setUid(uid);
         d2.setDimension("y");
         d2.setField(dto.getY().getField());
@@ -91,8 +103,13 @@ public class CustomAnalysisItemSchemaService extends ServiceImpl<CustomAnalysisI
         d2.setPtype(dto.getY().getPtype());
         d2.setType(dto.getY().getType());
         d2.setNum(dto.getY().getNum());
+        d2.setName(dto.getY().getName());
+        d2.setGroupBy(dto.getY().getGroupBy());
+        d2.setFieldKind(dto.getY().getFieldKind());
         d2.setCreateId(personnelVO.getId());
         d2.setCreateName(personnelVO.getName());
+        d2.setCreateTime(new Date());
+        d2.setUpdateTime(new Date());
         customAnalysisItemSchema.add(d1);
         customAnalysisItemSchema.add(d2);
         this.saveBatch(customAnalysisItemSchema);
@@ -111,6 +128,9 @@ public class CustomAnalysisItemSchemaService extends ServiceImpl<CustomAnalysisI
                         item.setPtype(dto.getX().getPtype());
                         item.setNum(dto.getX().getNum());
                         item.setType(dto.getX().getType());
+                        item.setName(dto.getX().getName());
+                        item.setGroupBy(dto.getX().getGroupBy());
+                        item.setFieldKind(dto.getX().getFieldKind());
                         break;
                     case "y":
                         item.setField(dto.getY().getField());
@@ -118,6 +138,9 @@ public class CustomAnalysisItemSchemaService extends ServiceImpl<CustomAnalysisI
                         item.setPtype(dto.getY().getPtype());
                         item.setNum(dto.getY().getNum());
                         item.setType(dto.getY().getType());
+                        item.setName(dto.getY().getName());
+                        item.setGroupBy(dto.getY().getGroupBy());
+                        item.setFieldKind(dto.getY().getFieldKind());
                         break;
                 }
             });

src/main/java/cn/cslg/pas/service/business/CustomAnalysisItemSettingService.java

@@ -67,6 +67,8 @@ public class CustomAnalysisItemSettingService extends ServiceImpl<CustomAnalysis
         }
         CustomAnalysisItemSetting customAnalysisItemSetting = new CustomAnalysisItemSetting();
         BeanUtils.copyProperties(setting, customAnalysisItemSetting);
+        customAnalysisItemSetting.setShow1(setting.getShow());
+        customAnalysisItemSetting.setInterval1(setting.getInterval());
         customAnalysisItemSetting.setUid(uid);
         customAnalysisItemSetting.setCreateId(personnelVO.getId());
         customAnalysisItemSetting.setCreateName(personnelVO.getName());

src/main/java/cn/cslg/pas/service/business/CustomAnalysisItemSourceService.java

@@ -21,6 +21,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -50,12 +51,12 @@ public class CustomAnalysisItemSourceService extends ServiceImpl<CustomAnalysisI
         return sourceDataDTO;
     }
 
-    public List<CustomAnalysisItemSource> getItemSourceList(String uid, String dimension, Integer fieldId, Integer expandId) {
+    public List<CustomAnalysisItemSource> getItemSourceList(String uid, String dimension, String field, String expand) {
         LambdaQueryWrapper<CustomAnalysisItemSource> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(CustomAnalysisItemSource::getUid, uid);
         queryWrapper.eq(CustomAnalysisItemSource::getDimension, dimension);
-        queryWrapper.eq(CustomAnalysisItemSource::getFieldId, fieldId);
-        queryWrapper.eq(CustomAnalysisItemSource::getExpandId, expandId);
+        queryWrapper.eq(CustomAnalysisItemSource::getField, field);
+        queryWrapper.eq(CustomAnalysisItemSource::getExpand, expand);
         return this.list(queryWrapper);
     }
 
@@ -63,14 +64,17 @@ public class CustomAnalysisItemSourceService extends ServiceImpl<CustomAnalysisI
         list.forEach(item -> {
             item.setUid(null);
             item.setDimension(null);
-            item.setFieldId(null);
-            item.setExpandId(null);
+            item.setField(null);
+            item.setExpand(null);
             item.setCreateTime(null);
             item.setUpdateTime(null);
             item.setStatus(null);
             item.setId(null);
             item.setCreateId(null);
             item.setCreateName(null);
+            item.setName(null);
+            item.setNumber(null);
+            item.setTopN(null);
             if (StringUtils.isNotEmpty(item.getMaxData())) {
                 item.setMax(JsonUtils.jsonToPojo(item.getMaxData(), SourceMinAndMaxDataDTO.class));
                 item.setMaxData(null);
@@ -88,22 +92,34 @@ public class CustomAnalysisItemSourceService extends ServiceImpl<CustomAnalysisI
         SourceDataVO x = new SourceDataVO();
         SourceDataVO y = new SourceDataVO();
         SourceDataDTO sourceDataDTO = vo.getSource();
-        if (vo.getSchema().getX().getPtype().equals(3) || vo.getSchema().getX().getPtype().equals(4)
-                || vo.getSchema().getX().getType().equals(6)) {
+        Integer xPType = vo.getSchema().getX().getPtype();
+        String xType = vo.getSchema().getX().getType();
+        if ((xPType != null && (xPType.equals(3) || xPType.equals(4))) || (StringUtils.isNotEmpty(xType) && xType.equalsIgnoreCase("tree"))) {
             x.setUid(vo.getUid());
             x.setDimension("x");
-            x.setFieldId(vo.getSchema().getX().getField());
-            x.setExpandId(vo.getSchema().getX().getExpand());
+            x.setField(vo.getSchema().getX().getField());
+            x.setExpand(vo.getSchema().getX().getExpand());
+            x.setName(vo.getSchema().getX().getName());
+            x.setNumber(vo.getSchema().getX().getNum());
             x.setSource(sourceDataDTO.getX());
+            if (!CollectionUtils.isEmpty(sourceDataDTO.getX())) {
+                x.setSelected(true);
+            }
             this.updateSource(x);
         }
-        if (vo.getSchema().getY().getPtype().equals(3) || vo.getSchema().getY().getPtype().equals(4)
-                || vo.getSchema().getY().getType().equals(6)) {
+        Integer yPType = vo.getSchema().getY().getPtype();
+        String yType = vo.getSchema().getY().getType();
+        if ((yPType != null && (yPType.equals(3) || yPType.equals(4))) || (StringUtils.isNotEmpty(yType) && xType.equalsIgnoreCase("tree"))) {
             y.setUid(vo.getUid());
             y.setDimension("y");
-            y.setFieldId(vo.getSchema().getY().getField());
-            y.setExpandId(vo.getSchema().getY().getExpand());
+            y.setField(vo.getSchema().getY().getField());
+            y.setExpand(vo.getSchema().getY().getExpand());
+            y.setName(vo.getSchema().getY().getName());
+            y.setNumber(vo.getSchema().getY().getNum());
             y.setSource(sourceDataDTO.getY());
+            if (!CollectionUtils.isEmpty(sourceDataDTO.getY())) {
+                y.setSelected(true);
+            }
             this.updateSource(y);
         }
     }
@@ -128,12 +144,15 @@ public class CustomAnalysisItemSourceService extends ServiceImpl<CustomAnalysisI
             if (StringUtils.isNotNull(source.getMin())) {
                 source.setMinData(JsonUtils.objectToJson(source.getMin()));
             }
-            source.setFieldId(sourceDataVO.getFieldId());
-            source.setExpandId(sourceDataVO.getExpandId());
+            source.setField(sourceDataVO.getField());
+            source.setExpand(sourceDataVO.getExpand());
             source.setCreateId(finalPersonnelVO.getId());
             source.setCreateName(finalPersonnelVO.getName());
             source.setDimension(sourceDataVO.getDimension());
             source.setUid(sourceDataVO.getUid());
+            source.setName(sourceDataVO.getName());
+            source.setNumber(sourceDataVO.getNumber());
+            source.setSelected(sourceDataVO.getSelected());
             list.add(source);
         });
         this.saveOrUpdateBatch(list);

src/main/resources/jsons/patent.json

@@ -219,7 +219,7 @@
   {
     "name": "合并发明人",
     "type": "Array",
-    "value": "mergeRightHolder",
+    "value": "mergeInventor",
     "field": "MIN",
     "esField": "merge_inventor.name",
     "esClass": "nestedQueryBuilder",