推送

yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/csmcashreport/CsmCashReportRest.java

@@ -105,7 +105,7 @@ public class CsmCashReportRest {
         //推送微信消息
         ThreadUtil.execute(() -> {
             try {
-                //wechatRest.sendMessage(dataDate);
+                wechatRest.collectionSendMessage(dataDate);
             } catch (Exception e) {
                 throw new RuntimeException(e);
             }

yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/wechat/WechatRest.java

@@ -13,6 +13,8 @@ import com.yxt.supervise.report.api.wechat.Template;
 import com.yxt.supervise.report.biz.csmcashreport.CsmCashReportMapper;
 import com.yxt.supervise.report.biz.messagepushlog.MessagePushLogService;
 import com.yxt.supervise.report.biz.reportinventory.ReportInventoryDayGatherMapper;
+import com.yxt.supervise.report.biz.stock.ReportStockDay;
+import com.yxt.supervise.report.biz.stock.StockDayRest;
 import com.yxt.supervise.report.biz.util.WeixinCheckoutUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -62,6 +64,8 @@ public class WechatRest {
     private ReportInventoryDayGatherMapper reportInventoryDayGatherMapper;
     @Autowired
     MessagePushLogService messagePushLogService;
+    @Autowired
+    StockDayRest stockDayRest;
     @ApiOperation("token")
     @GetMapping(value = "token")
     public String wechate(String signature,String timestamp,String nonce,String echostr){
@@ -92,8 +96,8 @@ public class WechatRest {
      * @param orderDate
      * @throws Exception
      */
-    @PostMapping("/SendMessage/{orderDate}")
-    public void SendMessage(@PathVariable("orderDate") String orderDate) throws Exception {
+    @PostMapping("/collectionSendMessage/{orderDate}")
+    public void collectionSendMessage(@PathVariable("orderDate") String orderDate) throws Exception {
         //ReportInventoryDayGatherVo csmCashReportVo=reportInventoryDayGatherMapper.getReportInventoryDayGather(orderDate);
         ReportInventoryDayGatherVo reportInventoryDayGatherVo=reportInventoryDayGatherMapper.getReportInventoryDayGather(orderDate);
         // 模板参数
@@ -234,9 +238,15 @@ public class WechatRest {
         });
         //return forEntity.getBody();
     }
-    @PostMapping("/HcsmSendMessage/{orderDate}")
-    public void HcsmSendMessage(@PathVariable("orderDate") String orderDate) throws Exception {
-        ReportInventoryDayGatherVo csmCashReportVo=reportInventoryDayGatherMapper.getReportInventoryDayGather(orderDate);
+
+    /**
+     * 瀚川库存推送
+     * @param orderDate
+     * @throws Exception
+     */
+    @PostMapping("/hcsmSendMessage/{orderDate}")
+    public void hcsmSendMessage(@PathVariable("orderDate") String orderDate) throws Exception {
+        ReportStockDay reportStockDay=stockDayRest.getDayGather("236408a1-c36e-416c-9f49-d6caa7671009",orderDate).getData();
         // 模板参数
         Map<String, Template> sendMag = new HashMap<String, Template>();
         // 公众号的模板id(也有相应的接口可以查询到)
@@ -246,11 +256,12 @@ public class WechatRest {
         String wxUrl = WX_URL_MESSAGE_SEND.replace("ACCESS_TOKEN", accessToken);
         List<String> openIds=new ArrayList<>();
         openIds.add("oGdho60xVtWEXUks7nYEAn0tGlDE");
-        openIds.add("oGdho66394A-4-NyumcJ1MEaT8Lo");
-        openIds.add("oGdho68CArVhC_-7ELkG-jX21ruk");
-        openIds.add("oGdho6yYB47f52HVk2NqirrFbRRk");
-        openIds.add("oGdho6-12-ioAKeLhVUDYPucbDb4");
-        openIds.add("oGdho668Hew45t0xfBJC84TNGVzI");
+
+//        openIds.add("oGdho66394A-4-NyumcJ1MEaT8Lo");
+//        openIds.add("oGdho68CArVhC_-7ELkG-jX21ruk");
+//        openIds.add("oGdho6yYB47f52HVk2NqirrFbRRk");
+//        openIds.add("oGdho6-12-ioAKeLhVUDYPucbDb4");
+//        openIds.add("oGdho668Hew45t0xfBJC84TNGVzI");
         String pa="";
         JSONObject jsonObject=new JSONObject();
         List<MessageOpenidDto> list=new ArrayList<>();
@@ -258,12 +269,12 @@ public class WechatRest {
             MessageOpenidDto dto=new MessageOpenidDto();
             dto.setOpenId(openId);
             list.add(dto);
-            sendMag.put("time1", new Template(csmCashReportVo.getOrderDate()));
+            sendMag.put("time1", new Template(reportStockDay.getOrderDate()));
             sendMag.put("thing2", new Template("瀚川商贸库存汇总"));
             sendMag.put("thing3", new Template("赵丽晓"));
             Map<String, String> miniprogram = new HashMap<>();
-            miniprogram.put("appid","wx11565021714ba796");
-            miniprogram.put("pagepath","pages/index/inventoryReport?orderDate="+csmCashReportVo.getOrderDate());
+            miniprogram.put("appid","wx05604ce2a8bede05");
+            miniprogram.put("pagepath","pages/index/demoReportKc2?orderDate="+reportStockDay.getOrderDate()+"projectSid="+reportStockDay.getProjectSid());
             pa=miniprogram.get("pagepath");
             RestTemplate restTemplate = new RestTemplate();
             //拼接base参数
@@ -285,7 +296,7 @@ public class WechatRest {
         //推送消息之后保存消息日志
         MessagePushLogDto logDto=new MessagePushLogDto();
         logDto.setContent(sendMag);
-        logDto.setMessageTime(csmCashReportVo.getReportTime());
+        logDto.setMessageTime(reportStockDay.getReportTime());
         logDto.setPagepath(pa);
         logDto.setMessageOpenidDtos(list);
         ThreadUtil.execute(() -> {