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/resources/spring-servlet.xml | 1
src/webapp/page/Duanxinlog.jsp | 14
src/main/java/com/flow/service/impl/CardServiceImpl.java | 11
src/webapp/page/Fuwuqi.jsp | 137 ++++++--
src/main/java/com/flow/pojo/Duanxinlog.java | 6
src/webapp/page/setting.jsp | 2
src/webapp/page/KaiPiaoJiLu.jsp | 2
src/main/java/com/flow/mapper/CardMapper.java | 8
src/main/java/com/flow/mapper/LoginJiLuMapper.java | 2
src/webapp/page/loginJiLu.jsp | 4
src/main/java/com/flow/service/impl/CompanyServiceImpl.java | 2
src/webapp/page/ChongZhi.jsp | 12
src/main/java/com/flow/controller/IndexController.java | 107 +++---
src/main/java/com/flow/quartz/MyJob.java | 253 +++++++-------
src/webapp/page/Gongs.jsp | 73 ++-
src/webapp/page/error.jsp | 11
src/main/java/com/flow/mapper/DuanxinlogMapper.java | 2
src/main/java/com/flow/controller/DuanxinlogController.java | 42 ++
src/main/java/com/flow/controller/TbFuwuqiController.java | 1
src/webapp/page/index1.jsp | 256 ++++++++++-----
20 files changed, 579 insertions(+), 367 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()+"鍒版湡锛屼负閬垮厤褰卞搷鎮ㄧ殑姝ｅ父浣跨敤璇峰強鏃剁画璐癸紝鎮ㄥ彲鐧诲綍鍗庢槦鏅烘帶鍏徃鐗╄仈缃戠鐞嗗钩鍙版煡璇㈣鎯呯画璐癸紝濡傛湁鐤戦棶鍙挩璇㈡垜鍏徃瀹㈡湇浜哄憳锛岀鎮ㄧ敓娲绘剦蹇紒");
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()+"鍒版湡锛屼负閬垮厤褰卞搷鎮ㄧ殑姝ｅ父浣跨敤璇峰強鏃剁画璐癸紝鎮ㄥ彲鐧诲綍鍗庢槦鏅烘帶鍏徃鐗╄仈缃戠鐞嗗钩鍙版煡璇㈣鎯呯画璐癸紝濡傛湁鐤戦棶鍙挩璇㈡垜鍏徃瀹㈡湇浜哄憳锛岀鎮ㄧ敓娲绘剦蹇紒"
+ );
this.duanxinlogService.addDuanxinlog(duanxinlog);
}
}
+
}
}
diff --git a/src/main/java/com/flow/controller/IndexController.java b/src/main/java/com/flow/controller/IndexController.java
index 7cecefe..27c254f 100644
--- a/src/main/java/com/flow/controller/IndexController.java
+++ b/src/main/java/com/flow/controller/IndexController.java
@@ -15,6 +15,7 @@
import com.flow.util.result;
import com.flow.util.resultutil;
import com.github.pagehelper.PageInfo;
+
import java.io.BufferedReader;
import java.io.InputStreamReader;
import java.net.HttpURLConnection;
@@ -26,6 +27,7 @@
import java.util.*;
import javax.crypto.Mac;
import javax.crypto.spec.SecretKeySpec;
+
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
@@ -56,35 +58,39 @@
public result<List<Card>> FindCard(Integer page, Integer limit) throws Exception {
PageInfo<Card> cz = this.cardService.FindCarda(page, limit);
- for(int i = 0; i < cz.getSize(); ++i) {
- if (((Card)cz.getList().get(i)).getCompany() != null) {
- ((Card)cz.getList().get(i)).setZflow(((Card)cz.getList().get(i)).getZflow() / 1024);
- ((Card)cz.getList().get(i)).setSyflow(((Card)cz.getList().get(i)).getSyflow() / 1024);
- ((Card)cz.getList().get(i)).setSyll(((Card)cz.getList().get(i)).getZflow() - ((Card)cz.getList().get(i)).getSyflow());
+ for (int i = 0; i < cz.getSize(); ++i) {
+ if (((Card) cz.getList().get(i)).getCompany() != null) {
+ ((Card) cz.getList().get(i)).setZflow(((Card) cz.getList().get(i)).getZflow() / 1024);
+ ((Card) cz.getList().get(i)).setSyflow(((Card) cz.getList().get(i)).getSyflow() / 1024);
+ ((Card) cz.getList().get(i)).setSyll(((Card) cz.getList().get(i)).getZflow() - ((Card) cz.getList().get(i)).getSyflow());
+
+ if (((Card) cz.getList().get(i)).getBindid() == null || ((Card) cz.getList().get(i)).getBindid().equals("undefined")) {
+ ((Card) cz.getList().get(i)).setBindid("鏈煡");
+ }
SimpleDateFormat date2 = new SimpleDateFormat("yyyy-MM-dd");
Date date = new Date();
- if (cz.getList().get(i).getEnddate()!=null){
- if (cz.getList().get(i).getFlow()==null){
- ((Card)cz.getList().get(i)).setFlow("12G/骞�");
- this.cardService.UpdateCard((Card)cz.getList().get(i));
+ if (cz.getList().get(i).getEnddate() != null) {
+ if (cz.getList().get(i).getFlow() == null) {
+ ((Card) cz.getList().get(i)).setFlow("12G/骞�");
+ this.cardService.UpdateCard((Card) cz.getList().get(i));
}
- if (cz.getList().get(i).getUnitprice()==null){
- ((Card)cz.getList().get(i)).setUnitprice(80);
- this.cardService.UpdateCard((Card)cz.getList().get(i));
+ if (cz.getList().get(i).getUnitprice() == null) {
+ ((Card) cz.getList().get(i)).setUnitprice(80);
+ this.cardService.UpdateCard((Card) cz.getList().get(i));
}
System.out.println(cz.getList().get(i).getEnddate());
- if (cz.getList().get(i).getEnddate()!=null){
+ if (cz.getList().get(i).getEnddate() != null) {
Date endDay = date2.parse(cz.getList().get(i).getEnddate());//缁撴潫鏃堕棿
Long starTime = date.getTime();
Long endTime = endDay.getTime();
Long num11 = endTime - starTime;//鏃堕棿鎴�
- if ((num11/24/60/60/1000)<0){
- ((Card)cz.getList().get(i)).setRemainingdays("0澶�");
- }else{
- ((Card)cz.getList().get(i)).setRemainingdays(+num11/24/60/60/1000+"澶�");
+ if ((num11 / 24 / 60 / 60 / 1000) < 0) {
+ ((Card) cz.getList().get(i)).setRemainingdays("0澶�");
+ } else {
+ ((Card) cz.getList().get(i)).setRemainingdays(+num11 / 24 / 60 / 60 / 1000 + "澶�");
}
- if (!((Card)cz.getList().get(i)).getRemainingdays().equals("0澶�") || !((Card)cz.getList().get(i)).getRemainingdays().equals(+num11/24/60/60/1000+"澶�") ){
- this.cardService.UpdateCard((Card)cz.getList().get(i));
+ if (!((Card) cz.getList().get(i)).getRemainingdays().equals("0澶�") || !((Card) cz.getList().get(i)).getRemainingdays().equals(+num11 / 24 / 60 / 60 / 1000 + "澶�")) {
+ this.cardService.UpdateCard((Card) cz.getList().get(i));
}
}
@@ -106,25 +112,25 @@
public result<List<Card>> FindCardZi(String Zong, Integer page, Integer limit) throws Exception {
PageInfo<Card> cz = this.cardService.FindCardaZi(Zong, page, limit);
- for(int i = 0; i < cz.getSize(); ++i) {
- if (((Card)cz.getList().get(i)).getCompany() != null) {
- ((Card)cz.getList().get(i)).setZflow(((Card)cz.getList().get(i)).getZflow() / 1024);
- ((Card)cz.getList().get(i)).setSyflow(((Card)cz.getList().get(i)).getSyflow() / 1024);
- ((Card)cz.getList().get(i)).setSyll(((Card)cz.getList().get(i)).getZflow() - ((Card)cz.getList().get(i)).getSyflow());
+ for (int i = 0; i < cz.getSize(); ++i) {
+ if (((Card) cz.getList().get(i)).getCompany() != null) {
+ ((Card) cz.getList().get(i)).setZflow(((Card) cz.getList().get(i)).getZflow() / 1024);
+ ((Card) cz.getList().get(i)).setSyflow(((Card) cz.getList().get(i)).getSyflow() / 1024);
+ ((Card) cz.getList().get(i)).setSyll(((Card) cz.getList().get(i)).getZflow() - ((Card) cz.getList().get(i)).getSyflow());
SimpleDateFormat date2 = new SimpleDateFormat("yyyy-MM-dd");
Date date = new Date();
- if (cz.getList().get(i).getEnddate()!=null){
+ if (cz.getList().get(i).getEnddate() != null) {
Date endDay = date2.parse(cz.getList().get(i).getEnddate());//缁撴潫鏃堕棿
Long starTime = date.getTime();
Long endTime = endDay.getTime();
Long num11 = endTime - starTime;//鏃堕棿鎴�
- if ((num11/24/60/60/1000)<0){
- ((Card)cz.getList().get(i)).setRemainingdays("0澶�");
- }else{
- ((Card)cz.getList().get(i)).setRemainingdays(+num11/24/60/60/1000+"澶�");
+ if ((num11 / 24 / 60 / 60 / 1000) < 0) {
+ ((Card) cz.getList().get(i)).setRemainingdays("0澶�");
+ } else {
+ ((Card) cz.getList().get(i)).setRemainingdays(+num11 / 24 / 60 / 60 / 1000 + "澶�");
}
- if (!((Card)cz.getList().get(i)).getRemainingdays().equals("0澶�") || !((Card)cz.getList().get(i)).getRemainingdays().equals(+num11/24/60/60/1000+"澶�") ){
- this.cardService.UpdateCard((Card)cz.getList().get(i));
+ if (!((Card) cz.getList().get(i)).getRemainingdays().equals("0澶�") || !((Card) cz.getList().get(i)).getRemainingdays().equals(+num11 / 24 / 60 / 60 / 1000 + "澶�")) {
+ this.cardService.UpdateCard((Card) cz.getList().get(i));
}
}
}
@@ -151,6 +157,7 @@
this.cardService.UpdateCardChong(card);
ModelAndView modelAndView = new ModelAndView();
modelAndView.setViewName("/page/index1.jsp");
+ modelAndView.addObject("operatornum", 2);
return modelAndView;
}
@@ -164,7 +171,7 @@
int i;
Card card1;
if (str.length > 1 && str1.length > 1) {
- for(i = 0; i < str.length; ++i) {
+ for (i = 0; i < str.length; ++i) {
card1 = new Card();
card1.setCompany(card.getCompany());
card1.setCardnumber(str[i]);
@@ -179,7 +186,7 @@
this.cardService.addCard(card1);
}
} else if (str.length > 1 && str1[0] == "") {
- for(i = 0; i < str.length; ++i) {
+ for (i = 0; i < str.length; ++i) {
card1 = new Card();
card1.setCompany(card.getCompany());
card1.setCardnumber(str[i]);
@@ -194,7 +201,7 @@
this.cardService.addCard(card1);
}
} else if (str.length > 1 && str1.length == 1) {
- for(i = 0; i < str.length; ++i) {
+ for (i = 0; i < str.length; ++i) {
card1 = new Card();
card1.setCompany(card.getCompany());
card1.setCardnumber(str[i]);
@@ -209,7 +216,7 @@
this.cardService.addCard(card1);
}
} else {
- if (card.getCardnumber()!=null){
+ if (card.getCardnumber() != null && card.getCardnumber() != "") {
card.setCompany(card.getCompany());
this.cardService.addCard(card);
}
@@ -223,24 +230,24 @@
public result<List<Card>> tableSearch(Card card, int page, int limit) throws Exception {
PageInfo<Card> cz = this.cardService.tableSearch(card, page, limit);
- for(int i = 0; i < cz.getSize(); ++i) {
- ((Card)cz.getList().get(i)).setZflow(((Card)cz.getList().get(i)).getZflow() / 1024);
- ((Card)cz.getList().get(i)).setSyflow(((Card)cz.getList().get(i)).getSyflow() / 1024);
- ((Card)cz.getList().get(i)).setSyll(((Card)cz.getList().get(i)).getSyll() / 1024);
+ for (int i = 0; i < cz.getSize(); ++i) {
+ ((Card) cz.getList().get(i)).setZflow(((Card) cz.getList().get(i)).getZflow() / 1024);
+ ((Card) cz.getList().get(i)).setSyflow(((Card) cz.getList().get(i)).getSyflow() / 1024);
+ ((Card) cz.getList().get(i)).setSyll(((Card) cz.getList().get(i)).getSyll() / 1024);
SimpleDateFormat date2 = new SimpleDateFormat("yyyy-MM-dd");
Date date = new Date();
- if (cz.getList().get(i).getEnddate()!=null){
+ if (cz.getList().get(i).getEnddate() != null) {
Date endDay = date2.parse(cz.getList().get(i).getEnddate());//缁撴潫鏃堕棿
Long starTime = date.getTime();
Long endTime = endDay.getTime();
Long num11 = endTime - starTime;//鏃堕棿鎴�
- if ((num11/24/60/60/1000)<0){
- ((Card)cz.getList().get(i)).setRemainingdays("0澶�");
- }else{
- ((Card)cz.getList().get(i)).setRemainingdays(+num11/24/60/60/1000+"澶�");
+ if ((num11 / 24 / 60 / 60 / 1000) < 0) {
+ ((Card) cz.getList().get(i)).setRemainingdays("0澶�");
+ } else {
+ ((Card) cz.getList().get(i)).setRemainingdays(+num11 / 24 / 60 / 60 / 1000 + "澶�");
}
- if (!((Card)cz.getList().get(i)).getRemainingdays().equals("0澶�") || !((Card)cz.getList().get(i)).getRemainingdays().equals(+num11/24/60/60/1000+"澶�") ){
- this.cardService.UpdateCard((Card)cz.getList().get(i));
+ if (!((Card) cz.getList().get(i)).getRemainingdays().equals("0澶�") || !((Card) cz.getList().get(i)).getRemainingdays().equals(+num11 / 24 / 60 / 60 / 1000 + "澶�")) {
+ this.cardService.UpdateCard((Card) cz.getList().get(i));
}
}
@@ -271,7 +278,7 @@
int length = 30;
Random random = new Random();
- for(int i = length; i > 0; --i) {
+ for (int i = length; i > 0; --i) {
int index = random.nextInt(str.length());
nonce = nonce + str.charAt(index);
}
@@ -284,7 +291,7 @@
String sign = Base64.getEncoder().encodeToString(hmacBytes);
String targetUrl = "https://api.spruceiot.cn/api/v1/sim/list/query?pageIndex=1&pageSize=1";
URL url = new URL(targetUrl);
- HttpURLConnection connection = (HttpURLConnection)url.openConnection();
+ HttpURLConnection connection = (HttpURLConnection) url.openConnection();
connection.setRequestProperty("Accept-Charset", "UTF-8");
connection.setRequestProperty("Content-Type", "application/json; charset=UTF-8");
connection.setRequestProperty("Access-Control-Allow-Origin", "http://localhost:8080");
@@ -297,7 +304,7 @@
StringBuilder response1 = new StringBuilder();
String line;
- while((line = reader.readLine()) != null) {
+ while ((line = reader.readLine()) != null) {
response1.append(line);
}
@@ -310,7 +317,7 @@
int total1 = result.getInt("total");
JSONArray list = result.getJSONArray("list");
- for(int i = 0; i < list.size(); ++i) {
+ for (int i = 0; i < list.size(); ++i) {
JSONObject item = list.getJSONObject(i);
String msisdn = item.getStr("msisdn");
String iccid = item.getStr("iccid");
diff --git a/src/main/java/com/flow/controller/TbFuwuqiController.java b/src/main/java/com/flow/controller/TbFuwuqiController.java
index e992fcc..c17ac30 100644
--- a/src/main/java/com/flow/controller/TbFuwuqiController.java
+++ b/src/main/java/com/flow/controller/TbFuwuqiController.java
@@ -85,7 +85,6 @@
this.tbFuwuqiService.addTbFuwuqi(tbFuwuqi);
modelAndView.addObject("suoshu", this.companyService.findSuoShu());
modelAndView.setViewName("/page/Fuwuqi.jsp");
-
return modelAndView;
}
diff --git a/src/main/java/com/flow/mapper/CardMapper.java b/src/main/java/com/flow/mapper/CardMapper.java
index dd30f6c..10530d1 100644
--- a/src/main/java/com/flow/mapper/CardMapper.java
+++ b/src/main/java/com/flow/mapper/CardMapper.java
@@ -48,9 +48,9 @@
@Select({"SELECT count(*) FROM card WHERE syflow < '2G' and none = 0 and company = #{zi}"})
int findCardNum5z(String var1);
- @Select({"SELECT * FROM card WHERE none = 0 and cardnumber LIKE CONCAT('%', #{number}, '%') and company = #{company} OR notes LIKE CONCAT('%', #{notes}, '%')"})
- List<Card> FindSearch(@Param("number") String var1, @Param("company") String var2, @Param("notes") String var3);
+ @Select({"SELECT * FROM card WHERE none = 0 and cardnumber LIKE CONCAT('%', #{number}, '%') and company = #{company}"})
+ List<Card> FindSearch(@Param("number") String var1, @Param("company") String var2);
- @Select({"SELECT * FROM card WHERE none = 0 and cardnumber LIKE CONCAT('%', #{number}, '%') OR notes LIKE CONCAT('%', #{notes}, '%')"})
- List<Card> FindSearch1(@Param("number") String var1, @Param("notes") String var3);
+ @Select({"SELECT * FROM card WHERE none = 0 and cardnumber LIKE CONCAT('%', #{number}, '%')"})
+ List<Card> FindSearch1(@Param("number") String var1);
}
diff --git a/src/main/java/com/flow/mapper/DuanxinlogMapper.java b/src/main/java/com/flow/mapper/DuanxinlogMapper.java
index f1b816b..5fcbd84 100644
--- a/src/main/java/com/flow/mapper/DuanxinlogMapper.java
+++ b/src/main/java/com/flow/mapper/DuanxinlogMapper.java
@@ -12,6 +12,6 @@
List<Duanxinlog> FindDuanxinlog();
- @Select({"SELECT dispatchDate FROM tb_duanxinlog where number = #{Zong} ORDER BY dispatchDate DESC LIMIT 0 , 1"})
+ @Select({"SELECT dispatchDate FROM tb_duanxinlog where identification = #{Zong} ORDER BY dispatchDate DESC LIMIT 0 , 1"})
String userdate(String var1);
}
diff --git a/src/main/java/com/flow/mapper/LoginJiLuMapper.java b/src/main/java/com/flow/mapper/LoginJiLuMapper.java
index 9de6490..1446ba8 100644
--- a/src/main/java/com/flow/mapper/LoginJiLuMapper.java
+++ b/src/main/java/com/flow/mapper/LoginJiLuMapper.java
@@ -11,7 +11,7 @@
import org.apache.ibatis.annotations.Select;
public interface LoginJiLuMapper extends BaseMapper<Loginjilu> {
- @Select({"select * from loginjilu where none = 0"})
+ @Select({"select * from loginjilu where none = 0 ORDER BY LoginDate DESC"})
List<Loginjilu> findAllLoginJiLu();
@Select({"select * from loginjilu where none = 0 and LoginCompany = #{Zong}"})
diff --git a/src/main/java/com/flow/pojo/Duanxinlog.java b/src/main/java/com/flow/pojo/Duanxinlog.java
index 72b454c..5bc20c3 100644
--- a/src/main/java/com/flow/pojo/Duanxinlog.java
+++ b/src/main/java/com/flow/pojo/Duanxinlog.java
@@ -3,7 +3,9 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+@Data
@TableName("tb_duanxinlog")
public class Duanxinlog {
@TableId(type = IdType.AUTO)
@@ -18,6 +20,9 @@
private String dispatchdate;
private String none;
+
+ private String identification;
+
public Duanxinlog() {
}
@@ -68,4 +73,5 @@
public void setNone(String none) {
this.none = none;
}
+
}
diff --git a/src/main/java/com/flow/quartz/MyJob.java b/src/main/java/com/flow/quartz/MyJob.java
index b0efb3f..b3638bc 100644
--- a/src/main/java/com/flow/quartz/MyJob.java
+++ b/src/main/java/com/flow/quartz/MyJob.java
@@ -9,6 +9,7 @@
import cn.hutool.json.JSONObject;
import com.flow.pojo.Card;
import com.flow.service.CardService;
+
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStreamReader;
@@ -28,6 +29,7 @@
import java.util.concurrent.TimeUnit;
import javax.crypto.Mac;
import javax.crypto.spec.SecretKeySpec;
+
import org.springframework.beans.factory.annotation.Autowired;
public class MyJob {
@@ -48,7 +50,7 @@
int length = 30;
Random random = new Random();
- for(int i = length; i > 0; --i) {
+ for (int i = length; i > 0; --i) {
int index = random.nextInt(str.length());
nonce = nonce + str.charAt(index);
}
@@ -61,7 +63,7 @@
String sign = Base64.getEncoder().encodeToString(hmacBytes);
String targetUrl = "https://api.spruceiot.cn/api/v1/sim/list/query?pageIndex=1&pageSize=10";
URL url = new URL(targetUrl);
- HttpURLConnection connection = (HttpURLConnection)url.openConnection();
+ HttpURLConnection connection = (HttpURLConnection) url.openConnection();
connection.setRequestProperty("Accept-Charset", "UTF-8");
connection.setRequestProperty("Content-Type", "application/json; charset=UTF-8");
connection.setRequestProperty("Access-Control-Allow-Origin", "http://localhost:8080");
@@ -74,7 +76,7 @@
StringBuilder response1 = new StringBuilder();
String line;
- while((line = reader.readLine()) != null) {
+ while ((line = reader.readLine()) != null) {
response1.append(line);
}
@@ -87,7 +89,7 @@
int total1 = result.getInt("total");
JSONArray list = result.getJSONArray("list");
System.out.println("瀹氭椂鍣ㄦ墽琛屾垚鍔燂紒鏇存柊鏁版嵁");
- int num = total1;
+ int num = total1; //绗笁鏂规墍鏈夊崱鍙�
int t = 0;
int total = 90;
int num1 = 0;
@@ -99,25 +101,28 @@
String stringSignTemp1;
String line1;
String stt1;
- while(numm < num) {
+ while (numm < num) {
++num1;
System.out.println("绗�" + num1 + "娆¤皟鐢ㄦ帴鍙ｄ粠" + t + "鍒�" + total + "缁撴潫:鎬绘潯鏁�" + num);
List<Card> card = this.cardService.proxyfindCard();
- String stt = "";
+ String stt = ""; //浠庢暟鎹簱鏌ヨ鐨勫崱鍙�
- for(int i = t; i < total; ++i) {
+ for (int i = t; i < total; ++i) {
++numm;
if (numm == 90) {
- stt = stt + ((Card)card.get(i)).getCardnumber();
+ stt = stt + ((Card) card.get(i)).getCardnumber();
} else {
- stt = stt + ((Card)card.get(i)).getCardnumber() + ",";
+ if (card.size() <= i) {
+ break;
+ } else {
+ stt = stt + ((Card) card.get(i)).getCardnumber() + ",";
+ }
+
}
}
-
- System.out.println(stt);
stt1 = "";
- for(int i = length; i > 0; --i) {
+ for (int i = length; i > 0; --i) {
index = random.nextInt(str.length());
stt1 = stt1 + str.charAt(index);
}
@@ -126,13 +131,13 @@
SimpleDateFormat dateFormat1 = new SimpleDateFormat("yyyyMMddHHmmss");
nonce1 = dateFormat1.format(now1);
stringSignTemp1 = accessKey + stt1 + nonce1;
- System.out.println(nonce1);
+
byte[] hmacBytes1 = sha256Hmac.doFinal(stringSignTemp1.getBytes(StandardCharsets.UTF_8));
Timestamp1 = Base64.getEncoder().encodeToString(hmacBytes1);
stringSignTemp1 = "https://api.spruceiot.cn/api/v1/sim/detail/batch/query";
- stringSignTemp1 = stringSignTemp1 + "?cNo=" + stt;
+ stringSignTemp1 = stringSignTemp1 + "?cNo=" + stt.replaceAll("\\s+", "");
URL url1 = new URL(stringSignTemp1);
- HttpURLConnection connection1 = (HttpURLConnection)url1.openConnection();
+ HttpURLConnection connection1 = (HttpURLConnection) url1.openConnection();
connection1.setRequestProperty("Accept-Charset", "UTF-8");
connection1.setRequestProperty("Content-Type", "application/json; charset=UTF-8");
connection1.setRequestProperty("Access-Control-Allow-Origin", "http://localhost:8080");
@@ -145,7 +150,7 @@
StringBuilder response11 = new StringBuilder();
- while((line1 = reader1.readLine()) != null) {
+ while ((line1 = reader1.readLine()) != null) {
response11.append(line1);
}
@@ -157,120 +162,114 @@
JSONArray resultArray = jsonObject1.getJSONArray("result");
Calendar calendar = Calendar.getInstance();
SimpleDateFormat date1 = new SimpleDateFormat("yyyy-MM-dd :hh:mm:ss");
-
- for(int i = 0; i < resultArray.size(); ++i) {
- Card cardl = new Card();
- JSONObject item1 = resultArray.getJSONObject(i);
- cardl.setCardnumber(item1.getStr("iccid"));
- cardl.setOperator(item1.getStr("operators"));
- cardl.setCarddate(item1.getStr("serviceStartDate"));
- cardl.setEnddate(item1.getStr("serviceEndDate"));
- cardl.setEnterdate(item1.getStr("serviceStartDate"));
- cardl.setZflow(item1.getInt("dataLimit"));
- cardl.setSyflow(item1.getInt("dataUsage"));
- cardl.setSyll(item1.getInt("dataLimit") - item1.getInt("dataUsage"));
- cardl.setStatus(item1.getStr("status"));
- cardl.setIccid(item1.getStr("msisdn"));
-// Date date = new Date();
-// Date endDay=date1.parse(cardl.getEnddate());//缁撴潫鏃堕棿
-// Long starTime = date.getTime();
-// Long endTime=endDay.getTime();
-// Long num11=endTime-starTime;//鏃堕棿鎴崇浉宸殑姣鏁�
-// cardl.setRemainingdays(+num11/24/60/60/1000+"澶�");
-// cardl.setUptime(date1.format(calendar.getTime()));
- this.cardService.proxyupXinXi(cardl);
+ if (resultArray!=null) {
+ for (int i = 0; i < resultArray.size(); ++i) {
+ Card cardl = new Card();
+ JSONObject item1 = resultArray.getJSONObject(i);
+ cardl.setCardnumber(item1.getStr("iccid"));
+ cardl.setOperator(item1.getStr("operators"));
+ cardl.setCarddate(item1.getStr("serviceStartDate"));
+ cardl.setEnddate(item1.getStr("serviceEndDate"));
+ cardl.setEnterdate(item1.getStr("serviceStartDate"));
+ cardl.setZflow(item1.getInt("dataLimit"));
+ cardl.setSyflow(item1.getInt("dataUsage"));
+ cardl.setSyll(item1.getInt("dataLimit") - item1.getInt("dataUsage"));
+ cardl.setStatus(item1.getStr("status"));
+ cardl.setIccid(item1.getStr("msisdn"));
+ this.cardService.proxyupXinXi(cardl);
+ }
+ t += 90;
+ total += 90;
+ try {
+ TimeUnit.SECONDS.sleep(12L);
+ } catch (InterruptedException var59) {
+ var59.printStackTrace();
+ }
+ }else{
+ break;
}
- t += 90;
- total += 90;
-
- try {
- TimeUnit.SECONDS.sleep(12L);
- } catch (InterruptedException var59) {
- var59.printStackTrace();
- }
}
-
- int sheng = num % 90;
- List<Card> card = this.cardService.proxyfindCard();
- stt1 = "";
- int i = 0;
- index = sheng - 1;
-
- for(int j = num - sheng; j < num - 1; ++j) {
- ++i;
- if (i == index) {
- stt1 = stt1 + ((Card)card.get(j)).getCardnumber();
- } else {
- stt1 = stt1 + ((Card)card.get(j)).getCardnumber() + ",";
- }
- }
-
- nonce1 = "";
-
- for( i = length; i > 0; --i) {
- index = random.nextInt(str.length());
- nonce1 = nonce1 + str.charAt(index);
- }
-
- Date now1 = new Date();
- SimpleDateFormat dateFormat1 = new SimpleDateFormat("yyyyMMddHHmmss");
- Timestamp1 = dateFormat1.format(now1);
- stringSignTemp1 = accessKey + nonce1 + Timestamp1;
- System.out.println(Timestamp1);
- byte[] hmacBytes1 = sha256Hmac.doFinal(stringSignTemp1.getBytes(StandardCharsets.UTF_8));
- String sign1 = Base64.getEncoder().encodeToString(hmacBytes1);
- String targetUrl1 = "https://api.spruceiot.cn/api/v1/sim/detail/batch/query";
- targetUrl1 = targetUrl1 + "?cNo=" + stt1;
- URL url1 = new URL(targetUrl1);
- HttpURLConnection connection1 = (HttpURLConnection)url1.openConnection();
- connection1.setRequestProperty("Accept-Charset", "UTF-8");
- connection1.setRequestProperty("Content-Type", "application/json; charset=UTF-8");
- connection1.setRequestProperty("Access-Control-Allow-Origin", "http://localhost:8080");
- connection1.setRequestProperty("AccessKey", accessKey);
- connection1.setRequestProperty("Nonce", nonce1);
- connection1.setRequestProperty("Timestamp", Timestamp1);
- connection1.setRequestProperty("Sign", sign1);
- connection1.connect();
- BufferedReader reader1 = new BufferedReader(new InputStreamReader(connection1.getInputStream(), "UTF-8"));
- StringBuilder response11 = new StringBuilder();
-
- while((line1 = reader1.readLine()) != null) {
- response11.append(line1);
- }
-
- reader1.close();
- connection1.disconnect();
- JSONObject jsonObject1 = new JSONObject(response11);
- int code1 = jsonObject1.getInt("code");
- String message1 = jsonObject1.getStr("message");
- JSONArray resultArray = jsonObject1.getJSONArray("result");
- Calendar calendar = Calendar.getInstance();
- SimpleDateFormat date2 = new SimpleDateFormat("yyyy-MM-dd :hh:mm:ss");
-
- for( i = 0; i < resultArray.size(); ++i) {
- Card cardl = new Card();
- JSONObject item1 = resultArray.getJSONObject(i);
- cardl.setCardnumber(item1.getStr("iccid"));
- cardl.setOperator(item1.getStr("operators"));
- cardl.setCarddate(item1.getStr("serviceStartDate"));
- cardl.setEnddate(item1.getStr("serviceEndDate"));
- cardl.setEnterdate(item1.getStr("serviceStartDate"));
- cardl.setZflow(item1.getInt("dataLimit"));
- cardl.setSyflow(item1.getInt("dataUsage"));
- cardl.setStatus(item1.getStr("status"));
- cardl.setIccid(item1.getStr("msisdn"));
- cardl.setSyll(item1.getInt("dataLimit") - item1.getInt("dataUsage"));
-
-// Date date = new Date();
-// Date endDay=date2.parse(cardl.getEnddate());//缁撴潫鏃堕棿
-// Long starTime = date.getTime();
-// Long endTime=endDay.getTime();
-// Long num11=endTime-starTime;//鏃堕棿鎴崇浉宸殑姣鏁�
-// cardl.setRemainingdays(+num11/24/60/60/1000+"澶�");
-// cardl.setUptime(date2.format(calendar.getTime()));
- this.cardService.proxyupXinXi(cardl);
- }
+//
+// int sheng = num % 90;
+// List<Card> card = this.cardService.proxyfindCard();
+// stt1 = "";
+// int i = 0;
+// index = sheng - 1;
+//
+// for (int j = num - sheng; j < num - 1; ++j) {
+// ++i;
+// if (i == index) {
+// stt1 = stt1 + ((Card) card.get(j)).getCardnumber();
+// } else {
+// stt1 = stt1 + ((Card) card.get(j)).getCardnumber() + ",";
+// }
+// }
+//
+// nonce1 = "";
+//
+// for (i = length; i > 0; --i) {
+// index = random.nextInt(str.length());
+// nonce1 = nonce1 + str.charAt(index);
+// }
+//
+// Date now1 = new Date();
+// SimpleDateFormat dateFormat1 = new SimpleDateFormat("yyyyMMddHHmmss");
+// Timestamp1 = dateFormat1.format(now1);
+// stringSignTemp1 = accessKey + nonce1 + Timestamp1;
+// byte[] hmacBytes1 = sha256Hmac.doFinal(stringSignTemp1.getBytes(StandardCharsets.UTF_8));
+// String sign1 = Base64.getEncoder().encodeToString(hmacBytes1);
+// String targetUrl1 = "https://api.spruceiot.cn/api/v1/sim/detail/batch/query";
+// targetUrl1 = targetUrl1 + "?cNo=" + stt1.replaceAll("\\s+", "");
+// URL url1 = new URL(targetUrl1);
+// HttpURLConnection connection1 = (HttpURLConnection) url1.openConnection();
+// connection1.setRequestProperty("Accept-Charset", "UTF-8");
+// connection1.setRequestProperty("Content-Type", "application/json; charset=UTF-8");
+// connection1.setRequestProperty("Access-Control-Allow-Origin", "http://localhost:8080");
+// connection1.setRequestProperty("AccessKey", accessKey);
+// connection1.setRequestProperty("Nonce", nonce1);
+// connection1.setRequestProperty("Timestamp", Timestamp1);
+// connection1.setRequestProperty("Sign", sign1);
+// connection1.connect();
+// BufferedReader reader1 = new BufferedReader(new InputStreamReader(connection1.getInputStream(), "UTF-8"));
+// StringBuilder response11 = new StringBuilder();
+//
+// while ((line1 = reader1.readLine()) != null) {
+// response11.append(line1);
+// }
+//
+// reader1.close();
+// connection1.disconnect();
+// JSONObject jsonObject1 = new JSONObject(response11);
+// int code1 = jsonObject1.getInt("code");
+// String message1 = jsonObject1.getStr("message");
+// JSONArray resultArray = jsonObject1.getJSONArray("result");
+// Calendar calendar = Calendar.getInstance();
+// SimpleDateFormat date2 = new SimpleDateFormat("yyyy-MM-dd :hh:mm:ss");
+//
+// for (i = 0; i < resultArray.size(); ++i) {
+// Card cardl = new Card();
+// JSONObject item1 = resultArray.getJSONObject(i);
+// cardl.setCardnumber(item1.getStr("iccid"));
+// cardl.setOperator(item1.getStr("operators"));
+// cardl.setCarddate(item1.getStr("serviceStartDate"));
+// cardl.setEnddate(item1.getStr("serviceEndDate"));
+// cardl.setEnterdate(item1.getStr("serviceStartDate"));
+// cardl.setZflow(item1.getInt("dataLimit"));
+// cardl.setSyflow(item1.getInt("dataUsage"));
+// cardl.setStatus(item1.getStr("status"));
+// cardl.setIccid(item1.getStr("msisdn"));
+// cardl.setSyll(item1.getInt("dataLimit") - item1.getInt("dataUsage"));
+//
+//// Date date = new Date();
+//// Date endDay=date2.parse(cardl.getEnddate());//缁撴潫鏃堕棿
+//// Long starTime = date.getTime();
+//// Long endTime=endDay.getTime();
+//// Long num11=endTime-starTime;//鏃堕棿鎴崇浉宸殑姣鏁�
+//// cardl.setRemainingdays(+num11/24/60/60/1000+"澶�");
+//// cardl.setUptime(date2.format(calendar.getTime()));
+// this.cardService.proxyupXinXi(cardl);
+// }
System.out.println("寰幆缁撴潫,绛夊緟瀹氭椂鍣ㄨЕ鍙戝啀娆¤皟鐢�");
}
diff --git a/src/main/java/com/flow/service/impl/CardServiceImpl.java b/src/main/java/com/flow/service/impl/CardServiceImpl.java
index f1e2952..d48cd14 100644
--- a/src/main/java/com/flow/service/impl/CardServiceImpl.java
+++ b/src/main/java/com/flow/service/impl/CardServiceImpl.java
@@ -65,6 +65,9 @@
public int UpdateCardChong(Card card) {
QueryWrapper queryWrapper = new QueryWrapper();
queryWrapper.eq("cardnumber", card.getCardnumber());
+ Date date = new Date();
+ SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ card.setEnterdate(formatter.format(date));
return ((CardMapper)this.baseMapper).update(card, queryWrapper);
}
@@ -115,14 +118,14 @@
PageInfo<Card> info = null;
if (card.getCardnumber() != "" && card.getCompany() != "") {
if (card.getCompany().equals("鍗庢槦鏅烘帶")){
- info = new PageInfo(this.cardMapper.FindSearch1(card.getCardnumber(), card.getCardnumber()));
+ info = new PageInfo(this.cardMapper.FindSearch1(card.getCardnumber()));
}else{
- info = new PageInfo(this.cardMapper.FindSearch(card.getCardnumber(), card.getCompany(), card.getCardnumber()));
+ info = new PageInfo(this.cardMapper.FindSearch(card.getCardnumber(), card.getCompany()));
}
} else if (card.getCompany() != "") {
if (card.getCompany().equals("鍗庢槦鏅烘帶")) {
- info = new PageInfo(this.cardMapper.FindSearch(card.getCardnumber(), card.getCompany(), card.getCardnumber()));
+ info = new PageInfo(this.cardMapper.FindSearch(card.getCardnumber(), card.getCompany()));
} else {
queryWrapper.like("company", card.getCompany());
queryWrapper.eq("none", 0);
@@ -133,7 +136,7 @@
queryWrapper.eq("none", 0);
info = new PageInfo(((CardMapper)this.baseMapper).selectList(queryWrapper));
}
-
+ System.out.println(info);
return info;
}
diff --git a/src/main/java/com/flow/service/impl/CompanyServiceImpl.java b/src/main/java/com/flow/service/impl/CompanyServiceImpl.java
index b51e68a..41ebc3e 100644
--- a/src/main/java/com/flow/service/impl/CompanyServiceImpl.java
+++ b/src/main/java/com/flow/service/impl/CompanyServiceImpl.java
@@ -82,6 +82,7 @@
}
public int UpdateCard(Company company) throws Exception {
+ System.out.println(company);
QueryWrapper queryWrapper = new QueryWrapper();
queryWrapper.eq("companyId", company.getCompanyid());
Company company1 = new Company();
@@ -93,6 +94,7 @@
company1.setPhone(DESUtil.encrypt(company.getPhone(), this.key));
company1.setAccountbank(DESUtil.encrypt(company.getAccountbank(), this.key));
company1.setShuinum(DESUtil.encrypt(company.getShuinum(), this.key));
+ System.out.println(company1);
return ((CompanyMapper)this.baseMapper).update(company1, queryWrapper);
}
diff --git a/src/main/resources/spring-servlet.xml b/src/main/resources/spring-servlet.xml
index 14e3f69..c25b6ad 100644
--- a/src/main/resources/spring-servlet.xml
+++ b/src/main/resources/spring-servlet.xml
@@ -100,6 +100,7 @@
<!-- 瀹氫箟trigger 瑙﹀彂鍣� -->
<bean id="cronTrigger" class="org.springframework.scheduling.quartz.CronTriggerFactoryBean">
<property name="jobDetail" ref="jobDetail"></property>
+<!-- <property name="cronExpression" value="0 30 14 * * ?"></property>-->
<property name="cronExpression" value="0 0 0 * * ?"></property>
</bean>
diff --git a/src/webapp/page/ChongZhi.jsp b/src/webapp/page/ChongZhi.jsp
index dd082df..ae79c76 100644
--- a/src/webapp/page/ChongZhi.jsp
+++ b/src/webapp/page/ChongZhi.jsp
@@ -31,15 +31,15 @@
</head>
<body style="overflow-x: hidden;overflow-y: hidden">
<div class="layuimini-container">
- <div id="xxs" style="width: 100%;height: 130px;position: absolute;top: 700px;background-color: white;box-shadow: 2px -2px 20px #c2c2c2;display: none"></div>
+ <div id="xxs" style="width: 100%;height: 130px;position: absolute;background-color: white;box-shadow: 2px -2px 20px #c2c2c2;display: none"></div>
<div class="layuimini-main">
- <div class="layui-fluid">
+ <div >
<div class="layui-card">
- <div class="layui-card-body" style="padding-top: 30px;">
- <div class="layui-carousel" id="stepForm" lay-filter="stepForm" style="margin: 0 auto;">
+ <div >
+ <div class="layui-carousel" id="stepForm" lay-filter="stepForm" >
<div carousel-item style="height: 800px">
<div style="background: none">
- <div id="main1" style="">
+ <div id="main1" style="display: inline-block;width: 100%;margin-top: -10px">
<table id="demo" lay-filter="demo"></table>
</div>
<span style="position: relative;top: 10px;left: 1290px;font-size: 16px">宸查�夊緟寮�绁ㄩ噾棰�:<span style="color: orange;font-size: 16px" id="jine">0</span></span>
@@ -361,7 +361,7 @@
table.render({
elem: '#demo'
, layEvent: 'LAYTABLE_TIPS'
- , height: 620
+ , height: 780
, url: '/HxzkFlow/hxzk/FindChongzhi' //鏁版嵁鎺ュ彛
,cellMinWidth: 80
, page: true //寮�鍚垎椤�
diff --git a/src/webapp/page/Duanxinlog.jsp b/src/webapp/page/Duanxinlog.jsp
index 02c3666..f2ec078 100644
--- a/src/webapp/page/Duanxinlog.jsp
+++ b/src/webapp/page/Duanxinlog.jsp
@@ -17,13 +17,13 @@
<body style="width: 100%;text-align: center;overflow:hidden;">
<div style="width: 100%;">
- <div style="margin-top: 0px;width: 100%;overflow:hidden;margin-left: 15px">
- <div style="width:55%;height: 600px;display: inline-block" id="userWidth">
+ <div style="margin-top: -10px;width: 100%;overflow:hidden;">
+ <div style="width:55%;display: inline-block" id="userWidth">
<table id="demo" lay-filter="demo"></table>
</div>
- <div style="width: 40%;height: 600px;display: inline-block;" class="userNo">
- <div id="main" style="width: 100%;height: 600px;"></div>
- </div>
+<%-- <div style="width: 40%;height: 600px;display: inline-block;" class="userNo">--%>
+<%-- <div id="main" style="width: 100%;height: 600px;"></div>--%>
+<%-- </div>--%>
</div>
</div>
<h3 style="position: absolute;top: 210px;left: 400px;z-index: 9999;font-weight: bolder;color: black;display:none" class="userNo">鐭俊璁板綍淇℃伅</h3>
@@ -98,8 +98,8 @@
table.render({
elem: '#demo'
, layEvent: 'LAYTABLE_TIPS'
- , height: 600
- ,cellMinWidth: 80
+ , height: 780
+ // ,cellMinWidth: 80
, url: '/HxzkFlow/hxzk/findDuanxinlog' //鏁版嵁鎺ュ彛
, page: true //寮�鍚垎椤�
, toolbar: '#toolbarDemo'
diff --git a/src/webapp/page/Fuwuqi.jsp b/src/webapp/page/Fuwuqi.jsp
index e8840d1..455b9e1 100644
--- a/src/webapp/page/Fuwuqi.jsp
+++ b/src/webapp/page/Fuwuqi.jsp
@@ -36,13 +36,13 @@
<body>
<form class="layui-form layui-row layui-col-space16" style="width: 1672px;margin-left: 12px;padding-bottom: 10px">
- <div class="layui-col-md4" style="position: relative;top: 89px;z-index: 999;width: 150px;left: 500px">
+ <div class="layui-col-md4" style="position: relative;top: 29px;z-index: 999;width: 150px;left: 500px">
<div class="layui-input-wrap">
<input type="text" name="servername" style="width: 220px" value="" placeholder="璇疯緭鍏ユ湇鍔″櫒鍚嶇О" class="layui-input" lay-affix="clear">
</div>
</div>
<div class="layui-col-md4" style="margin-left: 20px">
- <div class="layui-input-wrap" style="position: relative;top: 89px;z-index: 999;width: 150px;left: 560px">
+ <div class="layui-input-wrap" style="position: relative;top: 29px;z-index: 999;width: 150px;left: 560px">
<input type="text" name="company" style="width: 150px" placeholder="璇疯緭鍏ユ墍灞炲叕鍙�" lay-affix="clear" class="layui-input">
</div>
</div>
@@ -51,13 +51,13 @@
<%-- <input type="text" name="bindid" style="width: 150px" placeholder="璇疯緭鍏ョ粦瀹氳澶�" lay-affix="clear" class="layui-input">--%>
<%-- </div>--%>
<%-- </div>--%>
- <button style="position: relative;top: 96.5px;z-index: 999;width: 70px;left: -400px" id="relo" class="layui-btn layui-btn-normal" lay-filter="demo-table-search1">鍒锋柊</button>
- <button style="position: relative;top: 96.5px;z-index: 999;width: 80px;left: 90px" class="layui-btn layui-btn-normal" lay-submit lay-filter="demo-table-search" lay-event="getselect">鏌ヨ</button>
+ <button style="position: relative;top: 36.5px;z-index: 999;width: 70px;left: -400px" id="relo" class="layui-btn layui-btn-normal" lay-filter="demo-table-search1">鍒锋柊</button>
+ <button style="position: relative;top: 36.5px;z-index: 999;width: 80px;left: 90px" class="layui-btn layui-btn-normal" lay-submit lay-filter="demo-table-search" lay-event="getselect">鏌ヨ</button>
</form>
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container" style="margin-left: 0px;margin-top: 20px;display: inline-block">
<button class="layui-btn" lay-event="getadd">鏂板</button>
- <button class="layui-btn layui-btn-warm" onclick="update()" lay-event="getUpdate">淇敼</button>
+ <button class="layui-btn layui-btn-warm" lay-event="getUpdate">淇敼</button>
<button class="layui-btn layui-btn-danger" lay-event="getDelete">鍒犻櫎</button>
<button class="layui-btn" lay-event="getchongzhi">鍏呭��</button>
@@ -68,12 +68,12 @@
<button class="layui-btn" lay-event="getchongzhi">鍏呭��</button>
</div>
</script>
-<div style="display: inline-block;width: 100%;margin-left: 20px">
+<div style="display: inline-block;width: 100%;margin-top: -60px;margin-left: -8px">
<table id="demo" lay-filter="demo"></table>
</div>
<div class="heimu" style="display: none;width: 100%;height: 100%;position: fixed;top: 0px;left: 0px;z-index: 9999;background-color: black;opacity: 0.8"></div>
<div class="add" style="display: none;width: 600px;background-color: white;border: 1px solid #cccccc;padding: 50px;border-radius: 20px;position: fixed;top: 50px;left: 450px;z-index: 99999">
- <form class="layui-form" action="/HxzkFlow/hxzk/addTbFuwuqi" method="post" lay-filter="example" onsubmit="return checkadd()">
+ <form class="layui-form" method="post" lay-filter="example" onsubmit="return checkadd()">
<div class="layui-form-item">
<label class="layui-form-label" style="width: 20% ;margin-left: -40px">鏈嶅姟鍣ㄥ悕绉帮細</label>
@@ -235,7 +235,7 @@
<%-- </form>--%>
<%--</div>--%>
<div class="updateZong" style="width: 500px;border: 1px solid #ccc;padding: 50px;border-radius: 20px;position: fixed;top: 150px;left: 500px;z-index: 99999;background-color: white;display: none">
- <form class="layui-form" action="/HxzkFlow/hxzk/UpdateTbFuwuqi" method="post" lay-filter="example">
+ <form class="layui-form" method="post" lay-filter="example" onsubmit="return checkupdate()">
<input type="text" id="id" name="id" style="display: none" class="upnum"/>
<div class="layui-form-item">
<label class="layui-form-label" style="width: 20% ;margin-left: -20px">鏈嶅姟鍣ㄥ悕绉帮細</label>
@@ -552,9 +552,10 @@
table.render({
elem: '#demo'
,layEvent: 'LAYTABLE_TIPS'
- ,height: 695
+ ,height: 780
,url: '/HxzkFlow/hxzk/findTbFuwuqi' //鏁版嵁鎺ュ彛
- ,cellMinWidth: 80
+ // ,cellMinWidth: 80
+ ,width: 1680
,page: true //寮�鍚垎椤�
,toolbar:'#toolbarDemo'
,defaultToolbar: ['filter', 'exports', 'print', { //鑷畾涔夊ご閮ㄥ伐鍏锋爮鍙充晶鍥炬爣銆傚鏃犻渶鑷畾涔夛紝鍘婚櫎璇ュ弬鏁板嵆鍙�
@@ -565,11 +566,11 @@
, cols: [[ //琛ㄥご
{type: 'checkbox', sort: true, fixed: "left"}
,{field: 'id', title: '搴忓彿', sort: true,width:'5%'}
- ,{field: 'servername', title: '鏈嶅姟鍣ㄥ悕绉�', }
- ,{field: 'company', title: '鍏徃', }
+ ,{field: 'servername', title: '鏈嶅姟鍣ㄥ悕绉�', width:'15%'}
+ ,{field: 'company', title: '鍏徃', width:'15%'}
,{field: 'startdate', title: '寮�濮嬫棩鏈�', sort: true}
,{field: 'enddate', title: '缁撴潫鏃ユ湡', sort: true}
- ,{field: 'remainingdays', title: '鍓╀綑澶╂暟', sort: true}
+ ,{field: 'remainingdays', title: '鍓╀綑澶╂暟', sort: true,}
,{field: 'expense', title: '璐圭敤', sort: true}
,{field: 'rechargedate', title: '鏈�杩戝厖鍊兼棩鏈�', sort: true}
,{field: 'rechargemoney', title: '鍏呭�奸噾棰�', sort: true}
@@ -587,7 +588,7 @@
table.render({
elem: '#demo'
, layEvent: 'LAYTABLE_TIPS'
- , height: 612
+ , height: 780
,cellMinWidth: 80
, url: '/HxzkFlow/hxzk/findTbFuwuqiZi?Zong='+jc //鏁版嵁鎺ュ彛
, page: true //寮�鍚垎椤�
@@ -600,11 +601,11 @@
, cols: [[ //琛ㄥご
{type: 'checkbox', sort: true, fixed: "left"}
,{field: 'id', title: '搴忓彿', sort: true,width:'5%'}
- ,{field: 'servername', title: '鏈嶅姟鍣ㄥ悕绉�', }
- ,{field: 'company', title: '鍏徃', }
+ ,{field: 'servername', title: '鏈嶅姟鍣ㄥ悕绉�', width:'15%'}
+ ,{field: 'company', title: '鍏徃', width:'15%'}
,{field: 'startdate', title: '寮�濮嬫棩鏈�', sort: true}
,{field: 'enddate', title: '缁撴潫鏃ユ湡', sort: true}
- ,{field: 'remainingdays', title: '鍓╀綑澶╂暟', sort: true}
+ ,{field: 'remainingdays', title: '鍓╀綑澶╂暟', sort: true,}
,{field: 'expense', title: '璐圭敤', sort: true}
,{field: 'rechargedate', title: '鏈�杩戝厖鍊兼棩鏈�', sort: true}
,{field: 'rechargemoney', title: '鍏呭�奸噾棰�', sort: true}
@@ -923,6 +924,62 @@
}
}
+
+ function checkupdate() {
+ // $("#id").val(data[0].id);
+ // $("#servernameupp").val(data[0].servername);
+ // $("#companyd").val(data[0].company);
+ // $("#startdateg").val(data[0].startdate);
+ // $("#enddateg").val(data[0].enddate);
+ // $("#expense").val(data[0].expense);
+ console.log("11111111111111111")
+ // console.log($("#card").val())
+ var add1 = $("#servernameupp").val();
+ var add2 = $("#companyd").val();
+ var add3 = $("#startdateg").val();
+ // var add4 = $("#enddateg").val();
+ var add4 = $("#id").val();
+ var add12 = $("#expense").val();
+ // var add5 = $("#bindidadd1").val();
+ // var add6 = $("#locationadd1").val();
+ // var add7 = $("#notesadd1").val();
+ var add8 = $("#enddateg").val();
+ var add9 = "0";
+ var add10 = $("#flowu").val();
+ // var add11 = $("#feiyongadd").val();
+ if(add1 == "" || add1 == null){
+ layer.alert("璇烽�夋嫨鎵�灞炲叕鍙�")
+ return false;
+ }else if(add2 == "" || add2 == null){
+ layer.alert("璇疯緭鍏ュ崱鍙�")
+ return false;
+ }else if(add3 == "" || add3 == null){
+ layer.alert("璇烽�夋嫨寮�濮嬫棩鏈�")
+ return false;
+ }else if(add8 == "" || add8 == null){
+ layer.alert("璇烽�夋嫨缁撴潫鏃ユ湡")
+ return false;
+ }else if(add12 == "" || add12 == null){
+ layer.alert("璇烽�夋嫨鍗曚环")
+ return false;
+ }else{
+ // if(parts.length>1){
+ // for (var i = 0 ; i<parts.length;i++){
+
+ var upp = "id="+add4+"&servername="+add1+"&company="+add2+"&startdate="+add3+"&enddate="+add8+"&expense="+add12
+ console.log(upp)
+ $.post("/HxzkFlow/hxzk/UpdateTbFuwuqi",upp,function (data){
+
+ })
+ console.log(66666666)
+ return true;
+ }
+ // var parts = add2.replace(/\s*/g,"").split(";");
+ // var parts;
+ // var parts1 = add5.split(";");
+
+
+ }
//鏂板鎴愬姛
function checkadd() {
var add1 = $("#companyadd1").val();
@@ -936,26 +993,6 @@
// var add7 = $("#notesadd1").val();
var add3 = $("#enddateadd1").val();
var add9 = "0";
- // var add10 = $("#flowadd1").val();
- // var add11 = $("#unitPriceadd1").val();
- // var parts = add2.split(";");
- // var parts1 = add5.split(";");
- var data = "servername="+add5
- $.ajax({
- url: "/HxzkFlow/hxzk/ifFuwuqi",
- type: "POST",
- data: data,
- async: false,
- success: function(data) {
- if(data != ""){
- alert("璇ユ湇鍔″櫒宸插瓨鍦紒")
- add9 = "1";
- // return false
- }else{
- add9 = "0";
- }
- }
- });
if(add1 == "" || add1 == null){
layer.alert("璇烽�夋嫨鎵�灞炲叕鍙�")
return false;
@@ -974,6 +1011,32 @@
}else if (add9 == "1"){
return false
}
+ // var add10 = $("#flowadd1").val();
+ // var add11 = $("#unitPriceadd1").val();
+ // var parts = add2.split(";");
+ // var parts1 = add5.split(";");
+ var data = "servername="+add5
+ $.ajax({
+ url: "/HxzkFlow/hxzk/ifFuwuqi",
+ type: "POST",
+ data: data,
+ async: false,
+ success: function(data) {
+ if(data != ""){
+ alert("璇ユ湇鍔″櫒宸插瓨鍦紒")
+ add9 = "1";
+ // return false
+ }else{
+ console.log("33333332")
+ var upp = "company="+add1+"&servername="+add5+"&startdate="+add2+"&enddate="+add3+"&expense="+add4
+ $.post("/HxzkFlow/hxzk/addTbFuwuqi",upp,function (data){
+
+ })
+ add9 = "0";
+ }
+ }
+ });
+
}
//閫夋嫨娴侀噺
diff --git a/src/webapp/page/Gongs.jsp b/src/webapp/page/Gongs.jsp
index 74f8369..e259cd0 100644
--- a/src/webapp/page/Gongs.jsp
+++ b/src/webapp/page/Gongs.jsp
@@ -50,8 +50,8 @@
<div class="update" style="width: 500px;border: 1px solid #ccc;padding: 50px;border-radius: 20px;position: fixed;top: 150px;left: 500px;z-index: 99999;background-color: white;display: none">
- <form class="layui-form" action="/HxzkFlow/hxzk/UpdateGongSi" method="post" lay-filter="example" onsubmit="return checkup()">
- <input type="" style="display:none" name="companyid" class="gongsiid" />
+ <form class="layui-form" method="post" lay-filter="example" onsubmit="return checkup()">
+ <input type="" style="display:none" name="companyid" id="companyidup" class="gongsiid" />
<div class="layui-form-item">
<label class="layui-form-label">鍏徃鍚嶇О锛�</label>
<div class="layui-input-block">
@@ -104,7 +104,7 @@
</div>
<div class="add" style="display: none;width: 600px;background-color: white;border: 1px solid #cccccc;padding: 50px;border-radius: 20px;position: fixed;top: 50px;left: 450px;z-index: 99999">
- <form class="layui-form" action="/HxzkFlow/hxzk/addGongSi" method="post" lay-filter="example" onsubmit="return checkadd()">
+ <form class="layui-form" method="post" lay-filter="example" onsubmit="return checkadd()">
<div class="layui-form-item">
<label class="layui-form-label">鍏徃鍚嶇О锛�</label>
<div class="layui-input-block">
@@ -234,7 +234,7 @@
table.render({
elem: '#demo'
, layEvent: 'LAYTABLE_TIPS'
- , height: 612
+ , height: 780
, url: '/HxzkFlow/hxzk/FindCompany' //鏁版嵁鎺ュ彛
, page: true //寮�鍚垎椤�
@@ -271,7 +271,7 @@
table.render({
elem: '#demo'
, layEvent: 'LAYTABLE_TIPS'
- , height: 612
+ , height: 780
, url: '/HxzkFlow/hxzk/FindCompanyZi?Zong='+jc //鏁版嵁鎺ュ彛
@@ -346,7 +346,8 @@
$("#accountup").val(data[0].account)
$(".update").show();
$(".heimu").show();
- $(".gongsiid").val(JSON.stringify(data[0].companyid));
+ $(".gongsiid").val(data[0].companyid);
+ $("#companyidup").val(data[0].companyid);
}
break;
case 'getadd':
@@ -439,28 +440,6 @@
var add8 = $("#accountadd").val();
var add9 = "0" ;
var data = "companyname="+add1+"&companyabbname="+add2
- $.ajax({
- url: "/HxzkFlow/hxzk/ifGongSi",
- type: "POST",
- data: data,
- async: false,
- success: function(data) {
- console.log(data)
- if(data != ""){
- alert("璇ュ叕鍙稿悕绉版垨绠�绉板凡瀛樺湪锛�")
- add9 = "1";
- }else{
- add9 = "0";
- }
- }
- });
-
-
-
-
-
-
-
if(add1 == "" || add1 == null){
layer.alert("鍏徃鍚嶇О涓嶈兘涓虹┖")
@@ -491,8 +470,39 @@
}else{
return true;
}
+ console.log(add1)
+ $.ajax({
+ url: "/HxzkFlow/hxzk/ifGongSi",
+ type: "POST",
+ data: data,
+ async: false,
+ success: function(data) {
+ console.log(data)
+ if(data != ""){
+ alert("璇ュ叕鍙稿悕绉版垨绠�绉板凡瀛樺湪锛�")
+ add9 = "1";
+ }else{
+ console.log("33333332")
+ var upp = "companyname="+add1+"&companyabbname="+add2+"&loginphone="+add3+"&shuinum="+add4+"&address="+add5+"&phone="+add6+"&accountbank="+add7+"&account="+add8
+ $.post("/HxzkFlow/hxzk/addGongSi",upp,function (data){
+
+ })
+ add9 = "0";
+ }
+ }
+ });
+
+
+
+
+
+
+
+
}
function checkup(){
+
+ var up0 = $("#companyidup").val();
var up1 = $("#companynameup").val();
var up2 = $("#companyabbnameup").val();
var up3 = $("#loginphoneup").val();
@@ -523,7 +533,14 @@
layer.alert("璐﹀彿涓嶈兘涓虹┖")
return false;
}else {
+ var upp = "companyid="+up0+"&companyname="+up1+"&companyabbname="+up2+"&loginphone="+up3+"&shuinum="+up4+"&address="+up5+"&phone="+up6+"&accountbank="+up7+"&account="+up8
+ console.log(upp)
+ $.post("/HxzkFlow/hxzk/UpdateGongSi",upp,function (data){
+
+ })
+ console.log(66666666)
return true;
+ // return true;
}
}
diff --git a/src/webapp/page/KaiPiaoJiLu.jsp b/src/webapp/page/KaiPiaoJiLu.jsp
index 902ca5b..125215b 100644
--- a/src/webapp/page/KaiPiaoJiLu.jsp
+++ b/src/webapp/page/KaiPiaoJiLu.jsp
@@ -32,7 +32,7 @@
<body>
<div class="layuimini-container">
<div class="layuimini-main">
- <div>
+ <div style="margin-top: -10px;width: 100%;overflow:hidden;">
<table id="demo" lay-filter="demo"></table>
</div>
<div class="layui-form-item" id="y1">
diff --git a/src/webapp/page/error.jsp b/src/webapp/page/error.jsp
index 0364ee3..15e772c 100644
--- a/src/webapp/page/error.jsp
+++ b/src/webapp/page/error.jsp
@@ -54,8 +54,17 @@
</head>
<body style="overflow: hidden">
<div class="content" style="position: relative;top: 0px;left: 420px">
- <a class="button" href="/HxzkFlow/page/index.jsp">杩斿洖涓婚〉</a>
+ <a class="button" href="/HxzkFlow/page/index.jsp" onclick="canselupdate()">杩斿洖涓婚〉</a>
</div>
+<script>
+
+ function canselupdate(){
+ location.reload();
+ // $(".update").hide();
+ // $(".heimu").hide();
+ // $(".updateZong").hide();
+ }
+</script>
</body>
</html>
diff --git a/src/webapp/page/index1.jsp b/src/webapp/page/index1.jsp
index c32d913..711f4c3 100644
--- a/src/webapp/page/index1.jsp
+++ b/src/webapp/page/index1.jsp
@@ -37,13 +37,13 @@
<body>
<form class="layui-form layui-row layui-col-space16" style="width: 1672px;margin-left: 12px;padding-bottom: 10px">
- <div class="layui-col-md4" style="position: relative;top: 89px;z-index: 999;width: 150px;left: 500px">
+ <div class="layui-col-md4" style="position: relative;top: 30px;z-index: 999;width: 150px;left: 500px">
<div class="layui-input-wrap">
- <input type="text" name="cardnumber" style="width: 220px" value="" placeholder="璇疯緭鍏ュ崱鍙�/澶囨敞" class="layui-input" lay-affix="clear">
+ <input type="text" name="cardnumber" style="width: 220px" value="" placeholder="璇疯緭鍏ュ崱鍙�" class="layui-input" lay-affix="clear">
</div>
</div>
<div class="layui-col-md4" style="margin-left: 20px">
- <div class="layui-input-wrap" style="position: relative;top: 89px;z-index: 999;width: 150px;left: 560px">
+ <div class="layui-input-wrap" style="position: relative;top: 30px;z-index: 999;width: 150px;left: 560px">
<input type="text" name="company" style="width: 150px" placeholder="璇疯緭鍏ユ墍灞炲叕鍙�" lay-affix="clear" class="layui-input">
</div>
</div>
@@ -52,8 +52,8 @@
<%-- <input type="text" name="bindid" style="width: 150px" placeholder="璇疯緭鍏ョ粦瀹氳澶�" lay-affix="clear" class="layui-input">--%>
<%-- </div>--%>
<%-- </div>--%>
- <button style="position: relative;top: 96.5px;z-index: 999;width: 70px;left: -400px" id="relo" class="layui-btn layui-btn-normal" lay-filter="demo-table-search1">鍒锋柊</button>
- <button style="position: relative;top: 96.5px;z-index: 999;width: 80px;left: 90px" class="layui-btn layui-btn-normal" lay-submit lay-filter="demo-table-search" lay-event="getselect">鏌ヨ</button>
+ <button style="position: relative;top: 36.5px;z-index: 999;width: 70px;left: -400px" id="relo" class="layui-btn layui-btn-normal" lay-filter="demo-table-search1">鍒锋柊</button>
+ <button style="position: relative;top: 36.5px;z-index: 999;width: 80px;left: 90px" class="layui-btn layui-btn-normal" lay-submit lay-filter="demo-table-search" lay-event="getselect">鏌ヨ</button>
</form>
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container" style="margin-left: 0px;margin-top: 20px;display: inline-block">
@@ -70,12 +70,12 @@
<button class="layui-btn" lay-event="getchongzhi">鍏呭��</button>
</div>
</script>
-<div style="display: inline-block;width: 100%;margin-left: 20px">
+<div style="display: inline-block;width: 100%;margin-top: -60px">
<table id="demo" lay-filter="demo"></table>
</div>
-<div class="heimu" style="display: none;width: 100%;height: 100%;position: fixed;top: 0px;left: 0px;z-index: 9999;background-color: black;opacity: 0.8"></div>
+<%--<div class="heimu" style="display: none;width: 100%;height: 100%;position: fixed;top: 0px;left: 0px;z-index: 9999;background-color: black;opacity: 0.8"></div>--%>
<div class="add" style="display: none;width: 600px;background-color: white;border: 1px solid #cccccc;padding: 50px;border-radius: 20px;position: fixed;top: 50px;left: 450px;z-index: 99999">
- <form class="layui-form" action="/HxzkFlow/hxzk/addCard" method="post" lay-filter="example" onsubmit="return checkadd()">
+ <form class="layui-form" method="post" lay-filter="example" onsubmit="return checkadd()">
<div class="layui-form-item">
<label class="layui-form-label">鎵�灞炲叕鍙革細</label>
<div class="layui-input-block">
@@ -245,7 +245,7 @@
</form>
</div>
<div class="updateZong" style="width: 500px;border: 1px solid #ccc;padding: 50px;border-radius: 20px;position: fixed;top: 150px;left: 500px;z-index: 99999;background-color: white;display: none">
- <form class="layui-form" action="/HxzkFlow/hxzk/Update" method="post" lay-filter="example">
+ <form class="layui-form" method="post" lay-filter="example" onsubmit="return checkupdate()">
<input type="text" name="num" style="display: none" class="upnum"/>
<div class="layui-form-item">
<label class="layui-form-label">鍗″彿锛�</label>
@@ -286,7 +286,7 @@
<div class="layui-form-item">
<label class="layui-form-label">閫夋嫨娴侀噺锛�</label>
<div class="layui-input-block">
- <select name="flow" lay-filter="ddtt">
+ <select name="flow" id="flowu" lay-filter="ddtt">
<option value="12G/骞�">12G/骞�</option>
<option value="24G/骞�">24G/骞�</option>
<option value="36G/骞�">36G/骞�</option>
@@ -297,11 +297,10 @@
<div class="layui-form-item">
<label class="layui-form-label">杩愯惀鍟嗭細</label>
<div class="layui-input-block">
- <select name="operator" lay-filter="aihao" >
-<%-- <option value="operatoru">#{operatoru}</option>--%>
+ <select name="operator" id="operatoru" lay-filter="operatoru" >
<option value="绉诲姩" >绉诲姩</option>
<option value="鑱旈��" >鑱旈��</option>
- <option value="鐢典俊">鐢典俊</option>
+ <option value="鐢典俊" >鐢典俊</option>
</select>
</div>
</div>
@@ -315,13 +314,13 @@
</div>
<div class="layui-form-item">
<div class="layui-input-block">
- <button type="submit" class="layui-btn" onclick="chongzhitj()" lay-filter="demoupdate">绔嬪嵆鎻愪氦</button>
+ <button type="submit" class="layui-btn" lay-filter="demoupdate">绔嬪嵆鎻愪氦</button>
<button type="button" class="layui-btn layui-btn-normal" lay-filter="demo1" onclick="canselupdate()" style="margin-left: 200px">鍙栨秷</button>
</div>
</div>
</form>
</div>
-<div id="fhfrom"></div>
+
<script type="text/html" id="titleTpl">
{{# if(d.status === '寰呮縺娲�') { }}
@@ -371,7 +370,10 @@
value = parseFloat(0).toFixed(0);
return value;
}
-
+ // layui.use('form', function(){
+ // var form = layui.form;
+ // form.render('select'); // 閲嶆柊娓叉煋select妗�
+ // });
function xzGongSi(){
var company = $("#companyadd1").val();
var data = "companyname="+company
@@ -403,6 +405,8 @@
for(var i = 0;i<items.length;i++){
itemTitle = items[i].value;
}
+ console.log(itemTitle)
+ console.log(items)
}
if(qb === "鍗庢槦鏅烘帶"){
// url: 'https://api.spruceiot.cn/api/v1/sim/detail/query',
@@ -611,9 +615,11 @@
table.render({
elem: '#demo'
,layEvent: 'LAYTABLE_TIPS'
- ,height: 695
+ ,height: 780
,url: '/HxzkFlow/hxzk/FindCard' //鏁版嵁鎺ュ彛
- ,cellMinWidth: 80
+ // ,cellMinWidth: 80
+ ,width: 1680
+ ,autoWidth: true
,page: true //寮�鍚垎椤�
,toolbar:'#toolbarDemo'
,defaultToolbar: ['filter', 'exports', 'print', { //鑷畾涔夊ご閮ㄥ伐鍏锋爮鍙充晶鍥炬爣銆傚鏃犻渶鑷畾涔夛紝鍘婚櫎璇ュ弬鏁板嵆鍙�
@@ -623,26 +629,26 @@
}]
,cols: [[ //琛ㄥご
{type:'checkbox',sort: true,fixed: "left"}
- ,{field: 'num', title: '搴忓彿', sort: true,width:'5%'}
- ,{field: 'company', title: '鎵�灞炲叕鍙�', }
- ,{field: 'cardnumber', title: '鍗″彿', sort: true}
- ,{field:'status', title: '鐘舵��',templet: '#titleTpl'}
- ,{field: 'flow', title: '娴侀噺', sort: true}
+ ,{field: 'num', title: '搴忓彿', sort: true,width:'75'}
+ ,{field: 'company', title: '鎵�灞炲叕鍙�', width:'250'}
+ ,{field: 'cardnumber', title: '鍗″彿', sort: true,width:'200'}
+ ,{field:'status', title: '鐘舵��',templet: '#titleTpl',width:'90'}
+ ,{field: 'flow', title: '娴侀噺', sort: true,width:'80'}
// ,{field: 'zflow', title: '鎬绘祦閲�(MB)', }
// ,{field: 'syflow', title: '宸茬敤娴侀噺(MB)', }
- ,{field: 'remainingdays', title: '鍓╀綑澶╂暟', }
+ ,{field: 'remainingdays', title: '鍓╀綑澶╂暟', width:'85'}
// ,{field: 'syll', title: '鍓╀綑娴侀噺(MB)', }
- ,{field: 'carddate', title: '寮�濮嬫棩鏈�', sort: true}
- ,{field: 'operator', title: '杩愯惀鍟�', sort: true}
+ ,{field: 'carddate', title: '寮�濮嬫棩鏈�', sort: true,width:'110'}
+ ,{field: 'operator', title: '杩愯惀鍟�', sort: true,width:'110'}
- ,{field: 'unitprice', title: '鍗曚环', sort: true}
- ,{field: 'bindid', title: '缁戝畾璁惧'}
+ ,{field: 'unitprice', title: '鍗曚环', sort: true,width:'75'}
+ ,{field: 'bindid', title: '缁戝畾璁惧',width:'90'}
// ,{field: 'location', title: '鎵�鍦ㄥ湴', sort: true}
- ,{field: 'notes', title: '澶囨敞', sort: true}
- ,{field: 'enddate', title: '缁撴潫鏃ユ湡', sort: true}
- // ,{field: 'enterdate', title: '褰曞叆鏃ユ湡', sort: true}
- ,{field: 'rechargedate', title: '鏈�杩戝厖鍊兼棩鏈�', sort: true}
- ,{field: 'rechargemoney', title: '鍏呭�奸噾棰�', sort: true}
+ // ,{field: 'notes', title: '澶囨敞', sort: true}
+ ,{field: 'enddate', title: '缁撴潫鏃ユ湡', sort: true,width:'110'}
+ ,{field: 'enterdate', title: '褰曞叆鏃ユ湡', sort: true,width:'110'}
+ ,{field: 'rechargedate', title: '鏈�杩戝厖鍊兼棩鏈�', sort: true,width:'110'}
+ ,{field: 'rechargemoney', title: '鍏呭�奸噾棰�', sort: true,width:'100'}
]],
@@ -658,7 +664,7 @@
table.render({
elem: '#demo'
,layEvent: 'LAYTABLE_TIPS'
- ,height: 695
+ ,height: 780
,url: '/HxzkFlow/hxzk/FindCardZi?Zong='+jc //鏁版嵁鎺ュ彛
,cellMinWidth: 80
,page: true //寮�鍚垎椤�
@@ -682,7 +688,7 @@
,{field: 'remainingdays', title: '鍓╀綑澶╂暟', }
,{field: 'carddate', title: '寮�濮嬫棩鏈�', sort: true}
,{field: 'operator', title: '杩愯惀鍟�', sort: true}
-
+ ,{field: 'enddate', title: '缁撴潫鏃ユ湡', sort: true}
,{field: 'unitprice', title: '鍗曚环', sort: true}
,{field: 'rechargedate', title: '鏈�杩戝厖鍊兼棩鏈�', sort: true}
,{field: 'rechargemoney', title: '鍏呭�奸噾棰�', sort: true}
@@ -729,6 +735,10 @@
layer.alert("璇烽�変腑涓�鏉℃暟鎹�")
}else{
showUpdate();
+ console.log(data[0])
+ var o = data[0].operator
+ console.log("tijiao11111111111")
+ $("#card").val(data[0])
$("#cardnumber").val(data[0].cardnumber)
$(".upnum").val(data[0].num);
$("#xgkh").val(data[0].cardnumber);
@@ -736,8 +746,9 @@
$("#carddateu").val(data[0].carddate);
$("#enddateu").val(data[0].enddate);
$("#unitpriceu").val(data[0].unitprice);
- $("#operatoru").append(new Option(data[0].operator,data[0].operator));
- $("#flowu").append(new Option(data[0].flow,data[0].flow));
+ $("#operatoru").val(data[0].operator);
+ $("#flowu").val(data[0].flow);
+ form.render();
}
break;
case 'getadd':
@@ -961,6 +972,7 @@
$(".updateZong").hide();
}
function showUpdate(){
+ console.log("tijiao2222222222222")
var gsjc = localStorage.getItem("gsjc");
if(gsjc == "鍗庢槦鏅烘帶"){
$(".updateZong").show();
@@ -971,8 +983,67 @@
}
}
+
+ function checkupdate() {
+ console.log("11111111111111111")
+ console.log($("#card").val())
+ console.log($("#cardnumber").val())
+ var add1 = $("#xggs").val();
+ var add2 = $("#cardnumber").val();
+ var add3 = $("#carddateu").val();
+ var add4 = $("#operatoru").val();
+ // var add4 = $("#flowadd1").val();
+ var add12 = $("#unitpriceu").val();
+ // var add5 = $("#bindidadd1").val();
+ // var add6 = $("#locationadd1").val();
+ // var add7 = $("#notesadd1").val();
+ var add8 = $("#enddateu").val();
+ var add9 = "0";
+ var add10 = $("#flowu").val();
+ // var add11 = $("#feiyongadd").val();
+ if(add1 == "" || add1 == null){
+ layer.alert("璇烽�夋嫨鎵�灞炲叕鍙�")
+ return false;
+ }else if(add2 == "" || add2 == null){
+ layer.alert("璇疯緭鍏ュ崱鍙�")
+ return false;
+ }else if(add3 == "" || add3 == null){
+ layer.alert("璇烽�夋嫨寮�濮嬫棩鏈�")
+ return false;
+ }else if(add8 == "" || add8 == null){
+ layer.alert("璇烽�夋嫨缁撴潫鏃ユ湡")
+ return false;
+ }else if(add4 == "" || add4 == null){
+ layer.alert("璇烽�夋嫨杩愯惀鍟�")
+ return false;
+ }else if(add10 == "" || add10 == null){
+ layer.alert("璇烽�夋嫨娴侀噺")
+ return false;
+ }else if(add12 == "" || add12 == null){
+ layer.alert("璇烽�夋嫨鍗曚环")
+ return false;
+ }else{
+ // if(parts.length>1){
+ // for (var i = 0 ; i<parts.length;i++){
+
+ var upp = "company="+add1+"&cardnumber="+add2+"&carddate="+add3+"&operator="+add4+"&enddate="+add8+"&flow="+add10+"&unitprice="+add12
+ console.log(upp)
+ $.post("/HxzkFlow/hxzk/UpdateChong",upp,function (data){
+
+ })
+ console.log(66666666)
+ return true;
+ }
+ // var parts = add2.replace(/\s*/g,"").split(";");
+ // var parts;
+ // var parts1 = add5.split(";");
+
+
+ }
//鏂板鎴愬姛
function checkadd() {
+ console.log("11111111111111111")
+ console.log( $("#cardnumberadd1").val())
var add1 = $("#companyadd1").val();
var add2 = $("#cardnumberadd1").val();
var add3 = $("#carddateadd1").val();
@@ -986,53 +1057,6 @@
var add9 = "0";
var add10 = $("#flowadd1").val();
var add11 = $("#feiyongadd").val();
- var parts = add2.replace(/\s*/g,"").split(";");
- // var parts;
- var parts1 = add5.split(";");
- if(parts.length>1){
- for (var i = 0 ; i<parts.length;i++){
- var data = "cardnumber="+parts[i]
- $.ajax({
- url: "/HxzkFlow/hxzk/ifCard",
- type: "POST",
- data: data,
- async: false,
- success: function(data) {
- if(data != ""){
- //宸茬粡瀛樺湪锛� 鏍规嵁鍗″彿淇敼淇℃伅
- var upp = "company="+add1+"&cardnumber="+parts[i]+"&carddate="+add3+"&operator="+add4+"&bindid="+parts1[i]+"&location="+add6+"¬es="+add7+"&enddate="+add8+"&flow="+add10+"&unitprice="+add11
- $.post("/HxzkFlow/hxzk/UpdateChong",upp,function (data){
-
- })
- $("#cardnumberadd1").val(parts[i])
- }else{
-
- }
-
- }
- });
-
- }
- if(add9 == "1"){
- alert("璇ュ崱鍙蜂腑鍙兘鏈夊凡缁忓瓨鍦ㄨ繃鐨�")
- }
- }else{
- var data = "cardnumber="+add2
- $.ajax({
- url: "/HxzkFlow/hxzk/ifCard",
- type: "POST",
- data: data,
- async: false,
- success: function(data) {
- if(data != ""){
- alert("璇ュ崱鍙峰凡瀛樺湪锛�")
- add9 = "1";
- }else{
- add9 = "0";
- }
- }
- });
- }
if(add1 == "" || add1 == null){
layer.alert("璇烽�夋嫨鎵�灞炲叕鍙�")
return false;
@@ -1056,9 +1080,69 @@
return false;
}else if (add9 == "1"){
return false;
- }else if (add9 == "0"){
- return true
}
+ var parts = add2.replace(/\s*/g,"").split(";");
+ // var parts;
+ var parts1 = add5.split(";");
+ console.log(parts)
+ console.log(parts.length)
+ if(parts.length>1){
+ for (var i = 0 ; i<parts.length;i++){
+
+ console.log("=================")
+ var data = "cardnumber="+parts[i]
+ $.ajax({
+ url: "/HxzkFlow/hxzk/ifCard",
+ type: "POST",
+ data: data,
+ async: false,
+ success: function(data) {
+ if(data != ""){
+ //宸茬粡瀛樺湪锛� 鏍规嵁鍗″彿淇敼淇℃伅
+ var upp = "company="+add1+"&cardnumber="+parts[i]+"&carddate="+add3+"&operator="+add4+"&bindid="+add5+"&location="+add6+"¬es="+add7+"&enddate="+add8+"&flow="+add10+"&unitprice="+add11
+ console.log(upp)
+ $.post("/HxzkFlow/hxzk/UpdateChong",upp,function (data){
+
+ })
+ // parts.splice(i,2)
+ // $("#cardnumberadd1").val(parts)
+ }else{
+ console.log("33333332")
+ var upp = "company="+add1+"&cardnumber="+parts[i]+"&carddate="+add3+"&operator="+add4+"&bindid="+add5+"&location="+add6+"¬es="+add7+"&enddate="+add8+"&flow="+add10+"&unitprice="+add11
+ $.post("/HxzkFlow/hxzk/addCard",upp,function (data){
+
+ })
+ }
+ console.log(parts)
+ }
+
+ });
+
+ }
+ if(add9 == "1"){
+ alert("璇ュ崱鍙蜂腑鍙兘鏈夊凡缁忓瓨鍦ㄨ繃鐨�")
+ }
+ }else{
+ var data = "cardnumber="+add2
+ $.ajax({
+ url: "/HxzkFlow/hxzk/ifCard",
+ type: "POST",
+ data: data,
+ async: false,
+ success: function(data) {
+ if(data != ""){
+ alert("璇ュ崱鍙峰凡瀛樺湪锛�")
+ add9 = "1";
+ }else{
+ var upp = "company="+add1+"&cardnumber="+add2+"&carddate="+add3+"&operator="+add4+"&bindid="+add5+"&location="+add6+"¬es="+add7+"&enddate="+add8+"&flow="+add10+"&unitprice="+add11
+ $.post("/HxzkFlow/hxzk/addCard",upp,function (data){
+
+ })
+ }
+ }
+ });
+ }
+
}
//閫夋嫨娴侀噺
//鐩戝惉閫変腑浜嬩欢
diff --git a/src/webapp/page/loginJiLu.jsp b/src/webapp/page/loginJiLu.jsp
index 6c0a669..3c3158d 100644
--- a/src/webapp/page/loginJiLu.jsp
+++ b/src/webapp/page/loginJiLu.jsp
@@ -17,7 +17,7 @@
<body style="width: 100%;text-align: center;overflow:hidden;">
<div style="width: 100%;">
- <div style="margin-top: 0px;width: 100%;overflow:hidden;margin-left: 15px">
+ <div style="margin-top: -10px;width: 100%;">
<div style="width:55%;height: 600px;display: inline-block" id="userWidth">
<table id="demo" lay-filter="demo"></table>
</div>
@@ -149,7 +149,7 @@
table.render({
elem: '#demo'
, layEvent: 'LAYTABLE_TIPS'
- , height: 600
+ , height: 780
,cellMinWidth: 80
, url: '/HxzkFlow/hxzk/FindLoginJiLu' //鏁版嵁鎺ュ彛
, page: true //寮�鍚垎椤�
diff --git a/src/webapp/page/setting.jsp b/src/webapp/page/setting.jsp
index f22c3e7..b933012 100644
--- a/src/webapp/page/setting.jsp
+++ b/src/webapp/page/setting.jsp
@@ -16,7 +16,7 @@
<body style="width: 100%;height: 100%;background-color: #EFF1F4">
<div></div>
<div style="width: 100%;height: 100%;">
- <div class="layui-card" style="width: 100%;height: 100%;margin: 20px">
+ <div class="layui-card" style="width: 100%;height: 100%;">
<div class="layui-card-header">涓汉淇℃伅</div>
<div class="layui-card-body">
<form class="layui-form" method="post" action="/HxzkFlow/hxzk/upUser" style="margin-top: 20px" onsubmit="return checkadd()">
--
Gitblit v1.9.3