1/17

src/main/java/cn/cslg/pas/common/dto/business/OtherReferencesDTO.java

@@ -0,0 +1,24 @@
+package cn.cslg.pas.common.dto.business;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Author xiexiang
+ * @Date 2024/1/17
+ */
+@Data
+public class OtherReferencesDTO {
+    private Integer id;
+
+    private Integer projectId;
+
+    private String remark;
+
+    private String referencesName;
+
+    private String referenceUrl;
+
+    private List<String> fileGuids;
+}

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

@@ -0,0 +1,19 @@
+package cn.cslg.pas.domain.business;
+
+import cn.cslg.pas.domain.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+/**
+ * @Author xiexiang
+ * @Date 2024/1/17
+ */
+@Data
+@TableName("asso_other_references_file")
+public class AssoOtherReferencesFile extends BaseEntity<AssoOtherReferencesFile> {
+    @TableField(value = "file_guid")
+    private String fileGuid;
+    @TableField(value = "other_references_id")
+    private Integer otherReferencesId;
+}

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

@@ -2,6 +2,7 @@ package cn.cslg.pas.domain.business;
 
 import cn.cslg.pas.domain.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 import java.util.Date;
@@ -13,6 +14,7 @@ import java.util.List;
  * @Date 2024/1/12
  */
 @Data
+@TableName("hightlight_template")
 public class HightlightTemplate extends BaseEntity<HightlightTemplate> {
     /**
      * 模板名称

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

@@ -2,6 +2,7 @@ package cn.cslg.pas.domain.business;
 
 import cn.cslg.pas.domain.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 import java.util.Date;
@@ -11,6 +12,7 @@ import java.util.Date;
  * @Date 2024/1/15
  */
 @Data
+@TableName("litigation_history")
 public class LitigationHistory extends BaseEntity<LitigationHistory> {
     /**
      * 原告

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

@@ -0,0 +1,49 @@
+package cn.cslg.pas.domain.business;
+
+import cn.cslg.pas.domain.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @Author xiexiang
+ * @Date 2024/1/17
+ */
+@Data
+@TableName("other_references")
+public class OtherReferences extends BaseEntity<OtherReferences> {
+    /**
+     * 报告/专题库id
+     */
+    @TableField(value = "project_id")
+    private Integer projectId;
+
+    /**
+     * 说明
+     */
+    @TableField(value = "remark")
+    private String remark;
+
+    /**
+     * 其他参考资料名称
+     */
+    @TableField(value = "references_name")
+    private String referencesName;
+
+    @TableField(value = "reference_url")
+    private String referenceUrl;
+
+    /**
+     * 创建人id
+     */
+    @TableField(value = "create_id")
+    private String createId;
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "create_time")
+    private Date createTime;
+}

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

@@ -3,6 +3,7 @@ package cn.cslg.pas.domain.business;
 import cn.cslg.pas.common.dto.business.PermissionRecordDTO;
 import cn.cslg.pas.domain.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 import java.util.Date;
@@ -13,6 +14,7 @@ import java.util.Date;
  * @Date 2024/1/16
  */
 @Data
+@TableName("permission_record")
 public class PermissionRecord extends BaseEntity<PermissionRecord> {
     /**
      * 专利号

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

@@ -2,6 +2,7 @@ package cn.cslg.pas.domain.business;
 
 import cn.cslg.pas.domain.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -14,6 +15,7 @@ import java.util.Date;
  * @Date 2024/1/15
  */
 @Data
+@TableName("review_history")
 public class ReviewHistory extends BaseEntity<ReviewHistory> {
     /**
      * 时间

src/main/java/cn/cslg/pas/factorys/getSqlFactorys/GetComBoolSql.java

@@ -0,0 +1,28 @@
+package cn.cslg.pas.factorys.getSqlFactorys;
+
+import cn.cslg.pas.common.model.cronModel.SqlObject;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+
+@Slf4j
+@Component
+public class GetComBoolSql implements GetSqlObject{
+
+ private SqlObject sqlObject;
+    @Override
+    public String getSql(String value) {
+      String filed= sqlObject.getSqlField();
+      String option =sqlObject.getOption();
+       return  filed+option+ " " +value + " ";
+    }
+
+    public void setSqlObject(SqlObject sqlObject)
+    {
+        this.sqlObject=sqlObject;
+    }
+
+    public SqlObject getSqlObject(){
+        return sqlObject;
+    }
+}

src/main/java/cn/cslg/pas/mapper/AssoOtherReferencesFileMapper.java

@@ -0,0 +1,13 @@
+package cn.cslg.pas.mapper;
+
+import cn.cslg.pas.domain.business.AssoOtherReferencesFile;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Author xiexiang
+ * @Date 2024/1/17
+ */
+@Repository
+public interface AssoOtherReferencesFileMapper extends BaseMapper<AssoOtherReferencesFile> {
+}

src/main/java/cn/cslg/pas/mapper/OtherReferencesMapper.java

@@ -0,0 +1,13 @@
+package cn.cslg.pas.mapper;
+
+import cn.cslg.pas.domain.business.OtherReferences;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Author xiexiang
+ * @Date 2024/1/17
+ */
+@Repository
+public interface OtherReferencesMapper extends BaseMapper<OtherReferences> {
+}

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

@@ -0,0 +1,16 @@
+package cn.cslg.pas.service.business;
+
+import cn.cslg.pas.domain.business.AssoOtherReferencesFile;
+import cn.cslg.pas.mapper.AssoOtherReferencesFileMapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+/**
+ * @Author xiexiang
+ * @Date 2024/1/17
+ */
+@Slf4j
+@Service
+public class AssoOtherReferencesFileService extends ServiceImpl<AssoOtherReferencesFileMapper, AssoOtherReferencesFile> {
+}

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

@@ -0,0 +1,99 @@
+package cn.cslg.pas.service.business;
+
+import cn.cslg.pas.common.dto.business.OtherReferencesDTO;
+import cn.cslg.pas.common.model.cronModel.PersonnelVO;
+import cn.cslg.pas.common.utils.CacheUtils;
+import cn.cslg.pas.common.utils.LoginUtils;
+import cn.cslg.pas.domain.business.AssoOtherReferencesFile;
+import cn.cslg.pas.domain.business.LitigationHistory;
+import cn.cslg.pas.domain.business.OtherReferences;
+import cn.cslg.pas.exception.XiaoShiException;
+import cn.cslg.pas.mapper.OtherReferencesMapper;
+import cn.cslg.pas.service.permissions.PermissionService;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 其他参考资料
+ * @Author xiexiang
+ * @Date 2024/1/17
+ */
+@Slf4j
+@Service
+public class OtherReferencesService extends ServiceImpl<OtherReferencesMapper, OtherReferences> {
+    @Autowired
+    private LoginUtils loginUtils;
+
+    @Autowired
+    private CacheUtils cacheUtils;
+
+    @Autowired
+    private PermissionService permissionService;
+
+    @Autowired
+    private AssoOtherReferencesFileService assoReferencesFileService;
+
+    /**
+     * 新增or更新其他参考资料
+     * @param otherReferencesDTO
+     * @return
+     */
+    public Integer saveOrUpdate(OtherReferencesDTO otherReferencesDTO){
+        if (otherReferencesDTO == null) {
+            throw new XiaoShiException("入参为空");
+        }
+        Integer id = otherReferencesDTO.getId();
+        List<String> fileGuids = otherReferencesDTO.getFileGuids();
+        OtherReferences otherReferences = new OtherReferences();
+        if (id != null) {
+            //update
+            otherReferences = this.getById(id);
+            BeanUtils.copyProperties(otherReferencesDTO, otherReferences);
+            otherReferences.updateById();
+            if (!fileGuids.isEmpty()) {
+                //先删除 后添加
+                LambdaQueryWrapper<AssoOtherReferencesFile> queryWrapper = new LambdaQueryWrapper<>();
+                queryWrapper.eq(AssoOtherReferencesFile::getOtherReferencesId, id);
+                assoReferencesFileService.remove(queryWrapper);
+                List<Integer> fileIds = this.addFile(otherReferences.getId(), fileGuids);
+            }
+        } else {
+            BeanUtils.copyProperties(otherReferencesDTO, otherReferences);
+            PersonnelVO personnelVO = new PersonnelVO();
+            try {
+                personnelVO = cacheUtils.getLoginUser(loginUtils.getId());
+            } catch (Exception e) {
+                throw new XiaoShiException("未查询到当前登陆人");
+            }
+            otherReferences.setCreateId(personnelVO.getId());
+            otherReferences.insert();
+            if (!fileGuids.isEmpty()) {
+                //先删除 后添加
+                List<Integer> fileIds = this.addFile(otherReferences.getId(), fileGuids);
+            }
+        }
+        return otherReferences.getId();
+    }
+
+    public List<Integer> addFile(Integer id, List<String> fileGuids){
+        List<Integer> ids = new ArrayList<>();
+        if (!fileGuids.isEmpty()) {
+            List<AssoOtherReferencesFile> assoOtherReferencesFiles = new ArrayList<>();
+            fileGuids.forEach(item -> {
+                AssoOtherReferencesFile assoOtherReferencesFile = new AssoOtherReferencesFile();
+                assoOtherReferencesFile.setOtherReferencesId(id);
+                assoOtherReferencesFile.setFileGuid(item);
+                assoOtherReferencesFiles.add(assoOtherReferencesFile);
+            });
+            assoReferencesFileService.saveBatch(assoOtherReferencesFiles);
+        }
+        return ids;
+    }
+}

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

@@ -243,6 +243,7 @@ public class TaskHandleResultService extends ServiceImpl<TaskHandleResultMapper,
                     SystemFile systemFile = systemFiles.stream().filter(item -> item.getGuid().equals(assoHandleResultFile.getFileGuid())).findFirst().orElse(null);
                     if (systemFile != null) {
                         BeanUtils.copyProperties(assoHandleResultFile, handleResultFileVO);
+                        handleResultFileVO.setGuid(assoHandleResultFile.getFileGuid());
                         handleResultFileVO.setType(systemFile.getType());
                         handleResultFileVO.setOriginalName(systemFile.getOriginalName());
                         handleResultFileVOS.add(handleResultFileVO);

src/main/java/cn/cslg/pas/service/common/PersonFieldService.java

@@ -64,9 +64,9 @@ public class PersonFieldService {
         String json = redisUtil.get(RedisConf.USER_FIELD + RedisConf.SYMBOL_COLON + key);
 
         //如果查到
-        if (StringUtils.isNotEmpty(json)) {
-            return JsonUtils.jsonToList(json, PersonSelfFieldVO.class);
-        }
+//        if (StringUtils.isNotEmpty(json)) {
+//            return JsonUtils.jsonToList(json, PersonSelfFieldVO.class);
+//        }
         String fieldJson = "";
         //如果没查询到，则获取所有栏位添加到redis里
         try {