From 871d4095b07cedacb7fbef4c38d64982f539c404 Mon Sep 17 00:00:00 2001
From: fei.wang <wf18701153496@163.com>
Date: 星期四, 09 五月 2024 15:40:15 +0800
Subject: [PATCH] 测试提交
---
src/main/java/com/flow/controller/DuanxinlogController.java | 117 +++++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 95 insertions(+), 22 deletions(-)
diff --git a/src/main/java/com/flow/controller/DuanxinlogController.java b/src/main/java/com/flow/controller/DuanxinlogController.java
index 83efd34..63517cb 100644
--- a/src/main/java/com/flow/controller/DuanxinlogController.java
+++ b/src/main/java/com/flow/controller/DuanxinlogController.java
@@ -1,14 +1,8 @@
package com.flow.controller;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.flow.mapper.CardMapper;
-import com.flow.mapper.CompanyMapper;
-import com.flow.mapper.DuanxinlogMapper;
-import com.flow.mapper.TbFuwuqiMapper;
-import com.flow.pojo.Card;
-import com.flow.pojo.Company;
-import com.flow.pojo.Duanxinlog;
-import com.flow.pojo.TbFuwuqi;
+import com.flow.mapper.*;
+import com.flow.pojo.*;
import com.flow.service.DuanxinlogService;
import com.flow.service.TbFuwuqiService;
import com.flow.util.DESUtil;
@@ -25,8 +19,10 @@
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.servlet.ModelAndView;
import java.text.SimpleDateFormat;
import java.util.Date;
@@ -55,10 +51,20 @@
@Autowired
CompanyMapper companyMapper;
+ @Autowired
+ ManagerMapper managerMapper;
@GetMapping({"findDuanxinlog"})
result<List<Duanxinlog>> findDuanxinlog(Integer page, Integer limit) {
PageInfo<Duanxinlog> cz = this.duanxinlogService.FindDuanxinlog(page, limit);
return resultutil.returnSuccess(cz.getTotal(), cz.getList());
+ }
+ @PostMapping({"DeleteDuanxinlog"})
+ public ModelAndView DeleteManager(String num) {
+ this.duanxinlogService.DeleteDuanxinlog(num);
+ ModelAndView modelAndView = new ModelAndView();
+ modelAndView.setViewName("/page/Duanxinlog.jsp");
+ return modelAndView;
+
}
/*
@@ -76,8 +82,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);
@@ -86,16 +94,16 @@
queryWrapper3.eq("none", "0");
queryWrapper3.eq("companyName", fuwuqiList.get(i).getCompany());
Company companyList = (companyMapper).selectOne(queryWrapper3);
- SimpleDateFormat date2 = new SimpleDateFormat("yyyy-MM-dd");
+ SimpleDateFormat date2 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
Date date = new Date();
Date endDay = date2.parse(fuwuqiList.get(i).getEnddate());//缁撴潫鏃堕棿
Long starTime = date.getTime();
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));
- SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
+ 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 HH:mm:ss");
String dtext = formatter.format(date);
if (dispatchDate == null || !dtext.equals(dispatchDate)) {
@@ -115,23 +123,45 @@
SendSmsRequest req = new SendSmsRequest();
// String[] phoneNumberSet1 = {"18701153496"};
String[] phoneNumberSet1 = {DESUtil.decrypt(companyList.getLoginphone(), DESUtil.key)};
+ QueryWrapper sms = new QueryWrapper();
+ sms.eq("none", "0");
+ sms.eq("smsreception", "1");
+ List<Manager> managerList = (managerMapper).selectList(sms);
+ for (int s=0;s<managerList.size();s++){
+// System.out.println(managerList.get(s).getPhone());
+// phoneNumberSet1[s] = managerList.get(s).getPhone();
+ String[] phoneNumberSet12 = {managerList.get(s).getPhone()};
+ System.out.println(phoneNumberSet12);
+ req.setPhoneNumberSet(phoneNumberSet12);
+
+ req.setSmsSdkAppId("1400838975");
+ req.setSignName("鍖椾含鍗庢槦鍖楁枟鏅烘帶");
+ req.setTemplateId("2100321");
+
+// String[] templateParamSet1 = {String.valueOf(+num11 / 24 / 60 / 60 / 1000)};
+ String[] templateParamSet1 = {String.valueOf("鎮ㄦ湁娴侀噺鍗″皢浜庯細" + fuwuqiList.get(i).getEnddate()+"鍒版湡锛�")};
+ req.setTemplateParamSet(templateParamSet1);
+ // 杩斿洖鐨剅esp鏄竴涓猄endSmsResponse鐨勫疄渚嬶紝涓庤姹傚璞″搴�
+ SendSmsResponse resp = client.SendSms(req);
+ }
req.setPhoneNumberSet(phoneNumberSet1);
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()+"鍒版湡锛屼负閬垮厤褰卞搷鎮ㄧ殑姝ｅ父浣跨敤璇峰強鏃剁画璐癸紝鎮ㄥ彲鐧诲綍鍗庢槦鏅烘帶鍏徃鐗╄仈缃戠鐞嗗钩鍙版煡璇㈣鎯呯画璐癸紝濡傛湁鐤戦棶鍙挩璇㈡垜鍏徃瀹㈡湇浜哄憳锛岀鎮ㄧ敓娲绘剦蹇紒");
this.duanxinlogService.addDuanxinlog(duanxinlog);
}
}
@@ -154,14 +184,28 @@
*/
// @EnableScheduling
// @Scheduled(cron = "*/10 * * * * ?")//娴嬭瘯10绉掓墽琛屼竴娆�
+// @Scheduled(cron = "0 49 10 * * ?")
@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++) {
- SimpleDateFormat date2 = new SimpleDateFormat("yyyy-MM-dd");
+ 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 HH:mm:ss");
Date date = new Date();
Date endDay = date2.parse(cardList.get(i).getEnddate());//缁撴潫鏃堕棿
Long starTime = date.getTime();
@@ -169,7 +213,8 @@
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());
- SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
+// String dispatchDate = this.duanxinlogService.userdate(cardList.get(i).getCardnumber());
+ SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
String dtext = formatter.format(date);
if (dispatchDate == null || !dtext.equals(dispatchDate)) {
String randomNumber = new String();
@@ -187,27 +232,55 @@
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"};
+ QueryWrapper sms = new QueryWrapper();
+ sms.eq("none", "0");
+ sms.eq("smsreception", "1");
+ List<Manager> managerList = (managerMapper).selectList(sms);
+ for (int s=0;s<managerList.size();s++){
+// System.out.println(managerList.get(s).getPhone());
+// phoneNumberSet1[s] = managerList.get(s).getPhone();
+ String[] phoneNumberSet12 = {managerList.get(s).getPhone()};
+ System.out.println(phoneNumberSet12);
+ req.setPhoneNumberSet(phoneNumberSet12);
+
+ req.setSmsSdkAppId("1400838975");
+ req.setSignName("鍖椾含鍗庢槦鍖楁枟鏅烘帶");
+ req.setTemplateId("2100321");
+
+// String[] templateParamSet1 = {String.valueOf(+num11 / 24 / 60 / 60 / 1000)};
+ String[] templateParamSet1 = {String.valueOf("鎮ㄦ湁娴侀噺鍗″皢浜庯細" + cardList.get(i).getEnddate()+"鍒版湡锛�")};
+ req.setTemplateParamSet(templateParamSet1);
+ // 杩斿洖鐨剅esp鏄竴涓猄endSmsResponse鐨勫疄渚嬶紝涓庤姹傚璞″搴�
+ SendSmsResponse resp = client.SendSms(req);
+ }
+// phoneNumberSet1[managerList.size()] = DESUtil.decrypt(companyList.getLoginphone(), DESUtil.key);
+// System.out.println(phoneNumberSet1);
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);
+ System.out.println(SendSmsResponse.toJsonString(resp));
// 杈撳嚭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()+"鍒版湡锛屼负閬垮厤褰卞搷鎮ㄧ殑姝ｅ父浣跨敤璇峰強鏃剁画璐癸紝鎮ㄥ彲鐧诲綍鍗庢槦鏅烘帶鍏徃鐗╄仈缃戠鐞嗗钩鍙版煡璇㈣鎯呯画璐癸紝濡傛湁鐤戦棶鍙挩璇㈡垜鍏徃瀹㈡湇浜哄憳锛岀鎮ㄧ敓娲绘剦蹇紒"
+ );
this.duanxinlogService.addDuanxinlog(duanxinlog);
}
}
+
}
}
--
Gitblit v1.9.3