Merge branch 'refs/heads/v16.3_line_warn_20240528' into test

performance-web/src/main/java/com/clx/performance/controller/temp/TempLineWarnController.java

@@ -2,6 +2,7 @@ package com.clx.performance.controller.temp;
 
 import com.clx.order.vo.feign.FeignAddressVO;
 import com.clx.performance.extranal.user.AddressService;
+import com.clx.performance.service.linewarn.LineWarnMqHandlerService;
 import com.clx.performance.service.linewarn.LineWarnMqService;
 import com.clx.performance.utils.gd.GdUtils;
 import com.msl.common.base.Optional;
@@ -14,6 +15,7 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -34,6 +36,8 @@ public class TempLineWarnController {
     private AddressService addressService;
     @Autowired
     private GdUtils gdUtils;
+    @Autowired
+    private LineWarnMqHandlerService lineWarnMqHandlerService;
 
     @ApiOperation(value = "test", notes = "<br>By:艾庆国")
     @PostMapping("/test")
@@ -84,4 +88,21 @@ public class TempLineWarnController {
         return Result.ok(result);
     }
 
+    @ApiOperation(value = "发送预警短信", notes = "<br>By:艾庆国")
+    @PostMapping("/sendSms")
+    public Result sendSms(String mobile, String warnName, String orderGoodsNo) {
+
+        lineWarnMqHandlerService.sendSms(Arrays.asList(mobile), warnName, orderGoodsNo);
+
+        return Result.ok();
+    }
+
+    @ApiOperation(value = "发送预警外呼", notes = "<br>By:艾庆国")
+    @PostMapping("/sendClink")
+    public Result sendClink(String mobile, String warnName, String orderGoodsNo) {
+        lineWarnMqHandlerService.sendClink(Arrays.asList(mobile), warnName, orderGoodsNo);
+
+        return Result.ok();
+    }
+
 }

performance-web/src/main/java/com/clx/performance/service/impl/linewarn/LineWarnMqHandlerServiceImpl.java

@@ -254,6 +254,7 @@ public class LineWarnMqHandlerServiceImpl implements LineWarnMqHandlerService {
         ClinkMessageReq req = new ClinkMessageReq();
 
         StringBuilder sb = new StringBuilder();
+
         sb.append("触发");
         sb.append(warnName);
         sb.append("预警；货单");