From b9b58b9ef261cb290d93465f88a2cbd814b576f0 Mon Sep 17 00:00:00 2001
From: fei.wang <wf18701153496@163.com>
Date: 星期一, 13 五月 2024 17:51:44 +0800
Subject: [PATCH] 更改
---
src/webapp/page/loginJiLu.jsp | 2
src/webapp/page/manager.jsp | 97 ++++++++++++++++++++++----------
src/webapp/page/Duanxinlog.jsp | 2
src/webapp/page/Gongs.jsp | 15 ++++
src/main/java/com/flow/service/impl/ManagerServiceImpl.java | 2
src/main/java/com/flow/controller/DuanxinlogController.java | 28 +++++----
6 files changed, 99 insertions(+), 47 deletions(-)
diff --git a/src/main/java/com/flow/controller/DuanxinlogController.java b/src/main/java/com/flow/controller/DuanxinlogController.java
index 63517cb..8f3cf37 100644
--- a/src/main/java/com/flow/controller/DuanxinlogController.java
+++ b/src/main/java/com/flow/controller/DuanxinlogController.java
@@ -25,8 +25,7 @@
import org.springframework.web.servlet.ModelAndView;
import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
@RestController
@RequestMapping({"/hxzk"})
@@ -103,10 +102,9 @@
//涓嶈冻涓�澶╃殑绠椾綔涓�澶╋紝鍥犳鍦ㄥ埌鏈熷ぉ鏁颁笂鍔�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(fuwuqiList.get(i).getServername());
- SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
String dtext = formatter.format(date);
if (dispatchDate == null || !dtext.equals(dispatchDate)) {
-
// 瀹炰緥鍖栦竴涓璇佸璞★紝鍏ュ弬闇�瑕佷紶鍏ヨ吘璁簯璐︽埛 SecretId 鍜� SecretKey锛屾澶勮繕闇�娉ㄦ剰瀵嗛挜瀵圭殑淇濆瘑
// 浠ｇ爜娉勯湶鍙兘浼氬鑷� SecretId 鍜� SecretKey 娉勯湶锛屽苟濞佽儊璐﹀彿涓嬫墍鏈夎祫婧愮殑瀹夊叏鎬с�備互涓嬩唬鐮佺ず渚嬩粎渚涘弬鑰冿紝寤鸿閲囩敤鏇村畨鍏ㄧ殑鏂瑰紡鏉ヤ娇鐢ㄥ瘑閽ワ紝璇峰弬瑙侊細https://cloud.tencent.com/document/product/1278/85305
// 瀵嗛挜鍙墠寰�瀹樼綉鎺у埗鍙� https://console.cloud.tencent.com/cam/capi 杩涜鑾峰彇
@@ -184,14 +182,14 @@
*/
// @EnableScheduling
// @Scheduled(cron = "*/10 * * * * ?")//娴嬭瘯10绉掓墽琛屼竴娆�
-// @Scheduled(cron = "0 49 10 * * ?")
+// @Scheduled(cron = "0 11 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");
+// queryWrapper.eq("num", "1");
List<Card> cardList = (cardMapper).selectList(queryWrapper);
for (int i = 0; i < cardList.size(); i++) {
QueryWrapper queryWrapper3 = new QueryWrapper();
@@ -205,18 +203,20 @@
queryWrapper4.eq("companyabbname", cardList.get(i).getCompany());
companyList = (companyMapper).selectOne(queryWrapper4);
}
- SimpleDateFormat date2 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ SimpleDateFormat date2 = new SimpleDateFormat("yyyy-MM-dd");
Date date = new Date();
Date endDay = date2.parse(cardList.get(i).getEnddate());//缁撴潫鏃堕棿
Long starTime = date.getTime();
Long endTime = endDay.getTime();
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 HH:mm:ss");
- String dtext = formatter.format(date);
- if (dispatchDate == null || !dtext.equals(dispatchDate)) {
+ Date dtext = formatter.parse(dispatchDate);//缁撴潫鏃堕棿
+ Long endTime1 = dtext.getTime();
+ if ((endTime1-starTime) / 24 / 60 / 60 / 1000 != 0) {
String randomNumber = new String();
// 瀹炰緥鍖栦竴涓璇佸璞★紝鍏ュ弬闇�瑕佷紶鍏ヨ吘璁簯璐︽埛 SecretId 鍜� SecretKey锛屾澶勮繕闇�娉ㄦ剰瀵嗛挜瀵圭殑淇濆瘑
// 浠ｇ爜娉勯湶鍙兘浼氬鑷� SecretId 鍜� SecretKey 娉勯湶锛屽苟濞佽儊璐﹀彿涓嬫墍鏈夎祫婧愮殑瀹夊叏鎬с�備互涓嬩唬鐮佺ず渚嬩粎渚涘弬鑰冿紝寤鸿閲囩敤鏇村畨鍏ㄧ殑鏂瑰紡鏉ヤ娇鐢ㄥ瘑閽ワ紝璇峰弬瑙侊細https://cloud.tencent.com/document/product/1278/85305
@@ -239,9 +239,13 @@
sms.eq("none", "0");
sms.eq("smsreception", "1");
List<Manager> managerList = (managerMapper).selectList(sms);
+ String string = new String();
for (int s=0;s<managerList.size();s++){
-// System.out.println(managerList.get(s).getPhone());
-// phoneNumberSet1[s] = managerList.get(s).getPhone();
+
+ if (s!=0){
+ string+=",";
+ }
+ string += managerList.get(s).getPhone();
String[] phoneNumberSet12 = {managerList.get(s).getPhone()};
System.out.println(phoneNumberSet12);
req.setPhoneNumberSet(phoneNumberSet12);
@@ -274,7 +278,7 @@
Duanxinlog duanxinlog = new Duanxinlog();
duanxinlog.setIdentification(cardList.get(i).getCardnumber());
duanxinlog.setReceiver(cardList.get(i).getCompany());
- duanxinlog.setNumber(phoneNumberSet1[0]);
+ duanxinlog.setNumber(string);
duanxinlog.setContent("灏婃暚鐨勭敤鎴凤紝鎮ㄥソ锛佹偍鏈夋祦閲忓崱灏嗕簬"+cardList.get(i).getEnddate()+"鍒版湡锛屼负閬垮厤褰卞搷鎮ㄧ殑姝ｅ父浣跨敤璇峰強鏃剁画璐癸紝鎮ㄥ彲鐧诲綍鍗庢槦鏅烘帶鍏徃鐗╄仈缃戠鐞嗗钩鍙版煡璇㈣鎯呯画璐癸紝濡傛湁鐤戦棶鍙挩璇㈡垜鍏徃瀹㈡湇浜哄憳锛岀鎮ㄧ敓娲绘剦蹇紒"
);
this.duanxinlogService.addDuanxinlog(duanxinlog);
diff --git a/src/main/java/com/flow/service/impl/ManagerServiceImpl.java b/src/main/java/com/flow/service/impl/ManagerServiceImpl.java
index a47d8ea..6c2fc63 100644
--- a/src/main/java/com/flow/service/impl/ManagerServiceImpl.java
+++ b/src/main/java/com/flow/service/impl/ManagerServiceImpl.java
@@ -57,7 +57,7 @@
OperationLog operationLog = new OperationLog();
operationLog.setCaozuotype("淇敼");
operationLog.setCaozuocontent("淇敼鐢ㄦ埛锛�"+manager.getName());
- operationLog.setCaozuoname(manager.getCaozuoname());
+ operationLog.setCaozuoname(tbFuwuqi.getCaozuoname());
operationLogService.addOperationLog(operationLog);
Date date = new Date();
diff --git a/src/webapp/page/Duanxinlog.jsp b/src/webapp/page/Duanxinlog.jsp
index 8265b48..e006ae5 100644
--- a/src/webapp/page/Duanxinlog.jsp
+++ b/src/webapp/page/Duanxinlog.jsp
@@ -114,7 +114,7 @@
table.render({
elem: '#demo'
, layEvent: 'LAYTABLE_TIPS'
- , height: 830
+ , height: 800
// ,cellMinWidth: 80
, url: '/HxzkFlow/hxzk/findDuanxinlog' //鏁版嵁鎺ュ彛
// , page: true //寮�鍚垎椤�
diff --git a/src/webapp/page/Gongs.jsp b/src/webapp/page/Gongs.jsp
index 96ed41b..2b81b6a 100644
--- a/src/webapp/page/Gongs.jsp
+++ b/src/webapp/page/Gongs.jsp
@@ -211,11 +211,22 @@
button.classList.add('layui-btn-disabled');
}
if (getde==1){
- var button = document.getElementById('btn-delete');
+ var button = document.getElementById('btndelete');
// 璁剧疆鏍峰紡灞炴�ф潵闅愯棌鎸夐挳
button.classList.add('layui-btn-disabled');
}
-
+ // if (add1==1){
+ // $("#btn-add").hide();
+ //
+ // }
+ // if (up==1){
+ // $("#btn-update").hide();
+ //
+ // }
+ // if (getde==1){
+ // $("#btndelete").hide();
+ //
+ // }
$.get("/HxzkFlow/hxzk/chawu",function (data){
$(".zk").text(data[0])
$(".by").text(data[1])
diff --git a/src/webapp/page/loginJiLu.jsp b/src/webapp/page/loginJiLu.jsp
index 2b48954..8ac39b8 100644
--- a/src/webapp/page/loginJiLu.jsp
+++ b/src/webapp/page/loginJiLu.jsp
@@ -149,7 +149,7 @@
table.render({
elem: '#demo'
, layEvent: 'LAYTABLE_TIPS'
- , height: 830
+ , height: 800
,cellMinWidth: 80
, url: '/HxzkFlow/hxzk/FindLoginJiLu' //鏁版嵁鎺ュ彛
// , page: true //寮�鍚垎椤�
diff --git a/src/webapp/page/manager.jsp b/src/webapp/page/manager.jsp
index 8938c57..dbe9172 100644
--- a/src/webapp/page/manager.jsp
+++ b/src/webapp/page/manager.jsp
@@ -258,7 +258,41 @@
}
if(qb === "鍗庢槦鏅烘帶"){
+ var add1 = localStorage.getItem("getadd")
+ var up = localStorage.getItem("getup")
+ var getde = localStorage.getItem("getde")
+ // console.log(getde)
+// if (add1 == 1) {
+// var button = document.getElementById('btn-add');
+// // 璁剧疆鏍峰紡灞炴�ф潵闅愯棌鎸夐挳
+// button.classList.add('layui-btn-disabled');
+// }
+// if (up == 1) {
+// var button = document.getElementById('btn-update');
+//
+// // 璁剧疆寮忓睘鎬ф潵闅愯棌鎸夐挳
+// button.classList.add('layui-btn-disabled');
+// }
+// if (getde == 1) {
+// var button = document.getElementById('btndelete');
+//
+// // 浣挎寜閽笉鍙偣鍑�
+// button.classList.add('layui-btn-disabled');
+// }
+
+ if (add1==1){
+ $("#btn-add").hide();
+
+ }
+ if (up==1){
+ $("#btn-update").hide();
+
+ }
+ if (getde==1){
+ $("#btndelete").hide();
+
+ }
$.get("/HxzkFlow/hxzk/chawu",function (data){
$(".zk").text(data[0])
$(".by").text(data[1])
@@ -358,24 +392,7 @@
//浠庢湰鍦板瓨鍌ㄨ幏鍙栫敤鎴风櫥褰曚俊鎭紝濡傛灉鏄瓙璐﹀彿锛屽彧鏄剧ずelse 濡傛灉鏄�昏处鍙锋樉绀篿f
layui.use('table', function(){
var table = layui.table;
- var add1 = localStorage.getItem("getadd")
- var up = localStorage.getItem("getup")
- var getde = localStorage.getItem("getde")
- console.log(getde)
-
- if (add1==1){
- $("#btn-add").hide();
-
- }
- if (up==1){
- $("#btn-update").hide();
-
- }
- if (getde==1){
- $("#btn-delete").hide();
-
- }
var Zong = localStorage.getItem("gsjc")
var data ="Zong="+Zong
if(Zong == null){
@@ -504,6 +521,11 @@
$("#udeleteup1").prop("checked",true);
}else{
$("#udeleteup2").prop("checked",true);
+ }
+ if (data[0].smsreception==1){
+ $("#upsms1").prop("checked",true);
+ }else{
+ $("#upsms2").prop("checked",true);
}
// $("#uaddup").val(data[0].enddate);
@@ -705,6 +727,19 @@
var add1 = $("#nameup1").val();
var add2 = $("#phoneup1").val();
var add3 = $("#jueseup1").val();
+
+ // var add4 = $("#enddateg").val();
+ var add4 = $("#id").val();
+ var PassOrNotadd =$('input[name="uadd"]:checked').val();
+ var PassOrNotup =$('input[name="uupdate"]:checked').val();
+ var PassOrNotde =$('input[name="udelete"]:checked').val();
+ var PassOrNotsms =$('input[name="smsreception"]:checked').val();
+
+ var add5 = PassOrNotadd
+ var add6 = PassOrNotup
+ var add7 = PassOrNotde
+ console.log(PassOrNotadd)
+ console.log(PassOrNotsms)
if (add3!="璁垮"){
if(!add5 ){
layer.alert("璇烽�夋嫨鏂板鏉冮檺")
@@ -717,14 +752,6 @@
return false;
}
}
- // var add4 = $("#enddateg").val();
- var add4 = $("#id").val();
- var PassOrNotadd =$('input[name="uadd"]:checked').val();
- var PassOrNotup =$('input[name="uupdate"]:checked').val();
- var PassOrNotde =$('input[name="udelete"]:checked').val();
- var add5 = PassOrNotadd
- var add6 = PassOrNotup
- var add7 = PassOrNotde
// var add12 = $("#expense").val();
// var add5 = $("#bindidadd1").val();
// var add6 = $("#locationadd1").val();
@@ -741,6 +768,9 @@
return false;
}else if(add3 == "" || add3 == null){
layer.alert("璇烽�夋嫨瑙掕壊")
+ return false;
+ }else if(!PassOrNotsms){
+ layer.alert("璇烽�夋嫨鐭俊鎺ユ敹鏉冮檺")
return false;
}else{
// if(parts.length>1){
@@ -763,7 +793,7 @@
if (data[0].id!=add4){
alert("绯荤粺鍙厑璁稿瓨鍦ㄤ竴涓秴绾х鐞嗗憳锛�")
}else{
- var upp = "id="+add4+"&name="+add1+"&phone="+add2+"&juese="+add3+"&uadd="+add5+"&uupdate="+add6+"&udelete="+add7+"&caozuoname="+getUserName
+ var upp = "id="+add4+"&name="+add1+"&phone="+add2+"&juese="+add3+"&uadd="+add5+"&uupdate="+add6+"&udelete="+add7+"&caozuoname="+getUserName+"&smsreception="+PassOrNotsms
console.log(upp)
$.post("/HxzkFlow/hxzk/UpdateManager",upp,function (data){
@@ -771,7 +801,7 @@
console.log(66666666)
}
}else{
- var upp = "id="+add4+"&name="+add1+"&phone="+add2+"&juese="+add3+"&uadd="+add5+"&uupdate="+add6+"&udelete="+add7+"&caozuoname="+getUserName
+ var upp = "id="+add4+"&name="+add1+"&phone="+add2+"&juese="+add3+"&uadd="+add5+"&uupdate="+add6+"&udelete="+add7+"&caozuoname="+getUserName+"&smsreception="+PassOrNotsms
console.log(upp)
$.post("/HxzkFlow/hxzk/UpdateManager",upp,function (data){
@@ -801,7 +831,10 @@
var PassOrNotadd =$('input[name="uadd"]:checked').val();
var PassOrNotup =$('input[name="uupdate"]:checked').val();
var PassOrNotde =$('input[name="udelete"]:checked').val();
- // console.log(PassOrNotadd)
+ var PassOrNotsms =$('input[name="smsreception"]:checked').val();
+
+
+ console.log(PassOrNotadd)
// console.log(PassOrNotup)
// console.log(PassOrNotde)
// var add5 = PassOrNotadd
@@ -815,6 +848,7 @@
var add5 = PassOrNotadd
var add6 = PassOrNotup
var add7 = PassOrNotde
+
if(!add5 ){
layer.alert("璇烽�夋嫨鏂板鏉冮檺")
return false;
@@ -823,6 +857,9 @@
return false;
}else if(!add7){
layer.alert("璇烽�夋嫨鍒犻櫎鏉冮檺")
+ return false;
+ }else if(!PassOrNotsms){
+ layer.alert("璇烽�夋嫨鐭俊鎺ユ敹鏉冮檺")
return false;
}
@@ -871,7 +908,7 @@
break;
}else {
console.log("33333332")
- var upp = "name="+add1+"&phone="+add2+"&juese="+add3+"&uadd="+add5+"&uupdate="+add6+"&udelete="+add7+"&caozuoname="+getUserName
+ var upp = "name="+add1+"&phone="+add2+"&juese="+add3+"&uadd="+add5+"&uupdate="+add6+"&udelete="+add7+"&caozuoname="+getUserName+"&smsreception="+PassOrNotsms
$.post("/HxzkFlow/hxzk/addManager",upp,function (data){
})
@@ -880,7 +917,7 @@
}
}else{
console.log("33333332")
- var upp = "name="+add1+"&phone="+add2+"&juese="+add3+"&uadd="+add5+"&uupdate="+add6+"&udelete="+add7+"&caozuoname="+getUserName
+ var upp = "name="+add1+"&phone="+add2+"&juese="+add3+"&uadd="+add5+"&uupdate="+add6+"&udelete="+add7+"&caozuoname="+getUserName+"&smsreception="+PassOrNotsms
$.post("/HxzkFlow/hxzk/addManager",upp,function (data){
})
--
Gitblit v1.9.3