From df5cc553bde495f22757f0d6472a714a056a02d8 Mon Sep 17 00:00:00 2001
From: kongdeqiang <123456>
Date: 星期五, 28 四月 2023 16:57:57 +0800
Subject: [PATCH] 默认变更列表
---
src/main/java/com/boying/controller/phone/EticketController.java | 24 ++++++------
src/main/java/com/boying/entity/EnterPark.java | 10 +++++
src/main/java/com/boying/controller/car/PlateServlet3.java | 28 +++++++++++--
src/main/java/com/boying/service/FileInfoService.java | 2 +
src/main/java/com/boying/controller/FileInfoController.java | 6 +++
src/main/java/com/boying/entity/OutPark.java | 10 +++++
src/main/java/com/boying/job/ReadFileScheduled2.java | 9 ++--
src/main/java/com/boying/job/GetEticketScheduled.java | 9 +++-
src/main/java/com/boying/service/impl/FileInfoServiceImpl.java | 13 ++++++
src/main/java/com/boying/job/EticketScheduled.java | 2
10 files changed, 88 insertions(+), 25 deletions(-)
diff --git a/src/main/java/com/boying/controller/FileInfoController.java b/src/main/java/com/boying/controller/FileInfoController.java
index 2423411..93b54af 100644
--- a/src/main/java/com/boying/controller/FileInfoController.java
+++ b/src/main/java/com/boying/controller/FileInfoController.java
@@ -59,4 +59,10 @@
fileInfoService.getFile(path,response);
}
+
+ @GetMapping("/showImgById/{fileId}")
+ public void showImgById(@PathVariable Long fileId,HttpServletResponse response) {
+ fileInfoService.getFileById(fileId,response);
+ }
+
}
diff --git a/src/main/java/com/boying/controller/car/PlateServlet3.java b/src/main/java/com/boying/controller/car/PlateServlet3.java
index a318310..e00d4ee 100644
--- a/src/main/java/com/boying/controller/car/PlateServlet3.java
+++ b/src/main/java/com/boying/controller/car/PlateServlet3.java
@@ -9,6 +9,7 @@
import com.boying.entity.*;
import com.boying.service.*;
import com.boying.util.DateUtilOther;
+import com.boying.util.FileUtil;
import com.boying.util.StringUtil;
import com.google.gson.JsonObject;
import com.google.gson.JsonParser;
@@ -35,6 +36,7 @@
import java.util.List;
import java.util.concurrent.TimeUnit;
+
/**
* Servlet implementation class PlateServlet
*/
@@ -52,6 +54,7 @@
private final TicketService ticketService;
private final CostRuleService costRuleService;
private final WhiteListService whiteListService;
+ private final FileInfoService fileInfoService;
private final String LEDURL = "http://192.168.31.212:9988/LedShow/IGetResultDataAllLine";
/**
@@ -216,6 +219,7 @@
BufferedReader reader = new BufferedReader(new InputStreamReader(request.getInputStream(),"UTF-8"));
String str = "";
String lineStr = "";
+ FileInfo fileInfo = null;
while((str = reader.readLine()) != null){
lineStr += str;
}
@@ -226,6 +230,7 @@
JSONObject result = alarmInfoPlate.getJSONObject("result");
JSONObject plateResult = result.getJSONObject("PlateResult");
String carNo = plateResult.get("license").toString();
+ String image = plateResult.get("imageFile").toString();
String code = alarmInfoPlate.get("serialno").toString();
try {
@@ -261,7 +266,14 @@
break;
}
- System.out.println("缂栧彿锛�"+serialno+"璁惧璇嗗埆鍒颁簡锛�"+license);
+
+ if(StringUtils.isNotBlank(image)){
+ fileInfo = FileUtil.generateBase64StringToFile(image, 1,1);
+ fileInfoService.save(fileInfo);
+ }
+
+
+ System.out.println("缂栧彿锛�"+serialno+" 璁惧璇嗗埆鍒颁簡锛�"+license);
String format = sdf.format(new Date());
s+= format+",杞︾墝鍙蜂负锛�"+license+",serialno涓猴細"+code+" ";
@@ -272,7 +284,7 @@
easyNoOpen(request,response);
}else{
if(barrier.getType()==0){
- outPark(license, barrier.getId(), barrier.getParkId(),request,response);
+ outPark(license, barrier.getId(), barrier.getParkId(),request,response,fileInfo);
s+=license+"-淇濆瓨鍑哄満璁板綍\n";
}else{
String num = redisTemplate.opsForValue().get("car_park_" + barrier.getParkId());
@@ -288,7 +300,7 @@
}else {
//led鏄剧ず
inLedShow(code, license,barrier.getParkId(),request,response);
- enterPark(license,barrier.getId(),barrier.getParkId());
+ enterPark(license,barrier.getId(),barrier.getParkId(),fileInfo);
s+=license+"-淇濆瓨鍏ュ満璁板綍\n";
}
}
@@ -342,7 +354,7 @@
- public void enterPark(String carNo,Integer barrierId,Integer parkId) {
+ public void enterPark(String carNo,Integer barrierId,Integer parkId,FileInfo fileInfo) {
Park park = parkService.getById(parkId);
// int num = 0;
// String s = redisTemplate.opsForValue().get("car_park_" + parkId);
@@ -373,6 +385,9 @@
if(tickets.size()>0){
enterPark.setStatus(1);//鍙戠幇鏈夎繚绔�
}
+ if(fileInfo != null){
+ enterPark.setImgId(fileInfo.getId());
+ }
enterParkService.saveOrUpdate(enterPark);
// Barrier barrier = barrierService.getById(barrierId);
@@ -380,7 +395,7 @@
// barrierService.saveOrUpdate(barrier);
}
- public double outPark(String carNo,Integer barrierId,Integer parkId,HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+ public double outPark(String carNo,Integer barrierId,Integer parkId,HttpServletRequest request, HttpServletResponse response,FileInfo fileInfo) throws ServletException, IOException {
double money = 0.0;
EnterPark enterPark = null;
String toDayHrMinSec = null;
@@ -411,6 +426,9 @@
//outPark.setPrice(Double.valueOf(String.format("%.1f", money)));
outPark.setPrice(money);
outPark.setStatus3(findTicket(carNo));
+ if(fileInfo != null){
+ outPark.setImgId(fileInfo.getId());
+ }
outParkService.saveOrUpdate(outPark);
Barrier barrier =barrierService.getById(barrierId);
barrier.setCarNo(carNo);
diff --git a/src/main/java/com/boying/controller/phone/EticketController.java b/src/main/java/com/boying/controller/phone/EticketController.java
index 8c98762..4b0f1f9 100644
--- a/src/main/java/com/boying/controller/phone/EticketController.java
+++ b/src/main/java/com/boying/controller/phone/EticketController.java
@@ -29,13 +29,13 @@
*/
- public static void main(String[] args) {
+ public static void main9(String[] args) {
//鐩存帴寮�绁�
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
SimpleDateFormat sdf2 = new SimpleDateFormat("hh:mm:ss");
String format = sdf.format(new Date());
String format2 = sdf2.format(new Date());
- String idStr = 111111+"";
+ String idStr = 17107+"";
String dateStr = DateUtil.currentSeconds()+"";
String l = idStr + dateStr;
@@ -43,7 +43,7 @@
//寮�绁ㄧ敵璇�
DirectTicket.info info = new DirectTicket.info();
info.setOrdernum(1);
- info.setAmt(3.0);
+ info.setAmt(7.5);
info.setAmount(1);
info.setIncitemcode("072101");
info.setIncitemname("鍋滆溅娉婁綅鍙婂叕鍏卞仠杞﹀満绛夋湁鍋夸娇鐢ㄦ敹鍏�");
@@ -57,8 +57,8 @@
directTicket.setIssuedate(format);
directTicket.setIssuetime(format2);
directTicket.setPayerpartytype("1");
- directTicket.setPayer("鍐�A0C5MA");
- directTicket.setAmt(3.0);
+ directTicket.setPayer("鍐�A0CM05");
+ directTicket.setAmt(7.5);
directTicket.setUsername("寮犲▏");
directTicket.setChecker("涔斿畞");
directTicket.setPayinfo(json);
@@ -73,7 +73,7 @@
txt += map+",\n";
if(entity.getBody().getCode() ==1 ){
//鐢宠鎴愬姛锛屽幓鑾峰彇寮�绁ㄦ枃浠�
- //System.out.println(entity.getBody());
+ System.out.println(entity.getBody());
Object o = entity.getBody().getData().get(0);
String s = JSON.toJSONString(o);
Map<String,Object> mapTypes = (Map)JSON.parse(s);
@@ -88,18 +88,18 @@
}
}
- public static void main9(String[] args) {
+ public static void main(String[] args) {
Map<String,Object> map1 = new HashMap<>();
- map1.put("einvoicecode", "");
- map1.put("einvoicenumber","");
- map1.put("bizcode", "");
- map1.put("randomnumber","");
+ map1.put("einvoicecode", "13011223");
+ map1.put("einvoicenumber","0005489442");
+ map1.put("bizcode", "171071682490940");
+ map1.put("randomnumber","366660");
map1.put("billfiletype",1);
SimpleDateFormat sdf3 = new SimpleDateFormat("yyyy-MM-dd_HH_mm_ss");
RestTemplate restTemplate = new RestTemplate();
ResponseEntity<ReturnData> entity = restTemplate.postForEntity("http://10.255.200.204:7991/geteinvoicebybizcode", HTTPEntityUtil.setEntity(map1), ReturnData.class);
+ System.out.println(entity.getBody());
if(entity.getBody().getCode() == 1){
- System.out.println(entity.getBody());
Object o1 = entity.getBody().getData().get(0);
String s1 = JSON.toJSONString(o1);
EticketFile eticketFile = JSONObject.parseObject(s1, EticketFile.class);
diff --git a/src/main/java/com/boying/entity/EnterPark.java b/src/main/java/com/boying/entity/EnterPark.java
index 1e709d8..e430ee6 100644
--- a/src/main/java/com/boying/entity/EnterPark.java
+++ b/src/main/java/com/boying/entity/EnterPark.java
@@ -5,6 +5,7 @@
import com.boying.common.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
+import io.swagger.models.auth.In;
import lombok.Data;
import javax.persistence.Column;
@@ -42,8 +43,17 @@
@Column(columnDefinition = "int comment '鏈彂鐜拌繚绔狅細0 鍙戠幇杩濈珷锛�1'")
private int status;
+ @ApiModelProperty(value = "鍥剧墖id")
+ @Column(columnDefinition = "int comment '鍥剧墖id'")
+ private Integer imgId;
+
+
@Transient
@TableField(exist = false)
private String parkName;
+ @Transient
+ @TableField(exist = false)
+ private String imgPath;
+
}
diff --git a/src/main/java/com/boying/entity/OutPark.java b/src/main/java/com/boying/entity/OutPark.java
index 513c70c..b0e44fc 100644
--- a/src/main/java/com/boying/entity/OutPark.java
+++ b/src/main/java/com/boying/entity/OutPark.java
@@ -5,9 +5,11 @@
import com.boying.common.BaseEntity;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
+import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Transient;
import java.time.LocalDateTime;
@@ -95,7 +97,15 @@
*/
private int status3;
+ @ApiModelProperty(value = "鍥剧墖id")
+ @Column(columnDefinition = "int comment '鍥剧墖id'")
+ private Integer imgId;
+
@Transient
@TableField(exist = false)
private String parkName;
+
+ @Transient
+ @TableField(exist = false)
+ private String imgPath;
}
diff --git a/src/main/java/com/boying/job/EticketScheduled.java b/src/main/java/com/boying/job/EticketScheduled.java
index 22737de..eb28bd6 100644
--- a/src/main/java/com/boying/job/EticketScheduled.java
+++ b/src/main/java/com/boying/job/EticketScheduled.java
@@ -43,7 +43,7 @@
private FileInfoService fileInfoService;
private Boolean taskFlag = false;
- // @Scheduled(cron = "0/10 * * * * ?")
+ //@Scheduled(cron = "0/10 * * * * ?")
public void execute() throws Exception {
if(taskFlag == true){
System.out.println("姝ｅ湪杩愯锛屽己鍒堕��鍑�-------銆�");
diff --git a/src/main/java/com/boying/job/GetEticketScheduled.java b/src/main/java/com/boying/job/GetEticketScheduled.java
index 0fd02e2..7f439d8 100644
--- a/src/main/java/com/boying/job/GetEticketScheduled.java
+++ b/src/main/java/com/boying/job/GetEticketScheduled.java
@@ -47,9 +47,12 @@
}
QueryWrapper<OrderRecord> wrapper = new QueryWrapper<>();
wrapper.lambda()
- .eq(OrderRecord::getTicketStatus, 0)
- .isNotNull(OrderRecord::getEinvoicecode)
- .orderByDesc(OrderRecord::getCreateTime);
+// .eq(OrderRecord::getTicketStatus, 0)
+// .isNotNull(OrderRecord::getEinvoicecode)
+// .orderByDesc(OrderRecord::getCreateTime);
+ .in(OrderRecord::getPayCode,"13040623000000055070","13040623000000062406","13040623000000232508","13040623000000363081","13040623000000242992","13040623000000319574","13040623000000362919","13040623000000154458","13040623000000151150",
+ "13040623000000155450","13040623000000241009","13040623000000363014","13040623000000220187","13040623000000231732","13040623000000362898","13040623000000362900","13040623000000362951","13040623000000153156","13040623000000150991",
+ "13040623000000327435","13040623000000226482");
List<OrderRecord> list = orderRecordService.list(wrapper);
if (list.size() > 0) {
if (list.size() > 50) {
diff --git a/src/main/java/com/boying/job/ReadFileScheduled2.java b/src/main/java/com/boying/job/ReadFileScheduled2.java
index f4e134a..3baa9ab 100644
--- a/src/main/java/com/boying/job/ReadFileScheduled2.java
+++ b/src/main/java/com/boying/job/ReadFileScheduled2.java
@@ -9,6 +9,7 @@
import com.boying.service.OrderRecordService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
import java.io.IOException;
@@ -36,12 +37,12 @@
@Autowired
private ErrorLogService errorLogService;
- //@Scheduled(cron = "0 30 14 * * ?")
+ //@Scheduled(cron = "0 40 18 * * ?")
public void execute() throws Exception {
- Path path = Paths.get("E:\\ycCheckBill\\Bank_PSBC_20230422.txt");
+ Path path = Paths.get("E:\\ycCheckBill\\Bank_PSBC_20230421.txt");
- DateTime start = DateUtil.parse( "2023-04-21 22:30:00");
- DateTime end = DateUtil.parse("2023-04-22 22:29:59");
+ DateTime start = DateUtil.parse( "2023-04-20 22:30:00");
+ DateTime end = DateUtil.parse("2023-04-21 22:29:59");
QueryWrapper<OrderRecord> wrapper = new QueryWrapper<>();
wrapper.lambda()
diff --git a/src/main/java/com/boying/service/FileInfoService.java b/src/main/java/com/boying/service/FileInfoService.java
index 6080a63..884c2d8 100644
--- a/src/main/java/com/boying/service/FileInfoService.java
+++ b/src/main/java/com/boying/service/FileInfoService.java
@@ -16,4 +16,6 @@
void downloadPng(FileInfo byId,HttpServletRequest request, HttpServletResponse response);
void getFile(String downloadPath, HttpServletResponse response);
+
+ void getFileById(Long fileId, HttpServletResponse response);
}
diff --git a/src/main/java/com/boying/service/impl/FileInfoServiceImpl.java b/src/main/java/com/boying/service/impl/FileInfoServiceImpl.java
index c1eae7f..7978673 100644
--- a/src/main/java/com/boying/service/impl/FileInfoServiceImpl.java
+++ b/src/main/java/com/boying/service/impl/FileInfoServiceImpl.java
@@ -31,6 +31,7 @@
public class FileInfoServiceImpl extends ServiceImpl<FileInfoMapper, FileInfo> implements FileInfoService {
private final SystemConfigProperties systemConfigProperties;
+ private final FileInfoMapper fileInfoMapper;
@Override
public String downloadPathFile(String downloadPath, HttpServletRequest request, HttpServletResponse response) {
//璁剧疆鏂囦欢璺緞
@@ -166,4 +167,16 @@
System.out.println("鏂囦欢璇诲彇寮傚父锛�"+e.getLocalizedMessage());
}
}
+
+ @Override
+ public void getFileById(Long fileId, HttpServletResponse response) {
+ try {
+ FileInfo fileInfo = fileInfoMapper.selectById(fileId);
+ InputStream input = new FileInputStream(new File(fileInfo.getFileBaseDir()+fileInfo.getFileName()+fileInfo.getFileLast()));
+ response.setContentType(MediaType.IMAGE_PNG_VALUE);
+ IoUtil.copy(input, response.getOutputStream());
+ }catch (Exception e){
+ System.out.println("鏂囦欢璇诲彇寮傚父锛�"+e.getLocalizedMessage());
+ }
+ }
}
--
Gitblit v1.9.1