Merge branch 'cpq-dev' of wangfan/adweb3-server into master

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/common/constant/RobotMsgTemplate.java

@@ -1,93 +1,177 @@
 package org.jeecg.modules.adweb.common.constant;
 
 /**
- * @Description:
- * @Author: wrk
+ * @Description: @Author: wrk
+ *
  * @date 2022/7/18 18:02
  */
 public class RobotMsgTemplate {
 
-    public static final String EXCEPTION_MSG = "{\n" +
-            "  \"config\": {\n" +
-            "    \"wide_screen_mode\": true\n" +
-            "  },\n" +
-            "  \"elements\": [\n" +
-            "    {\n" +
-            "      \"fields\": [\n" +
-            "        {\n" +
-            "          \"is_short\": true,\n" +
-            "          \"text\": {\n" +
-            "            \"content\": \"** 询盘耗时：**\\n{consumeTime}\",\n" +
-            "            \"tag\": \"lark_md\"\n" +
-            "          }\n" +
-            "        },\n" +
-            "        {\n" +
-            "          \"is_short\": false,\n" +
-            "          \"text\": {\n" +
-            "            \"content\": \"\",\n" +
-            "            \"tag\": \"lark_md\"\n" +
-            "          }\n" +
-            "        },\n" +
-            "        {\n" +
-            "          \"is_short\": true,\n" +
-            "          \"text\": {\n" +
-            "            \"content\": \"** 发生时间：**\\n{time}\",\n" +
-            "            \"tag\": \"lark_md\"\n" +
-            "          }\n" +
-            "        },\n" +
-            "        {\n" +
-            "          \"is_short\": false,\n" +
-            "          \"text\": {\n" +
-            "            \"content\": \"\",\n" +
-            "            \"tag\": \"lark_md\"\n" +
-            "          }\n" +
-            "        },\n" +
-            "        {\n" +
-            "          \"is_short\": true,\n" +
-            "          \"text\": {\n" +
-            "            \"content\": \"** 系统模块：**\\n{title}\",\n" +
-            "            \"tag\": \"lark_md\"\n" +
-            "          }\n" +
-            "        },\n" +
-            "        {\n" +
-            "          \"is_short\": false,\n" +
-            "          \"text\": {\n" +
-            "            \"content\": \"\",\n" +
-            "            \"tag\": \"lark_md\"\n" +
-            "          }\n" +
-            "        },\n" +
-            "        {\n" +
-            "          \"is_short\": true,\n" +
-            "          \"text\": {\n" +
-            "            \"content\": \"** 异常方法：**\\n{methodName}\",\n" +
-            "            \"tag\": \"lark_md\"\n" +
-            "          }\n" +
-            "        },\n" +
-            "        {\n" +
-            "          \"is_short\": false,\n" +
-            "          \"text\": {\n" +
-            "            \"content\": \"\",\n" +
-            "            \"tag\": \"lark_md\"\n" +
-            "          }\n" +
-            "        },\n" +
-            "        {\n" +
-            "          \"is_short\": true,\n" +
-            "          \"text\": {\n" +
-            "            \"content\": \"** 错误消息：**\\n{errorMsg}\",\n" +
-            "            \"tag\": \"lark_md\"\n" +
-            "          }\n" +
-            "        }\n" +
-            "      ],\n" +
-            "      \"tag\": \"div\"\n" +
-            "    }\n" +
-            "  ],\n" +
-            "  \"header\": {\n" +
-            "    \"template\": \"red\",\n" +
-            "    \"title\": {\n" +
-            "      \"content\": \"Adweb询盘报警-{environment}\",\n" +
-            "      \"tag\": \"plain_text\"\n" +
-            "    }\n" +
-            "  }\n" +
-            "}";
+  public static final String EXCEPTION_MSG =
+      "{\n"
+          + "  \"config\": {\n"
+          + "    \"wide_screen_mode\": true\n"
+          + "  },\n"
+          + "  \"elements\": [\n"
+          + "    {\n"
+          + "      \"fields\": [\n"
+          + "        {\n"
+          + "          \"is_short\": true,\n"
+          + "          \"text\": {\n"
+          + "            \"content\": \"** 询盘耗时：**\\n{consumeTime}\",\n"
+          + "            \"tag\": \"lark_md\"\n"
+          + "          }\n"
+          + "        },\n"
+          + "        {\n"
+          + "          \"is_short\": false,\n"
+          + "          \"text\": {\n"
+          + "            \"content\": \"\",\n"
+          + "            \"tag\": \"lark_md\"\n"
+          + "          }\n"
+          + "        },\n"
+          + "        {\n"
+          + "          \"is_short\": true,\n"
+          + "          \"text\": {\n"
+          + "            \"content\": \"** 发生时间：**\\n{time}\",\n"
+          + "            \"tag\": \"lark_md\"\n"
+          + "          }\n"
+          + "        },\n"
+          + "        {\n"
+          + "          \"is_short\": false,\n"
+          + "          \"text\": {\n"
+          + "            \"content\": \"\",\n"
+          + "            \"tag\": \"lark_md\"\n"
+          + "          }\n"
+          + "        },\n"
+          + "        {\n"
+          + "          \"is_short\": true,\n"
+          + "          \"text\": {\n"
+          + "            \"content\": \"** 系统模块：**\\n{title}\",\n"
+          + "            \"tag\": \"lark_md\"\n"
+          + "          }\n"
+          + "        },\n"
+          + "        {\n"
+          + "          \"is_short\": false,\n"
+          + "          \"text\": {\n"
+          + "            \"content\": \"\",\n"
+          + "            \"tag\": \"lark_md\"\n"
+          + "          }\n"
+          + "        },\n"
+          + "        {\n"
+          + "          \"is_short\": true,\n"
+          + "          \"text\": {\n"
+          + "            \"content\": \"** 异常方法：**\\n{methodName}\",\n"
+          + "            \"tag\": \"lark_md\"\n"
+          + "          }\n"
+          + "        },\n"
+          + "        {\n"
+          + "          \"is_short\": false,\n"
+          + "          \"text\": {\n"
+          + "            \"content\": \"\",\n"
+          + "            \"tag\": \"lark_md\"\n"
+          + "          }\n"
+          + "        },\n"
+          + "        {\n"
+          + "          \"is_short\": true,\n"
+          + "          \"text\": {\n"
+          + "            \"content\": \"** 错误消息：**\\n{errorMsg}\",\n"
+          + "            \"tag\": \"lark_md\"\n"
+          + "          }\n"
+          + "        }\n"
+          + "      ],\n"
+          + "      \"tag\": \"div\"\n"
+          + "    }\n"
+          + "  ],\n"
+          + "  \"header\": {\n"
+          + "    \"template\": \"red\",\n"
+          + "    \"title\": {\n"
+          + "      \"content\": \"Adweb询盘报警-{environment}\",\n"
+          + "      \"tag\": \"plain_text\"\n"
+          + "    }\n"
+          + "  }\n"
+          + "}";
 
+  public static final String PRODUCT_EXCEPTION_MSG =
+      "{\n"
+          + "  \"config\": {\n"
+          + "    \"wide_screen_mode\": true\n"
+          + "  },\n"
+          + "  \"elements\": [\n"
+          + "    {\n"
+          + "      \"fields\": [\n"
+          + "        {\n"
+          + "          \"is_short\": true,\n"
+          + "          \"text\": {\n"
+          + "            \"content\": \"** 消费产品耗时：**\\n{consumeTime}\",\n"
+          + "            \"tag\": \"lark_md\"\n"
+          + "          }\n"
+          + "        },\n"
+          + "        {\n"
+          + "          \"is_short\": false,\n"
+          + "          \"text\": {\n"
+          + "            \"content\": \"\",\n"
+          + "            \"tag\": \"lark_md\"\n"
+          + "          }\n"
+          + "        },\n"
+          + "        {\n"
+          + "          \"is_short\": true,\n"
+          + "          \"text\": {\n"
+          + "            \"content\": \"** 发生时间：**\\n{time}\",\n"
+          + "            \"tag\": \"lark_md\"\n"
+          + "          }\n"
+          + "        },\n"
+          + "        {\n"
+          + "          \"is_short\": false,\n"
+          + "          \"text\": {\n"
+          + "            \"content\": \"\",\n"
+          + "            \"tag\": \"lark_md\"\n"
+          + "          }\n"
+          + "        },\n"
+          + "        {\n"
+          + "          \"is_short\": true,\n"
+          + "          \"text\": {\n"
+          + "            \"content\": \"** 系统模块：**\\n{title}\",\n"
+          + "            \"tag\": \"lark_md\"\n"
+          + "          }\n"
+          + "        },\n"
+          + "        {\n"
+          + "          \"is_short\": false,\n"
+          + "          \"text\": {\n"
+          + "            \"content\": \"\",\n"
+          + "            \"tag\": \"lark_md\"\n"
+          + "          }\n"
+          + "        },\n"
+          + "        {\n"
+          + "          \"is_short\": true,\n"
+          + "          \"text\": {\n"
+          + "            \"content\": \"** 异常方法：**\\n{methodName}\",\n"
+          + "            \"tag\": \"lark_md\"\n"
+          + "          }\n"
+          + "        },\n"
+          + "        {\n"
+          + "          \"is_short\": false,\n"
+          + "          \"text\": {\n"
+          + "            \"content\": \"\",\n"
+          + "            \"tag\": \"lark_md\"\n"
+          + "          }\n"
+          + "        },\n"
+          + "        {\n"
+          + "          \"is_short\": true,\n"
+          + "          \"text\": {\n"
+          + "            \"content\": \"** 错误消息：**\\n{errorMsg}\",\n"
+          + "            \"tag\": \"lark_md\"\n"
+          + "          }\n"
+          + "        }\n"
+          + "      ],\n"
+          + "      \"tag\": \"div\"\n"
+          + "    }\n"
+          + "  ],\n"
+          + "  \"header\": {\n"
+          + "    \"template\": \"red\",\n"
+          + "    \"title\": {\n"
+          + "      \"content\": \"Adweb产品入库报警-{environment}\",\n"
+          + "      \"tag\": \"plain_text\"\n"
+          + "    }\n"
+          + "  }\n"
+          + "}";
 }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/common/service/FeishuService.java

@@ -43,6 +43,9 @@ public class FeishuService {
   @Value("${robot.site-url}")
   private String siteUrl;
 
+  @Value("${robot.product-missing-url}")
+  private String productMissingUrl;
+
   /** 本地属性 */
   public static String PROFILES_ACTIVE;
 
@@ -98,6 +101,41 @@ public class FeishuService {
     HttpRequest.post(enquiryUrl).body(json).execute(true);
   }
 
+  /**
+   * 异常栈发送机器人消息
+   *
+   * @param consumeTime
+   * @param title
+   * @param errorMsg
+   */
+  public void sendProductMissingRobot(
+      float consumeTime,
+      String title,
+      String classNameInit,
+      String methodNameInit,
+      String errorMsg) {
+
+    String className = classNameInit == null ? "未知类名" : classNameInit;
+    String methodName = methodNameInit == null ? "未知方法名" : methodNameInit;
+
+    SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+    String timeStr = simpleDateFormat.format(new Date());
+    String text = RobotMsgTemplate.PRODUCT_EXCEPTION_MSG;
+    text = text.replaceAll("\\{environment\\}", PROFILES_ACTIVE);
+    text = text.replaceAll("\\{consumeTime\\}", consumeTime + "秒");
+    text = text.replaceAll("\\{time\\}", timeStr);
+
+    text = text.replaceAll("\\{title\\}", title);
+    text = text.replaceAll("\\{methodName\\}", className + "." + methodName + "()");
+    text = text.replaceAll("\\{errorMsg\\}", errorMsg);
+    RobotDto robotDto = new RobotDto();
+    robotDto.setMsg_type("interactive");
+    robotDto.setCard(JSON.parseObject(text, RobotDto.CardBean.class));
+    String json = JSON.toJSONString(robotDto);
+
+    HttpRequest.post(productMissingUrl).body(json).execute(true);
+  }
+
   /** 邮件发送失败通知 */
   public void sendEnquiryEmailFailMsg(
       Long enquiryId, String siteCode, String email, String content) {

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/product/service/impl/AdwebProductServiceImpl.java

@@ -69,9 +69,13 @@ public class AdwebProductServiceImpl extends ServiceImpl<AdwebProductMapper, Adw
     AdwebProduct product = this.getOne(productQuery);
     // 执行更新操作
     if (product != null) {
+      // 库里有产品时执行更新动作
       updateProduct(productDTO, product);
     } else {
-      addProduct(productDTO, adwebSites);
+      // 非删除动作并且库里没有产品时，执行新增操作
+      if (!"delete".equals(productDTO.getActionType())) {
+        addProduct(productDTO, adwebSites);
+      }
     }
   }
 

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mq/ProductReceiver.java

@@ -7,6 +7,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.jeecg.boot.starter.rabbitmq.core.BaseRabbiMqHandler;
 import org.jeecg.boot.starter.rabbitmq.listenter.MqListener;
 import org.jeecg.common.annotation.RabbitComponent;
+import org.jeecg.modules.adweb.common.service.FeishuService;
 import org.jeecg.modules.adweb.product.dto.ProductDTO;
 import org.jeecg.modules.adweb.product.service.IAdwebProductService;
 import org.jeecg.modules.adweb.site.entity.AdwebSite;
@@ -30,6 +31,8 @@ public class ProductReceiver extends BaseRabbiMqHandler<List<ProductDTO>> {
 
   @Autowired private IAdwebProductService adwebProductService;
 
+  @Autowired private FeishuService feishuService;
+
   @RabbitHandler
   // ackMode需要设置为MANUAL - BaseRabbiMqHandler.onMessage()有channel.basicAck()操作
   @RabbitListener(queues = "site_product", ackMode = "MANUAL")
@@ -46,24 +49,61 @@ public class ProductReceiver extends BaseRabbiMqHandler<List<ProductDTO>> {
           public void handler(List<ProductDTO> products, Channel channel) {
             // 业务处理
             log.info("收到产品MQ消息 {}", products);
+
+            // 记录开始时间
+            long startTime = System.currentTimeMillis();
             for (ProductDTO product : products) {
               // 查看发布当前消息的站点是否是 adweb3 平台中绑定的是否是有效站点, 如果不是则直接确认消息，不做业务处理
-              List<AdwebSite> adwebSites =
-                  adwebSiteService.list(
+              AdwebSite adwebSite =
+                  adwebSiteService.getOne(
                       new LambdaQueryWrapper<AdwebSite>()
                           .like(AdwebSite::getDomain, product.getSiteHost())
                           .ne(AdwebSite::getStatus, 0));
 
               // 一个消息中的产品所属站点相同，一条不符合，则认为全部不符合
-              if (adwebSites.isEmpty()) {
+              if (adwebSite == null) {
                 log.error("站点：{} 不是adweb3的有效绑定站点,MQ消息确认失败", product.getSiteHost());
                 return;
               }
 
               // 产品入库
               try {
-                adwebProductService.addOrUpdateProduct(product, adwebSites.get(0));
+                adwebProductService.addOrUpdateProduct(product, adwebSite);
               } catch (Exception e) {
+
+                // 拉取产品失败时，发送告警到飞书
+                long endTimeEnquiry = System.currentTimeMillis();
+                long diffTime = endTimeEnquiry - startTime;
+
+                String className = this.getClass().getName();
+                String methodName = Thread.currentThread().getStackTrace()[1].getMethodName();
+                // 发送飞书告警
+                StringBuilder msg =
+                    new StringBuilder(
+                        "产品入库异常,\n产品id："
+                            + product.getProductId()
+                            + ",\n产品名称："
+                            + product.getProductName()
+                            + ",\n产品类型："
+                            + product.getCategoryName()
+                            + ",\n产品中文名称："
+                            + product.getProductNameZh()
+                            + ",\n产品编辑："
+                            + product.getAuthorName()
+                            + ",\n执行动作："
+                            + product.getActionType()
+                            + ",\n站点名称："
+                            + adwebSite.getName()
+                            + ",\n站点域名："
+                            + product.getSiteHost());
+
+                feishuService.sendProductMissingRobot(
+                    (float) diffTime / 1000,
+                    "MQ消费产品失败：",
+                    className,
+                    methodName,
+                    String.valueOf(msg));
+
                 log.error("产品入库失败：{}", e.getMessage());
               }
             }

jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml

@@ -394,6 +394,7 @@ geoip:
 ### 机器人预警url
 robot:
   enquiry-url: https://open.feishu.cn/open-apis/bot/v2/hook/38c1e0fb-1aa9-4097-8625-2b928684b1b2  #询盘拉取失败通知
+  product-missing-url: https://open.feishu.cn/open-apis/bot/v2/hook/4120be4a-1949-4638-b853-536626b82dd9 #产品信息拉取失败通知
   market-plan-missing-url: https://open.feishu.cn/open-apis/bot/v2/hook/4a7110ff-9121-49fc-b0b6-0d809b548ad4  #缺少营销方案导致的拉取站点失败
   flow-abnormal-url: https://open.feishu.cn/open-apis/bot/v2/hook/81ec5829-ba64-43d7-9662-2054e80a4ebe  #流量异常通知
   keyword-preOrSuffix-url: https://open.feishu.cn/open-apis/bot/v2/hook/325b4b0a-df54-4c7f-adaf-c5da61bb12b3  #关键词前后缀通知

jeecg-module-system/jeecg-system-start/src/main/resources/application-prod.yml

@@ -399,6 +399,7 @@ geoip:
 ### 机器人预警url
 robot:
   enquiry-url: https://open.feishu.cn/open-apis/bot/v2/hook/38c1e0fb-1aa9-4097-8625-2b928684b1b2  #询盘消费失败通知
+  product-missing-url: https://open.feishu.cn/open-apis/bot/v2/hook/4120be4a-1949-4638-b853-536626b82dd9 #产品信息拉取失败通知
   market-plan-missing-url: https://open.feishu.cn/open-apis/bot/v2/hook/4a7110ff-9121-49fc-b0b6-0d809b548ad4  #缺少营销方案导致的拉取站点失败
   flow-abnormal-url: https://open.feishu.cn/open-apis/bot/v2/hook/81ec5829-ba64-43d7-9662-2054e80a4ebe  #流量异常通知
   keyword-preOrSuffix-url: https://open.feishu.cn/open-apis/bot/v2/hook/325b4b0a-df54-4c7f-adaf-c5da61bb12b3

jeecg-module-system/jeecg-system-start/src/main/resources/application-test.yml

@@ -393,6 +393,7 @@ geoip:
 ### 机器人预警url
 robot:
   enquiry-url: https://open.feishu.cn/open-apis/bot/v2/hook/38c1e0fb-1aa9-4097-8625-2b928684b1b2  #询盘拉取失败通知
+  product-missing-url: https://open.feishu.cn/open-apis/bot/v2/hook/4120be4a-1949-4638-b853-536626b82dd9 #产品信息拉取失败通知
   market-plan-missing-url: https://open.feishu.cn/open-apis/bot/v2/hook/4a7110ff-9121-49fc-b0b6-0d809b548ad4  #缺少营销方案导致的拉取站点失败
   flow-abnormal-url: https://open.feishu.cn/open-apis/bot/v2/hook/81ec5829-ba64-43d7-9662-2054e80a4ebe  #流量异常通知
   keyword-preOrSuffix-url: https://open.feishu.cn/open-apis/bot/v2/hook/325b4b0a-df54-4c7f-adaf-c5da61bb12b3  #关键词前后缀通知