Merge remote-tracking branch 'origin/dev2' into dev2

RMS/src/main/java/cn/cslg/report/common/config/RabbitMQConfig.java

@@ -64,12 +64,12 @@ public class RabbitMQConfig {
 
     @Bean
     public Queue queue() {
-        return new Queue(MailConstants.MAIL_QUEUE_NAME);
+        return new Queue(queueName);
     }
 
     @Bean
     public DirectExchange directExchange() {
-        return new DirectExchange(queueName);
+        return new DirectExchange(MailConstants.MAIL_EXCHANGE_NAME);
     }
 
     @Bean

RMS/src/main/java/cn/cslg/report/common/model/vo/ReportVO.java

@@ -49,7 +49,7 @@ public class ReportVO extends BaseVO {
      * 报告状态
      */
     @Schema(description="报告状态")
-    private String status;
+    private Integer status;
 
     /**
      * 报告生成时间

RMS/src/main/java/cn/cslg/report/common/utils/message/MessageUtils.java

@@ -4,6 +4,7 @@ import cn.cslg.report.common.config.MailConstants;
 import org.springframework.amqp.rabbit.connection.CorrelationData;
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
 import java.util.Map;
@@ -12,7 +13,8 @@ import java.util.Map;
 public class MessageUtils {
     @Autowired
     private RabbitTemplate rabbitTemplate;
-
+    @Value("${queueName}")
+     private String queueName;
     /**
      * 向用户邮箱发送短信
      *

RMS/src/main/java/cn/cslg/report/controller/ReportController.java

@@ -125,26 +125,28 @@ public class ReportController {
         return Response.success();
     }
 
-    @PostMapping (value = "reportVisual")
+    @PostMapping(value = "reportVisual")
     @Operation(summary = "报告可视化")
     @Transactional(rollbackFor = Exception.class)
     public String reportVisual(@RequestBody ReportVO reportVO) throws IOException {
-        return Response.success( reportService.reportVisual(reportVO));
+        return Response.success(reportService.reportVisual(reportVO));
     }
 
-    @GetMapping (value = "getPermission")
+    @GetMapping(value = "getPermission")
     @Operation(summary = "获得报告权限")
     @Transactional(rollbackFor = Exception.class)
-    public String  getPermission() throws IOException {
-        return Response.success( reportService.getPermession());
+    public String getPermission() throws IOException {
+        return Response.success(reportService.getPermession());
     }
 
-    @PostMapping (value = "addConclusions")
+    @PostMapping(value = "addConclusions")
     @Operation(summary = "添加核心结论")
     @Transactional(rollbackFor = Exception.class)
-    public String  addConclusions(@RequestBody ConclusionDTO conclusionDTO) throws IOException {
-        Boolean flag =reportService.addConclusions(conclusionDTO);
-        if(flag){return Response.success("添加成功");}
+    public String addConclusions(@RequestBody ConclusionDTO conclusionDTO) throws IOException {
+        Boolean flag = reportService.addConclusions(conclusionDTO);
+        if (flag) {
+            return Response.success("添加成功");
+        }
         return Response.error("添加失败");
     }
 

RMS/src/main/java/cn/cslg/report/controller/TempleController.java

@@ -2,8 +2,11 @@ package cn.cslg.report.controller;
 
 import cn.cslg.report.common.core.base.Constants;
 
+import cn.cslg.report.common.utils.Response;
+import cn.cslg.report.common.utils.message.MessageUtils;
 import cn.cslg.report.entity.Template;
 import cn.cslg.report.service.business.TemplateService;
+import cn.hutool.extra.mail.MailUtil;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
@@ -12,7 +15,9 @@ import org.springframework.web.bind.annotation.*;
 
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.LinkedHashMap;
 import java.util.List;
+import java.util.Map;
 
 @Tag(name = "报告模板")
 @RestController
@@ -21,10 +26,37 @@ import java.util.List;
 @SuppressWarnings({"all"})
 public class TempleController {
     public final TemplateService templateService;
+    public final MessageUtils mailUtils;
     @RequestMapping(value = "/getTemplateByType", method = RequestMethod.POST)
     @Operation(summary = "根据报告类型获得模板")
     public  String getTemplateByType(@RequestBody Template template) throws IOException{
         return templateService.getTemplateByType(template);
     }
+    @RequestMapping(value = "/sendEmail", method = RequestMethod.GET)
+    @Operation(summary = "发送邮箱")
+    public  String sendEmail() throws IOException{
+        Map<String, Object> map = new LinkedHashMap<>();
+        map.put("title", "任务通知");
+        map.put("template", "mail/Synery.html");
+
+        map.put("value1", "personName");
+        map.put("email", "2232623707@qq.com");
+        map.put("img", "\\src\\main\\resources\\mail\\logo.png");
+        map.put("value2", "syneryCode.getCode()");
+        map.put("value3", "url + /identificationCode");
+        mailUtils.sendEmailMessage(map);
+        Map<String, Object> map2 = new LinkedHashMap<>();
+        map2.put("title", "任务通知");
+        map2.put("template", "mail/Synery.html");
+
+        map2.put("value1", "personName");
+        map2.put("email", "1619977931@qq.com");
+        map2.put("img", "\\src\\main\\resources\\mail\\logo.png");
+        map2.put("value2", "syneryCode.getCode()");
+        map2.put("value3", "url + /identificationCode");
+        mailUtils.sendEmailMessage(map2);
+        return Response.success();
+    }
+
 
 }

RMS/src/main/java/cn/cslg/report/entity/ReportFieldOption.java

@@ -22,7 +22,7 @@ import java.util.List;
 @Data
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = true)
-@TableName("OS_PATENT_FILED_OPTION")
+@TableName("OS_PATENT_FIELD_OPTION")
 public class ReportFieldOption extends BaseEntity<ReportFieldOption> {
 
 

RMS/src/main/java/cn/cslg/report/service/business/ReportService.java

@@ -228,6 +228,10 @@ public class ReportService extends ServiceImpl<ReportMapper, Report> {
         if (reportVO.getTypes() != null && reportVO.getTypes().size() > 0) {
             queryWrapper.in(Report::getType, reportVO.getTypes());
         }
+        //根据状态查询报告
+        if(reportVO.getStatus()!=null){
+            queryWrapper.eq(Report::getStatus,reportVO.getStatus());
+        }
         if (reportVO.getCronIds() != null && reportVO.getCronIds().size() > 0) {
             StringBuilder strs = new StringBuilder();
             for (int i = 0; i < reportVO.getCronIds().size(); i++) {

RMS/src/main/java/cn/cslg/report/service/business/TaskService.java

@@ -914,21 +914,12 @@ public class TaskService extends ServiceImpl<TaskMapper, Task> {
                     map.put("value2", name);
                     mailUtils.sendEmailMessage(map);
                 } else {
-                    String orgin = item.getCcEmail();
-                    String parStr = "\\<([^}]*)\\>";
-                    Pattern pattern = Pattern.compile(parStr);
-                    Matcher matcher = pattern.matcher(orgin);
-                    if (matcher.find()) {
-                        String personName = orgin.substring(0, matcher.start());
-                        String email = matcher.group(0);
-                        email = email.replace("<", "");
-                        email = email.replace(">", "");
                         map.put("value1", personnel.getName());
-                        map.put("email", email);
+                        map.put("email", item.getCcEmail());
                         map.put("img", "\\src\\main\\resources\\mail\\logo.png");
-                        map.put("value2", name);
+                        map.put("value2", item.getCcName());
                         mailUtils.sendEmailMessage(map);
-                    }
+
                 }
             }
             syneryCCService.saveBatch(synery_ccs);