Merge remote-tracking branch 'origin/master'

src/main/java/cn/cslg/pas/common/core/base/RedisConf.java

@@ -17,4 +17,5 @@ public class RedisConf {
     public final static String USER_FIELD = "user-field";
     public final static String FIELD_ORDER = "field-order";
     public final static String USER_IMPORT = "user-import";
+    public final static String PROJECT_FIELD_ORDER="project_field_order";
 }

src/main/java/cn/cslg/pas/common/utils/CacheUtils.java

@@ -4,6 +4,7 @@ import cn.cslg.pas.common.core.base.RedisConf;
 
 import cn.cslg.pas.common.model.cronModel.PersonnelVO;
 
+import cn.cslg.pas.common.vo.business.AllCustomFieldVO;
 import cn.dev33.satoken.exception.NotLoginException;
 import cn.hutool.core.lang.tree.Tree;
 import cn.hutool.core.util.IdUtil;
@@ -108,4 +109,18 @@ public class CacheUtils {
     public void deleteUserImport(Integer userId) {
         redisUtil.delete(RedisConf.USER_IMPORT + RedisConf.SYMBOL_COLON + userId);
     }
+
+    //添加自定义栏位顺序
+    public void addPatentCustomField(Integer projectId,List<AllCustomFieldVO> allCustomFieldVOS){
+        redisUtil.set(RedisConf.PROJECT_FIELD_ORDER +projectId,JsonUtils.objectToJson(allCustomFieldVOS));
+    }
+
+    public List<AllCustomFieldVO> getPatentCustomField(Object userId) {
+        String json = redisUtil.get(RedisConf.LOGIN_USER + RedisConf.SYMBOL_COLON + userId);
+        if (StringUtils.isEmpty(json)) {
+            throw new NotLoginException("无数据", "user", "");
+        } else {
+            return com.alibaba.fastjson2.JSONObject.parseObject(json, List.class);
+        }
+    }
 }

src/main/java/cn/cslg/pas/common/vo/business/AllCustomFieldVO.java

@@ -0,0 +1,31 @@
+package cn.cslg.pas.common.vo.business;
+
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 自定义栏位查询VO
+ * @Author xiexiang
+ * @Date 2023/11/13
+ */
+@Data
+public class AllCustomFieldVO {
+    /**
+     * id
+     */
+    private Integer id;
+
+    /**
+     * 自定义栏位名称
+     */
+    private String name;
+
+
+    /**
+     * 类型
+     */
+    private Integer type;
+
+
+}

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

@@ -81,12 +81,6 @@ public class PatentController {
         return Response.success(patentPageMessageVOS);
     }
 
-    @Operation(summary = "test")
-    @PostMapping("/test")
-    public Response test(@RequestBody List<EsCustomFieldValueDTO> customFields) throws Exception {
-        PatentDTO patentDTO = esService.esSearch(customFields);
-        return Response.success(patentDTO);
-    }
 
     @Operation(summary = "esCount")
     @PostMapping("/esCount")

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

@@ -9,8 +9,10 @@ import cn.cslg.pas.common.model.request.GroupRequest;
 import cn.cslg.pas.common.model.request.QueryRequest;
 import cn.cslg.pas.common.utils.CacheUtils;
 import cn.cslg.pas.common.utils.LoginUtils;
+import cn.cslg.pas.common.vo.business.AllCustomFieldVO;
 import cn.cslg.pas.common.vo.business.CustomFieldVO;
 import cn.cslg.pas.common.vo.business.ProductVO;
+import cn.cslg.pas.domain.business.AssoProjectTreeNode;
 import cn.cslg.pas.domain.business.CustomField;
 import cn.cslg.pas.exception.UnLoginException;
 import cn.cslg.pas.exception.XiaoShiException;
@@ -53,6 +55,8 @@ public class CustomFieldService extends ServiceImpl<CustomFieldMapper, CustomFie
 
     @Autowired
     private PermissionService permissionService;
+    @Autowired
+    private AssoProjectTreeNodeService assoProjectTreeNodeService;
 
     @Override
     public Object queryMessage(QueryRequest queryRequest) throws Exception {
@@ -84,6 +88,7 @@ public class CustomFieldService extends ServiceImpl<CustomFieldMapper, CustomFie
             throw new XiaoShiException("ids不能为空");
         }
         this.removeBatchByIds(ids);
+        //TODO 删除缓存中保存的栏位信息
         //TODO 删除与专题库的关联关系
         return ids;
     }
@@ -138,6 +143,7 @@ public class CustomFieldService extends ServiceImpl<CustomFieldMapper, CustomFie
         BeanUtils.copyProperties(customFieldDTO, customField);
         customField.setCreateId(personnelVO.getId());
         customField.insert();
+        //TODO 删除缓存中保存的栏位信息
         return customField.getId();
     }
 
@@ -171,6 +177,8 @@ public class CustomFieldService extends ServiceImpl<CustomFieldMapper, CustomFie
         if (!name.equals(customField.getName()) && customFields.size() != 0) {
             throw new XiaoShiException("名称重复");
         }
+
+        //TODO 删除缓存中保存的栏位信息
         BeanUtils.copyProperties(updateCustomFieldDTO, customField);
         customField.updateById();
         return customField.getId();
@@ -209,6 +217,16 @@ public class CustomFieldService extends ServiceImpl<CustomFieldMapper, CustomFie
     }
 
 
-    private void getAllPatentCustomField() {
+    private void getAllPatentCustomField(Integer projectId) {
+        //根据 project获得栏位值
+        List<CustomField> customFields = new ArrayList<>();
+        LambdaQueryWrapper<CustomField> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(CustomField::getProjectId, projectId);
+        customFields = this.list(queryWrapper);
+        //
+        LambdaQueryWrapper<AssoProjectTreeNode> assoQueryWrapper = new LambdaQueryWrapper<>();
+        assoQueryWrapper.eq(AssoProjectTreeNode::getProjectId, projectId);
+        List<AssoProjectTreeNode> projectTreeNodes = assoProjectTreeNodeService.list(assoQueryWrapper);
+
     }
 }

src/test/java/cn/cslg/pas/service/EventServiceTests.java

@@ -296,23 +296,23 @@ public class EventServiceTests {
         esCustomFieldService.addCustomField(dto);
     }
 
-    @Test
-    void test16() {
-        List<EsCustomFieldValueDTO> customFields = new ArrayList<>();
-        EsCustomFieldValueDTO dto1 = new EsCustomFieldValueDTO();
-        dto1.setFieldId("1");
-        dto1.setFieldValue(Arrays.asList("a", "b"));
-        EsCustomFieldValueDTO dto2 = new EsCustomFieldValueDTO();
-        dto2.setFieldId("2");
-        dto2.setFieldValue(Arrays.asList("a", "b"));
-        customFields.add(dto1);
-        customFields.add(dto2);
-        String s = esService.parseCustomField(customFields,Boolean.FALSE);
-        System.out.println("结果为:" + s);
-        System.out.println("-----------------------------");
-        List<EsCustomFieldValueDTO> fields = new ArrayList<>();
-
-    }
+//    @Test
+//    void test16() {
+//        List<EsCustomFieldValueDTO> customFields = new ArrayList<>();
+//        EsCustomFieldValueDTO dto1 = new EsCustomFieldValueDTO();
+//        dto1.setFieldId("1");
+//        dto1.setFieldValue(Arrays.asList("a", "b"));
+//        EsCustomFieldValueDTO dto2 = new EsCustomFieldValueDTO();
+//        dto2.setFieldId("2");
+//        dto2.setFieldValue(Arrays.asList("a", "b"));
+//        customFields.add(dto1);
+//        customFields.add(dto2);
+//        String s = esService.parseCustomField(customFields,Boolean.FALSE);
+//        System.out.println("结果为:" + s);
+//        System.out.println("-----------------------------");
+//        List<EsCustomFieldValueDTO> fields = new ArrayList<>();
+//
+//    }
 
     @Test
     void test17() throws IOException {