From 89f01d586a46d416b1ed853ef067c8cdfa53789c Mon Sep 17 00:00:00 2001
From: kongdeqiang <kongdeqiang960204@163.com>
Date: 星期三, 30 八月 2023 15:22:04 +0800
Subject: [PATCH] 提交更新
---
src/main/java/com/boying/controller/phone/TicketController.java | 8 ++++----
src/main/java/com/boying/controller/StreetController.java | 19 ++++++++++++-------
src/main/java/com/boying/util/FileUtil.java | 2 +-
src/main/java/com/boying/job/GetEticketScheduled.java | 6 +++---
4 files changed, 20 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/boying/controller/StreetController.java b/src/main/java/com/boying/controller/StreetController.java
index 55abf63..27ecd22 100644
--- a/src/main/java/com/boying/controller/StreetController.java
+++ b/src/main/java/com/boying/controller/StreetController.java
@@ -113,14 +113,19 @@
public Object findAll() {
Map<String,Object> map = new HashMap<>();
QueryWrapper<Street> wrapper = new QueryWrapper<>();
-// wrapper.lambda()
-// .eq(Street::getType,0);
-// map.put("list1",streetService.list(wrapper));
-// wrapper.clear();
-// wrapper.lambda()
-// .eq(Street::getType,1);
-// map.put("list2",streetService.list(wrapper));
+ wrapper.lambda()
+ .eq(Street::getType,0);
+ map.put("list1",streetService.list(wrapper));
+ wrapper.clear();
+ wrapper.lambda()
+ .eq(Street::getType,1);
+ map.put("list2",streetService.list(wrapper));
+ return R.ok(map);
+ }
+
+ @GetMapping("/findList2")
+ public Object findAll2() {
return R.ok(streetService.list());
}
diff --git a/src/main/java/com/boying/controller/phone/TicketController.java b/src/main/java/com/boying/controller/phone/TicketController.java
index cc0e7d2..bdb9adf 100644
--- a/src/main/java/com/boying/controller/phone/TicketController.java
+++ b/src/main/java/com/boying/controller/phone/TicketController.java
@@ -206,12 +206,12 @@
ticket.setMoneyStr(s.toString());
}
if(StringUtils.isBlank(ticket.getZfName1())){
- ticket.setZfName1("鐜嬩繆璇�");
- ticket.setZfName1("寮犲噣闆�");
+ ticket.setZfName1("鐜嬩繆绁�");
+ ticket.setZfName2("寮犲噣闆�");
ticket.setZfNum1("03041699001");
ticket.setZfNum2("03041618001");
- ticket.setZfQianMing1("http://183.196.93.178:8089/ffzf/fileinfo/showImg/wangjunxiang.png");
- ticket.setZfQianMing2("http://183.196.93.178:8089/ffzf/fileinfo/showImg/zhangjinglei.png");
+ ticket.setZfQianMing1("http://127.0.0.1:8089/ffzf/fileinfo/showImg/wangjunxiang.png");
+ ticket.setZfQianMing2("http://127.0.0.1:8089/ffzf/fileinfo/showImg/zhangjinglei.png");
}
if(StringUtils.isBlank(ticket.getNumber())){
ticket = ticketService.getNumber(ticket);
diff --git a/src/main/java/com/boying/job/GetEticketScheduled.java b/src/main/java/com/boying/job/GetEticketScheduled.java
index 7f439d8..1461264 100644
--- a/src/main/java/com/boying/job/GetEticketScheduled.java
+++ b/src/main/java/com/boying/job/GetEticketScheduled.java
@@ -60,7 +60,7 @@
}
//寮�鍙栧彂绁�
for (OrderRecord orderRecord : list) {
- System.out.println("姝ｅ湪鐢宠寮�绁細" + orderRecord);
+ // System.out.println("姝ｅ湪鐢宠寮�绁細" + orderRecord);
doTicket(orderRecord);
}
}
@@ -78,7 +78,7 @@
SimpleDateFormat sdf3 = new SimpleDateFormat("yyyy-MM-dd_HH_mm_ss");
String txt = sdf3.format(new Date())+"鐢宠寮�绁ㄧ即娆剧爜涓猴細"+orderRecord.getPayCode()+",\n";
if(entity.getBody().getCode() == 1){
- System.out.println(entity.getBody());
+ // System.out.println(entity.getBody());
//鐢宠鎴愬姛锛屽幓鑾峰彇寮�绁ㄦ枃浠�
txt += entity.getBody()+",\n";
Object o = entity.getBody().getData().get(0);
@@ -88,7 +88,7 @@
writeTxt(txt);
doTicketGet(mapTypes,orderRecord);
}else {
- System.out.println(entity.getBody());
+ // System.out.println(entity.getBody());
txt += "鏌ヨ鏈夎锛�"+entity.getBody()+"\n";
writeTxt(txt);
}
diff --git a/src/main/java/com/boying/util/FileUtil.java b/src/main/java/com/boying/util/FileUtil.java
index 4fef8c6..ebf98b6 100644
--- a/src/main/java/com/boying/util/FileUtil.java
+++ b/src/main/java/com/boying/util/FileUtil.java
@@ -142,7 +142,7 @@
}
public static void main(String[] args) {
- String get = netSourceToBase64("http://192.168.0.121:9999/admin/sys-file/platform/20230704154745.png", "GET");
+ String get = netSourceToBase64("http://36.134.129.218:9999/admin/sys-file/platform/20230815083801.png", "GET");
System.out.println(get);
}
--
Gitblit v1.9.1