From 4058cdff1546659f29e66414a50d49412df67f41 Mon Sep 17 00:00:00 2001
From: kongdeqiang <123456>
Date: 星期二, 04 七月 2023 15:12:04 +0800
Subject: [PATCH] 修改
---
src/main/java/com/boying/controller/phone/TicketController.java | 26 ++++++++
src/main/java/com/boying/service/impl/TicketServiceImpl.java | 62 ++++++++++++++++++++
src/main/java/com/boying/entity/Ticket.java | 14 ++++
src/main/java/com/boying/controller/StreetController.java | 17 +++--
src/main/java/com/boying/common/SystemConfigProperties.java | 6 ++
pom.xml | 28 ++++----
src/main/java/com/boying/service/TicketService.java | 2
src/main/java/com/boying/util/HTTPEntityUtil.java | 22 +++++++
8 files changed, 152 insertions(+), 25 deletions(-)
diff --git a/pom.xml b/pom.xml
index d8a76c0..73486ff 100644
--- a/pom.xml
+++ b/pom.xml
@@ -111,21 +111,21 @@
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
</dependency>
- <dependency>
- <groupId>net.sf</groupId>
- <artifactId>jni4net</artifactId>
- <version>0.8.8.0</version>
- <scope>system</scope>
- <systemPath>${basedir}/src/main/resources/jni/jni4net.j-0.8.8.0.jar</systemPath>
- </dependency>
+<!-- <dependency>-->
+<!-- <groupId>net.sf</groupId>-->
+<!-- <artifactId>jni4net</artifactId>-->
+<!-- <version>0.8.8.0</version>-->
+<!-- <scope>system</scope>-->
+<!-- <systemPath>${basedir}/src/main/resources/jni/jni4net.j-0.8.8.0.jar</systemPath>-->
+<!-- </dependency>-->
- <dependency>
- <groupId>com.led</groupId>
- <artifactId>show</artifactId>
- <version>0.0.1</version>
- <scope>system</scope>
- <systemPath>${basedir}/src/main/resources/jni/LedShow.j4n.jar</systemPath>
- </dependency>
+<!-- <dependency>-->
+<!-- <groupId>com.led</groupId>-->
+<!-- <artifactId>show</artifactId>-->
+<!-- <version>0.0.1</version>-->
+<!-- <scope>system</scope>-->
+<!-- <systemPath>${basedir}/src/main/resources/jni/LedShow.j4n.jar</systemPath>-->
+<!-- </dependency>-->
</dependencies>
<build>
diff --git a/src/main/java/com/boying/common/SystemConfigProperties.java b/src/main/java/com/boying/common/SystemConfigProperties.java
index bac5ee6..ffe6f0f 100644
--- a/src/main/java/com/boying/common/SystemConfigProperties.java
+++ b/src/main/java/com/boying/common/SystemConfigProperties.java
@@ -66,7 +66,13 @@
@Value("${ffzf.ip}")
private String ffzfIp;
+ @Value("${ffzf.loginIp}")
+ private String loginIp;
+
@Value("${ffzf.info}")
private String info;
+ @Value("${ffzf.getNumber}")
+ private String getNumber;
+
}
diff --git a/src/main/java/com/boying/controller/StreetController.java b/src/main/java/com/boying/controller/StreetController.java
index 8f8382e..55abf63 100644
--- a/src/main/java/com/boying/controller/StreetController.java
+++ b/src/main/java/com/boying/controller/StreetController.java
@@ -113,14 +113,15 @@
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));
- return R.ok(map);
+// 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(streetService.list());
}
@PostMapping("findLogo")
diff --git a/src/main/java/com/boying/controller/phone/TicketController.java b/src/main/java/com/boying/controller/phone/TicketController.java
index c7252ab..3b8aea8 100644
--- a/src/main/java/com/boying/controller/phone/TicketController.java
+++ b/src/main/java/com/boying/controller/phone/TicketController.java
@@ -28,6 +28,9 @@
import java.io.IOException;
import java.io.InputStream;
import java.math.BigDecimal;
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
import java.util.*;
@RestController
@@ -186,7 +189,23 @@
String s = NumberToCN.number2CNMontrayUnit(numberOfMoney);
ticket.setMoneyStr(s.toString());
}
- return R.ok(ticketService.updateById(ticket));
+ if(StringUtils.isBlank(ticket.getNumber())){
+ ticket = ticketService.getNumber(ticket);
+ ticket.setPush(0);
+ ticketService.uploadInfo(ticket);
+ }
+ return R.ok();
+ }
+
+ //涓庢墽娉曞鎺�
+ @GetMapping("/getResult")
+ public Object getResult(Ticket ticket){
+ if(StringUtils.isNotBlank(ticket.getShouQianMing())){
+ ticketService.updateById(ticket);
+ return R.ok();
+ }else {
+ return R.failed("鏇存柊澶辫触");
+ }
}
public void saveLogo(String name,String lng,String lat){
@@ -350,8 +369,11 @@
*/
@ApiOperation(value = "娴嬭瘯瀵规帴", notes = "娴嬭瘯瀵规帴")
@GetMapping("/test" )
- public void test() {
+ public R test() {
Ticket byId = ticketService.getById(13);
+ byId = ticketService.getNumber(byId);
+ byId.setPush(0);
ticketService.uploadInfo(byId);
+ return R.ok();
}
}
diff --git a/src/main/java/com/boying/entity/Ticket.java b/src/main/java/com/boying/entity/Ticket.java
index 0098650..e95d49f 100644
--- a/src/main/java/com/boying/entity/Ticket.java
+++ b/src/main/java/com/boying/entity/Ticket.java
@@ -131,8 +131,12 @@
//鎵ф硶浜�1濮撳悕
private String zfName1;
+ //鎵ф硶浜�1绛惧悕
+ private String zfQianMing1;
//鎵ф硶浜�2濮撳悕
private String zfName2;
+ //鎵ф硶浜�2绛惧悕
+ private String zfQianMing2;
//鎵ф硶浜哄憳1璇佸彿
private String zfNum1;
@@ -142,10 +146,20 @@
//鏈�鍚庢墽琛屾棩鏈�
private String days;
+ //鎵ф硶灞�鍗扮珷
+ private String zhifaYinZhang;
+
+ //鐢熸垚鏃ユ湡
+ private String wordDate;
+
+ //鏀朵欢浜虹鍚�
+ private String shouQianMing;
+
/**
* 娴佹按鍙�
*/
private String code2;
+ private Integer push;
@Transient
@TableField(exist = false)
diff --git a/src/main/java/com/boying/service/TicketService.java b/src/main/java/com/boying/service/TicketService.java
index bfd80a4..11eb7d6 100644
--- a/src/main/java/com/boying/service/TicketService.java
+++ b/src/main/java/com/boying/service/TicketService.java
@@ -31,4 +31,6 @@
double sumByPrice3();
void uploadInfo(Ticket ticket);
+
+ Ticket getNumber(Ticket byId);
}
diff --git a/src/main/java/com/boying/service/impl/TicketServiceImpl.java b/src/main/java/com/boying/service/impl/TicketServiceImpl.java
index 4de7725..9835e83 100644
--- a/src/main/java/com/boying/service/impl/TicketServiceImpl.java
+++ b/src/main/java/com/boying/service/impl/TicketServiceImpl.java
@@ -1,7 +1,9 @@
package com.boying.service.impl;
+import cn.hutool.http.Header;
import cn.hutool.http.HttpRequest;
import cn.hutool.json.JSONUtil;
+import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -15,10 +17,13 @@
import com.boying.util.HTTPEntityUtil;
import com.google.gson.Gson;
import lombok.AllArgsConstructor;
+import org.springframework.http.HttpHeaders;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Service;
import org.springframework.web.client.RestTemplate;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
@@ -147,14 +152,69 @@
@Override
public void uploadInfo(Ticket ticket) {
+ DateFormat sdf= new SimpleDateFormat("yyyy骞碝M鏈坉d鏃�");
String ffzfIp = systemConfigProperties.getFfzfIp();
String info = systemConfigProperties.getInfo();
- Map<String, Object> map = new HashMap<>();;
+ Map<String, Object> map = new HashMap<>();
String jsonString = JSONUtil.toJsonStr(ticket);
Gson gson = new Gson();
map = gson.fromJson(jsonString, map.getClass());
System.out.println(jsonString);
RestTemplate restTemplate = new RestTemplate();
ResponseEntity<R> entity = restTemplate.postForEntity(ffzfIp+info, HTTPEntityUtil.setEntity(map), R.class);
+ int code = entity.getBody().getCode();
+ if(code == 0){
+ ticket.setPush(1);
+ try {
+ Date date = new Date();
+ String format = sdf.format(date);
+ ticket.setWordDate(format);
+ }catch (Exception e){
+ e.printStackTrace();
+ }
+ this.updateById(ticket);
+ }
}
+
+ @Override
+ public Ticket getNumber(Ticket byId) {
+ String ffzfIp = systemConfigProperties.getFfzfIp();
+ String getNumber = systemConfigProperties.getGetNumber();
+ String loginIp = systemConfigProperties.getLoginIp();
+ Map<String, Object> paramMap = new HashMap<>();
+ paramMap.put("username","test");
+ paramMap.put("password","ttt000");
+ paramMap.put("randomStr","blockPuzzle");
+ paramMap.put("grant_type","password");
+ String body = HttpRequest.post(loginIp)
+ .header(Header.CONTENT_TYPE, "application/x-www-form-urlencoded")
+ .header("TENANT-ID", "1")
+ .header("isToken", "false")
+ .header(Header.AUTHORIZATION, "Basic YXBwOmFwcA==")
+ .form(paramMap)
+ .timeout(15000)
+ .execute()
+ .body();
+ System.out.println(body);
+ JSONObject map = JSON.parseObject(body);
+ String access_token = (String)map.get("access_token");
+
+ String body1 = HttpRequest.get(ffzfIp+getNumber)
+ .header(Header.CONTENT_TYPE, "application/json")
+ .header("TENANT-ID", "1")
+ .header(Header.AUTHORIZATION, "bearer "+access_token)
+ .timeout(15000)
+ .execute()
+ .body();
+ System.out.println(body1);
+ JSONObject map1 = JSON.parseObject(body1);
+ String data = (String)map1.get("data");
+ String[] split = data.split("-");
+ byId.setYear(split[0]);
+ byId.setNumber(split[1]);
+ updateById(byId);
+ return byId;
+ }
+
+
}
diff --git a/src/main/java/com/boying/util/HTTPEntityUtil.java b/src/main/java/com/boying/util/HTTPEntityUtil.java
index e6d0d0e..92ee350 100644
--- a/src/main/java/com/boying/util/HTTPEntityUtil.java
+++ b/src/main/java/com/boying/util/HTTPEntityUtil.java
@@ -38,6 +38,28 @@
return httpEntity;
}
+ //map绫诲瀷浣跨敤
+ public static HttpEntity setEntity2(Map<String, Object> map) {
+ HttpHeaders headers = new HttpHeaders();
+ // headers.setContentType(MediaType.parseMediaType("application/json; charset=UTF-8"));
+ headers.add("Tenant-Id","1");
+ headers.add("isToken","false");
+ headers.add("Authorization","Basic YXBwOmFwcA==");
+ ReturnData returnData = new ReturnData();
+ try {
+ if (map != null) {
+ HttpEntity<Map<String, Object>> httpEntity = new
+ HttpEntity<>(map, headers);
+ return httpEntity;
+ }
+ } catch (Exception e) {
+ returnData.setCode(-1);
+ returnData.setMsg("绯荤粺鍐呴儴鍑洪敊!FASP-HESSIAN-1001: 璇锋眰 缃戝叧鍑虹幇寮傚父!");
+ }
+ HttpEntity<String> httpEntity = new HttpEntity<>(headers);
+ return httpEntity;
+ }
+
//list绫诲瀷浣跨敤
public static HttpEntity setEntityForList(List<Map<String, Object>> list){
HttpHeaders headers = new HttpHeaders();
--
Gitblit v1.9.1