From ab64b09ce3020b376af1e6ee0326ea71330d34ad Mon Sep 17 00:00:00 2001
From: fei.wang <wf18701153496@163.com>
Date: 星期四, 21 三月 2024 09:52:42 +0800
Subject: [PATCH] 修改bug

---
 src/main/java/com/flow/controller/DuanxinlogController.java |   42 ++++++++++++++++++++++++++++++++----------
 1 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/flow/controller/DuanxinlogController.java b/src/main/java/com/flow/controller/DuanxinlogController.java
index 83efd34..3ad3679 100644
--- a/src/main/java/com/flow/controller/DuanxinlogController.java
+++ b/src/main/java/com/flow/controller/DuanxinlogController.java
@@ -76,8 +76,10 @@
      */
 //    @EnableScheduling
 //    @Scheduled(cron = "*/10 * * * * ?")//娴嬭瘯10涓�娆�
+//    @Scheduled(cron = "0 46 17 * * ?")
     @Scheduled(cron = "0 0 */1 * * ?")//涓�灏忔椂鎵ц涓�娆�
     public void smsfuwuqi() throws Exception {
+        System.out.println("鏈嶅姟鍣ㄥ畾鏃跺櫒鎵ц============銆嬨�嬨�嬨�嬨�嬨�嬨�嬨�嬨�嬨�嬨�嬨�嬨�嬨�嬨�嬨��");
         QueryWrapper queryWrapper1 = new QueryWrapper();
         queryWrapper1.eq("none", "0");
         List<TbFuwuqi> fuwuqiList = (tbFuwuqiMapper).selectList(queryWrapper1);
@@ -93,8 +95,8 @@
             Long endTime = endDay.getTime();
             Long num11 = endTime - starTime;//鏃堕棿鎴�
             //涓嶈冻涓�澶╃殑绠椾綔涓�澶╋紝鍥犳鍦ㄥ埌鏈熷ぉ鏁颁笂鍔�1
-            if (+num11 / 24 / 60 / 60 / 1000 == 19 | +num11 / 24 / 60 / 60 / 1000 ==9 | +num11 / 24 / 60 / 60 / 1000 == 4 | +num11 / 24 / 60 / 60 / 1000 == 0) {
-                String dispatchDate = this.duanxinlogService.userdate(DESUtil.decrypt(companyList.getLoginphone(), DESUtil.key));
+            if (+num11 / 24 / 60 / 60 / 1000 == 19 | +num11 / 24 / 60 / 60 / 1000 == 9 | +num11 / 24 / 60 / 60 / 1000 == 4 | +num11 / 24 / 60 / 60 / 1000 == 0) {
+                String dispatchDate = this.duanxinlogService.userdate(fuwuqiList.get(i).getServername());
                 SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
                 String dtext = formatter.format(date);
                 if (dispatchDate == null || !dtext.equals(dispatchDate)) {
@@ -119,19 +121,20 @@
 
                     req.setSmsSdkAppId("1400838975");
                     req.setSignName("鍖椾含鍗庢槦鍖楁枟鏅烘帶");
-                    req.setTemplateId("2081600");
+                    req.setTemplateId("2100321");
 
 //                    String[] templateParamSet1 = {String.valueOf(+num11 / 24 / 60 / 60 / 1000)};
-                    String[] templateParamSet1 = {String.valueOf("浜戞湇鍔″櫒杩樻湁"+(num11 / 24 / 60 / 60 / 1000+1))};
+                    String[] templateParamSet1 = {String.valueOf("鎮ㄦ湁鏈嶅姟鍣ㄥ皢浜庯細"  + fuwuqiList.get(i).getEnddate()+"鍒版湡锛�")};
                     req.setTemplateParamSet(templateParamSet1);
                     // 杩斿洖鐨剅esp鏄竴涓猄endSmsResponse鐨勫疄渚嬶紝涓庤姹傚璞″搴�
                     SendSmsResponse resp = client.SendSms(req);
                     // 杈撳嚭json鏍煎紡鐨勫瓧绗︿覆鍥炲寘
                     Duanxinlog duanxinlog = new Duanxinlog();
+                    duanxinlog.setIdentification(fuwuqiList.get(i).getServername());
                     duanxinlog.setReceiver(fuwuqiList.get(i).getCompany());
                     duanxinlog.setNumber(DESUtil.decrypt(companyList.getLoginphone(), DESUtil.key));
                     duanxinlog.setNumber(DESUtil.decrypt(companyList.getLoginphone(), DESUtil.key));
-                    duanxinlog.setContent("鎮ㄦ湁鏈嶅姟鍣ㄨ繕鏈�" + (num11 / 24 / 60 / 60 / 1000+1) + "澶╁埌鏈燂紝璇风櫥褰昳optposition.com缁垂锛屽宸茬画璐瑰拷鐣ヨ鎻愮ず淇℃伅");
+                    duanxinlog.setContent("灏婃暚鐨勭敤鎴凤紝鎮ㄥソ锛佹偍鏈夋湇鍔″櫒灏嗕簬"+fuwuqiList.get(i).getEnddate()+"鍒版湡锛屼负閬垮厤褰卞搷鎮ㄧ殑姝e父浣跨敤璇峰強鏃剁画璐癸紝鎮ㄥ彲鐧诲綍鍗庢槦鏅烘帶鍏徃鐗╄仈缃戠鐞嗗钩鍙版煡璇㈣鎯呯画璐癸紝濡傛湁鐤戦棶鍙挩璇㈡垜鍏徃瀹㈡湇浜哄憳锛岀鎮ㄧ敓娲绘剦蹇紒");
                     this.duanxinlogService.addDuanxinlog(duanxinlog);
                 }
             }
@@ -154,13 +157,27 @@
      */
 //    @EnableScheduling
 //    @Scheduled(cron = "*/10 * * * * ?")//娴嬭瘯10绉掓墽琛屼竴娆�
+//    @Scheduled(cron = "0 0 16 * * ?")
     @Scheduled(cron = "0 0 */1 * * ?")//涓�灏忔椂鎵ц涓�娆�
     public void sms() throws Exception {
+        System.out.println("鐭俊瀹氭椂鍣ㄦ墽琛�============銆嬨�嬨�嬨�嬨�嬨�嬨�嬨�嬨�嬨�嬨�嬨�嬨�嬨�嬨�嬨��");
         //鏌ヨ鏁版嵁搴撲腑鎵�鏈夌殑寮曟搸鏁版嵁
         QueryWrapper queryWrapper = new QueryWrapper();
         queryWrapper.eq("none", "0");
+//        queryWrapper.eq("num", "8");
         List<Card> cardList = (cardMapper).selectList(queryWrapper);
         for (int i = 0; i < cardList.size(); i++) {
+            QueryWrapper queryWrapper3 = new QueryWrapper();
+            queryWrapper3.eq("none", "0");
+            queryWrapper3.eq("companyName", cardList.get(i).getCompany());
+            Company companyList = new Company();
+            companyList = (companyMapper).selectOne(queryWrapper3);
+            if (companyList == null) {
+                QueryWrapper queryWrapper4 = new QueryWrapper();
+                queryWrapper4.eq("none", "0");
+                queryWrapper4.eq("companyabbname", cardList.get(i).getCompany());
+                companyList = (companyMapper).selectOne(queryWrapper4);
+            }
             SimpleDateFormat date2 = new SimpleDateFormat("yyyy-MM-dd");
             Date date = new Date();
             Date endDay = date2.parse(cardList.get(i).getEnddate());//缁撴潫鏃堕棿
@@ -169,6 +186,7 @@
             Long num11 = endTime - starTime;//鏃堕棿鎴�
             if (+num11 / 24 / 60 / 60 / 1000 == 19 | +num11 / 24 / 60 / 60 / 1000 == 9 | +num11 / 24 / 60 / 60 / 1000 == 4 | +num11 / 24 / 60 / 60 / 1000 == 0) {
                 String dispatchDate = this.duanxinlogService.userdate(cardList.get(i).getCardnumber());
+//                    String dispatchDate = this.duanxinlogService.userdate(cardList.get(i).getCardnumber());
                 SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
                 String dtext = formatter.format(date);
                 if (dispatchDate == null || !dtext.equals(dispatchDate)) {
@@ -187,27 +205,31 @@
                     SmsClient client = new SmsClient(cred, "ap-beijing", clientProfile);
                     // 瀹炰緥鍖栦竴涓姹傚璞�,姣忎釜鎺ュ彛閮戒細瀵瑰簲涓�涓猺equest瀵硅薄
                     SendSmsRequest req = new SendSmsRequest();
-            String[] phoneNumberSet1 = {cardList.get(i).getCardnumber()};
+//                        String[] phoneNumberSet1 = {cardList.get(i).getCardnumber()};
+                    String[] phoneNumberSet1 = {DESUtil.decrypt(companyList.getLoginphone(), DESUtil.key)};
 //                    String[] phoneNumberSet1 = {"18701153496"};
                     req.setPhoneNumberSet(phoneNumberSet1);
 
                     req.setSmsSdkAppId("1400838975");
                     req.setSignName("鍖椾含鍗庢槦鍖楁枟鏅烘帶");
-                    req.setTemplateId("1878633");
+                    req.setTemplateId("2100321");
 
 //                    String[] templateParamSet1 = {String.valueOf(+num11 / 24 / 60 / 60 / 1000)};
-                    String[] templateParamSet1 = {String.valueOf("娴侀噺鍗�")};
+                    String[] templateParamSet1 = {String.valueOf("鎮ㄦ湁娴侀噺鍗″皢浜庯細"  + cardList.get(i).getEnddate()+"鍒版湡锛�")};
                     req.setTemplateParamSet(templateParamSet1);
                     // 杩斿洖鐨剅esp鏄竴涓猄endSmsResponse鐨勫疄渚嬶紝涓庤姹傚璞″搴�
                     SendSmsResponse resp = client.SendSms(req);
                     // 杈撳嚭json鏍煎紡鐨勫瓧绗︿覆鍥炲寘
                     Duanxinlog duanxinlog = new Duanxinlog();
+                    duanxinlog.setIdentification(cardList.get(i).getCardnumber());
                     duanxinlog.setReceiver(cardList.get(i).getCompany());
-                    duanxinlog.setNumber(cardList.get(i).getCardnumber());
-                    duanxinlog.setContent("鎮ㄦ湁娴侀噺鍗¤繕鏈�" + (num11 / 24 / 60 / 60 / 1000+1) + "澶╁埌鏈燂紝璇风櫥褰昳optposition.com缁垂锛屽宸茬画璐瑰拷鐣ヨ鎻愮ず淇℃伅");
+                    duanxinlog.setNumber(phoneNumberSet1[0]);
+                    duanxinlog.setContent("灏婃暚鐨勭敤鎴凤紝鎮ㄥソ锛佹偍鏈夋祦閲忓崱灏嗕簬"+cardList.get(i).getEnddate()+"鍒版湡锛屼负閬垮厤褰卞搷鎮ㄧ殑姝e父浣跨敤璇峰強鏃剁画璐癸紝鎮ㄥ彲鐧诲綍鍗庢槦鏅烘帶鍏徃鐗╄仈缃戠鐞嗗钩鍙版煡璇㈣鎯呯画璐癸紝濡傛湁鐤戦棶鍙挩璇㈡垜鍏徃瀹㈡湇浜哄憳锛岀鎮ㄧ敓娲绘剦蹇紒"
+                    );
                     this.duanxinlogService.addDuanxinlog(duanxinlog);
                 }
             }
+
         }
     }
 

--
Gitblit v1.9.3