保存非专利文献

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

@@ -0,0 +1,52 @@
+package cn.cslg.pas.controller;
+
+import cn.cslg.pas.common.core.base.Constants;
+import cn.cslg.pas.common.model.cronModel.Records;
+import cn.cslg.pas.common.model.request.StringRequest;
+import cn.cslg.pas.common.utils.Response;
+import cn.cslg.pas.domain.business.CompareLiteratureDTO;
+import cn.cslg.pas.exception.XiaoShiException;
+import cn.cslg.pas.factorys.businessFactory.Business;
+import cn.cslg.pas.service.business.CompareLiteratureService;
+import io.swagger.v3.oas.annotations.Operation;
+import lombok.experimental.Accessors;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@Slf4j
+@RequestMapping(Constants.API_XiaoSHI + "/compareLiterature")
+@RestController
+public class CompareLiteratureController {
+    @Autowired
+    private CompareLiteratureService compareLiteratureService;
+
+    @Operation(summary = "添加非专利对比文件")
+    @PostMapping("/addCompareLiterature")
+    public Response queryCustomField(@RequestBody CompareLiteratureDTO compareLiteratureDTO) {
+        Integer id = null;
+        try {
+            id = compareLiteratureService.addCompareLiterature(compareLiteratureDTO);
+        } catch (Exception e) {
+                return Response.error(e.getMessage());
+        }
+            return Response.success(id);
+        }
+
+    @Operation(summary = "查询对比文献")
+    @PostMapping("/queryCompareLiterature")
+    public Response queryCompareLiterature(@RequestBody CompareLiteratureDTO compareLiteratureDTO) {
+        Integer id = null;
+        try {
+            id = compareLiteratureService.addCompareLiterature(compareLiteratureDTO);
+        } catch (Exception e) {
+            return Response.error(e.getMessage());
+        }
+        return Response.success(id);
+    }
+
+
+    }

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

@@ -0,0 +1,25 @@
+package cn.cslg.pas.controller;
+
+
+import cn.cslg.pas.common.core.base.Constants;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.io.IOException;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+@Tag(name = "报告模板")
+@RestController
+@RequestMapping(Constants.API_XiaoSHI  + "/template")
+@RequiredArgsConstructor(onConstructor_ = {@Lazy})
+@SuppressWarnings({"all"})
+public class TempleController {
+
+}

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

@@ -0,0 +1,13 @@
+package cn.cslg.pas.domain.business;
+
+import lombok.Data;
+
+@Data
+public class CompareLiteratureDTO {
+
+     private String   fileName;
+     private String    fileGuid;
+     private String   description;
+     private Integer   projectId;
+
+}

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

@@ -1,12 +1,19 @@
 package cn.cslg.pas.service.business;
 
+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.CompareLiterature;
+import cn.cslg.pas.domain.business.CompareLiteratureDTO;
 import cn.cslg.pas.domain.business.Matter;
+import cn.cslg.pas.exception.UnLoginException;
 import cn.cslg.pas.mapper.CompareLiteratureMapper;
 import cn.cslg.pas.mapper.MatterMapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.experimental.Accessors;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
@@ -19,9 +26,14 @@ import java.util.List;
 @Slf4j
 @Service
 public class CompareLiteratureService extends ServiceImpl<CompareLiteratureMapper, CompareLiterature> {
+    @Autowired
+    private CacheUtils cacheUtils;
+
+    @Autowired
+    private LoginUtils loginUtils;
 
     //添加专利对比文献
-    public Integer addPatentCompareLiterature(String patentNo, Integer projectId,String createId) {
+    public Integer addPatentCompareLiterature(String patentNo, Integer projectId, String createId) {
         Integer id = null;
         //根据专利号和报告id查询是否已经保存
         LambdaQueryWrapper<CompareLiterature> queryWrapper = new LambdaQueryWrapper<>();
@@ -36,9 +48,27 @@ public class CompareLiteratureService extends ServiceImpl<CompareLiteratureMappe
             compareLiterature.setName(patentNo);
             compareLiterature.insert();
             return compareLiterature.getId();
-        }
-        else {
+        } else {
             return compareLiteratures.get(0).getId();
         }
     }
+
+    //添加对比文献
+    public Integer addCompareLiterature(CompareLiteratureDTO compareLiteratureDTO) {
+        PersonnelVO personnelVO = new PersonnelVO();
+        try {
+            personnelVO = cacheUtils.getLoginUser(loginUtils.getId());
+        } catch (Exception e) {
+            throw new UnLoginException("未登录");
+        }
+        CompareLiterature compareLiterature = new CompareLiterature();
+        compareLiterature.setCreateId(personnelVO.getId());
+        compareLiterature.setProjectId(compareLiteratureDTO.getProjectId());
+        compareLiterature.setLiteratureNo(compareLiteratureDTO.getFileGuid());
+        compareLiterature.setName(compareLiteratureDTO.getFileName());
+        compareLiterature.setDescription(compareLiteratureDTO.getDescription());
+        compareLiterature.insert();
+
+        return compareLiterature.getId();
+    }
 }

src/main/java/cn/cslg/pas/service/mailSendService.java

@@ -0,0 +1,46 @@
+package cn.cslg.pas.service;
+
+import cn.cslg.pas.common.model.cronModel.Personnel;
+import cn.cslg.pas.service.permissions.PermissionService;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Arrays;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+@Service
+public class mailSendService {
+    @Autowired
+    private PermissionService permissionService;
+
+    public void sendSynery(String personId, String taskName, Boolean ifInner) {
+        Map<String, Object> map = new LinkedHashMap<>();
+        map.put("title", "任务通知");
+        map.put("template", "mail/eTaskConfirm.html");
+        map.put("img", "\\src\\main\\resources\\mail\\logo.png");
+        //判断是否为内部人员
+        if (ifInner) {
+            String res = "";
+            try {
+                res = permissionService.getPersonnelByIdsFromPCS(Arrays.asList(personId));
+            } catch (Exception e) {
+            }
+            if (!res.equals("")) {
+                JSONObject jsonObject = JSONObject.parseObject(res);
+                List<Personnel> personnels = JSON.parseArray(jsonObject.getString("data"), Personnel.class);
+                map.put("value1", personnels.get(0).getPersonnelName());
+                map.put("value2", taskName);
+                map.put("email", personnels.get(0).getPersonnelEmail());
+            }
+        } else {
+
+        }
+
+
+//    mailUtils.sendEmailMessage(map);
+    }
+}

src/main/resources/jsons/reportProject.json

@@ -7,9 +7,10 @@
     "sqlClass": "getComSql",
     "orderClass": "",
     "groupClass":"",
-    "ifSearch":"true",
+    "ifSearch":"false",
     "ifGroup": "false",
-    "ifShow":"false"
+    "ifShow":"false",
+    "ifAsCondition": "true"
   },
   {"name":"创建月份",
     "type":"DateTime",