From da9a4f7ad988c452f3a356989eaf7a6c06ae5032 Mon Sep 17 00:00:00 2001
From: kongdeqiang <kongdeqiang960204@163.com>
Date: 星期四, 26 九月 2024 23:03:05 +0800
Subject: [PATCH] fix:合并代码
---
src/main/java/com/boying/controller/phone/TicketController.java | 21
src/main/java/com/boying/controller/EnterParkController.java | 9
src/main/java/com/boying/controller/WhiteListController.java | 8
src/main/java/com/boying/controller/BarrierController.java | 20
src/main/java/com/boying/controller/phone/NoticeController.java | 7
src/main/java/com/boying/controller/car/MqttSample.java | 132 +-
src/main/java/com/boying/controller/CostRuleController.java | 8
src/main/java/com/boying/controller/TicketBlackController.java | 8
src/main/java/com/boying/controller/FileInfoController.java | 9
src/main/java/com/boying/controller/ViolationTypeController.java | 13
src/main/java/com/boying/controller/phone/PayController.java | 10
src/main/java/com/boying/controller/LedShowController.java | 2
src/main/java/com/boying/controller/UserController.java | 9
src/main/java/com/boying/controller/car/PlateServlet3.java | 2034 +++++++++++++++++++++---------------------
src/main/java/com/boying/controller/StatisticController.java | 7
src/main/java/com/boying/controller/phone/UpdateAppController.java | 4
src/main/java/com/boying/controller/phone/YCPayController.java | 16
src/main/java/com/boying/controller/car/MqttSample2.java | 138 +-
src/main/java/com/boying/controller/car/PlateServlet2.java | 6
src/main/java/com/boying/controller/OrderRecordController.java | 7
src/main/java/com/boying/controller/FileInfo2Controller.java | 8
src/main/java/com/boying/controller/car/PushCallback.java | 88
src/main/java/com/boying/controller/StreetController.java | 12
src/main/java/com/boying/controller/BarrierOpenLogController.java | 6
src/main/java/com/boying/controller/car/ServerMQTT.java | 186 +-
25 files changed, 1,314 insertions(+), 1,454 deletions(-)
diff --git a/src/main/java/com/boying/controller/BarrierController.java b/src/main/java/com/boying/controller/BarrierController.java
index 92fc67a..54144bd 100644
--- a/src/main/java/com/boying/controller/BarrierController.java
+++ b/src/main/java/com/boying/controller/BarrierController.java
@@ -13,8 +13,7 @@
import com.boying.service.OutParkService;
import com.boying.service.ParkService;
import com.boying.util.RedisJsonUtil;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.annotations.Tag;
import lombok.RequiredArgsConstructor;
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.web.bind.annotation.PostMapping;
@@ -31,7 +30,6 @@
@RestController
@RequestMapping("ffzf/barrier")
@RequiredArgsConstructor
-@Tag(description = "ffzf/barrier" , name = "閬撻椄鎺ュ彛" )
public class BarrierController {
private final BarrierService barrierService;
@@ -42,7 +40,7 @@
@PostMapping("findPage")
- @Operation(summary = "鏍规嵁鍋滆溅鍦哄垎椤垫煡璇㈤亾闂�" , description = "鏍规嵁鍋滆溅鍦哄垎椤垫煡璇㈤亾闂�" )
+ // @Operation(summary = "鏍规嵁鍋滆溅鍦哄垎椤垫煡璇㈤亾闂�" , description = "鏍规嵁鍋滆溅鍦哄垎椤垫煡璇㈤亾闂�" )
public Object findPage(Page page, String parkId) {
QueryWrapper<Barrier> wrapper = new QueryWrapper<>();
wrapper.lambda()
@@ -60,7 +58,7 @@
}
@PostMapping("save")
- @Operation(summary = "鏂板閬撻椄" , description = "鏂板閬撻椄" )
+ // @Operation(summary = "鏂板閬撻椄" , description = "鏂板閬撻椄" )
public Object save(Barrier barrier) {
barrier.setUpdateTime(LocalDateTime.now());
barrierService.saveOrUpdate(barrier);
@@ -74,7 +72,7 @@
}
@PostMapping("delete")
- @Operation(summary = "鍒犻櫎閬撻椄" , description = "鍒犻櫎閬撻椄" )
+ //@Operation(summary = "鍒犻櫎閬撻椄" , description = "鍒犻櫎閬撻椄" )
public Object delete(Integer id) {
Barrier byId = barrierService.getById(id);
barrierService.removeById(id);
@@ -83,7 +81,7 @@
}
@PostMapping("findAll")
- @Operation(summary = "鏌ヨ鎵�鏈夐亾闂革紙APP锛�" , description = "鏌ヨ鎵�鏈夐亾闂革紙APP锛�" )
+ //@Operation(summary = "鏌ヨ鎵�鏈夐亾闂革紙APP锛�" , description = "鏌ヨ鎵�鏈夐亾闂革紙APP锛�" )
public Object findAll(Long parkId) {
if (parkId==null) {
return R.failed("鏈彂鐜拌鍋滆溅鍦�");
@@ -95,7 +93,7 @@
}
@PostMapping("open")
- @Operation(summary = "鎵嬪姩寮�闂革紙搴熷純锛�" , description = "鎵嬪姩寮�闂革紙搴熷純锛�" )
+ // @Operation(summary = "鎵嬪姩寮�闂革紙搴熷純锛�" , description = "鎵嬪姩寮�闂革紙搴熷純锛�" )
public Object open(Long barrierId) {
Barrier b= barrierService.getById(barrierId);
if (b==null) {
@@ -114,7 +112,7 @@
}
@PostMapping("getByCode")
- @Operation(summary = "鏍规嵁code鏌ヨ閬撻椄" , description = "鏍规嵁code鏌ヨ閬撻椄" )
+ // @Operation(summary = "鏍规嵁code鏌ヨ閬撻椄" , description = "鏍规嵁code鏌ヨ閬撻椄" )
public Object getByCode(String code) {
Barrier b= barrierService.findByCode2(code);
if (b==null) {
@@ -127,7 +125,7 @@
@PostMapping("openBarrier")
- @Operation(summary = "鎵嬫寔鎵嬪姩寮�闂�" , description = "鎵嬫寔鎵嬪姩寮�闂�" )
+ // @Operation(summary = "鎵嬫寔鎵嬪姩寮�闂�" , description = "鎵嬫寔鎵嬪姩寮�闂�" )
public Object openBarrier(Long barrierId,Integer type,String carNo,String remark) {
Barrier b= barrierService.getById(barrierId);
if (b==null) {
@@ -203,7 +201,7 @@
}
@PostMapping("getDisConnect")
- @Operation(summary = "璁惧鎺夌嚎閫氱煡" , description = "璁惧鎺夌嚎閫氱煡" )
+ //@Operation(summary = "璁惧鎺夌嚎閫氱煡" , description = "璁惧鎺夌嚎閫氱煡" )
public Object getDisConnect() {
List<Map<String,Object>> resultlist = new ArrayList<>();
String barrierCodeAll = redisTemplate.opsForValue().get("barrierCode_all");
diff --git a/src/main/java/com/boying/controller/BarrierOpenLogController.java b/src/main/java/com/boying/controller/BarrierOpenLogController.java
index 526ad99..3d91f72 100644
--- a/src/main/java/com/boying/controller/BarrierOpenLogController.java
+++ b/src/main/java/com/boying/controller/BarrierOpenLogController.java
@@ -13,8 +13,8 @@
import com.boying.service.BarrierService;
import com.boying.service.OutParkService;
import com.boying.service.ParkService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
+
+import io.swagger.annotations.Tag;
import lombok.RequiredArgsConstructor;
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.web.bind.annotation.PostMapping;
@@ -28,7 +28,6 @@
@RestController
@RequestMapping("ffzf/barrierOpenLog")
@RequiredArgsConstructor
-@Tag(description = "ffzf/barrierOpenLog" , name = "鎵嬪姩寮�闂告棩蹇�" )
public class BarrierOpenLogController {
private final BarrierOpenLogService barrierOpenLogService;
@@ -36,7 +35,6 @@
@PostMapping("findPage")
- @Operation(summary = "鍒嗛〉鏌ヨ" , description = "鍒嗛〉鏌ヨ" )
public Object findPage(Page page, Integer parkId,String carNo) {
QueryWrapper<BarrierOpenLog> wrapper = new QueryWrapper<>();
wrapper.lambda()
diff --git a/src/main/java/com/boying/controller/CostRuleController.java b/src/main/java/com/boying/controller/CostRuleController.java
index 5f72406..2007a6b 100644
--- a/src/main/java/com/boying/controller/CostRuleController.java
+++ b/src/main/java/com/boying/controller/CostRuleController.java
@@ -13,8 +13,7 @@
import com.boying.service.ParkService;
import com.boying.util.DateUtilOther;
import com.fasterxml.jackson.databind.ObjectMapper;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
+
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
@@ -27,21 +26,18 @@
@RestController
@RequestMapping("ffzf/rule")
@RequiredArgsConstructor
-@Tag(description = "ffzf/rule" , name = "缂磋垂瑙勫垯" )
public class CostRuleController{
private final CostRuleService costRuleService;
private final ParkService parkService;
@GetMapping("test")
- @Operation(summary = "娴嬭瘯" , description = "娴嬭瘯" )
public Object save(String start,String end) throws ParseException {
double money = costRuleService.getMoney(4, DateUtilOther.stringToLocalDate(start,null), DateUtilOther.stringToLocalDate(end, null), 1);
return R.ok(money);
}
@PostMapping("/findPage")
- @Operation(summary = "鍒嗛〉鏌ヨ" , description = "鍒嗛〉鏌ヨ" )
public Object findPage(Page page,CostRule costRule) {
QueryWrapper<CostRule> wrapper = new QueryWrapper<>();
wrapper.lambda()
@@ -56,7 +52,6 @@
return R.ok(page1);}
@PostMapping("/save")
- @Operation(summary = "鏂板瑙勫垯" , description = "鏂板瑙勫垯" )
public Object save(CostRule costRule) {
costRuleService.saveOrUpdate(costRule);
return R.ok("淇濆瓨鎴愬姛");
@@ -64,7 +59,6 @@
@PostMapping("/delete")
- @Operation(summary = "鍒犻櫎瑙勫垯" , description = "鍒犻櫎瑙勫垯" )
public Object delete(Long id) {
costRuleService.removeById(id);
return R.ok("鍒犻櫎鎴愬姛");
diff --git a/src/main/java/com/boying/controller/EnterParkController.java b/src/main/java/com/boying/controller/EnterParkController.java
index 00b0fcc..ec9488d 100644
--- a/src/main/java/com/boying/controller/EnterParkController.java
+++ b/src/main/java/com/boying/controller/EnterParkController.java
@@ -14,8 +14,6 @@
import com.boying.service.ParkService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.*;
@@ -35,7 +33,6 @@
@RequiredArgsConstructor
@RequestMapping("ffzf/enterpark" )
@Api(value = "enterpark", tags = "鍏ュ満琛ㄧ鐞�")
-@Tag(description = "ffzf/enterpark" , name = "鍏ュ満琛ㄨ褰�" )
public class EnterParkController {
private final EnterParkService enterParkService;
@@ -68,7 +65,6 @@
// }
@PostMapping("/findPage")
- @Operation(summary = "鍒嗛〉鏌ヨ" , description = "鍒嗛〉鏌ヨ" )
public Object findPage(Page page, String carNo,Integer parkId,String date) throws ParseException {
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
if(StringUtils.isNotBlank(date)){
@@ -96,7 +92,6 @@
*/
@ApiOperation(value = "閫氳繃id鏌ヨ", notes = "閫氳繃id鏌ヨ")
@GetMapping("/{id}" )
- @Operation(summary = "鏍规嵁id鏌ヨ" , description = "鏍规嵁id鏌ヨ" )
public R getById(@PathVariable("id" ) Integer id) {
return R.ok(enterParkService.getById(id));
}
@@ -108,7 +103,6 @@
*/
@ApiOperation(value = "鏂板鍏ュ満琛�", notes = "鏂板鍏ュ満琛�")
@PostMapping
- @Operation(summary = "鏂板鍏ュ満" , description = "鏂板鍏ュ満" )
public R save(@RequestBody EnterPark enterPark) {
return R.ok(enterParkService.save(enterPark));
}
@@ -120,7 +114,6 @@
*/
@ApiOperation(value = "淇敼鍏ュ満琛�", notes = "淇敼鍏ュ満琛�")
@PutMapping
- @Operation(summary = "淇敼鍏ュ満" , description = "淇敼鍏ュ満" )
public R updateById(@RequestBody EnterPark enterPark) {
return R.ok(enterParkService.updateById(enterPark));
}
@@ -132,7 +125,6 @@
*/
@ApiOperation(value = "閫氳繃id鍒犻櫎鍏ュ満琛�", notes = "閫氳繃id鍒犻櫎鍏ュ満琛�")
@DeleteMapping("/{id}" )
- @Operation(summary = "鍒犻櫎鍏ュ満" , description = "鍒犻櫎鍏ュ満" )
public R removeById(@PathVariable Integer id) {
return R.ok(enterParkService.removeById(id));
}
@@ -144,7 +136,6 @@
* @return excel 鏂囦欢娴�
*/
@GetMapping("/export")
- @Operation(summary = "瀵煎嚭鍏ュ満" , description = "瀵煎嚭鍏ュ満" )
public List<EnterPark> export(EnterPark enterPark) {
return enterParkService.list(Wrappers.query(enterPark));
}
diff --git a/src/main/java/com/boying/controller/FileInfo2Controller.java b/src/main/java/com/boying/controller/FileInfo2Controller.java
index 17c56b6..1fceedb 100644
--- a/src/main/java/com/boying/controller/FileInfo2Controller.java
+++ b/src/main/java/com/boying/controller/FileInfo2Controller.java
@@ -3,8 +3,6 @@
import com.boying.entity.FileInfo;
import com.boying.service.FileInfoService;
import io.lettuce.core.dynamic.annotation.Param;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.*;
@@ -16,7 +14,6 @@
@RestController
@RequestMapping("ffzf/fileInfo")
@RequiredArgsConstructor
-@Tag(description = "ffzf/fileInfo" , name = "鏂囦欢涓婁紶鎺ュ彛" )
public class FileInfo2Controller {
private final FileInfoService fileInfoService;
@@ -26,14 +23,12 @@
* @Param downloadPath 鏂囦欢璺緞
*/
@GetMapping("/download/downloadZip")
- @Operation(summary = "涓嬭浇zip" , description = "涓嬭浇zip" )
public void downloadZip(@Param("downloadPath") String downloadPath, HttpServletRequest request, HttpServletResponse response) {
//涓嬭浇鍥剧墖
String down = fileInfoService.downloadPathFile(downloadPath, request, response);
}
@PostMapping("/download/downloadZips")
- @Operation(summary = "涓嬭浇澶氫釜zip" , description = "涓嬭浇澶氫釜zip" )
public void downloadZips(String fileIds, HttpServletRequest request, HttpServletResponse response) {
List<FileInfo> fileInfoList = new ArrayList<>();
if(fileIds.contains(",")){
@@ -51,20 +46,17 @@
fileInfoService.downForZip(fileInfoList, request, response);
}
@PostMapping("/download/downloadPng")
- @Operation(summary = "涓嬭浇鍥剧墖" , description = "涓嬭浇鍥剧墖" )
public void downloadPng(String fileId, HttpServletRequest request, HttpServletResponse response) {
FileInfo byId = fileInfoService.getById(Integer.parseInt(fileId));
fileInfoService.downloadPng(byId,request,response);
}
@GetMapping("/showImg")
- @Operation(summary = "鏍规嵁璺緞棰勮鍥剧墖" , description = "鏍规嵁璺緞棰勮鍥剧墖" )
public void showImg( String path,HttpServletResponse response) {
fileInfoService.getFile(path,response);
}
@GetMapping("/showImgById/{fileId}")
- @Operation(summary = "鏍规嵁鏂囦欢id棰勮鍥剧墖" , description = "鏍规嵁鏂囦欢id棰勮鍥剧墖" )
public void showImgById(@PathVariable Long fileId,HttpServletResponse response) {
fileInfoService.getFileById(fileId,response);
}
diff --git a/src/main/java/com/boying/controller/FileInfoController.java b/src/main/java/com/boying/controller/FileInfoController.java
index a6caf79..71f3ea0 100644
--- a/src/main/java/com/boying/controller/FileInfoController.java
+++ b/src/main/java/com/boying/controller/FileInfoController.java
@@ -6,8 +6,7 @@
import com.boying.service.FileInfoService;
import io.lettuce.core.dynamic.annotation.Param;
import io.swagger.models.auth.In;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
+
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.*;
@@ -19,7 +18,6 @@
@RestController
@RequestMapping("ffzf/fileinfo")
@RequiredArgsConstructor
-@Tag(description = "ffzf/fileinfo" , name = "鏂囦欢鎺ュ彛锛堝凡搴熷純锛�" )
public class FileInfoController {
private final FileInfoService fileInfoService;
@@ -29,14 +27,12 @@
* @Param downloadPath 鏂囦欢璺緞
*/
@GetMapping("/download/downloadZip")
- @Operation(summary = "涓嬭浇zip" , description = "涓嬭浇zip" )
public void downloadZip(@Param("downloadPath") String downloadPath, HttpServletRequest request, HttpServletResponse response) {
//涓嬭浇鍥剧墖
String down = fileInfoService.downloadPathFile(downloadPath, request, response);
}
@PostMapping("/download/downloadZips")
- @Operation(summary = "涓嬭浇澶氫釜zip" , description = "涓嬭浇澶氫釜zip" )
public void downloadZips(String fileIds, HttpServletRequest request, HttpServletResponse response) {
List<FileInfo> fileInfoList = new ArrayList<>();
if(fileIds.contains(",")){
@@ -54,20 +50,17 @@
fileInfoService.downForZip(fileInfoList, request, response);
}
@PostMapping("/download/downloadPng")
- @Operation(summary = "涓嬭浇鍥剧墖" , description = "涓嬭浇鍥剧墖" )
public void downloadPng(String fileId, HttpServletRequest request, HttpServletResponse response) {
FileInfo byId = fileInfoService.getById(Integer.parseInt(fileId));
fileInfoService.downloadPng(byId,request,response);
}
@GetMapping("/showImg/{filename}")
- @Operation(summary = "鏍规嵁璺緞棰勮鍥剧墖" , description = "鏍规嵁璺緞棰勮鍥剧墖" )
public void showImg(@PathVariable String filename,HttpServletResponse response) {
fileInfoService.getFile(filename,response);
}
@GetMapping("/showImgById/{fileId}")
- @Operation(summary = "鏍规嵁鏂囦欢id棰勮鍥剧墖" , description = "鏍规嵁鏂囦欢id棰勮鍥剧墖" )
public void showImgById(@PathVariable Long fileId,HttpServletResponse response) {
fileInfoService.getFileById(fileId,response);
}
diff --git a/src/main/java/com/boying/controller/LedShowController.java b/src/main/java/com/boying/controller/LedShowController.java
index b26fc70..1089c0c 100644
--- a/src/main/java/com/boying/controller/LedShowController.java
+++ b/src/main/java/com/boying/controller/LedShowController.java
@@ -8,7 +8,6 @@
import com.boying.service.BarrierService;
import com.boying.service.LedShowService;
import com.boying.service.ParkService;
-import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.web.bind.annotation.GetMapping;
@@ -27,7 +26,6 @@
@RestController
@RequestMapping("ledshow")
@RequiredArgsConstructor
-@Tag(description = "ledshow" , name = "led鏃ュ織锛堝凡搴熷純锛�" )
public class LedShowController {
private final LedShowService ledShowService;
diff --git a/src/main/java/com/boying/controller/OrderRecordController.java b/src/main/java/com/boying/controller/OrderRecordController.java
index 3b426cd..f9b88e2 100644
--- a/src/main/java/com/boying/controller/OrderRecordController.java
+++ b/src/main/java/com/boying/controller/OrderRecordController.java
@@ -16,8 +16,7 @@
import com.boying.service.UserService;
import io.swagger.annotations.ApiOperation;
import io.swagger.models.auth.In;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
+
import lombok.RequiredArgsConstructor;
import org.springframework.beans.BeanUtils;
import org.springframework.web.bind.annotation.GetMapping;
@@ -35,7 +34,6 @@
@RestController
@RequestMapping("ffzf/orderrecord")
@RequiredArgsConstructor
-@Tag(description = "ffzf/orderrecord" , name = "璁㈠崟鎺ュ彛" )
public class OrderRecordController {
private final OrderRecordService orderRecordService;
@@ -51,7 +49,6 @@
*/
@ApiOperation(value = "鍒嗛〉鏌ヨ", notes = "鍒嗛〉鏌ヨ")
@PostMapping("/findPage" )
- @Operation(summary = "鍒嗛〉鏌ヨ" , description = "鍒嗛〉鏌ヨ" )
public R getOrderRecordPage(Page page, OrderRecord orderRecord) {
QueryWrapper<OrderRecord> wrapper = new QueryWrapper<>();
wrapper.lambda()
@@ -76,7 +73,6 @@
@PostMapping("/getByCarNo")
- @Operation(summary = "閫氳繃杞︾墝鍙锋湀浠藉垎椤垫煡璇�" , description = "閫氳繃杞︾墝鍙锋湀浠藉垎椤垫煡璇�" )
public Object getByCarNo(Page page,String carNo,String month,String phone) {
List<OrderRecordVo> recordVos = new ArrayList<>();
QueryWrapper<OrderRecord> wrapper = new QueryWrapper<>();
@@ -105,7 +101,6 @@
}
@PostMapping("/findCountPage")
- @Operation(summary = "鏌ヨ鍋滆溅鍦鸿鍗曢噾棰濈粺璁�" , description = "鏌ヨ鍋滆溅鍦鸿鍗曢噾棰濈粺璁�" )
public Object findCountPage(Integer parkId,String startTime,String endTime) throws ParseException {
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
QueryWrapper<OutPark> wrapper = new QueryWrapper<>();
diff --git a/src/main/java/com/boying/controller/StatisticController.java b/src/main/java/com/boying/controller/StatisticController.java
index 56873d3..8ccdf3f 100644
--- a/src/main/java/com/boying/controller/StatisticController.java
+++ b/src/main/java/com/boying/controller/StatisticController.java
@@ -9,8 +9,7 @@
import com.boying.service.StatisticService;
import com.boying.service.StreetLogoService;
import com.boying.service.TicketBlackService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
+
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.PageRequest;
@@ -32,7 +31,6 @@
@RestController
@RequestMapping("statistic")
@RequiredArgsConstructor
-@Tag(description = "statistic" , name = "澶у睆缁熻鎺ュ彛" )
public class StatisticController{
private final StatisticService statisticService;
@@ -43,7 +41,6 @@
//鎸囨尌椤甸潰鏁版嵁
@PostMapping("/getData1")
- @Operation(summary = "鏌ヨ鎵�鏈夋硦杞︾粺璁�" , description = "鏌ヨ鎵�鏈夋硦杞︾粺璁�" )
public Object card1() {
List<Statistic> all = statisticService.list();
if(all.size() >0){
@@ -54,7 +51,6 @@
}
@PostMapping("/getBlackRecord")
- @Operation(summary = "鏌ヨ鎵�鏈夎繚娉曠粺璁�" , description = "鏌ヨ鎵�鏈夎繚娉曠粺璁�" )
public Object getList1(Page page) {
QueryWrapper<TicketBlack> wrapper = new QueryWrapper<>();
wrapper.lambda()
@@ -63,7 +59,6 @@
}
@PostMapping("/getLogo")
- @Operation(summary = "鏌ヨ鎵�鏈夎閬撹繚绔犵粺璁�" , description = "鏌ヨ鎵�鏈夎閬撹繚绔犵粺璁�" )
public Object getLogo() {
return R.ok(streetLogoService.list());
}
diff --git a/src/main/java/com/boying/controller/StreetController.java b/src/main/java/com/boying/controller/StreetController.java
index 7cf1b0a..27ecd22 100644
--- a/src/main/java/com/boying/controller/StreetController.java
+++ b/src/main/java/com/boying/controller/StreetController.java
@@ -11,8 +11,6 @@
import com.boying.service.StreetReRoadService;
import com.boying.service.StreetService;
import com.boying.util.LngLatUtil;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
@@ -29,7 +27,6 @@
@RestController
@RequestMapping("ffzf/street")
@RequiredArgsConstructor
-@Tag(description = "ffzf/street" , name = "琛楅亾缁熻" )
public class StreetController {
@@ -38,7 +35,6 @@
private final StreetLogoService streetLogoService;
@PostMapping("/findPage")
- @Operation(summary = "鍒嗛〉鏌ヨ" , description = "鍒嗛〉鏌ヨ" )
public Object findPage(Page page, Street street) {
QueryWrapper<Street> wrapper = new QueryWrapper<>();
wrapper.lambda()
@@ -47,7 +43,6 @@
}
@PostMapping("/save")
- @Operation(summary = "鏂板琛楅亾" , description = "鏂板琛楅亾" )
public Object save(Street street) {
QueryWrapper<Street> wrapper = new QueryWrapper<>();
wrapper.lambda()
@@ -68,7 +63,6 @@
}
@PostMapping("/save2")
- @Operation(summary = "鏂板璺�" , description = "鏂板璺�" )
public Object save2(StreetReRoad streetReRoad) {
streetReRoadService.saveOrUpdate(streetReRoad);
return R.ok();
@@ -76,21 +70,18 @@
@PostMapping("/delete")
- @Operation(summary = "鍒犻櫎琛�" , description = "鍒犻櫎琛�" )
public Object delete(Long id) {
streetService.removeById(id);
return R.ok();
}
@PostMapping("/delete2")
- @Operation(summary = "鍒犻櫎璺�" , description = "鍒犻櫎璺�" )
public Object delete2(Long id) {
streetReRoadService.removeById(id);
return R.ok();
}
@GetMapping("/findById")
- @Operation(summary = "鏍规嵁id鏌ヨ锛圓PP锛�" , description = "鏍规嵁id鏌ヨ锛圓PP锛�" )
public Object findById(Long id,int type) {
if(type==0){
QueryWrapper<StreetReRoad> roadQueryWrapper = new QueryWrapper<>();
@@ -119,7 +110,6 @@
}
@GetMapping("/findList")
- @Operation(summary = "鏌ヨ鎵�鏈夎閬撳拰璺�" , description = "鏌ヨ鎵�鏈夎閬撳拰璺�" )
public Object findAll() {
Map<String,Object> map = new HashMap<>();
QueryWrapper<Street> wrapper = new QueryWrapper<>();
@@ -135,13 +125,11 @@
}
@GetMapping("/findList2")
- @Operation(summary = "鏌ヨ鎵�鏈夎閬�" , description = "鏌ヨ鎵�鏈夎閬�" )
public Object findAll2() {
return R.ok(streetService.list());
}
@PostMapping("findLogo")
- @Operation(summary = "鏌ヨ鎵�鏈夎閬撹繚绔�" , description = "鏌ヨ鎵�鏈夎閬撹繚绔�" )
public Object findLogo(String lng ,String lat) {
List<StreetLogo> all = streetLogoService.list();
List<StreetLogo> all2 = new ArrayList<>();
diff --git a/src/main/java/com/boying/controller/TicketBlackController.java b/src/main/java/com/boying/controller/TicketBlackController.java
index 4694209..c71476c 100644
--- a/src/main/java/com/boying/controller/TicketBlackController.java
+++ b/src/main/java/com/boying/controller/TicketBlackController.java
@@ -11,8 +11,6 @@
import com.boying.util.FileUtil;
import com.boying.util.NumberToCN;
import io.swagger.annotations.ApiOperation;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.FilenameUtils;
@@ -34,7 +32,6 @@
@RestController
@RequestMapping("ffzf/ticketblack")
@RequiredArgsConstructor
-@Tag(description = "ffzf/ticketblack" , name = "榛戝悕鍗曡〃鎺ュ彛" )
public class TicketBlackController {
@@ -46,7 +43,6 @@
@PostMapping("findPage")
- @Operation(summary = "鍒嗛〉鏌ヨ" , description = "鍒嗛〉鏌ヨ" )
public Object findPage(Page page, TicketBlack ticket){
QueryWrapper<TicketBlack> wrapper = new QueryWrapper<>();
wrapper.lambda()
@@ -57,7 +53,6 @@
}
@PostMapping("/save")
- @Operation(summary = "鏂板榛戝悕鍗�" , description = "鏂板榛戝悕鍗�" )
public Object save(TicketBlack ticket) throws IOException{
QueryWrapper<TicketBlack> wrapper = new QueryWrapper<>();
wrapper.lambda()
@@ -79,7 +74,6 @@
*/
@ApiOperation(value = "閫氳繃id鏌ヨ", notes = "閫氳繃id鏌ヨ")
@GetMapping("/{id}" )
- @Operation(summary = "閫氳繃id鏌ヨ" , description = "閫氳繃id鏌ヨ" )
public R getById(@PathVariable("id" ) Integer id) {
TicketBlack byId = ticketBlackService.getById(id);
return R.ok(byId);
@@ -87,7 +81,6 @@
@PostMapping("/delete")
- @Operation(summary = "鍒犻櫎榛戝悕鍗�" , description = "鍒犻櫎榛戝悕鍗�" )
public Object delete(Long id){
TicketBlack ticket =ticketBlackService.getById(id);
if(ticket!=null){
@@ -101,7 +94,6 @@
}
@PostMapping("/updateById")
- @Operation(summary = "鏇存柊榛戝悕鍗�" , description = "鏇存柊榛戝悕鍗�" )
public Object updateById(TicketBlack ticket){
return R.ok( ticketBlackService.updateById(ticket));
}
diff --git a/src/main/java/com/boying/controller/UserController.java b/src/main/java/com/boying/controller/UserController.java
index 59b6f2a..c741915 100644
--- a/src/main/java/com/boying/controller/UserController.java
+++ b/src/main/java/com/boying/controller/UserController.java
@@ -9,8 +9,6 @@
import com.boying.service.ParkService;
import com.boying.service.UserService;
import com.boying.util.LngLatUtil;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import org.springframework.data.jpa.domain.Specification;
import org.springframework.web.bind.annotation.PostMapping;
@@ -27,14 +25,12 @@
@RestController
@RequestMapping("/ffzf/user")
@RequiredArgsConstructor
-@Tag(description = "ffzf/user" , name = "鐢ㄦ埛鎺ュ彛" )
public class UserController{
private final UserService userService;
private final ParkService parkService;
@PostMapping("/findPage")
- @Operation(summary = "鍒嗛〉鏌ヨ" , description = "鍒嗛〉鏌ヨ" )
public Object findPage(User user, Page page) {
QueryWrapper<User> wrapper = new QueryWrapper<>();
wrapper.lambda()
@@ -43,14 +39,12 @@
}
@PostMapping("/findAll")
- @Operation(summary = "鏌ヨ鎵�鏈�" , description = "鏌ヨ鎵�鏈�" )
public Object findAll() {
return R.ok(userService.list());
}
@PostMapping("/save")
- @Operation(summary = "鏂板鐢ㄦ埛" , description = "鏂板鐢ㄦ埛" )
public Object save(User user) {
if(user.getId()==null){
user.setPassword(user.getLoginName());
@@ -60,14 +54,12 @@
}
@PostMapping("/delete")
- @Operation(summary = "鍒犻櫎鐢ㄦ埛" , description = "鍒犻櫎鐢ㄦ埛" )
public Object delete(Long id) {
userService.removeById(id);
return R.ok("鍒犻櫎鎴愬姛");
}
@PostMapping("/login")
- @Operation(summary = "鐧诲綍" , description = "鐧诲綍" )
public Object login(String loginName,String password,String lng,String lat) {
if(StringUtils.isBlank(loginName)||StringUtils.isBlank(password)){
return R.failed("鐢ㄦ埛鍚嶅拰瀵嗙爜蹇呭～");
@@ -98,7 +90,6 @@
}
@PostMapping("updatePassword")
- @Operation(summary = "淇敼瀵嗙爜" , description = "淇敼瀵嗙爜" )
public Object updatePassword(Long userId,String oldPassword,String newPassword) {
QueryWrapper<User> wrapper = new QueryWrapper<>();
wrapper.lambda()
diff --git a/src/main/java/com/boying/controller/ViolationTypeController.java b/src/main/java/com/boying/controller/ViolationTypeController.java
index 3d05cce..dfb31b9 100644
--- a/src/main/java/com/boying/controller/ViolationTypeController.java
+++ b/src/main/java/com/boying/controller/ViolationTypeController.java
@@ -6,21 +6,18 @@
import com.boying.entity.ViolationType;
import com.boying.service.ViolationTypeService;
import io.swagger.models.auth.In;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.*;
@RestController
@RequestMapping("ffzf/violationtype")
@RequiredArgsConstructor
-@Tag(description = "ffzf/violationtype" , name = "杩濈珷绫诲瀷鎺ュ彛" )
public class ViolationTypeController {
private final ViolationTypeService violationTypeService;
@PostMapping("/findPage")
- @Operation(summary = "鍒嗛〉鏌ヨ" , description = "鍒嗛〉鏌ヨ" )
+ //@Operation(summary = "鍒嗛〉鏌ヨ" , description = "鍒嗛〉鏌ヨ" )
public Object findPage(Page page) {
QueryWrapper<ViolationType> wrapper = new QueryWrapper<>();
wrapper.lambda()
@@ -29,27 +26,27 @@
}
@PostMapping("/save")
- @Operation(summary = "鏂板杩濈珷绫诲瀷" , description = "鏂板杩濈珷绫诲瀷" )
+ // @Operation(summary = "鏂板杩濈珷绫诲瀷" , description = "鏂板杩濈珷绫诲瀷" )
public Object save(ViolationType violationType) {
violationTypeService.saveOrUpdate(violationType);
return R.ok("淇濆瓨鎴愬姛");
}
@GetMapping("/{id}")
- @Operation(summary = "鏍规嵁id鏌ヨ" , description = "鏍规嵁id鏌ヨ" )
+ // @Operation(summary = "鏍规嵁id鏌ヨ" , description = "鏍规嵁id鏌ヨ" )
public Object getObj(@PathVariable Integer id) {
return R.ok(violationTypeService.getById(id));
}
@PostMapping("/delete")
- @Operation(summary = "鍒犻櫎杩濈珷绫诲瀷" , description = "鍒犻櫎杩濈珷绫诲瀷" )
+ // @Operation(summary = "鍒犻櫎杩濈珷绫诲瀷" , description = "鍒犻櫎杩濈珷绫诲瀷" )
public Object delete(Long id) {
violationTypeService.removeById(id);
return R.ok("鍒犻櫎鎴愬姛");
}
@PostMapping("/findAll")
- @Operation(summary = "鏌ヨ鎵�鏈�" , description = "鏌ヨ鎵�鏈�" )
+ //@Operation(summary = "鏌ヨ鎵�鏈�" , description = "鏌ヨ鎵�鏈�" )
public Object findAll() {
return R.ok(violationTypeService.list());
}
diff --git a/src/main/java/com/boying/controller/WhiteListController.java b/src/main/java/com/boying/controller/WhiteListController.java
index 4869fb2..c49ada2 100644
--- a/src/main/java/com/boying/controller/WhiteListController.java
+++ b/src/main/java/com/boying/controller/WhiteListController.java
@@ -8,8 +8,6 @@
import com.boying.entity.WhiteList;
import com.boying.service.ParkService;
import com.boying.service.WhiteListService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -19,14 +17,13 @@
@RestController
@RequestMapping("ffzf/whiteList")
@RequiredArgsConstructor
-@Tag(description = "ffzf/whiteList" , name = "鐧藉悕鍗曟帴鍙�" )
public class WhiteListController{
private final WhiteListService whiteListService;
private final ParkService parkService;
@PostMapping("/findPage")
- @Operation(summary = "鍒嗛〉鏌ヨ" , description = "鍒嗛〉鏌ヨ" )
+ //@Operation(summary = "鍒嗛〉鏌ヨ" , description = "鍒嗛〉鏌ヨ" )
public Object findPage(Page page, String carNo) {
QueryWrapper<WhiteList> wrapper = new QueryWrapper<>();
wrapper.lambda()
@@ -42,7 +39,6 @@
}
@PostMapping("/findPageNew")
- @Operation(summary = "鍒嗛〉鏌ヨ锛堟柊锛�" , description = "鍒嗛〉鏌ヨ锛堟柊锛�" )
public Object findPageNew(Page page, String carNo) {
QueryWrapper<WhiteList> wrapper = new QueryWrapper<>();
wrapper.lambda()
@@ -69,14 +65,12 @@
}
@PostMapping("/save")
- @Operation(summary = "鏂板鐧藉悕鍗�" , description = "鏂板鐧藉悕鍗�" )
public Object save(WhiteList whiteList) {
whiteListService.saveOrUpdate(whiteList);
return R.ok("淇濆瓨鎴愬姛");
}
@PostMapping("/delete")
- @Operation(summary = "鍒犻櫎鐧藉悕鍗�" , description = "鍒犻櫎鐧藉悕鍗�" )
public Object delete(Long id) {
whiteListService.removeById(id);
return R.ok("鍒犻櫎鎴愬姛");
diff --git a/src/main/java/com/boying/controller/car/MqttSample.java b/src/main/java/com/boying/controller/car/MqttSample.java
index 8c05fd7..2b504c9 100644
--- a/src/main/java/com/boying/controller/car/MqttSample.java
+++ b/src/main/java/com/boying/controller/car/MqttSample.java
@@ -1,66 +1,66 @@
-package com.boying.controller.car;
-
-import org.eclipse.paho.client.mqttv3.*;
-import org.eclipse.paho.client.mqttv3.persist.MemoryPersistence;
-
-/**
- * @author kdq
- * @version 1.0.0
- * @ClassName MqttSample.java
- * @Description TODO
- * @createTime 2024骞�03鏈�19鏃� 16:56:00
- */
-public class MqttSample {
-
- public static void main(String[] args) throws MqttException{
- MqttSample client = new MqttSample();
- client.start();
- }
- //MQTT瀹夎鐨勬湇鍔″櫒鍦板潃鍜岀鍙ｅ彿锛堟湰鏈虹殑ip锛�
- public static final String HOST = "tcp://39.96.92.240:9092";
- //瀹氫箟涓�涓富棰�
- public static final String TOPIC = "/device/message/up/keep_alive";
- //瀹氫箟MQTT鐨処D锛屽彲浠ュ湪MQTT鏈嶅姟閰嶇疆涓寚瀹�
- private static final String clientid = "client-2";
- private MqttClient client;
- private MqttConnectOptions options;
- private String userName = "mqtt";
- private String passWord = "mqtt";
-
-// private ScheduledExecutorService scheduler;
-
- private void start() {
- try {
- // host涓轰富鏈哄悕锛宑lientid鍗宠繛鎺QTT鐨勫鎴风ID锛屼竴鑸互鍞竴鏍囪瘑绗﹁〃绀猴紝MemoryPersistence璁剧疆clientid鐨勪繚瀛樺舰寮忥紝榛樿涓轰互鍐呭瓨淇濆瓨
- client = new MqttClient(HOST, clientid, new MemoryPersistence());
- // MQTT鐨勮繛鎺ヨ缃�
- options = new MqttConnectOptions();
- // 璁剧疆鏄惁娓呯┖session,杩欓噷濡傛灉璁剧疆涓篺alse琛ㄧず鏈嶅姟鍣ㄤ細淇濈暀瀹㈡埛绔殑杩炴帴璁板綍锛岃繖閲岃缃负true琛ㄧず姣忔杩炴帴鍒版湇鍔″櫒閮戒互鏂扮殑韬唤杩炴帴
- options.setCleanSession(false);
- // 璁剧疆杩炴帴鐨勭敤鎴峰悕
- options.setUserName(userName);
- // 璁剧疆杩炴帴鐨勫瘑鐮�
- options.setPassword(passWord.toCharArray());
- // 璁剧疆瓒呮椂鏃堕棿 鍗曚綅涓虹
- options.setConnectionTimeout(10);
- // 璁剧疆浼氳瘽蹇冭烦鏃堕棿 鍗曚綅涓虹 鏈嶅姟鍣ㄤ細姣忛殧1.5*20绉掔殑鏃堕棿鍚戝鎴风鍙戦�佷釜娑堟伅鍒ゆ柇瀹㈡埛绔槸鍚﹀湪绾匡紝浣嗚繖涓柟娉曞苟娌℃湁閲嶈繛鐨勬満鍒�
- options.setKeepAliveInterval(20);
- // 璁剧疆鍥炶皟,client.setCallback灏卞彲浠ヨ皟鐢≒ushCallback绫讳腑鐨刴essageArrived()鏂规硶
- client.setCallback(new PushCallback());
- MqttTopic topic = client.getTopic(TOPIC);
-
- int qos = 2;
-
- //setWill鏂规硶锛屽鏋滈」鐩腑闇�瑕佺煡閬撳鎴风鏄惁鎺夌嚎鍙互璋冪敤璇ユ柟娉曘�傝缃渶缁堢鍙ｇ殑閫氱煡娑堟伅
- options.setWill(topic, "This is yizhu...".getBytes(), qos, true);
- client.connect(options);
- //璁㈤槄娑堟伅
- int[] Qos = {qos};
- String[] topic1 = {TOPIC};
- client.subscribe(topic1, Qos);
-
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
-}
+//package com.boying.controller.car;
+//
+//import org.eclipse.paho.client.mqttv3.*;
+//import org.eclipse.paho.client.mqttv3.persist.MemoryPersistence;
+//
+///**
+// * @author kdq
+// * @version 1.0.0
+// * @ClassName MqttSample.java
+// * @Description TODO
+// * @createTime 2024骞�03鏈�19鏃� 16:56:00
+// */
+//public class MqttSample {
+//
+// public static void main(String[] args) throws MqttException{
+// MqttSample client = new MqttSample();
+// client.start();
+// }
+// //MQTT瀹夎鐨勬湇鍔″櫒鍦板潃鍜岀鍙ｅ彿锛堟湰鏈虹殑ip锛�
+// public static final String HOST = "tcp://39.96.92.240:9092";
+// //瀹氫箟涓�涓富棰�
+// public static final String TOPIC = "/device/message/up/keep_alive";
+// //瀹氫箟MQTT鐨処D锛屽彲浠ュ湪MQTT鏈嶅姟閰嶇疆涓寚瀹�
+// private static final String clientid = "client-2";
+// private MqttClient client;
+// private MqttConnectOptions options;
+// private String userName = "mqtt";
+// private String passWord = "mqtt";
+//
+//// private ScheduledExecutorService scheduler;
+//
+// private void start() {
+// try {
+// // host涓轰富鏈哄悕锛宑lientid鍗宠繛鎺QTT鐨勫鎴风ID锛屼竴鑸互鍞竴鏍囪瘑绗﹁〃绀猴紝MemoryPersistence璁剧疆clientid鐨勪繚瀛樺舰寮忥紝榛樿涓轰互鍐呭瓨淇濆瓨
+// client = new MqttClient(HOST, clientid, new MemoryPersistence());
+// // MQTT鐨勮繛鎺ヨ缃�
+// options = new MqttConnectOptions();
+// // 璁剧疆鏄惁娓呯┖session,杩欓噷濡傛灉璁剧疆涓篺alse琛ㄧず鏈嶅姟鍣ㄤ細淇濈暀瀹㈡埛绔殑杩炴帴璁板綍锛岃繖閲岃缃负true琛ㄧず姣忔杩炴帴鍒版湇鍔″櫒閮戒互鏂扮殑韬唤杩炴帴
+// options.setCleanSession(false);
+// // 璁剧疆杩炴帴鐨勭敤鎴峰悕
+// options.setUserName(userName);
+// // 璁剧疆杩炴帴鐨勫瘑鐮�
+// options.setPassword(passWord.toCharArray());
+// // 璁剧疆瓒呮椂鏃堕棿 鍗曚綅涓虹
+// options.setConnectionTimeout(10);
+// // 璁剧疆浼氳瘽蹇冭烦鏃堕棿 鍗曚綅涓虹 鏈嶅姟鍣ㄤ細姣忛殧1.5*20绉掔殑鏃堕棿鍚戝鎴风鍙戦�佷釜娑堟伅鍒ゆ柇瀹㈡埛绔槸鍚﹀湪绾匡紝浣嗚繖涓柟娉曞苟娌℃湁閲嶈繛鐨勬満鍒�
+// options.setKeepAliveInterval(20);
+// // 璁剧疆鍥炶皟,client.setCallback灏卞彲浠ヨ皟鐢≒ushCallback绫讳腑鐨刴essageArrived()鏂规硶
+// client.setCallback(new PushCallback());
+// MqttTopic topic = client.getTopic(TOPIC);
+//
+// int qos = 2;
+//
+// //setWill鏂规硶锛屽鏋滈」鐩腑闇�瑕佺煡閬撳鎴风鏄惁鎺夌嚎鍙互璋冪敤璇ユ柟娉曘�傝缃渶缁堢鍙ｇ殑閫氱煡娑堟伅
+// options.setWill(topic, "This is yizhu...".getBytes(), qos, true);
+// client.connect(options);
+// //璁㈤槄娑堟伅
+// int[] Qos = {qos};
+// String[] topic1 = {TOPIC};
+// client.subscribe(topic1, Qos);
+//
+// } catch (Exception e) {
+// e.printStackTrace();
+// }
+// }
+//}
diff --git a/src/main/java/com/boying/controller/car/MqttSample2.java b/src/main/java/com/boying/controller/car/MqttSample2.java
index 4be9c4f..5b3bf0b 100644
--- a/src/main/java/com/boying/controller/car/MqttSample2.java
+++ b/src/main/java/com/boying/controller/car/MqttSample2.java
@@ -1,69 +1,69 @@
-package com.boying.controller.car;
-
-import org.eclipse.paho.client.mqttv3.MqttClient;
-import org.eclipse.paho.client.mqttv3.MqttConnectOptions;
-import org.eclipse.paho.client.mqttv3.MqttException;
-import org.eclipse.paho.client.mqttv3.MqttTopic;
-import org.eclipse.paho.client.mqttv3.persist.MemoryPersistence;
-
-/**
- * @author kdq
- * @version 1.0.0
- * @ClassName MqttSample.java
- * @Description TODO
- * @createTime 2024骞�03鏈�19鏃� 16:56:00
- */
-public class MqttSample2 {
-
- public static void main(String[] args) throws MqttException{
- MqttSample2 client = new MqttSample2();
- client.start();
- }
- //MQTT瀹夎鐨勬湇鍔″櫒鍦板潃鍜岀鍙ｅ彿锛堟湰鏈虹殑ip锛�
- public static final String HOST = "tcp://39.96.92.240:9092";
- //瀹氫箟涓�涓富棰�
- public static final String TOPIC = "/device/message/up/ivs_result";
- //瀹氫箟MQTT鐨処D锛屽彲浠ュ湪MQTT鏈嶅姟閰嶇疆涓寚瀹�
- private static final String clientid = "client-3";
- private MqttClient client;
- private MqttConnectOptions options;
- private String userName = "mqtt";
- private String passWord = "mqtt";
-
-// private ScheduledExecutorService scheduler;
-
- private void start() {
- try {
- // host涓轰富鏈哄悕锛宑lientid鍗宠繛鎺QTT鐨勫鎴风ID锛屼竴鑸互鍞竴鏍囪瘑绗﹁〃绀猴紝MemoryPersistence璁剧疆clientid鐨勪繚瀛樺舰寮忥紝榛樿涓轰互鍐呭瓨淇濆瓨
- client = new MqttClient(HOST, clientid, new MemoryPersistence());
- // MQTT鐨勮繛鎺ヨ缃�
- options = new MqttConnectOptions();
- // 璁剧疆鏄惁娓呯┖session,杩欓噷濡傛灉璁剧疆涓篺alse琛ㄧず鏈嶅姟鍣ㄤ細淇濈暀瀹㈡埛绔殑杩炴帴璁板綍锛岃繖閲岃缃负true琛ㄧず姣忔杩炴帴鍒版湇鍔″櫒閮戒互鏂扮殑韬唤杩炴帴
- options.setCleanSession(false);
- // 璁剧疆杩炴帴鐨勭敤鎴峰悕
- options.setUserName(userName);
- // 璁剧疆杩炴帴鐨勫瘑鐮�
- options.setPassword(passWord.toCharArray());
- // 璁剧疆瓒呮椂鏃堕棿 鍗曚綅涓虹
- options.setConnectionTimeout(10);
- // 璁剧疆浼氳瘽蹇冭烦鏃堕棿 鍗曚綅涓虹 鏈嶅姟鍣ㄤ細姣忛殧1.5*20绉掔殑鏃堕棿鍚戝鎴风鍙戦�佷釜娑堟伅鍒ゆ柇瀹㈡埛绔槸鍚﹀湪绾匡紝浣嗚繖涓柟娉曞苟娌℃湁閲嶈繛鐨勬満鍒�
- options.setKeepAliveInterval(20);
- // 璁剧疆鍥炶皟,client.setCallback灏卞彲浠ヨ皟鐢≒ushCallback绫讳腑鐨刴essageArrived()鏂规硶
- client.setCallback(new PushCallback());
- MqttTopic topic = client.getTopic(TOPIC);
-
- int qos = 2;
-
- //setWill鏂规硶锛屽鏋滈」鐩腑闇�瑕佺煡閬撳鎴风鏄惁鎺夌嚎鍙互璋冪敤璇ユ柟娉曘�傝缃渶缁堢鍙ｇ殑閫氱煡娑堟伅
- options.setWill(topic, "This is yizhu...".getBytes(), qos, true);
- client.connect(options);
- //璁㈤槄娑堟伅
- int[] Qos = {qos};
- String[] topic1 = {TOPIC};
- client.subscribe(topic1, Qos);
-
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
-}
+//package com.boying.controller.car;
+//
+//import org.eclipse.paho.client.mqttv3.MqttClient;
+//import org.eclipse.paho.client.mqttv3.MqttConnectOptions;
+//import org.eclipse.paho.client.mqttv3.MqttException;
+//import org.eclipse.paho.client.mqttv3.MqttTopic;
+//import org.eclipse.paho.client.mqttv3.persist.MemoryPersistence;
+//
+///**
+// * @author kdq
+// * @version 1.0.0
+// * @ClassName MqttSample.java
+// * @Description TODO
+// * @createTime 2024骞�03鏈�19鏃� 16:56:00
+// */
+//public class MqttSample2 {
+//
+// public static void main(String[] args) throws MqttException{
+// MqttSample2 client = new MqttSample2();
+// client.start();
+// }
+// //MQTT瀹夎鐨勬湇鍔″櫒鍦板潃鍜岀鍙ｅ彿锛堟湰鏈虹殑ip锛�
+// public static final String HOST = "tcp://39.96.92.240:9092";
+// //瀹氫箟涓�涓富棰�
+// public static final String TOPIC = "/device/message/up/ivs_result";
+// //瀹氫箟MQTT鐨処D锛屽彲浠ュ湪MQTT鏈嶅姟閰嶇疆涓寚瀹�
+// private static final String clientid = "client-3";
+// private MqttClient client;
+// private MqttConnectOptions options;
+// private String userName = "mqtt";
+// private String passWord = "mqtt";
+//
+//// private ScheduledExecutorService scheduler;
+//
+// private void start() {
+// try {
+// // host涓轰富鏈哄悕锛宑lientid鍗宠繛鎺QTT鐨勫鎴风ID锛屼竴鑸互鍞竴鏍囪瘑绗﹁〃绀猴紝MemoryPersistence璁剧疆clientid鐨勪繚瀛樺舰寮忥紝榛樿涓轰互鍐呭瓨淇濆瓨
+// client = new MqttClient(HOST, clientid, new MemoryPersistence());
+// // MQTT鐨勮繛鎺ヨ缃�
+// options = new MqttConnectOptions();
+// // 璁剧疆鏄惁娓呯┖session,杩欓噷濡傛灉璁剧疆涓篺alse琛ㄧず鏈嶅姟鍣ㄤ細淇濈暀瀹㈡埛绔殑杩炴帴璁板綍锛岃繖閲岃缃负true琛ㄧず姣忔杩炴帴鍒版湇鍔″櫒閮戒互鏂扮殑韬唤杩炴帴
+// options.setCleanSession(false);
+// // 璁剧疆杩炴帴鐨勭敤鎴峰悕
+// options.setUserName(userName);
+// // 璁剧疆杩炴帴鐨勫瘑鐮�
+// options.setPassword(passWord.toCharArray());
+// // 璁剧疆瓒呮椂鏃堕棿 鍗曚綅涓虹
+// options.setConnectionTimeout(10);
+// // 璁剧疆浼氳瘽蹇冭烦鏃堕棿 鍗曚綅涓虹 鏈嶅姟鍣ㄤ細姣忛殧1.5*20绉掔殑鏃堕棿鍚戝鎴风鍙戦�佷釜娑堟伅鍒ゆ柇瀹㈡埛绔槸鍚﹀湪绾匡紝浣嗚繖涓柟娉曞苟娌℃湁閲嶈繛鐨勬満鍒�
+// options.setKeepAliveInterval(20);
+// // 璁剧疆鍥炶皟,client.setCallback灏卞彲浠ヨ皟鐢≒ushCallback绫讳腑鐨刴essageArrived()鏂规硶
+// client.setCallback(new PushCallback());
+// MqttTopic topic = client.getTopic(TOPIC);
+//
+// int qos = 2;
+//
+// //setWill鏂规硶锛屽鏋滈」鐩腑闇�瑕佺煡閬撳鎴风鏄惁鎺夌嚎鍙互璋冪敤璇ユ柟娉曘�傝缃渶缁堢鍙ｇ殑閫氱煡娑堟伅
+// options.setWill(topic, "This is yizhu...".getBytes(), qos, true);
+// client.connect(options);
+// //璁㈤槄娑堟伅
+// int[] Qos = {qos};
+// String[] topic1 = {TOPIC};
+// client.subscribe(topic1, Qos);
+//
+// } catch (Exception e) {
+// e.printStackTrace();
+// }
+// }
+//}
diff --git a/src/main/java/com/boying/controller/car/PlateServlet2.java b/src/main/java/com/boying/controller/car/PlateServlet2.java
index f9f294e..75b1ebd 100644
--- a/src/main/java/com/boying/controller/car/PlateServlet2.java
+++ b/src/main/java/com/boying/controller/car/PlateServlet2.java
@@ -15,9 +15,6 @@
import com.google.gson.JsonObject;
import com.google.gson.JsonParser;
-import com.sun.media.jfxmedia.track.Track;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -49,7 +46,6 @@
@Controller
@RequestMapping("/ffzf/car2")
@RequiredArgsConstructor
-@Tag(description = "ffzf/car3" , name = "娉婅溅娴佺▼鎺ュ彛" )
public class PlateServlet2 extends HttpServlet {
private static final long serialVersionUID = 1L;
@Value("${ffpark.logPath}")
@@ -150,7 +146,6 @@
}
@PostMapping("/status")
- @Operation(summary = "鐩告満蹇冭烦鎺ュ彛" , description = "鐩告満蹇冭烦鎺ュ彛" )
public void heart(String serialno,HttpServletRequest request,HttpServletResponse response) throws ServletException, IOException {
Barrier barrier = barrierService.findByCode(serialno);
Park park = parkService.getOneById(barrier.getParkId());
@@ -251,7 +246,6 @@
* @see HttpServlet#doPost(HttpServletRequest request, HttpServletResponse response)
*/
@PostMapping("/PlateServlet")
- @Operation(summary = "杞﹁締璇嗗埆鎺ュ彛" , description = "杞﹁締璇嗗埆鎺ュ彛" )
protected void info(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
String s= "";
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd_HH:mm:ss");
diff --git a/src/main/java/com/boying/controller/car/PlateServlet3.java b/src/main/java/com/boying/controller/car/PlateServlet3.java
index af5e69f..da86413 100644
--- a/src/main/java/com/boying/controller/car/PlateServlet3.java
+++ b/src/main/java/com/boying/controller/car/PlateServlet3.java
@@ -1,1017 +1,1017 @@
-//package com.boying.controller.car;
-//
-//import cn.hutool.http.HttpRequest;
-//import com.alibaba.fastjson.JSON;
-//import com.alibaba.fastjson.JSONObject;
-//import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-//import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
-//import com.baomidou.mybatisplus.core.toolkit.StringUtils;
-//import com.boying.common.R;
-//import com.boying.common.SystemConfigProperties;
-//import com.boying.entity.*;
-//import com.boying.service.*;
-//import com.boying.util.DateUtilOther;
-//import com.boying.util.FileUtil;
-//import com.boying.util.RedisJsonUtil;
-//import com.boying.util.StringUtil;
-//import com.google.gson.JsonObject;
-//import com.google.gson.JsonParser;
-//import ledshow.CodeUtil;
-//import ledshow.LedBean;
-//import ledshow.ResultData;
-//import lombok.RequiredArgsConstructor;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.data.redis.core.StringRedisTemplate;
-//import org.springframework.stereotype.Controller;
-//import org.springframework.web.bind.annotation.PostMapping;
-//import org.springframework.web.bind.annotation.RequestMapping;
-//import org.springframework.web.bind.annotation.ResponseBody;
-//
-//import javax.servlet.ServletException;
-//import javax.servlet.http.HttpServlet;
-//import javax.servlet.http.HttpServletRequest;
-//import javax.servlet.http.HttpServletResponse;
-//import java.io.*;
-//import java.text.ParseException;
-//import java.text.SimpleDateFormat;
-//import java.time.Duration;
-//import java.time.LocalDateTime;
-//import java.time.ZoneOffset;
-//import java.util.Base64;
-//import java.util.Date;
-//import java.util.List;
-//import java.util.concurrent.TimeUnit;
-//
-//
-///**
-// * Servlet implementation class PlateServlet
-// */
-//@Controller
-//@RequestMapping("/ffzf/car")
-//@RequiredArgsConstructor
-//public class PlateServlet3 extends HttpServlet {
-// private static final long serialVersionUID = 1L;
-// private final SystemConfigProperties systemConfigProperties;
-// private final StringRedisTemplate redisTemplate;
-// private final ParkService parkService;
-// private final OutParkService outParkService;
-// private final EnterParkService enterParkService;
-// private final BarrierService barrierService;
-// private final TicketService ticketService;
-// private final CostRuleService costRuleService;
-// private final WhiteListService whiteListService;
-// private final FileInfoService fileInfoService;
-// private final TicketBlackService ticketBlackService;
-// private final OutParkLogService outParkLogService;
-// // private final RedisJsonUtil redisJsonUtil;
-// private final String LEDURL = "http://192.168.31.212:9988/LedShow/IGetResultDataAllLine";
-//
-// /**
-// * 鍥炲寮�闂�
-// */
-// protected void open(HttpServletRequest request, HttpServletResponse response,String data) throws ServletException, IOException {
-// response.setContentType("text/json");
-// PrintWriter out = response.getWriter();
-// String aa = "{" +
-// "\"Response_AlarmInfoPlate\": {" +
-// "\"info\":\"ok\"," +
-// "\"is_pay\":\"true\"," +
-// "\"serialData\" :[" +
-// "{" +
-// "\"serialChannel\":0," +
-// "\"data\" : \"" + data + "\"," +
-// "\"dataLen\" :" + data.length() +
-// "}" +
-// "]" +
-// "}" +
-// "}";
-// out.println(aa);
-// out.flush();
-// out.close();
-// }
-//
-//
-// //杞爜
-// public static String deCode(String str) {
-// try {
-// byte[] b = str.getBytes("UTF-8");//锟斤拷锟斤拷
-// String sa = new String(b);//锟斤拷锟斤拷:锟斤拷什么锟街凤拷锟斤拷锟斤拷锟斤拷锟斤拷锟绞裁达拷址锟斤拷锟斤拷锟斤拷锟�
-// //String sa = new String(str.getBytes());
-//
-// return sa;
-// } catch (Exception e) {
-// e.printStackTrace();
-// return "";
-// }
-// }
-//
-// protected void noOpen(HttpServletRequest request, HttpServletResponse response,String data) throws IOException {
-// response.setContentType("text/json");
-// PrintWriter out = response.getWriter();
-// String aa = "{" +
-// "\"Response_AlarmInfoPlate\": {" +
-// "\"serialData\" :[" +
-// "{" +
-// "\"serialChannel\":0," +
-// "\"data\" : \"" + data + "\"," +
-// "\"dataLen\" :" + data.length() +
-// "}" +
-// "]" +
-// "}" +
-// "}";
-// out.println(aa);
-// out.flush();
-// out.close();
-// }
-//
-// protected void easyOpen(HttpServletRequest request, HttpServletResponse response) throws IOException {
-// response.setContentType("text/json");
-// PrintWriter out = response.getWriter();
-// out.println("{\"Response_AlarmInfoPlate\":{\"info\":\"ok\",\"content\":\"...\",\"is_pay\":\"true\"}}");
-// out.flush();
-// out.close();
-// }
-//
-// protected void easyOpen2(HttpServletRequest request, HttpServletResponse response) throws IOException {
-// response.setContentType("text/json");
-// PrintWriter out = response.getWriter();
-// out.println("{\"Response_AlarmInfoPlate\":{\"ivs_ioctrl\":{\"delay\":1000,\"io\":0,\"value\":2}}}");
-// out.flush();
-// out.close();
-// }
-//
-// protected void easyNoOpen(HttpServletRequest request, HttpServletResponse response) throws IOException {
-// response.setContentType("text/json");
-// PrintWriter out = response.getWriter();
-// out.println("{\"Response_AlarmInfoPlate\":{\"info\":\"error\",\"content\":\"...\",\"is_pay\":\"false\"}}");
-// out.flush();
-// out.close();
-// }
-//
-// @PostMapping("/status")
-// public void heart(String serialno,HttpServletRequest request,HttpServletResponse response) throws ServletException, IOException {
-// Barrier barrier = barrierService.findByCode(serialno);
-// Park park = parkService.getOneById(barrier.getParkId());
-// // Park park = parkService.getById(barrier.getParkId());
-// // String redis = redisTemplate.opsForValue().get("park_up_" + park.getId());
-// String redisnum = redisTemplate.opsForValue().get("car_park_" + park.getId());
-// if(StringUtils.isBlank(redisnum)){
-// redisnum = "0";
-// }
-// if(barrier!=null){
-// if(barrier.getType2()==1){
-// //寰呭紑闂�
-// if(barrier.getType() == 1){
-// int i = Integer.parseInt(redisnum);
-// i++;
-// redisTemplate.opsForValue().set("car_park_" + park.getId(),Integer.toString(i),30, TimeUnit.DAYS);
-// }else if(barrier.getType() == 0){
-// int i = Integer.parseInt(redisnum);
-// i--;
-// if(i<0){
-// String s= "2."+barrier.getCarNo()+"闂告満鎵嬪姩鍚姩锛屽満鍐呭仠杞︽暟涓�"+i+"\n";
-// writeTxt2(s);
-// redisTemplate.opsForValue().set("car_park_" + park.getId(),"0",30, TimeUnit.DAYS);
-// redisTemplate.opsForValue().set("park_up_" + park.getId(),"true",30, TimeUnit.DAYS);
-// }else {
-// String s= "2."+barrier.getCarNo()+"闂告満鎵嬪姩鍚姩锛屽満鍐呭仠杞︽暟涓�"+i+"\n";
-// writeTxt2(s);
-// redisTemplate.opsForValue().set("car_park_" + park.getId(),Integer.toString(i),30, TimeUnit.DAYS);
-// redisTemplate.opsForValue().set("park_up_" + park.getId(),"true",30, TimeUnit.DAYS);
-// }
-//
-// }
-// barrier.setType2(0);
-// barrier.setUpdateTime(LocalDateTime.now());
-// barrier.setStatus(0);
-// barrier.setUpdateTime(LocalDateTime.now());
-// barrierService.saveOrUpdate(barrier);
-//
-// String jsonValue = JSON.toJSONString(barrier);
-// redisTemplate.opsForValue().set("barrier-"+barrier.getCode(), jsonValue);
-// easyOpen(request,response);
-// }else {
-// //涓嶉渶寮�闂�
-// LocalDateTime now = LocalDateTime.now();
-// LocalDateTime updateTime = barrier.getUpdateTime();
-// Duration duration = Duration.between(updateTime,now);
-// long minutes = duration.toMinutes();
-// if(minutes>=2){
-// barrier.setStatus(0);
-// barrier.setUpdateTime(LocalDateTime.now());
-// barrierService.saveOrUpdate(barrier);
-// }
-//
-// String jsonValue = JSON.toJSONString(barrier);
-// redisTemplate.opsForValue().set("barrier-"+barrier.getCode(), jsonValue);
-// if(barrier.getType() == 0){
-// OutPark outPark = outParkService.count4(barrier.getId());
-// if(outPark!=null){
-// if(barrier.getType() == 0){
-// int i = Integer.parseInt(redisnum);
-// i--;
-// if(i<0){
-// String s= "2."+outPark.getCarNo()+"缂磋垂瀹屾垚锛屽満鍐呭仠杞︽暟涓�"+i+"\n";
-// writeTxt2(s);
-// redisTemplate.opsForValue().set("car_park_" + park.getId(),"0",30, TimeUnit.DAYS);
-// redisTemplate.opsForValue().set("park_up_" + park.getId(),"true",30, TimeUnit.DAYS);
-// }else {
-// String s= "2."+outPark.getCarNo()+"缂磋垂瀹屾垚锛屽満鍐呭仠杞︽暟涓�"+i+"\n";
-// writeTxt2(s);
-// redisTemplate.opsForValue().set("car_park_" + park.getId(),Integer.toString(i),30, TimeUnit.DAYS);
-// redisTemplate.opsForValue().set("park_up_" + park.getId(),"true",30, TimeUnit.DAYS);
-// }
-// }
-// outPark.setStatus2(1);
-// outParkService.saveOrUpdate(outPark);
-// easyOpen(request,response);
-// OutParkLog byOutPark = outParkLogService.getByOutPark(outPark.getCarNo(), outPark.getId());
-// byOutPark.setOpenTime(LocalDateTime.now());
-// outParkLogService.saveOrUpdate(byOutPark);
-// enterParkService.deleteByCarNo(outPark.getCarNo(), barrier.getParkId());
-// redisTemplate.delete("outPark-"+outPark.getBarrierId());
-// }
-// }
-// if(barrier.getType() == 1){
-// boolean in = barrierService.getDateDifIn(park.getId());
-// if(in){
-// inLedShowDefault(park.getId(),request,response);
-// }
-// }else if(barrier.getType() == 0){
-// boolean out = barrierService.getDateDifOut(barrier.getId());
-// if(out){
-// outLedShowDefault(request,response);
-// }
-// }
-// }
-//
-// }else {
-// easyNoOpen(request,response);
-// }
-// }
-// /**
-// * @see HttpServlet#doPost(HttpServletRequest request, HttpServletResponse response)
-// */
-// @PostMapping("/PlateServlet")
-// protected void info(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
-// String s= "";
-// SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd_HH:mm:ss");
-// BufferedReader reader = new BufferedReader(new InputStreamReader(request.getInputStream(),"UTF-8"));
-// String str = "";
-// String lineStr = "";
-// FileInfo fileInfo = null;
-// while((str = reader.readLine()) != null){
-// lineStr += str;
-// }
-// // System.out.println("鑾峰彇鍒扮殑閬撻椄鎺ㄩ�佹暟鎹负锛�"+lineStr);
-//
-// JSONObject jsonObject1 = JSON.parseObject(lineStr);
-// JSONObject alarmInfoPlate = jsonObject1.getJSONObject("AlarmInfoPlate");
-// 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 {
-// JsonParser parser=new JsonParser();
-// do {
-// JsonObject jsonObject=(JsonObject) parser.parse(lineStr);
-// if( jsonObject == null || jsonObject.isJsonNull() ) {
-// break;
-// }
-//
-// JsonObject jsonInfoPlate = jsonObject.get("AlarmInfoPlate").getAsJsonObject();
-// if( jsonInfoPlate == null || jsonInfoPlate.isJsonNull() ) {
-// break;
-// }
-//
-// JsonObject jsonResult = jsonInfoPlate.get("result").getAsJsonObject();
-// if( jsonResult == null || jsonResult.isJsonNull() ) {
-// break;
-// }
-//
-// JsonObject jsonPlateResult = jsonResult.get("PlateResult").getAsJsonObject();
-// if( jsonPlateResult == null || jsonPlateResult.isJsonNull() ) {
-// break;
-// }
-//
-// String license = jsonPlateResult.get("license").getAsString();//杞︾墝鍙�
-// if( license == null || license == "") {
-// break;
-// }
-//
-// String serialno = jsonInfoPlate.get("serialno").getAsString();//鎽勫儚鏈哄簭鍒楀彿
-// if( serialno == null || serialno == "" ) {
-// break;
-// }
-//
-//
-// 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+" ";
-//
-// Barrier barrier = barrierService.findByCode(code);
-// System.out.println("鏌ヨ鍒伴亾闂镐负锛�"+barrier);
-// if(barrier==null){
-// s+="鏌ヨ閬撻椄涓虹┖\n";
-// easyNoOpen(request,response);
-// }else{
-// if(barrier.getType()==0){
-// outPark(license, barrier.getId(), barrier.getParkId(),request,response,fileInfo);
-// s+=license+"-淇濆瓨鍑哄満璁板綍\n";
-// }else{
-// String num = redisTemplate.opsForValue().get("car_park_" + barrier.getParkId());
-// if(StringUtils.isBlank(num)){
-// num = "0";
-// redisTemplate.opsForValue().set("car_park_" + barrier.getParkId(),num,30, TimeUnit.DAYS);
-// redisTemplate.opsForValue().set("park_up_" + barrier.getParkId(),"true",30, TimeUnit.DAYS);
-// }
-// Park byId = parkService.getById(barrier.getParkId());
-// if(Integer.parseInt(num) >= byId.getNum() ){
-// //led鏄剧ず
-// inLedFullShow(code, license,barrier.getParkId(),request,response);
-// }else {
-// //led鏄剧ず
-// enterPark(license,barrier.getId(),barrier.getParkId(),fileInfo);
-// inLedShow(code, license,barrier.getParkId(),request,response);
-// s+=license+"-淇濆瓨鍏ュ満璁板綍\n";
-// }
-// }
-// }
-// writeTxt(s);
-// }while(false);
-// }
-// catch (Exception e) {
-// System.out.println("鏃犲叆鍦鸿褰�");
-// s+=" ,鏌ヨ鍦哄唴璁板綍寮傚父";
-// writeTxt(s);
-// easyNoOpen(request,response);
-// }
-// }
-//
-// /**
-// * 鎵嬫満鍙峰叆鍦�
-// * @param
-// * @return
-// */
-// @PostMapping("/inParkByPhone" )
-// @ResponseBody
-// public Object inParkByPhone( EnterPark enterPark){
-// Barrier barrier = barrierService.getById(enterPark.getBarrierId());
-// if(barrier!=null){
-// String num = redisTemplate.opsForValue().get("car_park_" + barrier.getParkId());
-// if(StringUtils.isBlank(num)){
-// num = "0";
-// redisTemplate.opsForValue().set("car_park_" + barrier.getParkId(),num,30, TimeUnit.DAYS);
-// redisTemplate.opsForValue().set("park_up_" + barrier.getParkId(),"true",30, TimeUnit.DAYS);
-// }
-// Park byId = parkService.getById(barrier.getParkId());
-// if(Integer.parseInt(num) >= byId.getNum() ){
-// return R.failed(null,"绂佹閫氳,杞︿綅宸叉弧");
-// }else {
-// QueryWrapper<EnterPark> wrapper2 = new QueryWrapper<>();
-// wrapper2.lambda()
-// .eq(EnterPark::getBarrierId,barrier.getId())
-// .orderByDesc(EnterPark::getCreateTime)
-// .last(" limit 1");
-// EnterPark one = enterParkService.getOne(wrapper2);
-// if(one == null){
-// return R.failed("鏈煡璇㈠埌杞﹁締瀛樺湪");
-// }else {
-// if(one.getCarNo().equals("鏃犵墝杞�")){
-// enterPark.setCreateTime(LocalDateTime.now());
-// QueryWrapper<Ticket> wrapper = new QueryWrapper<>();
-// wrapper.lambda()
-// .eq(Ticket::getCarNo,enterPark.getCarNo())
-// .eq(Ticket::getPayStatus,1);
-// List<Ticket> tickets = ticketService.list(wrapper);
-// if(tickets.size()>0){
-// enterPark.setStatus(1);//鍙戠幇鏈夎繚绔�
-// }
-// enterPark.setIsPay(0);
-// enterPark.setPrice(0);
-// enterParkService.deleteByCarNo(enterPark.getCarNo(),enterPark.getParkId());
-// enterParkService.save(enterPark);
-// barrier.setType2(1);
-// barrierService.updateById(barrier);
-// return R.ok();
-// }else {
-// return R.failed("闈炴硶鎿嶄綔");
-// }
-// }
-// }
-// }
-// return R.failed(null,"鏁版嵁寮傚父");
-// }
-//
-// /**
-// * 鎵嬫満鍙峰嚭鍦�
-// * @param
-// * @return
-// */
-// @PostMapping("/outParkByPhone" )
-// @ResponseBody
-// public Object outParkByPhone(String code2,String carNo){
-// Barrier byCode2 = barrierService.findByCode2(code2);
-// QueryWrapper<EnterPark> wrapper =new QueryWrapper<>();
-// wrapper.lambda()
-// .eq(EnterPark::getParkId,byCode2.getParkId())
-// .eq(EnterPark::getCarNo,carNo);
-// EnterPark one = enterParkService.getOne(wrapper);
-// if(one != null){
-// double money = 0.0;
-// String toDayHrMinSec = null;
-// OutPark outPark = new OutPark();
-// outPark.setCarNo(carNo);
-// outPark.setParkId(one.getParkId());
-// outPark.setBarrierId(byCode2.getId());
-// outPark.setCreateTime(LocalDateTime.now());
-// outPark.setCode(System.currentTimeMillis()+"");
-// System.out.println("鍏ュ満璁板綍锛�"+one);
-// outPark.setEnterTime(one.getCreateTime());
-// outPark.setParkName(byCode2.getName());
-// if(outPark.getTime() > 0){
-// outPark.setTimeStr(DateUtilOther.millisToDayHrMinSec(new Double(outPark.getTime()).longValue()));
-// }else {
-// outPark.setTimeStr("涓嶈冻涓�鍒嗛挓");
-// }
-// try {
-// long l = outPark.getCreateTime().toInstant(ZoneOffset.of("+8")).toEpochMilli() - one.getCreateTime().toInstant(ZoneOffset.of("+8")).toEpochMilli();
-// outPark.setTime(l/(1000*60));
-// toDayHrMinSec = DateUtilOther.millisToDayHrMinSec(l/(1000*60));
-// money = costRuleService.getMoney(one.getParkId(), outPark.getEnterTime(), outPark.getCreateTime(), 1);
-//
-// //鍏ュ満璁板綍淇濆瓨涓�涓�
-// if(one.getIsPay()==1){
-// money = money - one.getPrice();
-// }else {
-// one.setPrice(money);
-// one.setIsPay(0);
-// enterParkService.updateById(one);
-// }
-// } catch (ParseException e) {
-// e.printStackTrace();
-// }
-// outPark.setPrice(money);
-// outPark.setStatus3(findTicket(carNo));
-// outParkService.saveOrUpdate(outPark);
-// byCode2.setCarNo(carNo);
-// //led灞曠ず
-// if(toDayHrMinSec == null){
-// return R.failed("寮傚父璁板綍");
-// }
-// if(outPark.getPrice()==0&&outPark.getStatus3()==0){
-// System.out.println(outPark.getCarNo()+"璇ヨ溅涓嶉渶瑕佺即璐�");
-// String s= "1."+byCode2.getCarNo()+"璇ヨ溅涓嶉渶瑕佺即璐筡n";
-// writeTxt2(s);
-// byCode2.setType2(1);
-// barrierService.updateById(byCode2);
-// return R.ok(outPark);
-// }else {
-// //闇�瑕佺即璐规垨鑰呮湁杩濈珷
-// System.out.println(outPark.getCarNo()+"璇ヨ溅闇�瑕佺即璐�"+outPark.getPrice());
-// String s= "1."+byCode2.getCarNo()+"璇ヨ溅闇�瑕佺即璐筡n";
-// writeTxt2(s);
-// barrierService.updateById(byCode2);
-// return R.ok(outPark);
-// }
-//
-// }else {
-// return R.failed("鏈煡璇㈠埌鍏ュ満璁板綍");
-// }
-// }
-//
-//
-// private void writeTxt( String txt)
-// {
-// SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
-// try
-// {
-// FileWriter f = new FileWriter(systemConfigProperties.getLogPath()+sdf.format(new Date())+".txt",true);
-// BufferedWriter bw=new BufferedWriter(f);
-// bw.write(txt);
-// bw.newLine();
-// bw.close();
-// }
-// catch(Exception e)
-// {
-// System.out.println("鎵撳嵃閿欒");
-// }
-// }
-//
-// private void writeTxt2( String txt)
-// {
-// SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
-// try
-// {
-// FileWriter f = new FileWriter(systemConfigProperties.getLogPath()+sdf.format(new Date())+"LED.txt",true);
-// BufferedWriter bw=new BufferedWriter(f);
-// bw.write(txt);
-// bw.newLine();
-// bw.close();
-// }
-// catch(Exception e)
-// {
-// System.out.println("鎵撳嵃閿欒");
-// }
-// }
-//
-//
-//
-//
-// public void enterPark(String carNo,Integer barrierId,Integer parkId,FileInfo fileInfo) {
-// TicketBlack black = ticketBlackService.getByCarNo(carNo, 1);
-// if(black != null){
-// System.out.println("榛戝悕鍗曡溅杈�"+carNo);
-// }else {
-// enterParkService.deleteByCarNo(carNo,parkId);
-// EnterPark enterPark = new EnterPark();
-// enterPark.setIsPay(0);
-// enterPark.setPrice(0);
-// enterPark.setCarNo(carNo);
-// enterPark.setBarrierId(barrierId);
-// enterPark.setParkId(parkId);
-//
-// QueryWrapper<Ticket> wrapper = new QueryWrapper<>();
-// wrapper.lambda()
-// .eq(Ticket::getCarNo,enterPark.getCarNo())
-// .eq(Ticket::getPayStatus,1);
-// List<Ticket> tickets = ticketService.list(wrapper);
-// if(tickets.size()>0){
-// enterPark.setStatus(1);//鍙戠幇鏈夎繚绔�
-// }
-// if(fileInfo != null){
-// enterPark.setImgId(fileInfo.getId());
-// }
-// enterParkService.saveOrUpdate(enterPark);
-// String jsonValue = JSON.toJSONString(enterPark);
-// redisTemplate.opsForValue().set("enterPark_dif_"+ parkId, jsonValue);
-//
-// }
-// }
-//
-// 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;
-// OutPark outPark = new OutPark();
-// outPark.setCarNo(carNo);
-// outPark.setParkId(parkId);
-// outPark.setBarrierId(barrierId);
-// outPark.setCreateTime(LocalDateTime.now());
-// outPark.setCode(System.currentTimeMillis()+"");
-// List<EnterPark> byCarNo = enterParkService.findByCarNo(carNo,parkId);
-//
-// if(byCarNo.size() == 0){
-// System.out.println(carNo+"鏈彂鐜板満鍐呰溅杈�");
-// }else{
-// enterPark = byCarNo.get(0);
-// System.out.println("鍏ュ満璁板綍锛�"+enterPark);
-// outPark.setEnterTime(enterPark.getCreateTime());
-// try {
-// long l = outPark.getCreateTime().toInstant(ZoneOffset.of("+8")).toEpochMilli() - enterPark.getCreateTime().toInstant(ZoneOffset.of("+8")).toEpochMilli();
-// outPark.setTime(l/(1000*60));
-// toDayHrMinSec = DateUtilOther.millisToDayHrMinSec(l/(1000*60));
-// money = costRuleService.getMoney(parkId, outPark.getEnterTime(), outPark.getCreateTime(), 1);
-//
-// //鍏ュ満璁板綍淇濆瓨涓�涓�
-// if(enterPark.getIsPay() != null && enterPark.getIsPay()==1){
-// money = money - enterPark.getPrice();
-// }else {
-// enterPark.setPrice(money);
-// enterPark.setIsPay(0);
-// enterParkService.updateById(enterPark);
-// }
-// } catch (ParseException e) {
-// e.printStackTrace();
-// }
-//
-// }
-// //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);
-// //led灞曠ず
-// if(toDayHrMinSec == null){
-// toDayHrMinSec = "鍏ュ満璁板綍寮傚父,璇疯仈绯荤鐞嗗憳";
-// }
-// //鍒ゆ柇鏄惁鍦ㄧ櫧鍚嶅崟
-// QueryWrapper<WhiteList> wrapper = new QueryWrapper<>();
-// wrapper.lambda()
-// .eq(WhiteList::getCarNo,carNo);
-// List<WhiteList> all = whiteListService.list(wrapper);
-// if(all.size() >0){
-// for(WhiteList w : all){
-// if(w.getType()==0){
-// outLedShowYueZu(barrier.getCarNo(),"鏈堢杞�",parkId,request,response,0);
-// OutPark byCarNoAndBarrierId = outParkService.findByCarNoAndBarrierId(carNo, barrierId);
-// byCarNoAndBarrierId.setStatus(2);
-// byCarNoAndBarrierId.setStatus2(1);
-// outParkService.saveOrUpdate(byCarNoAndBarrierId);
-// barrierService.saveOrUpdate(barrier);
-// String jsonValue2 = JSON.toJSONString(barrier);
-// redisTemplate.opsForValue().set("barrier-"+barrier.getCode(), jsonValue2);
-// String jsonValue = JSON.toJSONString(byCarNoAndBarrierId);
-// redisTemplate.opsForValue().set("outPark_dif_"+ barrierId, jsonValue);
-// return 0.0;
-// }else{
-// if(StringUtils.isNotBlank(w.getParkIds())){
-// if(w.getEndTime()!=null){
-// String parkIds = w.getParkIds();
-// String[] split = parkIds.split(",");
-// for (String s : split) {
-// int pid = Integer.parseInt(s);
-// if(pid == outPark.getParkId() && System.currentTimeMillis()<w.getEndTime().getTime()){
-// outLedShowYueZu(barrier.getCarNo(),"鏈堢杞�",parkId,request,response,0);
-// OutPark byCarNoAndBarrierId = outParkService.findByCarNoAndBarrierId(carNo, barrierId);
-// byCarNoAndBarrierId.setStatus(2);
-// byCarNoAndBarrierId.setStatus2(1);
-// outParkService.saveOrUpdate(byCarNoAndBarrierId);
-// barrierService.saveOrUpdate(barrier);
-// String jsonValue2 = JSON.toJSONString(barrier);
-// redisTemplate.opsForValue().set("barrier-"+barrier.getCode(), jsonValue2);
-// String jsonValue = JSON.toJSONString(byCarNoAndBarrierId);
-// redisTemplate.opsForValue().set("outPark_dif_"+ barrierId, jsonValue);
-// return 0.0;
-// }
-// }
-// }
-// }
-// }
-// }
-// }
-// barrierService.saveOrUpdate(barrier);
-// String jsonValue2 = JSON.toJSONString(barrier);
-// redisTemplate.opsForValue().set("barrier-"+barrier.getCode(), jsonValue2);
-// if(outPark.getPrice()==0&&outPark.getStatus3()==0){
-// System.out.println(outPark.getCarNo()+"璇ヨ溅涓嶉渶瑕佺即璐�");
-// String s= "1."+barrier.getCarNo()+"璇ヨ溅涓嶉渶瑕佺即璐筡n";
-// writeTxt2(s);
-// String jsonValue = JSON.toJSONString(outPark);
-// redisTemplate.opsForValue().set("outPark_dif_"+ barrierId, jsonValue);
-// outLedShow(outPark,barrier.getCode(),barrier.getCarNo(),outPark.getPrice(),toDayHrMinSec,barrier.getParkId(),request,response,0);
-// }else {
-// //闇�瑕佺即璐规垨鑰呮湁杩濈珷
-// System.out.println(outPark.getCarNo()+"璇ヨ溅闇�瑕佺即璐�"+outPark.getPrice());
-// String s= "1."+barrier.getCarNo()+"璇ヨ溅闇�瑕佺即璐筡n";
-// writeTxt2(s);
-// OutParkLog byOutPark = outParkLogService.getByOutPark(outPark.getCarNo(), outPark.getId());
-// byOutPark.setOutTime(outPark.getCreateTime());
-// byOutPark.setParkId(outPark.getParkId());
-// outParkLogService.saveOrUpdate(byOutPark);
-// String jsonValue = JSON.toJSONString(outPark);
-// redisTemplate.opsForValue().set("outPark_dif_"+ barrierId, jsonValue);
-// outLedShow(outPark,barrier.getCode(),barrier.getCarNo(),outPark.getPrice(),toDayHrMinSec,barrier.getParkId(),request,response,1);
-// }
-// return money;
-// }
-//
-// public int findTicket(String carNo){
-// QueryWrapper<Ticket> wrapper = new QueryWrapper<>();
-// wrapper.lambda()
-// .eq(Ticket::getCarNo,carNo)
-// .eq(Ticket::getPayStatus,1);
-// List<Ticket> tickets = ticketService.list(wrapper);
-// if(tickets.size()>0){
-// return 1;
-// }else{
-// return 0;
-// }
-// }
-//
-//
-// public void inLedShow(String ledId,String carNo,Integer parkId,HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
-// TicketBlack black = ticketBlackService.getByCarNo(carNo, 1);
-// if(black != null){
-// LedBean ledBean = new LedBean();
-// ledBean.setcolor1(0);
-// ledBean.setcolor2(0);
-// ledBean.setcolor3(0);
-// ledBean.setcolor4(0);
-// ledBean.setcontent1(carNo);
-// ledBean.setcontent2("榛戝悕鍗曡溅杈�");
-// ledBean.setcontent3("绂佹椹跺叆");
-// ledBean.setcontent4("鑱旂郴绠＄悊鍛�");
-// ledBean.setdisMode1(0);
-// ledBean.setdisMode2(0);
-// ledBean.setdisMode3(0);
-// ledBean.setdisMode4(0);
-// ledBean.setvoiceContent("榛戝悕鍗曡溅杈�"+carNo+",绂佹椹跺叆");
-// ResultData resultData = CodeUtil.GetResultDataAllLine(ledBean);
-// byte[] dataX = new byte[resultData.getlenth()];
-// System.arraycopy(resultData.getdatas(),0,dataX,0,resultData.getlenth());
-// String data1 = Base64.getMimeEncoder().encodeToString(dataX) + "=";
-// data1 = data1.replaceAll("\r\n", "");
-// noOpen(request,response,data1);
-// }else {
-// String num = redisTemplate.opsForValue().get("car_park_" + parkId);
-// if(num == null){
-// num = "0";
-// }
-// Park byId = parkService.getById(parkId);
-// int n = Integer.parseInt(num)+1;
-// redisTemplate.opsForValue().set("car_park_" + parkId,Integer.toString(n),30, TimeUnit.DAYS);
-// int i = byId.getNum() - Integer.parseInt(num);
-// if(i<0){
-// i = 0;
-// }
-// String carType = "";
-// String carDay = "";
-// Barrier barrier = barrierService.findByCode(ledId);
-// WhiteList byCarNo = whiteListService.getByCarNo(carNo);
-// if(byCarNo == null){
-// carType = "涓存椂杞�";
-// }else {
-// if (byCarNo.getType() == 0){
-// //鐧藉悕鍗曟案涔呰溅杈�
-// carType = "鏈堢杞�";
-// }else {
-// //鐧藉悕鍗曞浐瀹氬仠杞﹀満杞﹁締
-// if(StringUtils.isNotBlank(byCarNo.getParkIds()) && byCarNo.getParkIds().contains(barrier.getParkId()+"")){
-// carType = "鏈堢杞�";
-// long l = (byCarNo.getEndTime().getTime() - byCarNo.getStartTime().getTime()) / (24 * 3600 * 1000);
-// carDay = "鏈夋晥鏈熻繕鏈�"+l+"澶�";
-// }else {
-// carType = "涓存椂杞�";
-// }
-// }
-// }
-// if(StringUtils.isBlank(carDay) && !carNo.equals("鏃犵墝杞�")){
-// carDay = "娆㈣繋鍏変复";
-// }else if(StringUtils.isBlank(carDay) && carNo.equals("鏃犵墝杞�")){
-// carDay = "鎷掔粷椹跺叆";
-// }
-//
-// LedBean ledBean = new LedBean();
-// ledBean.setcolor1(0);
-// ledBean.setcolor2(0);
-// ledBean.setcolor3(0);
-// ledBean.setcolor4(0);
-// ledBean.setcontent1(carNo);
-// ledBean.setcontent2(carType);
-// ledBean.setcontent3(carDay);
-// ledBean.setcontent4("浣欎綅:"+i);
-// ledBean.setdisMode1(0);
-// ledBean.setdisMode2(0);
-// ledBean.setdisMode3(0);
-// ledBean.setdisMode4(0);
-// ledBean.setvoiceContent(carType+","+carNo+","+carDay);
-// ResultData resultData = CodeUtil.GetResultDataAllLine(ledBean);
-// byte[] dataX = new byte[resultData.getlenth()];
-// System.arraycopy(resultData.getdatas(),0,dataX,0,resultData.getlenth());
-// String data1 = Base64.getMimeEncoder().encodeToString(dataX) + "=";
-// data1 = data1.replaceAll("\r\n", "");
-//
-// if(!carNo.equals("鏃犵墝杞�")){
-// open(request,response,data1);//鍏ュ満寮�闂�
-// }else {
-// noOpen(request,response,data1);
-// }
-// }
-// }
-//
-// public void inLedFullShow(String ledId, String carNo, Integer parkId,HttpServletRequest request, HttpServletResponse response) throws IOException {
-// String carType = "";
-// String carDay = "";
-// Barrier barrier = barrierService.findByCode(ledId);
-// WhiteList byCarNo = whiteListService.getByCarNo(carNo);
-// if(byCarNo == null){
-// carType = "涓存椂杞�";
-// }else {
-// if (byCarNo.getType() == 0){
-// //鐧藉悕鍗曟案涔呰溅杈�
-// carType = "鏈堢杞�";
-// }else {
-// //鐧藉悕鍗曞浐瀹氬仠杞﹀満杞﹁締
-// if(StringUtils.isNotBlank(byCarNo.getParkIds()) && byCarNo.getParkIds().contains(barrier.getParkId()+"")){
-// carType = "鏈堢杞�";
-// }else {
-// carType = "涓存椂杞�";
-// }
-// }
-// }
-//
-// LedBean ledBean = new LedBean();
-// ledBean.setcolor1(0);
-// ledBean.setcolor2(0);
-// ledBean.setcolor3(0);
-// ledBean.setcolor4(0);
-// ledBean.setcontent1(carNo);
-// ledBean.setcontent2(carType);
-// ledBean.setcontent3("杞︿綅宸叉弧");
-// ledBean.setcontent4("璇烽┒绂�");
-// ledBean.setdisMode1(0);
-// ledBean.setdisMode2(0);
-// ledBean.setdisMode3(0);
-// ledBean.setdisMode4(0);
-// ledBean.setvoiceContent("杞︿綅宸叉弧,璇烽┒绂�");
-// ResultData resultData = CodeUtil.GetResultDataAllLine(ledBean);
-// byte[] dataX = new byte[resultData.getlenth()];
-// System.arraycopy(resultData.getdatas(),0,dataX,0,resultData.getlenth());
-// String data1 = Base64.getMimeEncoder().encodeToString(dataX) + "=";
-// data1 = data1.replaceAll("\r\n", "");
-//
-// noOpen(request,response,data1);//鍏ュ満寮�闂�
-// }
-//
-// public void outLedShow(OutPark outPark,String ledId,String carNo,Double price,String timeStamp,Integer parkId,HttpServletRequest request, HttpServletResponse response,int type) throws ServletException, IOException {
-// String redisnum = redisTemplate.opsForValue().get("car_park_" + parkId);
-// Park park = parkService.getById(parkId);
-// LedBean ledBean = new LedBean();
-// ledBean.setcolor1(0);
-// ledBean.setcolor2(0);
-// ledBean.setcolor3(0);
-// ledBean.setcolor4(0);
-// ledBean.setcontent1(carNo);
-// ledBean.setcontent2("鍋滆溅"+timeStamp);
-// ledBean.setcontent3("浜よ垂"+price+"鍏�");
-// ledBean.setcontent4("绂佹闂潌");
-// ledBean.setdisMode1(0);
-// ledBean.setdisMode2(1);
-// ledBean.setdisMode3(1);
-// ledBean.setdisMode4(0);
-// ledBean.setvoiceContent(carNo+"鍋滆溅"+timeStamp+"浜よ垂"+price+"鍏�");
-// ResultData resultData = CodeUtil.GetResultDataAllLine(ledBean);
-// byte[] dataX = new byte[resultData.getlenth()];
-// System.arraycopy(resultData.getdatas(),0,dataX,0,resultData.getlenth());
-// String data1 = Base64.getMimeEncoder().encodeToString(dataX) + "=";
-// data1 = data1.replaceAll("\r\n", "");
-// if(type == 0){
-// if(carNo.equals("鏃犵墝杞�")){
-// noOpen(request,response,data1);
-// }else {
-// if(timeStamp.contains("璁板綍寮傚父")){
-// OutPark by5min = outParkService.findBy5min(carNo, parkId, LocalDateTime.now());
-// if(by5min != null){
-// //寮�闂�
-// open(request,response,data1);
-// enterParkService.deleteByCarNo(carNo, parkId);
-// redisTemplate.opsForValue().set("park_change_in_"+parkId,"true",1, TimeUnit.DAYS);
-// int i = Integer.parseInt(redisnum);
-// i--;
-// if(i<0){
-// String s= "2."+carNo+"锛屽満鍐呭仠杞︽暟涓�0\n";
-// writeTxt2(s);
-// redisTemplate.opsForValue().set("car_park_" + parkId,"0",30, TimeUnit.DAYS);
-// redisTemplate.opsForValue().set("park_up_" + parkId,"true",30, TimeUnit.DAYS);
-// }else {
-// String s= "2."+carNo+"锛屽満鍐呭仠杞︽暟涓�"+i+"\n";
-// writeTxt2(s);
-// redisTemplate.opsForValue().set("car_park_" + parkId,Integer.toString(i),30, TimeUnit.DAYS);
-// redisTemplate.opsForValue().set("park_up_" + parkId,"true",30, TimeUnit.DAYS);
-// }
-// }else {
-// noOpen(request,response,data1);
-// }
-// }else {
-// //寮�闂�
-// open(request,response,data1);
-//
-// //缂撳瓨鍦╮edis閲�,蹇冭烦鎺ュ彛鍘绘姮鏉�
-// String jsonValue = JSON.toJSONString(outPark);
-// redisTemplate.opsForValue().set("outPark-"+outPark.getBarrierId(), jsonValue);
-//
-// enterParkService.deleteByCarNo(carNo, parkId);
-// redisTemplate.opsForValue().set("park_change_in_"+parkId,"true",1, TimeUnit.DAYS);
-// int i = Integer.parseInt(redisnum);
-// i--;
-// if(i<0){
-// String s= "2."+carNo+"锛屽満鍐呭仠杞︽暟涓�0\n";
-// writeTxt2(s);
-// redisTemplate.opsForValue().set("car_park_" + parkId,"0",30, TimeUnit.DAYS);
-// redisTemplate.opsForValue().set("park_up_" + parkId,"true",30, TimeUnit.DAYS);
-// }else {
-// String s= "2."+carNo+"锛屽満鍐呭仠杞︽暟涓�"+i+"\n";
-// writeTxt2(s);
-// redisTemplate.opsForValue().set("car_park_" + parkId,Integer.toString(i),30, TimeUnit.DAYS);
-// redisTemplate.opsForValue().set("park_up_" + parkId,"true",30, TimeUnit.DAYS);
-// }
-// }
-//
-// }
-// }else {
-// noOpen(request,response,data1);
-// }
-//
-// }
-//
-// public void outLedShowYueZu(String carNo,String text,Integer parkId,HttpServletRequest request, HttpServletResponse response,int type) throws ServletException, IOException{
-// String redisnum = redisTemplate.opsForValue().get("car_park_" + parkId);
-// LedBean ledBean = new LedBean();
-// ledBean.setcolor1(0);
-// ledBean.setcolor2(0);
-// ledBean.setcolor3(0);
-// ledBean.setcolor4(0);
-// ledBean.setcontent1(carNo);
-// ledBean.setcontent2(text);
-// ledBean.setcontent3("鍑忛�熸參琛�");
-// ledBean.setcontent4("娆㈣繋涓嬫鍏変复");
-// ledBean.setdisMode1(0);
-// ledBean.setdisMode2(0);
-// ledBean.setdisMode3(0);
-// ledBean.setdisMode4(1);
-// ledBean.setvoiceContent(text+carNo+"娆㈣繋涓嬫鍏変复");
-// ResultData resultData = CodeUtil.GetResultDataAllLine(ledBean);
-// byte[] dataX = new byte[resultData.getlenth()];
-// System.arraycopy(resultData.getdatas(),0,dataX,0,resultData.getlenth());
-// String data1 = Base64.getMimeEncoder().encodeToString(dataX) + "=";
-// data1 = data1.replaceAll("\r\n", "");
-// if(type == 0){
-// //寮�闂�
-// open(request,response,data1);
-// enterParkService.deleteByCarNo(carNo,parkId);
-// redisTemplate.opsForValue().set("park_change_in_"+parkId,"true",1, TimeUnit.DAYS);
-// int i = Integer.parseInt(redisnum);
-// i--;
-// if(i<0){
-// String s= "2."+carNo+"锛屽満鍐呭仠杞︽暟涓�0\n";
-// writeTxt2(s);
-// redisTemplate.opsForValue().set("car_park_" + parkId,"0",30, TimeUnit.DAYS);
-// redisTemplate.opsForValue().set("park_up_" + parkId,"true",30, TimeUnit.DAYS);
-// }else {
-// String s= "2."+carNo+"锛屽満鍐呭仠杞︽暟涓�"+i+"\n";
-// writeTxt2(s);
-// redisTemplate.opsForValue().set("car_park_" + parkId,Integer.toString(i),30, TimeUnit.DAYS);
-// redisTemplate.opsForValue().set("park_up_" + parkId,"true",30, TimeUnit.DAYS);
-// }
-// }else {
-// noOpen(request,response,data1);
-// }
-// }
-//
-// public void outLedShowDefault(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException{
-// LedBean ledBean = new LedBean();
-// ledBean.setcolor1(0);
-// ledBean.setcolor2(0);
-// ledBean.setcolor3(0);
-// ledBean.setcolor4(0);
-// ledBean.setcontent1("涓�杞︿竴鏉�");
-// ledBean.setcontent2("鍑忛�熸參琛�");
-// ledBean.setcontent3("鏃犻渶鍙栧崱");
-// ledBean.setcontent4("鎵爜缂磋垂");
-// ledBean.setdisMode1(0);
-// ledBean.setdisMode2(0);
-// ledBean.setdisMode3(0);
-// ledBean.setdisMode4(0);
-// ledBean.setvoiceContent("");
-// ResultData resultData = CodeUtil.GetResultDataAllLine(ledBean);
-// byte[] dataX = new byte[resultData.getlenth()];
-// System.arraycopy(resultData.getdatas(),0,dataX,0,resultData.getlenth());
-// String data1 = Base64.getMimeEncoder().encodeToString(dataX) + "=";
-// data1 = data1.replaceAll("\r\n", "");
-// noOpen(request,response,data1);
-// }
-//
-// public void inLedShowDefault(Integer parkId,HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException{
-// String num = redisTemplate.opsForValue().get("car_park_" + parkId);
-// String con3 = "";
-// String con4 = "";
-// if(num == null){
-// num = "0";
-// }
-// Park byId = parkService.getById(parkId);
-// int i = byId.getNum() - Integer.parseInt(num);
-// if(i<=0){
-// i = 0;
-// con3 = "杞︿綅宸叉弧";
-// con4 = "璇烽┒绂�";
-// }else {
-// con3 = "鎺掗槦绛夊��";
-// con4 = "浣欎綅:"+i;
-// }
-// LedBean ledBean = new LedBean();
-// ledBean.setcolor1(0);
-// ledBean.setcolor2(0);
-// ledBean.setcolor3(0);
-// ledBean.setcolor4(0);
-// ledBean.setcontent1("涓�杞︿竴鏉�");
-// ledBean.setcontent2("鍑忛�熸參琛�");
-// ledBean.setcontent3(con3);
-// ledBean.setcontent4(con4);
-// ledBean.setdisMode1(0);
-// ledBean.setdisMode2(0);
-// ledBean.setdisMode3(0);
-// ledBean.setdisMode4(0);
-// ledBean.setvoiceContent("");
-// ResultData resultData = CodeUtil.GetResultDataAllLine(ledBean);
-// byte[] dataX = new byte[resultData.getlenth()];
-// System.arraycopy(resultData.getdatas(),0,dataX,0,resultData.getlenth());
-// String data1 = Base64.getMimeEncoder().encodeToString(dataX) + "=";
-// data1 = data1.replaceAll("\r\n", "");
-// noOpen(request,response,data1);
-// }
-//
-//
-//}
+package com.boying.controller.car;
+
+import cn.hutool.http.HttpRequest;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.boying.common.R;
+import com.boying.common.SystemConfigProperties;
+import com.boying.entity.*;
+import com.boying.service.*;
+import com.boying.util.DateUtilOther;
+import com.boying.util.FileUtil;
+import com.boying.util.RedisJsonUtil;
+import com.boying.util.StringUtil;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
+import ledshow.CodeUtil;
+import ledshow.LedBean;
+import ledshow.ResultData;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.*;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.time.Duration;
+import java.time.LocalDateTime;
+import java.time.ZoneOffset;
+import java.util.Base64;
+import java.util.Date;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+
+
+/**
+ * Servlet implementation class PlateServlet
+ */
+@Controller
+@RequestMapping("/ffzf/car")
+@RequiredArgsConstructor
+public class PlateServlet3 extends HttpServlet {
+ private static final long serialVersionUID = 1L;
+ private final SystemConfigProperties systemConfigProperties;
+ private final StringRedisTemplate redisTemplate;
+ private final ParkService parkService;
+ private final OutParkService outParkService;
+ private final EnterParkService enterParkService;
+ private final BarrierService barrierService;
+ private final TicketService ticketService;
+ private final CostRuleService costRuleService;
+ private final WhiteListService whiteListService;
+ private final FileInfoService fileInfoService;
+ private final TicketBlackService ticketBlackService;
+ private final OutParkLogService outParkLogService;
+ // private final RedisJsonUtil redisJsonUtil;
+ private final String LEDURL = "http://192.168.31.212:9988/LedShow/IGetResultDataAllLine";
+
+ /**
+ * 鍥炲寮�闂�
+ */
+ protected void open(HttpServletRequest request, HttpServletResponse response,String data) throws ServletException, IOException {
+ response.setContentType("text/json");
+ PrintWriter out = response.getWriter();
+ String aa = "{" +
+ "\"Response_AlarmInfoPlate\": {" +
+ "\"info\":\"ok\"," +
+ "\"is_pay\":\"true\"," +
+ "\"serialData\" :[" +
+ "{" +
+ "\"serialChannel\":0," +
+ "\"data\" : \"" + data + "\"," +
+ "\"dataLen\" :" + data.length() +
+ "}" +
+ "]" +
+ "}" +
+ "}";
+ out.println(aa);
+ out.flush();
+ out.close();
+ }
+
+
+ //杞爜
+ public static String deCode(String str) {
+ try {
+ byte[] b = str.getBytes("UTF-8");//锟斤拷锟斤拷
+ String sa = new String(b);//锟斤拷锟斤拷:锟斤拷什么锟街凤拷锟斤拷锟斤拷锟斤拷锟斤拷锟绞裁达拷址锟斤拷锟斤拷锟斤拷锟�
+ //String sa = new String(str.getBytes());
+
+ return sa;
+ } catch (Exception e) {
+ e.printStackTrace();
+ return "";
+ }
+ }
+
+ protected void noOpen(HttpServletRequest request, HttpServletResponse response,String data) throws IOException {
+ response.setContentType("text/json");
+ PrintWriter out = response.getWriter();
+ String aa = "{" +
+ "\"Response_AlarmInfoPlate\": {" +
+ "\"serialData\" :[" +
+ "{" +
+ "\"serialChannel\":0," +
+ "\"data\" : \"" + data + "\"," +
+ "\"dataLen\" :" + data.length() +
+ "}" +
+ "]" +
+ "}" +
+ "}";
+ out.println(aa);
+ out.flush();
+ out.close();
+ }
+
+ protected void easyOpen(HttpServletRequest request, HttpServletResponse response) throws IOException {
+ response.setContentType("text/json");
+ PrintWriter out = response.getWriter();
+ out.println("{\"Response_AlarmInfoPlate\":{\"info\":\"ok\",\"content\":\"...\",\"is_pay\":\"true\"}}");
+ out.flush();
+ out.close();
+ }
+
+ protected void easyOpen2(HttpServletRequest request, HttpServletResponse response) throws IOException {
+ response.setContentType("text/json");
+ PrintWriter out = response.getWriter();
+ out.println("{\"Response_AlarmInfoPlate\":{\"ivs_ioctrl\":{\"delay\":1000,\"io\":0,\"value\":2}}}");
+ out.flush();
+ out.close();
+ }
+
+ protected void easyNoOpen(HttpServletRequest request, HttpServletResponse response) throws IOException {
+ response.setContentType("text/json");
+ PrintWriter out = response.getWriter();
+ out.println("{\"Response_AlarmInfoPlate\":{\"info\":\"error\",\"content\":\"...\",\"is_pay\":\"false\"}}");
+ out.flush();
+ out.close();
+ }
+
+ @PostMapping("/status")
+ public void heart(String serialno,HttpServletRequest request,HttpServletResponse response) throws ServletException, IOException {
+ Barrier barrier = barrierService.findByCode(serialno);
+ Park park = parkService.getOneById(barrier.getParkId());
+ // Park park = parkService.getById(barrier.getParkId());
+ // String redis = redisTemplate.opsForValue().get("park_up_" + park.getId());
+ String redisnum = redisTemplate.opsForValue().get("car_park_" + park.getId());
+ if(StringUtils.isBlank(redisnum)){
+ redisnum = "0";
+ }
+ if(barrier!=null){
+ if(barrier.getType2()==1){
+ //寰呭紑闂�
+ if(barrier.getType() == 1){
+ int i = Integer.parseInt(redisnum);
+ i++;
+ redisTemplate.opsForValue().set("car_park_" + park.getId(),Integer.toString(i),30, TimeUnit.DAYS);
+ }else if(barrier.getType() == 0){
+ int i = Integer.parseInt(redisnum);
+ i--;
+ if(i<0){
+ String s= "2."+barrier.getCarNo()+"闂告満鎵嬪姩鍚姩锛屽満鍐呭仠杞︽暟涓�"+i+"\n";
+ writeTxt2(s);
+ redisTemplate.opsForValue().set("car_park_" + park.getId(),"0",30, TimeUnit.DAYS);
+ redisTemplate.opsForValue().set("park_up_" + park.getId(),"true",30, TimeUnit.DAYS);
+ }else {
+ String s= "2."+barrier.getCarNo()+"闂告満鎵嬪姩鍚姩锛屽満鍐呭仠杞︽暟涓�"+i+"\n";
+ writeTxt2(s);
+ redisTemplate.opsForValue().set("car_park_" + park.getId(),Integer.toString(i),30, TimeUnit.DAYS);
+ redisTemplate.opsForValue().set("park_up_" + park.getId(),"true",30, TimeUnit.DAYS);
+ }
+
+ }
+ barrier.setType2(0);
+ barrier.setUpdateTime(LocalDateTime.now());
+ barrier.setStatus(0);
+ barrier.setUpdateTime(LocalDateTime.now());
+ barrierService.saveOrUpdate(barrier);
+
+ String jsonValue = JSON.toJSONString(barrier);
+ redisTemplate.opsForValue().set("barrier-"+barrier.getCode(), jsonValue);
+ easyOpen(request,response);
+ }else {
+ //涓嶉渶寮�闂�
+ LocalDateTime now = LocalDateTime.now();
+ LocalDateTime updateTime = barrier.getUpdateTime();
+ Duration duration = Duration.between(updateTime,now);
+ long minutes = duration.toMinutes();
+ if(minutes>=2){
+ barrier.setStatus(0);
+ barrier.setUpdateTime(LocalDateTime.now());
+ barrierService.saveOrUpdate(barrier);
+ }
+
+ String jsonValue = JSON.toJSONString(barrier);
+ redisTemplate.opsForValue().set("barrier-"+barrier.getCode(), jsonValue);
+ if(barrier.getType() == 0){
+ OutPark outPark = outParkService.count4(barrier.getId());
+ if(outPark!=null){
+ if(barrier.getType() == 0){
+ int i = Integer.parseInt(redisnum);
+ i--;
+ if(i<0){
+ String s= "2."+outPark.getCarNo()+"缂磋垂瀹屾垚锛屽満鍐呭仠杞︽暟涓�"+i+"\n";
+ writeTxt2(s);
+ redisTemplate.opsForValue().set("car_park_" + park.getId(),"0",30, TimeUnit.DAYS);
+ redisTemplate.opsForValue().set("park_up_" + park.getId(),"true",30, TimeUnit.DAYS);
+ }else {
+ String s= "2."+outPark.getCarNo()+"缂磋垂瀹屾垚锛屽満鍐呭仠杞︽暟涓�"+i+"\n";
+ writeTxt2(s);
+ redisTemplate.opsForValue().set("car_park_" + park.getId(),Integer.toString(i),30, TimeUnit.DAYS);
+ redisTemplate.opsForValue().set("park_up_" + park.getId(),"true",30, TimeUnit.DAYS);
+ }
+ }
+ outPark.setStatus2(1);
+ outParkService.saveOrUpdate(outPark);
+ easyOpen(request,response);
+ OutParkLog byOutPark = outParkLogService.getByOutPark(outPark.getCarNo(), outPark.getId());
+ byOutPark.setOpenTime(LocalDateTime.now());
+ outParkLogService.saveOrUpdate(byOutPark);
+ enterParkService.deleteByCarNo(outPark.getCarNo(), barrier.getParkId());
+ redisTemplate.delete("outPark-"+outPark.getBarrierId());
+ }
+ }
+ if(barrier.getType() == 1){
+ boolean in = barrierService.getDateDifIn(park.getId());
+ if(in){
+ inLedShowDefault(park.getId(),request,response);
+ }
+ }else if(barrier.getType() == 0){
+ boolean out = barrierService.getDateDifOut(barrier.getId());
+ if(out){
+ outLedShowDefault(request,response);
+ }
+ }
+ }
+
+ }else {
+ easyNoOpen(request,response);
+ }
+ }
+ /**
+ * @see HttpServlet#doPost(HttpServletRequest request, HttpServletResponse response)
+ */
+ @PostMapping("/PlateServlet")
+ protected void info(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+ String s= "";
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd_HH:mm:ss");
+ BufferedReader reader = new BufferedReader(new InputStreamReader(request.getInputStream(),"UTF-8"));
+ String str = "";
+ String lineStr = "";
+ FileInfo fileInfo = null;
+ while((str = reader.readLine()) != null){
+ lineStr += str;
+ }
+ // System.out.println("鑾峰彇鍒扮殑閬撻椄鎺ㄩ�佹暟鎹负锛�"+lineStr);
+
+ JSONObject jsonObject1 = JSON.parseObject(lineStr);
+ JSONObject alarmInfoPlate = jsonObject1.getJSONObject("AlarmInfoPlate");
+ 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 {
+ JsonParser parser=new JsonParser();
+ do {
+ JsonObject jsonObject=(JsonObject) parser.parse(lineStr);
+ if( jsonObject == null || jsonObject.isJsonNull() ) {
+ break;
+ }
+
+ JsonObject jsonInfoPlate = jsonObject.get("AlarmInfoPlate").getAsJsonObject();
+ if( jsonInfoPlate == null || jsonInfoPlate.isJsonNull() ) {
+ break;
+ }
+
+ JsonObject jsonResult = jsonInfoPlate.get("result").getAsJsonObject();
+ if( jsonResult == null || jsonResult.isJsonNull() ) {
+ break;
+ }
+
+ JsonObject jsonPlateResult = jsonResult.get("PlateResult").getAsJsonObject();
+ if( jsonPlateResult == null || jsonPlateResult.isJsonNull() ) {
+ break;
+ }
+
+ String license = jsonPlateResult.get("license").getAsString();//杞︾墝鍙�
+ if( license == null || license == "") {
+ break;
+ }
+
+ String serialno = jsonInfoPlate.get("serialno").getAsString();//鎽勫儚鏈哄簭鍒楀彿
+ if( serialno == null || serialno == "" ) {
+ break;
+ }
+
+
+ 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+" ";
+
+ Barrier barrier = barrierService.findByCode(code);
+ System.out.println("鏌ヨ鍒伴亾闂镐负锛�"+barrier);
+ if(barrier==null){
+ s+="鏌ヨ閬撻椄涓虹┖\n";
+ easyNoOpen(request,response);
+ }else{
+ if(barrier.getType()==0){
+ outPark(license, barrier.getId(), barrier.getParkId(),request,response,fileInfo);
+ s+=license+"-淇濆瓨鍑哄満璁板綍\n";
+ }else{
+ String num = redisTemplate.opsForValue().get("car_park_" + barrier.getParkId());
+ if(StringUtils.isBlank(num)){
+ num = "0";
+ redisTemplate.opsForValue().set("car_park_" + barrier.getParkId(),num,30, TimeUnit.DAYS);
+ redisTemplate.opsForValue().set("park_up_" + barrier.getParkId(),"true",30, TimeUnit.DAYS);
+ }
+ Park byId = parkService.getById(barrier.getParkId());
+ if(Integer.parseInt(num) >= byId.getNum() ){
+ //led鏄剧ず
+ inLedFullShow(code, license,barrier.getParkId(),request,response);
+ }else {
+ //led鏄剧ず
+ enterPark(license,barrier.getId(),barrier.getParkId(),fileInfo);
+ inLedShow(code, license,barrier.getParkId(),request,response);
+ s+=license+"-淇濆瓨鍏ュ満璁板綍\n";
+ }
+ }
+ }
+ writeTxt(s);
+ }while(false);
+ }
+ catch (Exception e) {
+ System.out.println("鏃犲叆鍦鸿褰�");
+ s+=" ,鏌ヨ鍦哄唴璁板綍寮傚父";
+ writeTxt(s);
+ easyNoOpen(request,response);
+ }
+ }
+
+ /**
+ * 鎵嬫満鍙峰叆鍦�
+ * @param
+ * @return
+ */
+ @PostMapping("/inParkByPhone" )
+ @ResponseBody
+ public Object inParkByPhone( EnterPark enterPark){
+ Barrier barrier = barrierService.getById(enterPark.getBarrierId());
+ if(barrier!=null){
+ String num = redisTemplate.opsForValue().get("car_park_" + barrier.getParkId());
+ if(StringUtils.isBlank(num)){
+ num = "0";
+ redisTemplate.opsForValue().set("car_park_" + barrier.getParkId(),num,30, TimeUnit.DAYS);
+ redisTemplate.opsForValue().set("park_up_" + barrier.getParkId(),"true",30, TimeUnit.DAYS);
+ }
+ Park byId = parkService.getById(barrier.getParkId());
+ if(Integer.parseInt(num) >= byId.getNum() ){
+ return R.failed(null,"绂佹閫氳,杞︿綅宸叉弧");
+ }else {
+ QueryWrapper<EnterPark> wrapper2 = new QueryWrapper<>();
+ wrapper2.lambda()
+ .eq(EnterPark::getBarrierId,barrier.getId())
+ .orderByDesc(EnterPark::getCreateTime)
+ .last(" limit 1");
+ EnterPark one = enterParkService.getOne(wrapper2);
+ if(one == null){
+ return R.failed("鏈煡璇㈠埌杞﹁締瀛樺湪");
+ }else {
+ if(one.getCarNo().equals("_鏃燺")){
+ enterPark.setCreateTime(LocalDateTime.now());
+ QueryWrapper<Ticket> wrapper = new QueryWrapper<>();
+ wrapper.lambda()
+ .eq(Ticket::getCarNo,enterPark.getCarNo())
+ .eq(Ticket::getPayStatus,1);
+ List<Ticket> tickets = ticketService.list(wrapper);
+ if(tickets.size()>0){
+ enterPark.setStatus(1);//鍙戠幇鏈夎繚绔�
+ }
+ enterPark.setIsPay(0);
+ enterPark.setPrice(0);
+ enterParkService.deleteByCarNo(enterPark.getCarNo(),enterPark.getParkId());
+ enterParkService.save(enterPark);
+ barrier.setType2(1);
+ barrierService.updateById(barrier);
+ return R.ok();
+ }else {
+ return R.failed("闈炴硶鎿嶄綔");
+ }
+ }
+ }
+ }
+ return R.failed(null,"鏁版嵁寮傚父");
+ }
+
+ /**
+ * 鎵嬫満鍙峰嚭鍦�
+ * @param
+ * @return
+ */
+ @PostMapping("/outParkByPhone" )
+ @ResponseBody
+ public Object outParkByPhone(String code2,String carNo){
+ Barrier byCode2 = barrierService.findByCode2(code2);
+ QueryWrapper<EnterPark> wrapper =new QueryWrapper<>();
+ wrapper.lambda()
+ .eq(EnterPark::getParkId,byCode2.getParkId())
+ .eq(EnterPark::getCarNo,carNo);
+ EnterPark one = enterParkService.getOne(wrapper);
+ if(one != null){
+ double money = 0.0;
+ String toDayHrMinSec = null;
+ OutPark outPark = new OutPark();
+ outPark.setCarNo(carNo);
+ outPark.setParkId(one.getParkId());
+ outPark.setBarrierId(byCode2.getId());
+ outPark.setCreateTime(LocalDateTime.now());
+ outPark.setCode(System.currentTimeMillis()+"");
+ System.out.println("鍏ュ満璁板綍锛�"+one);
+ outPark.setEnterTime(one.getCreateTime());
+ outPark.setParkName(byCode2.getName());
+ if(outPark.getTime() > 0){
+ outPark.setTimeStr(DateUtilOther.millisToDayHrMinSec(new Double(outPark.getTime()).longValue()));
+ }else {
+ outPark.setTimeStr("涓嶈冻涓�鍒嗛挓");
+ }
+ try {
+ long l = outPark.getCreateTime().toInstant(ZoneOffset.of("+8")).toEpochMilli() - one.getCreateTime().toInstant(ZoneOffset.of("+8")).toEpochMilli();
+ outPark.setTime(l/(1000*60));
+ toDayHrMinSec = DateUtilOther.millisToDayHrMinSec(l/(1000*60));
+ money = costRuleService.getMoney(one.getParkId(), outPark.getEnterTime(), outPark.getCreateTime(), 1);
+
+ //鍏ュ満璁板綍淇濆瓨涓�涓�
+ if(one.getIsPay()==1){
+ money = money - one.getPrice();
+ }else {
+ one.setPrice(money);
+ one.setIsPay(0);
+ enterParkService.updateById(one);
+ }
+ } catch (ParseException e) {
+ e.printStackTrace();
+ }
+ outPark.setPrice(money);
+ outPark.setStatus3(findTicket(carNo));
+ outParkService.saveOrUpdate(outPark);
+ byCode2.setCarNo(carNo);
+ //led灞曠ず
+ if(toDayHrMinSec == null){
+ return R.failed("寮傚父璁板綍");
+ }
+ if(outPark.getPrice()==0&&outPark.getStatus3()==0){
+ System.out.println(outPark.getCarNo()+"璇ヨ溅涓嶉渶瑕佺即璐�");
+ String s= "1."+byCode2.getCarNo()+"璇ヨ溅涓嶉渶瑕佺即璐筡n";
+ writeTxt2(s);
+ byCode2.setType2(1);
+ barrierService.updateById(byCode2);
+ return R.ok(outPark);
+ }else {
+ //闇�瑕佺即璐规垨鑰呮湁杩濈珷
+ System.out.println(outPark.getCarNo()+"璇ヨ溅闇�瑕佺即璐�"+outPark.getPrice());
+ String s= "1."+byCode2.getCarNo()+"璇ヨ溅闇�瑕佺即璐筡n";
+ writeTxt2(s);
+ barrierService.updateById(byCode2);
+ return R.ok(outPark);
+ }
+
+ }else {
+ return R.failed("鏈煡璇㈠埌鍏ュ満璁板綍");
+ }
+ }
+
+
+ private void writeTxt( String txt)
+ {
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
+ try
+ {
+ FileWriter f = new FileWriter(systemConfigProperties.getLogPath()+sdf.format(new Date())+".txt",true);
+ BufferedWriter bw=new BufferedWriter(f);
+ bw.write(txt);
+ bw.newLine();
+ bw.close();
+ }
+ catch(Exception e)
+ {
+ System.out.println("鎵撳嵃閿欒");
+ }
+ }
+
+ private void writeTxt2( String txt)
+ {
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
+ try
+ {
+ FileWriter f = new FileWriter(systemConfigProperties.getLogPath()+sdf.format(new Date())+"LED.txt",true);
+ BufferedWriter bw=new BufferedWriter(f);
+ bw.write(txt);
+ bw.newLine();
+ bw.close();
+ }
+ catch(Exception e)
+ {
+ System.out.println("鎵撳嵃閿欒");
+ }
+ }
+
+
+
+
+ public void enterPark(String carNo,Integer barrierId,Integer parkId,FileInfo fileInfo) {
+ TicketBlack black = ticketBlackService.getByCarNo(carNo, 1);
+ if(black != null){
+ System.out.println("榛戝悕鍗曡溅杈�"+carNo);
+ }else {
+ enterParkService.deleteByCarNo(carNo,parkId);
+ EnterPark enterPark = new EnterPark();
+ enterPark.setIsPay(0);
+ enterPark.setPrice(0);
+ enterPark.setCarNo(carNo);
+ enterPark.setBarrierId(barrierId);
+ enterPark.setParkId(parkId);
+
+ QueryWrapper<Ticket> wrapper = new QueryWrapper<>();
+ wrapper.lambda()
+ .eq(Ticket::getCarNo,enterPark.getCarNo())
+ .eq(Ticket::getPayStatus,1);
+ List<Ticket> tickets = ticketService.list(wrapper);
+ if(tickets.size()>0){
+ enterPark.setStatus(1);//鍙戠幇鏈夎繚绔�
+ }
+ if(fileInfo != null){
+ enterPark.setImgId(fileInfo.getId());
+ }
+ enterParkService.saveOrUpdate(enterPark);
+ String jsonValue = JSON.toJSONString(enterPark);
+ redisTemplate.opsForValue().set("enterPark_dif_"+ parkId, jsonValue);
+
+ }
+ }
+
+ 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;
+ OutPark outPark = new OutPark();
+ outPark.setCarNo(carNo);
+ outPark.setParkId(parkId);
+ outPark.setBarrierId(barrierId);
+ outPark.setCreateTime(LocalDateTime.now());
+ outPark.setCode(System.currentTimeMillis()+"");
+ List<EnterPark> byCarNo = enterParkService.findByCarNo(carNo,parkId);
+
+ if(byCarNo.size() == 0){
+ System.out.println(carNo+"鏈彂鐜板満鍐呰溅杈�");
+ }else{
+ enterPark = byCarNo.get(0);
+ System.out.println("鍏ュ満璁板綍锛�"+enterPark);
+ outPark.setEnterTime(enterPark.getCreateTime());
+ try {
+ long l = outPark.getCreateTime().toInstant(ZoneOffset.of("+8")).toEpochMilli() - enterPark.getCreateTime().toInstant(ZoneOffset.of("+8")).toEpochMilli();
+ outPark.setTime(l/(1000*60));
+ toDayHrMinSec = DateUtilOther.millisToDayHrMinSec(l/(1000*60));
+ money = costRuleService.getMoney(parkId, outPark.getEnterTime(), outPark.getCreateTime(), 1);
+
+ //鍏ュ満璁板綍淇濆瓨涓�涓�
+ if(enterPark.getIsPay() != null && enterPark.getIsPay()==1){
+ money = money - enterPark.getPrice();
+ }else {
+ enterPark.setPrice(money);
+ enterPark.setIsPay(0);
+ enterParkService.updateById(enterPark);
+ }
+ } catch (ParseException e) {
+ e.printStackTrace();
+ }
+
+ }
+ //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);
+ //led灞曠ず
+ if(toDayHrMinSec == null){
+ toDayHrMinSec = "鍏ュ満璁板綍寮傚父,璇疯仈绯荤鐞嗗憳";
+ }
+ //鍒ゆ柇鏄惁鍦ㄧ櫧鍚嶅崟
+ QueryWrapper<WhiteList> wrapper = new QueryWrapper<>();
+ wrapper.lambda()
+ .eq(WhiteList::getCarNo,carNo);
+ List<WhiteList> all = whiteListService.list(wrapper);
+ if(all.size() >0){
+ for(WhiteList w : all){
+ if(w.getType()==0){
+ outLedShowYueZu(barrier.getCarNo(),"鏈堢杞�",parkId,request,response,0);
+ OutPark byCarNoAndBarrierId = outParkService.findByCarNoAndBarrierId(carNo, barrierId);
+ byCarNoAndBarrierId.setStatus(2);
+ byCarNoAndBarrierId.setStatus2(1);
+ outParkService.saveOrUpdate(byCarNoAndBarrierId);
+ barrierService.saveOrUpdate(barrier);
+ String jsonValue2 = JSON.toJSONString(barrier);
+ redisTemplate.opsForValue().set("barrier-"+barrier.getCode(), jsonValue2);
+ String jsonValue = JSON.toJSONString(byCarNoAndBarrierId);
+ redisTemplate.opsForValue().set("outPark_dif_"+ barrierId, jsonValue);
+ return 0.0;
+ }else{
+ if(StringUtils.isNotBlank(w.getParkIds())){
+ if(w.getEndTime()!=null){
+ String parkIds = w.getParkIds();
+ String[] split = parkIds.split(",");
+ for (String s : split) {
+ int pid = Integer.parseInt(s);
+ if(pid == outPark.getParkId() && System.currentTimeMillis()<w.getEndTime().getTime()){
+ outLedShowYueZu(barrier.getCarNo(),"鏈堢杞�",parkId,request,response,0);
+ OutPark byCarNoAndBarrierId = outParkService.findByCarNoAndBarrierId(carNo, barrierId);
+ byCarNoAndBarrierId.setStatus(2);
+ byCarNoAndBarrierId.setStatus2(1);
+ outParkService.saveOrUpdate(byCarNoAndBarrierId);
+ barrierService.saveOrUpdate(barrier);
+ String jsonValue2 = JSON.toJSONString(barrier);
+ redisTemplate.opsForValue().set("barrier-"+barrier.getCode(), jsonValue2);
+ String jsonValue = JSON.toJSONString(byCarNoAndBarrierId);
+ redisTemplate.opsForValue().set("outPark_dif_"+ barrierId, jsonValue);
+ return 0.0;
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ barrierService.saveOrUpdate(barrier);
+ String jsonValue2 = JSON.toJSONString(barrier);
+ redisTemplate.opsForValue().set("barrier-"+barrier.getCode(), jsonValue2);
+ if(outPark.getPrice()==0&&outPark.getStatus3()==0){
+ System.out.println(outPark.getCarNo()+"璇ヨ溅涓嶉渶瑕佺即璐�");
+ String s= "1."+barrier.getCarNo()+"璇ヨ溅涓嶉渶瑕佺即璐筡n";
+ writeTxt2(s);
+ String jsonValue = JSON.toJSONString(outPark);
+ redisTemplate.opsForValue().set("outPark_dif_"+ barrierId, jsonValue);
+ outLedShow(outPark,barrier.getCode(),barrier.getCarNo(),outPark.getPrice(),toDayHrMinSec,barrier.getParkId(),request,response,0);
+ }else {
+ //闇�瑕佺即璐规垨鑰呮湁杩濈珷
+ System.out.println(outPark.getCarNo()+"璇ヨ溅闇�瑕佺即璐�"+outPark.getPrice());
+ String s= "1."+barrier.getCarNo()+"璇ヨ溅闇�瑕佺即璐筡n";
+ writeTxt2(s);
+ OutParkLog byOutPark = outParkLogService.getByOutPark(outPark.getCarNo(), outPark.getId());
+ byOutPark.setOutTime(outPark.getCreateTime());
+ byOutPark.setParkId(outPark.getParkId());
+ outParkLogService.saveOrUpdate(byOutPark);
+ String jsonValue = JSON.toJSONString(outPark);
+ redisTemplate.opsForValue().set("outPark_dif_"+ barrierId, jsonValue);
+ outLedShow(outPark,barrier.getCode(),barrier.getCarNo(),outPark.getPrice(),toDayHrMinSec,barrier.getParkId(),request,response,1);
+ }
+ return money;
+ }
+
+ public int findTicket(String carNo){
+ QueryWrapper<Ticket> wrapper = new QueryWrapper<>();
+ wrapper.lambda()
+ .eq(Ticket::getCarNo,carNo)
+ .eq(Ticket::getPayStatus,1);
+ List<Ticket> tickets = ticketService.list(wrapper);
+ if(tickets.size()>0){
+ return 1;
+ }else{
+ return 0;
+ }
+ }
+
+
+ public void inLedShow(String ledId,String carNo,Integer parkId,HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+ TicketBlack black = ticketBlackService.getByCarNo(carNo, 1);
+ if(black != null){
+ LedBean ledBean = new LedBean();
+ ledBean.setcolor1(0);
+ ledBean.setcolor2(0);
+ ledBean.setcolor3(0);
+ ledBean.setcolor4(0);
+ ledBean.setcontent1(carNo);
+ ledBean.setcontent2("榛戝悕鍗曡溅杈�");
+ ledBean.setcontent3("绂佹椹跺叆");
+ ledBean.setcontent4("鑱旂郴绠＄悊鍛�");
+ ledBean.setdisMode1(0);
+ ledBean.setdisMode2(0);
+ ledBean.setdisMode3(0);
+ ledBean.setdisMode4(0);
+ ledBean.setvoiceContent("榛戝悕鍗曡溅杈�"+carNo+",绂佹椹跺叆");
+ ResultData resultData = CodeUtil.GetResultDataAllLine(ledBean);
+ byte[] dataX = new byte[resultData.getlenth()];
+ System.arraycopy(resultData.getdatas(),0,dataX,0,resultData.getlenth());
+ String data1 = Base64.getMimeEncoder().encodeToString(dataX) + "=";
+ data1 = data1.replaceAll("\r\n", "");
+ noOpen(request,response,data1);
+ }else {
+ String num = redisTemplate.opsForValue().get("car_park_" + parkId);
+ if(num == null){
+ num = "0";
+ }
+ Park byId = parkService.getById(parkId);
+ int n = Integer.parseInt(num)+1;
+ redisTemplate.opsForValue().set("car_park_" + parkId,Integer.toString(n),30, TimeUnit.DAYS);
+ int i = byId.getNum() - Integer.parseInt(num);
+ if(i<0){
+ i = 0;
+ }
+ String carType = "";
+ String carDay = "";
+ Barrier barrier = barrierService.findByCode(ledId);
+ WhiteList byCarNo = whiteListService.getByCarNo(carNo);
+ if(byCarNo == null){
+ carType = "涓存椂杞�";
+ }else {
+ if (byCarNo.getType() == 0){
+ //鐧藉悕鍗曟案涔呰溅杈�
+ carType = "鏈堢杞�";
+ }else {
+ //鐧藉悕鍗曞浐瀹氬仠杞﹀満杞﹁締
+ if(StringUtils.isNotBlank(byCarNo.getParkIds()) && byCarNo.getParkIds().contains(barrier.getParkId()+"")){
+ carType = "鏈堢杞�";
+ long l = (byCarNo.getEndTime().getTime() - byCarNo.getStartTime().getTime()) / (24 * 3600 * 1000);
+ carDay = "鏈夋晥鏈熻繕鏈�"+l+"澶�";
+ }else {
+ carType = "涓存椂杞�";
+ }
+ }
+ }
+ if(StringUtils.isBlank(carDay) && !carNo.equals("_鏃燺")){
+ carDay = "娆㈣繋鍏変复";
+ }else if(StringUtils.isBlank(carDay) && carNo.equals("_鏃燺")){
+ carDay = "鎷掔粷椹跺叆";
+ }
+
+ LedBean ledBean = new LedBean();
+ ledBean.setcolor1(0);
+ ledBean.setcolor2(0);
+ ledBean.setcolor3(0);
+ ledBean.setcolor4(0);
+ ledBean.setcontent1(carNo);
+ ledBean.setcontent2(carType);
+ ledBean.setcontent3(carDay);
+ ledBean.setcontent4("浣欎綅:"+i);
+ ledBean.setdisMode1(0);
+ ledBean.setdisMode2(0);
+ ledBean.setdisMode3(0);
+ ledBean.setdisMode4(0);
+ ledBean.setvoiceContent(carType+","+carNo+","+carDay);
+ ResultData resultData = CodeUtil.GetResultDataAllLine(ledBean);
+ byte[] dataX = new byte[resultData.getlenth()];
+ System.arraycopy(resultData.getdatas(),0,dataX,0,resultData.getlenth());
+ String data1 = Base64.getMimeEncoder().encodeToString(dataX) + "=";
+ data1 = data1.replaceAll("\r\n", "");
+
+ if(!carNo.equals("_鏃燺")){
+ open(request,response,data1);//鍏ュ満寮�闂�
+ }else {
+ noOpen(request,response,data1);
+ }
+ }
+ }
+
+ public void inLedFullShow(String ledId, String carNo, Integer parkId,HttpServletRequest request, HttpServletResponse response) throws IOException {
+ String carType = "";
+ String carDay = "";
+ Barrier barrier = barrierService.findByCode(ledId);
+ WhiteList byCarNo = whiteListService.getByCarNo(carNo);
+ if(byCarNo == null){
+ carType = "涓存椂杞�";
+ }else {
+ if (byCarNo.getType() == 0){
+ //鐧藉悕鍗曟案涔呰溅杈�
+ carType = "鏈堢杞�";
+ }else {
+ //鐧藉悕鍗曞浐瀹氬仠杞﹀満杞﹁締
+ if(StringUtils.isNotBlank(byCarNo.getParkIds()) && byCarNo.getParkIds().contains(barrier.getParkId()+"")){
+ carType = "鏈堢杞�";
+ }else {
+ carType = "涓存椂杞�";
+ }
+ }
+ }
+
+ LedBean ledBean = new LedBean();
+ ledBean.setcolor1(0);
+ ledBean.setcolor2(0);
+ ledBean.setcolor3(0);
+ ledBean.setcolor4(0);
+ ledBean.setcontent1(carNo);
+ ledBean.setcontent2(carType);
+ ledBean.setcontent3("杞︿綅宸叉弧");
+ ledBean.setcontent4("璇烽┒绂�");
+ ledBean.setdisMode1(0);
+ ledBean.setdisMode2(0);
+ ledBean.setdisMode3(0);
+ ledBean.setdisMode4(0);
+ ledBean.setvoiceContent("杞︿綅宸叉弧,璇烽┒绂�");
+ ResultData resultData = CodeUtil.GetResultDataAllLine(ledBean);
+ byte[] dataX = new byte[resultData.getlenth()];
+ System.arraycopy(resultData.getdatas(),0,dataX,0,resultData.getlenth());
+ String data1 = Base64.getMimeEncoder().encodeToString(dataX) + "=";
+ data1 = data1.replaceAll("\r\n", "");
+
+ noOpen(request,response,data1);//鍏ュ満寮�闂�
+ }
+
+ public void outLedShow(OutPark outPark,String ledId,String carNo,Double price,String timeStamp,Integer parkId,HttpServletRequest request, HttpServletResponse response,int type) throws ServletException, IOException {
+ String redisnum = redisTemplate.opsForValue().get("car_park_" + parkId);
+ Park park = parkService.getById(parkId);
+ LedBean ledBean = new LedBean();
+ ledBean.setcolor1(0);
+ ledBean.setcolor2(0);
+ ledBean.setcolor3(0);
+ ledBean.setcolor4(0);
+ ledBean.setcontent1(carNo);
+ ledBean.setcontent2("鍋滆溅"+timeStamp);
+ ledBean.setcontent3("浜よ垂"+price+"鍏�");
+ ledBean.setcontent4("绂佹闂潌");
+ ledBean.setdisMode1(0);
+ ledBean.setdisMode2(1);
+ ledBean.setdisMode3(1);
+ ledBean.setdisMode4(0);
+ ledBean.setvoiceContent(carNo+"鍋滆溅"+timeStamp+"浜よ垂"+price+"鍏�");
+ ResultData resultData = CodeUtil.GetResultDataAllLine(ledBean);
+ byte[] dataX = new byte[resultData.getlenth()];
+ System.arraycopy(resultData.getdatas(),0,dataX,0,resultData.getlenth());
+ String data1 = Base64.getMimeEncoder().encodeToString(dataX) + "=";
+ data1 = data1.replaceAll("\r\n", "");
+ if(type == 0){
+ if(carNo.equals("_鏃燺")){
+ noOpen(request,response,data1);
+ }else {
+ if(timeStamp.contains("璁板綍寮傚父")){
+ OutPark by5min = outParkService.findBy5min(carNo, parkId, LocalDateTime.now());
+ if(by5min != null){
+ //寮�闂�
+ open(request,response,data1);
+ enterParkService.deleteByCarNo(carNo, parkId);
+ redisTemplate.opsForValue().set("park_change_in_"+parkId,"true",1, TimeUnit.DAYS);
+ int i = Integer.parseInt(redisnum);
+ i--;
+ if(i<0){
+ String s= "2."+carNo+"锛屽満鍐呭仠杞︽暟涓�0\n";
+ writeTxt2(s);
+ redisTemplate.opsForValue().set("car_park_" + parkId,"0",30, TimeUnit.DAYS);
+ redisTemplate.opsForValue().set("park_up_" + parkId,"true",30, TimeUnit.DAYS);
+ }else {
+ String s= "2."+carNo+"锛屽満鍐呭仠杞︽暟涓�"+i+"\n";
+ writeTxt2(s);
+ redisTemplate.opsForValue().set("car_park_" + parkId,Integer.toString(i),30, TimeUnit.DAYS);
+ redisTemplate.opsForValue().set("park_up_" + parkId,"true",30, TimeUnit.DAYS);
+ }
+ }else {
+ noOpen(request,response,data1);
+ }
+ }else {
+ //寮�闂�
+ open(request,response,data1);
+
+ //缂撳瓨鍦╮edis閲�,蹇冭烦鎺ュ彛鍘绘姮鏉�
+ String jsonValue = JSON.toJSONString(outPark);
+ redisTemplate.opsForValue().set("outPark-"+outPark.getBarrierId(), jsonValue);
+
+ enterParkService.deleteByCarNo(carNo, parkId);
+ redisTemplate.opsForValue().set("park_change_in_"+parkId,"true",1, TimeUnit.DAYS);
+ int i = Integer.parseInt(redisnum);
+ i--;
+ if(i<0){
+ String s= "2."+carNo+"锛屽満鍐呭仠杞︽暟涓�0\n";
+ writeTxt2(s);
+ redisTemplate.opsForValue().set("car_park_" + parkId,"0",30, TimeUnit.DAYS);
+ redisTemplate.opsForValue().set("park_up_" + parkId,"true",30, TimeUnit.DAYS);
+ }else {
+ String s= "2."+carNo+"锛屽満鍐呭仠杞︽暟涓�"+i+"\n";
+ writeTxt2(s);
+ redisTemplate.opsForValue().set("car_park_" + parkId,Integer.toString(i),30, TimeUnit.DAYS);
+ redisTemplate.opsForValue().set("park_up_" + parkId,"true",30, TimeUnit.DAYS);
+ }
+ }
+
+ }
+ }else {
+ noOpen(request,response,data1);
+ }
+
+ }
+
+ public void outLedShowYueZu(String carNo,String text,Integer parkId,HttpServletRequest request, HttpServletResponse response,int type) throws ServletException, IOException{
+ String redisnum = redisTemplate.opsForValue().get("car_park_" + parkId);
+ LedBean ledBean = new LedBean();
+ ledBean.setcolor1(0);
+ ledBean.setcolor2(0);
+ ledBean.setcolor3(0);
+ ledBean.setcolor4(0);
+ ledBean.setcontent1(carNo);
+ ledBean.setcontent2(text);
+ ledBean.setcontent3("鍑忛�熸參琛�");
+ ledBean.setcontent4("娆㈣繋涓嬫鍏変复");
+ ledBean.setdisMode1(0);
+ ledBean.setdisMode2(0);
+ ledBean.setdisMode3(0);
+ ledBean.setdisMode4(1);
+ ledBean.setvoiceContent(text+carNo+"娆㈣繋涓嬫鍏変复");
+ ResultData resultData = CodeUtil.GetResultDataAllLine(ledBean);
+ byte[] dataX = new byte[resultData.getlenth()];
+ System.arraycopy(resultData.getdatas(),0,dataX,0,resultData.getlenth());
+ String data1 = Base64.getMimeEncoder().encodeToString(dataX) + "=";
+ data1 = data1.replaceAll("\r\n", "");
+ if(type == 0){
+ //寮�闂�
+ open(request,response,data1);
+ enterParkService.deleteByCarNo(carNo,parkId);
+ redisTemplate.opsForValue().set("park_change_in_"+parkId,"true",1, TimeUnit.DAYS);
+ int i = Integer.parseInt(redisnum);
+ i--;
+ if(i<0){
+ String s= "2."+carNo+"锛屽満鍐呭仠杞︽暟涓�0\n";
+ writeTxt2(s);
+ redisTemplate.opsForValue().set("car_park_" + parkId,"0",30, TimeUnit.DAYS);
+ redisTemplate.opsForValue().set("park_up_" + parkId,"true",30, TimeUnit.DAYS);
+ }else {
+ String s= "2."+carNo+"锛屽満鍐呭仠杞︽暟涓�"+i+"\n";
+ writeTxt2(s);
+ redisTemplate.opsForValue().set("car_park_" + parkId,Integer.toString(i),30, TimeUnit.DAYS);
+ redisTemplate.opsForValue().set("park_up_" + parkId,"true",30, TimeUnit.DAYS);
+ }
+ }else {
+ noOpen(request,response,data1);
+ }
+ }
+
+ public void outLedShowDefault(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException{
+ LedBean ledBean = new LedBean();
+ ledBean.setcolor1(0);
+ ledBean.setcolor2(0);
+ ledBean.setcolor3(0);
+ ledBean.setcolor4(0);
+ ledBean.setcontent1("涓�杞︿竴鏉�");
+ ledBean.setcontent2("鍑忛�熸參琛�");
+ ledBean.setcontent3("鏃犻渶鍙栧崱");
+ ledBean.setcontent4("鎵爜缂磋垂");
+ ledBean.setdisMode1(0);
+ ledBean.setdisMode2(0);
+ ledBean.setdisMode3(0);
+ ledBean.setdisMode4(0);
+ ledBean.setvoiceContent("");
+ ResultData resultData = CodeUtil.GetResultDataAllLine(ledBean);
+ byte[] dataX = new byte[resultData.getlenth()];
+ System.arraycopy(resultData.getdatas(),0,dataX,0,resultData.getlenth());
+ String data1 = Base64.getMimeEncoder().encodeToString(dataX) + "=";
+ data1 = data1.replaceAll("\r\n", "");
+ noOpen(request,response,data1);
+ }
+
+ public void inLedShowDefault(Integer parkId,HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException{
+ String num = redisTemplate.opsForValue().get("car_park_" + parkId);
+ String con3 = "";
+ String con4 = "";
+ if(num == null){
+ num = "0";
+ }
+ Park byId = parkService.getById(parkId);
+ int i = byId.getNum() - Integer.parseInt(num);
+ if(i<=0){
+ i = 0;
+ con3 = "杞︿綅宸叉弧";
+ con4 = "璇烽┒绂�";
+ }else {
+ con3 = "鎺掗槦绛夊��";
+ con4 = "浣欎綅:"+i;
+ }
+ LedBean ledBean = new LedBean();
+ ledBean.setcolor1(0);
+ ledBean.setcolor2(0);
+ ledBean.setcolor3(0);
+ ledBean.setcolor4(0);
+ ledBean.setcontent1("涓�杞︿竴鏉�");
+ ledBean.setcontent2("鍑忛�熸參琛�");
+ ledBean.setcontent3(con3);
+ ledBean.setcontent4(con4);
+ ledBean.setdisMode1(0);
+ ledBean.setdisMode2(0);
+ ledBean.setdisMode3(0);
+ ledBean.setdisMode4(0);
+ ledBean.setvoiceContent("");
+ ResultData resultData = CodeUtil.GetResultDataAllLine(ledBean);
+ byte[] dataX = new byte[resultData.getlenth()];
+ System.arraycopy(resultData.getdatas(),0,dataX,0,resultData.getlenth());
+ String data1 = Base64.getMimeEncoder().encodeToString(dataX) + "=";
+ data1 = data1.replaceAll("\r\n", "");
+ noOpen(request,response,data1);
+ }
+
+
+}
diff --git a/src/main/java/com/boying/controller/car/PushCallback.java b/src/main/java/com/boying/controller/car/PushCallback.java
index 412adbe..eb070f4 100644
--- a/src/main/java/com/boying/controller/car/PushCallback.java
+++ b/src/main/java/com/boying/controller/car/PushCallback.java
@@ -1,44 +1,44 @@
-package com.boying.controller.car;
-
-/**
- * @author kdq
- * @version 1.0.0
- * @ClassName PushCallback.java
- * @Description TODO
- * @createTime 2024骞�03鏈�20鏃� 15:42:00
- */
-import org.eclipse.paho.client.mqttv3.IMqttDeliveryToken;
-import org.eclipse.paho.client.mqttv3.MqttCallback;
-import org.eclipse.paho.client.mqttv3.MqttMessage;
-
-/**
- * 蹇呴』瀹炵幇MqttCallback鐨勬帴鍙ｅ苟瀹炵幇瀵瑰簲鐨勭浉鍏虫帴鍙ｆ柟娉旵allBack 绫诲皢瀹炵幇 MqttCallBack銆�
- * 姣忎釜瀹㈡埛鏈烘爣璇嗛兘闇�瑕佷竴涓洖璋冨疄渚嬨�傚湪姝ょず渚嬩腑锛屾瀯閫犲嚱鏁颁紶閫掑鎴锋満鏍囪瘑浠ュ彟瀛樹负瀹炰緥鏁版嵁銆�
- * 鍦ㄥ洖璋冧腑锛屽皢瀹冪敤鏉ユ爣璇嗗凡缁忓惎鍔ㄤ簡璇ュ洖璋冪殑鍝釜瀹炰緥銆�
- * 蹇呴』鍦ㄥ洖璋冪被涓疄鐜颁笁涓柟娉曪細
- * public void messageArrived(MqttTopic topic, MqttMessage message)鎺ユ敹宸茬粡棰勮鐨勫彂甯冦��
- * public void connectionLost(Throwable cause)鍦ㄦ柇寮�杩炴帴鏃惰皟鐢ㄣ��
- * public void deliveryComplete(MqttDeliveryToken token))
- * 鎺ユ敹鍒板凡缁忓彂甯冪殑 QoS 1 鎴� QoS 2 娑堟伅鐨勪紶閫掍护鐗屾椂璋冪敤銆�
- * 鐢� MqttClient.connect 婵�娲绘鍥炶皟銆�
- */
-public class PushCallback implements MqttCallback{
-
- @Override
- public void connectionLost(Throwable cause) {
- // 杩炴帴涓㈠け鍚庯紝涓�鑸湪杩欓噷闈㈣繘琛岄噸杩�
- System.out.println("杩炴帴鏂紑鈥︹�︼紙鍙互鍋氶噸杩烇級");
- }
-
- @Override
- public void deliveryComplete(IMqttDeliveryToken token) {
- System.out.println("deliveryComplete---------" + token.isComplete());
- }
-
- @Override
- public void messageArrived(String topic, MqttMessage message) throws Exception {
- // subscribe鍚庡緱鍒扮殑娑堟伅浼氭墽琛屽埌杩欓噷闈�
- System.out.println("鎺ユ敹娑堟伅涓婚:" + topic + " 鎺ユ敹娑堟伅Qos:" + message.getQos() + "鎺ユ敹娑堟伅鍐呭:" + new String(message.getPayload()));
-
- }
-}
+//package com.boying.controller.car;
+//
+///**
+// * @author kdq
+// * @version 1.0.0
+// * @ClassName PushCallback.java
+// * @Description TODO
+// * @createTime 2024骞�03鏈�20鏃� 15:42:00
+// */
+//import org.eclipse.paho.client.mqttv3.IMqttDeliveryToken;
+//import org.eclipse.paho.client.mqttv3.MqttCallback;
+//import org.eclipse.paho.client.mqttv3.MqttMessage;
+//
+///**
+// * 蹇呴』瀹炵幇MqttCallback鐨勬帴鍙ｅ苟瀹炵幇瀵瑰簲鐨勭浉鍏虫帴鍙ｆ柟娉旵allBack 绫诲皢瀹炵幇 MqttCallBack銆�
+// * 姣忎釜瀹㈡埛鏈烘爣璇嗛兘闇�瑕佷竴涓洖璋冨疄渚嬨�傚湪姝ょず渚嬩腑锛屾瀯閫犲嚱鏁颁紶閫掑鎴锋満鏍囪瘑浠ュ彟瀛樹负瀹炰緥鏁版嵁銆�
+// * 鍦ㄥ洖璋冧腑锛屽皢瀹冪敤鏉ユ爣璇嗗凡缁忓惎鍔ㄤ簡璇ュ洖璋冪殑鍝釜瀹炰緥銆�
+// * 蹇呴』鍦ㄥ洖璋冪被涓疄鐜颁笁涓柟娉曪細
+// * public void messageArrived(MqttTopic topic, MqttMessage message)鎺ユ敹宸茬粡棰勮鐨勫彂甯冦��
+// * public void connectionLost(Throwable cause)鍦ㄦ柇寮�杩炴帴鏃惰皟鐢ㄣ��
+// * public void deliveryComplete(MqttDeliveryToken token))
+// * 鎺ユ敹鍒板凡缁忓彂甯冪殑 QoS 1 鎴� QoS 2 娑堟伅鐨勪紶閫掍护鐗屾椂璋冪敤銆�
+// * 鐢� MqttClient.connect 婵�娲绘鍥炶皟銆�
+// */
+//public class PushCallback implements MqttCallback{
+//
+// @Override
+// public void connectionLost(Throwable cause) {
+// // 杩炴帴涓㈠け鍚庯紝涓�鑸湪杩欓噷闈㈣繘琛岄噸杩�
+// System.out.println("杩炴帴鏂紑鈥︹�︼紙鍙互鍋氶噸杩烇級");
+// }
+//
+// @Override
+// public void deliveryComplete(IMqttDeliveryToken token) {
+// System.out.println("deliveryComplete---------" + token.isComplete());
+// }
+//
+// @Override
+// public void messageArrived(String topic, MqttMessage message) throws Exception {
+// // subscribe鍚庡緱鍒扮殑娑堟伅浼氭墽琛屽埌杩欓噷闈�
+// System.out.println("鎺ユ敹娑堟伅涓婚:" + topic + " 鎺ユ敹娑堟伅Qos:" + message.getQos() + "鎺ユ敹娑堟伅鍐呭:" + new String(message.getPayload()));
+//
+// }
+//}
diff --git a/src/main/java/com/boying/controller/car/ServerMQTT.java b/src/main/java/com/boying/controller/car/ServerMQTT.java
index e2254a9..582264d 100644
--- a/src/main/java/com/boying/controller/car/ServerMQTT.java
+++ b/src/main/java/com/boying/controller/car/ServerMQTT.java
@@ -1,93 +1,93 @@
-package com.boying.controller.car;
-
-import org.eclipse.paho.client.mqttv3.*;
-import org.eclipse.paho.client.mqttv3.persist.MemoryPersistence;
-
-/**
- * @author kdq
- * @version 1.0.0
- * @ClassName ServerMQTT.java
- * @Description TODO
- * @createTime 2024骞�03鏈�20鏃� 15:43:00
- */
-public class ServerMQTT {
-
- public static void main(String[] args) throws MqttException {
- ServerMQTT server = new ServerMQTT();
-
- server.message = new MqttMessage();
- server.message.setQos(2);
- server.message.setRetained(true);
- server.message.setPayload("ServerMQTT".getBytes());
- server.publish(server.topic , server.message);
- System.out.println(server.message.isRetained() + "------ratained鐘舵��");
- }
-
- //MQTT瀹夎鐨勬湇鍔″櫒鍦板潃鍜岀鍙ｅ彿
- public static final String HOST = "tcp://39.96.92.240:9092";
- //瀹氫箟涓�涓富棰�
- public static final String TOPIC = "/device/message/up/ivs_result";
- //瀹氫箟MQTT鐨処D锛屽彲浠ュ湪MQTT鏈嶅姟閰嶇疆涓寚瀹�
- private static final String clientid = "client-1";
-
- private MqttClient client;
- private MqttTopic topic;
- private String userName = "mqtt";
- private String passWord = "mqtt";
- private MqttMessage message;
-
- /**
- * g鏋勯�犲嚱鏁�
- */
- public ServerMQTT() throws MqttException {
- // MemoryPersistence璁剧疆clientid鐨勪繚瀛樺舰寮忥紝榛樿涓轰互鍐呭瓨淇濆瓨
- client = new MqttClient(HOST, clientid, new MemoryPersistence());
- connect();
- }
-
- /**
- * l杩炴帴鏈嶅姟鍣�
- */
- private void connect() {
- MqttConnectOptions options = new MqttConnectOptions();
- options.setCleanSession(false);
- options.setUserName(userName);
- options.setPassword(passWord.toCharArray());
- // 璁剧疆瓒呮椂鏃堕棿
- options.setConnectionTimeout(10);
- // 璁剧疆浼氳瘽蹇冭烦鏃堕棿
- options.setKeepAliveInterval(20);
- try {
- client.setCallback(new MqttCallback() {
- @Override
- public void connectionLost(Throwable cause) {
- // 杩炴帴涓㈠け鍚庯紝涓�鑸湪杩欓噷闈㈣繘琛岄噸杩�
- System.out.println("杩炴帴鏂紑鈥︹�︼紙鍙互鍋氶噸杩烇級");
- }
- @Override
- public void deliveryComplete(IMqttDeliveryToken token) {
- System.out.println("deliveryComplete---------" + token.isComplete());
- }
- @Override
- public void messageArrived(String topic, MqttMessage message) throws Exception {
- // subscribe鍚庡緱鍒扮殑娑堟伅浼氭墽琛屽埌杩欓噷闈�
- System.out.println("鎺ユ敹娑堟伅涓婚:" + topic + " 鎺ユ敹娑堟伅Qos:" + message.getQos() + "鎺ユ敹娑堟伅鍐呭:" + new String(message.getPayload()));
- }
- });
- client.connect(options);
-
- topic = client.getTopic(TOPIC);
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
-
- /**
- * t鎺ㄩ�佹秷鎭�
- */
- public void publish(MqttTopic topic , MqttMessage message) throws MqttPersistenceException, MqttException {
- MqttDeliveryToken token = topic.publish(message);
- token.waitForCompletion();
- System.out.println("message is published completely! " + token.isComplete());
- }
-}
+//package com.boying.controller.car;
+//
+//import org.eclipse.paho.client.mqttv3.*;
+//import org.eclipse.paho.client.mqttv3.persist.MemoryPersistence;
+//
+///**
+// * @author kdq
+// * @version 1.0.0
+// * @ClassName ServerMQTT.java
+// * @Description TODO
+// * @createTime 2024骞�03鏈�20鏃� 15:43:00
+// */
+//public class ServerMQTT {
+//
+// public static void main(String[] args) throws MqttException {
+// ServerMQTT server = new ServerMQTT();
+//
+// server.message = new MqttMessage();
+// server.message.setQos(2);
+// server.message.setRetained(true);
+// server.message.setPayload("ServerMQTT".getBytes());
+// server.publish(server.topic , server.message);
+// System.out.println(server.message.isRetained() + "------ratained鐘舵��");
+// }
+//
+// //MQTT瀹夎鐨勬湇鍔″櫒鍦板潃鍜岀鍙ｅ彿
+// public static final String HOST = "tcp://39.96.92.240:9092";
+// //瀹氫箟涓�涓富棰�
+// public static final String TOPIC = "/device/message/up/ivs_result";
+// //瀹氫箟MQTT鐨処D锛屽彲浠ュ湪MQTT鏈嶅姟閰嶇疆涓寚瀹�
+// private static final String clientid = "client-1";
+//
+// private MqttClient client;
+// private MqttTopic topic;
+// private String userName = "mqtt";
+// private String passWord = "mqtt";
+// private MqttMessage message;
+//
+// /**
+// * g鏋勯�犲嚱鏁�
+// */
+// public ServerMQTT() throws MqttException {
+// // MemoryPersistence璁剧疆clientid鐨勪繚瀛樺舰寮忥紝榛樿涓轰互鍐呭瓨淇濆瓨
+// client = new MqttClient(HOST, clientid, new MemoryPersistence());
+// connect();
+// }
+//
+// /**
+// * l杩炴帴鏈嶅姟鍣�
+// */
+// private void connect() {
+// MqttConnectOptions options = new MqttConnectOptions();
+// options.setCleanSession(false);
+// options.setUserName(userName);
+// options.setPassword(passWord.toCharArray());
+// // 璁剧疆瓒呮椂鏃堕棿
+// options.setConnectionTimeout(10);
+// // 璁剧疆浼氳瘽蹇冭烦鏃堕棿
+// options.setKeepAliveInterval(20);
+// try {
+// client.setCallback(new MqttCallback() {
+// @Override
+// public void connectionLost(Throwable cause) {
+// // 杩炴帴涓㈠け鍚庯紝涓�鑸湪杩欓噷闈㈣繘琛岄噸杩�
+// System.out.println("杩炴帴鏂紑鈥︹�︼紙鍙互鍋氶噸杩烇級");
+// }
+// @Override
+// public void deliveryComplete(IMqttDeliveryToken token) {
+// System.out.println("deliveryComplete---------" + token.isComplete());
+// }
+// @Override
+// public void messageArrived(String topic, MqttMessage message) throws Exception {
+// // subscribe鍚庡緱鍒扮殑娑堟伅浼氭墽琛屽埌杩欓噷闈�
+// System.out.println("鎺ユ敹娑堟伅涓婚:" + topic + " 鎺ユ敹娑堟伅Qos:" + message.getQos() + "鎺ユ敹娑堟伅鍐呭:" + new String(message.getPayload()));
+// }
+// });
+// client.connect(options);
+//
+// topic = client.getTopic(TOPIC);
+// } catch (Exception e) {
+// e.printStackTrace();
+// }
+// }
+//
+// /**
+// * t鎺ㄩ�佹秷鎭�
+// */
+// public void publish(MqttTopic topic , MqttMessage message) throws MqttPersistenceException, MqttException {
+// MqttDeliveryToken token = topic.publish(message);
+// token.waitForCompletion();
+// System.out.println("message is published completely! " + token.isComplete());
+// }
+//}
diff --git a/src/main/java/com/boying/controller/phone/NoticeController.java b/src/main/java/com/boying/controller/phone/NoticeController.java
index c23b309..08ed781 100644
--- a/src/main/java/com/boying/controller/phone/NoticeController.java
+++ b/src/main/java/com/boying/controller/phone/NoticeController.java
@@ -7,8 +7,7 @@
import com.boying.entity.Park;
import com.boying.service.EnterParkService;
import com.boying.service.ParkService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
+
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -19,7 +18,6 @@
@RestController
@RequestMapping("ffzf/notice")
@RequiredArgsConstructor
-@Tag(description = "ffzf/notice" , name = "杩濇硶閫氱煡鎺ュ彛" )
public class NoticeController {
private final EnterParkService enterParkService;
@@ -27,7 +25,6 @@
//鍋滆溅鍦哄唴鏈夎繚娉曠殑杞﹁締
@PostMapping("/illegalCar")
- @Operation(summary = "鏍规嵁id鏌ヨ鍋滆溅鍦哄唴鎵�鏈夎繚娉曡溅杈�" , description = "鏍规嵁id鏌ヨ鍋滆溅鍦哄唴鎵�鏈夎繚娉曡溅杈�" )
public Object illegalCar(Long parkId){
QueryWrapper<EnterPark> wrapper = new QueryWrapper<>();
wrapper.lambda()
@@ -39,7 +36,6 @@
//鍋滆溅鍦哄唴鏈夎繚娉曠殑杞﹁締
@PostMapping("/illegalCar2")
- @Operation(summary = "鏌ヨ鎵�鏈夊仠杞﹀満鍐呮墍鏈夎繚娉曡溅杈�" , description = "鏌ヨ鎵�鏈夊仠杞﹀満鍐呮墍鏈夎繚娉曡溅杈�" )
public Object illegalCar2(){
QueryWrapper<EnterPark> wrapper = new QueryWrapper<>();
wrapper.lambda()
@@ -54,7 +50,6 @@
}
@PostMapping("/enterPark")
- @Operation(summary = "鍋滆溅鍦哄唴鐨勮溅杈� 鏍规嵁鐘舵�佹煡璇�" , description = "鍋滆溅鍦哄唴鐨勮溅杈� 鏍规嵁鐘舵�佹煡璇�" )
public Object enterPark(Integer status, Page page){
if(status==null){
Page page1 = enterParkService.page(page);
diff --git a/src/main/java/com/boying/controller/phone/PayController.java b/src/main/java/com/boying/controller/phone/PayController.java
index c69da84..843bb41 100644
--- a/src/main/java/com/boying/controller/phone/PayController.java
+++ b/src/main/java/com/boying/controller/phone/PayController.java
@@ -15,8 +15,7 @@
import com.boying.service.*;
import com.boying.util.HTTPEntityUtil;
import com.google.gson.Gson;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
+
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
@@ -47,7 +46,6 @@
@RestController
@RequestMapping("ffzf/ffPay")
@RequiredArgsConstructor
-@Tag(description = "ffzf/ffPay" , name = "瀵规帴璐㈡斂鏀粯鎺ュ彛" )
public class PayController extends BaseController {
private final OrderRecordService orderRecordService;
@@ -70,7 +68,6 @@
//鐢熸垚鐢靛瓙缂存鐮�
@PostMapping("zhiFa")
- @Operation(summary = "鎵ф硶鐢熸垚缂存鐮�" , description = "鎵ф硶鐢熸垚缂存鐮�" )
public Object zhiFa(Long id){
Ticket ticket = ticketService.getById(id);
if(ticket.getPayStatus()==1){
@@ -172,7 +169,6 @@
//鏀粯鎺ュ彛閫氱煡
@PostMapping("result")
- @Operation(summary = "缂磋垂缁撴灉閫氱煡" , description = "缂磋垂缁撴灉閫氱煡" )
public String result(HttpServletRequest request, String payKey, String payerTypeCode, String payerNum, String payCode, Double amt, String status, String errorInfo, String sign, String signType) throws Exception{
try {
// updateOrderRecord(payCode,status);
@@ -184,7 +180,6 @@
//鐢熸垚鐢靛瓙缂存鐮�
@PostMapping("park2")
- @Operation(summary = "璐㈡斂缂磋垂鏇存柊鐢熸垚缂存鐮�" , description = "璐㈡斂缂磋垂鏇存柊鐢熸垚缂存鐮�" )
public Object park2(Long id){
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd_HH:mm:ss");
String logs = sdf.format(new Date())+"寮�濮嬫壂鐮佺即璐�------銆媆n";
@@ -283,7 +278,6 @@
* 缂存涔�
*/
@PostMapping("park")
- @Operation(summary = "瀵规帴閭偍鐢熸垚缂存涔�" , description = "瀵规帴閭偍鐢熸垚缂存涔�" )
public Object park(Long id){
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd_HH:mm:ss");
String logs = sdf.format(new Date())+"寮�濮嬫壂鐮佺即璐�------銆媆n";
@@ -396,7 +390,6 @@
* 鑾峰彇鎵ф硶id
*/
@PostMapping("getZhifaId")
- @Operation(summary = "鏇存柊澶у巺缂存鐮�" , description = "鏇存柊澶у巺缂存鐮�" )
public Object getZhifaId(){
QueryWrapper<NowPayOrder> wrapper = new QueryWrapper<>();
wrapper.lambda()
@@ -415,7 +408,6 @@
* 缂存涔�
*/
@PostMapping("zhifa")
- @Operation(summary = "鎵ф硶缂磋垂锛堟柊锛�" , description = "鎵ф硶缂磋垂锛堟柊锛�" )
public Object zhifa(Long id){
System.out.println(id+"寮�濮嬬即璐�");
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd_HH:mm:ss");
diff --git a/src/main/java/com/boying/controller/phone/TicketController.java b/src/main/java/com/boying/controller/phone/TicketController.java
index 6e17f23..5f65c09 100644
--- a/src/main/java/com/boying/controller/phone/TicketController.java
+++ b/src/main/java/com/boying/controller/phone/TicketController.java
@@ -12,8 +12,7 @@
import com.boying.util.FileUtil;
import com.boying.util.NumberToCN;
import io.swagger.annotations.ApiOperation;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
+
import lombok.RequiredArgsConstructor;
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.FilenameUtils;
@@ -40,7 +39,6 @@
@RestController
@RequestMapping("ffzf/ticket")
@RequiredArgsConstructor
-@Tag(description = "ffzf/ticket" , name = "鎵嬫寔寮�缃氬崟鎺ュ彛" )
public class TicketController{
@@ -68,7 +66,6 @@
//鍥剧墖鍥炴樉
@RequestMapping(value = "/showImg", method = RequestMethod.GET)
- @Operation(summary = "鍥剧墖鍥炴樉" , description = "鍥剧墖鍥炴樉" )
public void getAwardAsByteArray(HttpServletResponse response, HttpServletRequest request) throws IOException {
String result = request.getParameter("result");
InputStream in = null;
@@ -85,7 +82,6 @@
}
@PostMapping("findPage")
- @Operation(summary = "鍒嗛〉鏌ヨ" , description = "鍒嗛〉鏌ヨ" )
public Object findPage(Page page, Ticket ticket){
QueryWrapper<Ticket> wrapper = new QueryWrapper<>();
wrapper.lambda()
@@ -99,7 +95,6 @@
}
@PostMapping("/save")
- @Operation(summary = "淇濆瓨缃氬崟" , description = "淇濆瓨缃氬崟" )
public Object save(Ticket ticket,HttpServletRequest request) throws IOException{
String imgStr = "";
MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
@@ -170,7 +165,6 @@
}
@PostMapping("/save2")
- @Operation(summary = "淇濆瓨缃氬崟锛堝簾寮冿級" , description = "淇濆瓨缃氬崟锛堝簾寮冿級" )
public Object save2(Ticket ticket) throws IOException{
if(ticket.getUserId()!=null){
User user = userService.getById(ticket.getUserId());
@@ -201,7 +195,6 @@
*/
@ApiOperation(value = "閫氳繃id鏌ヨ", notes = "閫氳繃id鏌ヨ")
@GetMapping("/{id}" )
- @Operation(summary = "閫氳繃id鏌ヨ缃氬崟" , description = "閫氳繃id鏌ヨ缃氬崟" )
public R getById(@PathVariable("id" ) Integer id) {
Ticket byId = ticketService.getById(id);
byId.setContent(violationTypeService.getById(byId.getViolationTypeId()).getContent());
@@ -225,7 +218,6 @@
@PostMapping("/delete")
- @Operation(summary = "鍒犻櫎缃氬崟" , description = "鍒犻櫎缃氬崟" )
public Object delete(Long id){
Ticket ticket =ticketService.getById(id);
ticket.setStatus(3);
@@ -243,7 +235,6 @@
}
@PostMapping("/updateById")
- @Operation(summary = "鏇存柊缃氬崟鐘舵��" , description = "鏇存柊缃氬崟鐘舵��" )
public Object updateById(Ticket ticket){
if(ticket.getMoney() >0){
BigDecimal numberOfMoney = new BigDecimal(ticket.getMoney()+"");
@@ -274,7 +265,6 @@
//涓庢墽娉曞鎺�
@GetMapping("/getResult")
- @Operation(summary = "涓庢墽娉曞钩鍙板鎺ワ紝鑾峰彇绛惧瓧缁撴灉" , description = "涓庢墽娉曞钩鍙板鎺ワ紝鑾峰彇绛惧瓧缁撴灉" )
public Object getResult(Ticket ticket){
ticketService.updateById(ticket);
return R.ok();
@@ -313,7 +303,6 @@
}
@PostMapping("/getZhiFa")
- @Operation(summary = "鏍规嵁鐘舵�佹煡璇㈢綒鍗�" , description = "鏍规嵁鐘舵�佹煡璇㈢綒鍗�" )
public Object getZhiFa(Integer status,Page page){
QueryWrapper<Ticket> wrapper = new QueryWrapper<>();
@@ -325,7 +314,6 @@
}
@PostMapping("/getCar")
- @Operation(summary = "鑾峰彇榛戝悕鍗曡溅杈�" , description = "鑾峰彇榛戝悕鍗曡溅杈�" )
public Object getCar(String carNo,Page page,int type){
QueryWrapper<TicketBlack> wrapper = new QueryWrapper<>();
wrapper.lambda()
@@ -336,7 +324,6 @@
}
@PostMapping("/getCarList")
- @Operation(summary = "鏍规嵁杞︾墝鍒嗛〉鑾峰彇缃氬崟" , description = "鏍规嵁杞︾墝鍒嗛〉鑾峰彇缃氬崟" )
public Object getCarList(String carNo,Page page){
QueryWrapper<Ticket> wrapper = new QueryWrapper<>();
wrapper.lambda()
@@ -347,7 +334,6 @@
@PostMapping("/noFound")
- @Operation(summary = "鏇存柊缃氬崟鐘舵�侊紝澧炲姞澶囨敞" , description = "鏇存柊缃氬崟鐘舵�侊紝澧炲姞澶囨敞" )
public Object noFound(Long ticketId,String remark){
Ticket ticket = ticketService.getById(ticketId);
ticket.setStatus(2);
@@ -357,7 +343,6 @@
}
@PostMapping("/getStatisticByYear")
- @Operation(summary = "缁熻骞村害缃氬崟" , description = "缁熻骞村害缃氬崟" )
public Object getStatistic(int year){
Map<String,Object> map = new HashMap<>();
List<Object> list = new ArrayList<>();
@@ -394,7 +379,6 @@
}
@PostMapping("/getOrderList")
- @Operation(summary = "鏍规嵁骞村拰鏈堢粺璁＄綒鍗�" , description = "鏍规嵁骞村拰鏈堢粺璁＄綒鍗�" )
public Object getOrderList(int year,int month){
Date yearFirst = DateUtilOther.getFirstDayOfMonth(year,month);
@@ -408,7 +392,6 @@
}
@PostMapping("findById")
- @Operation(summary = "鏍规嵁id鏌ヨ" , description = "鏍规嵁id鏌ヨ" )
public Object findById(Long id){
Ticket ticket = ticketService.getById(id);
if(ticket.getViolationTypeId()!=null){
@@ -426,7 +409,6 @@
*/
@ApiOperation(value = "鎵嬪姩缂磋垂", notes = "鎵嬪姩缂磋垂")
@PostMapping("/jiaofei" )
- @Operation(summary = "鎵嬪姩缂磋垂鏇存柊浜岀淮鐮�" , description = "鎵嬪姩缂磋垂鏇存柊浜岀淮鐮�" )
public R jiaofei(Integer id) {
Ticket byId = ticketService.getById(id);
if(byId.getPayStatus() == 1){
@@ -450,7 +432,6 @@
*/
@ApiOperation(value = "娴嬭瘯瀵规帴", notes = "娴嬭瘯瀵规帴")
@GetMapping("/test" )
- @Operation(summary = "娴嬭瘯瀵规帴鎵ф硶骞冲彴" , description = "娴嬭瘯瀵规帴鎵ф硶骞冲彴" )
public R test() {
Ticket byId = ticketService.getById(13);
byId = ticketService.getNumber(byId);
diff --git a/src/main/java/com/boying/controller/phone/UpdateAppController.java b/src/main/java/com/boying/controller/phone/UpdateAppController.java
index de14b69..21a6bc4 100644
--- a/src/main/java/com/boying/controller/phone/UpdateAppController.java
+++ b/src/main/java/com/boying/controller/phone/UpdateAppController.java
@@ -3,8 +3,6 @@
import com.boying.common.R;
import com.boying.entity.UpdateApp;
import com.boying.service.UpdateAppService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -15,13 +13,11 @@
@RestController
@RequestMapping("ffzf/updateApp")
@RequiredArgsConstructor
-@Tag(description = "ffzf/updateApp" , name = "app鏇存柊鎺ュ彛" )
public class UpdateAppController{
private final UpdateAppService updateAppService;
@PostMapping("/getUpdateApp")
- @Operation(summary = "鑾峰彇鏈�鏂癮pp鐗堟湰" , description = "鑾峰彇鏈�鏂癮pp鐗堟湰" )
public Object getUpdateApp(){
List<UpdateApp> all = updateAppService.list();
if(all.size()==0){
diff --git a/src/main/java/com/boying/controller/phone/YCPayController.java b/src/main/java/com/boying/controller/phone/YCPayController.java
index 9f54dde..a19093c 100644
--- a/src/main/java/com/boying/controller/phone/YCPayController.java
+++ b/src/main/java/com/boying/controller/phone/YCPayController.java
@@ -13,8 +13,7 @@
import com.boying.service.*;
import com.boying.util.DateUtilOther;
import com.google.gson.Gson;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
+
import lombok.RequiredArgsConstructor;
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.http.ResponseEntity;
@@ -48,7 +47,6 @@
@RestController
@RequestMapping("/ffzf/api")
@RequiredArgsConstructor
-@Tag(description = "ffzf/api" , name = "閭偍/閭㈠彴閾惰 瀵规帴鏀粯鎺ュ彛" )
public class YCPayController {
private final OutParkService outParkService;
private final PayLogService payLogService;
@@ -71,7 +69,6 @@
* @return
*/
@GetMapping("/getByQueryId")
- @Operation(summary = "鏍规嵁鍑哄満id鑾峰彇鍑哄満鏁版嵁" , description = "鏍规嵁鍑哄満id鑾峰彇鍑哄満鏁版嵁" )
public Object getByQueryId(Long queryId){
if(queryId == null){
return R.failed("鍙傛暟涓虹┖");
@@ -87,7 +84,6 @@
* 缂存涔�
*/
@PostMapping("park")
- @Operation(summary = "閭偍鐢宠缂存涔�" , description = "閭偍鐢宠缂存涔�" )
public Object park(Long id){
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd_HH:mm:ss");
OutPark outPark = outParkService.getById(id);
@@ -157,7 +153,6 @@
* @return
*/
@PostMapping("parkJudg")
- @Operation(summary = "鍒ゆ柇鏀粯绔槸鍚﹀凡缁忕敵璇疯繃鏀粯" , description = "鍒ゆ柇鏀粯绔槸鍚﹀凡缁忕敵璇疯繃鏀粯" )
public Object parkJudg(Long id){
if(id == null){
return R.failed("鏈壘鍒版暟鎹紝璇风◢鍚庨噸鏂扮偣鍑�");
@@ -188,7 +183,6 @@
* 鍒ゆ柇鏄惁缂磋垂
*/
@PostMapping("parkXT")
- @Operation(summary = "閭㈠彴閾惰鐢宠缂磋垂" , description = "閭㈠彴閾惰鐢宠缂磋垂" )
public Object parkXT(Long id){
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd_HH:mm:ss");
OutPark outPark = outParkService.getById(id);
@@ -263,7 +257,6 @@
* 闃块噷缂磋垂
*/
@PostMapping("payByAli")
- @Operation(summary = "閭㈠彴閾惰鏀粯瀹濈即璐�" , description = "閭㈠彴閾惰鏀粯瀹濈即璐�" )
public Object payByAli(Long id){
OutPark outPark = outParkService.getById(id);
String xtyhpay = systemConfigProperties.getXTYHPAY();
@@ -339,7 +332,6 @@
* 鑾峰彇寰俊openid
*/
@PostMapping("getOpenId")
- @Operation(summary = "閭㈠彴閾惰鑾峰彇寰俊鐢ㄦ埛openid" , description = "閭㈠彴閾惰鑾峰彇寰俊鐢ㄦ埛openid" )
public Object park(Long id,String code){
OutPark outPark = outParkService.getById(id);
String openIdByCode = wxService.getOpenIdByCode(code);
@@ -351,7 +343,6 @@
* 寰俊缂磋垂
*/
@PostMapping("payByWX")
- @Operation(summary = "閭㈠彴閾惰寰俊鏀粯" , description = "閭㈠彴閾惰寰俊鏀粯" )
public Object payByWX(Long id,String openId){
System.out.println("寮�濮嬫敮浠�");
OutPark outPark = outParkService.getById(id);
@@ -444,7 +435,6 @@
* @return
*/
@GetMapping("/result")
- @Operation(summary = "閭偍鑾峰緱鏀粯鍥炶皟" , description = "閭偍鑾峰緱鏀粯鍥炶皟" )
public Object result(Long queryId,int success,int msg){
OutPark byId = outParkService.getById(queryId);
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd_HH:mm:ss");
@@ -479,7 +469,6 @@
* @return
*/
@PostMapping("/getResult")
- @Operation(summary = "閭㈠彴閾惰鏀粯鍥炶皟鎺ュ彛" , description = "閭㈠彴閾惰鏀粯鍥炶皟鎺ュ彛" )
public Object getResult(HttpServletRequest request){
System.out.println("getResult鏀跺埌璁块棶");
String respCode = request.getParameter("respCode");
@@ -534,7 +523,6 @@
* @return
*/
@PostMapping ("/checkbill")
- @Operation(summary = "閭偍瀵硅处鎺ュ彛" , description = "閭偍瀵硅处鎺ュ彛" )
public Object checkbill(@RequestBody Map params){
String checkDate = (String) params.get("checkDate");
String tranDate = (String) params.get("tranDate");
@@ -556,7 +544,6 @@
* @return
*/
@PostMapping ("/checkbillXTYH")
- @Operation(summary = "閭㈠彴閾惰瀵硅处鎺ュ彛" , description = "閭㈠彴閾惰瀵硅处鎺ュ彛" )
public Object checkbillXTYH(String date){
String xtyhpay = systemConfigProperties.getXTYHPAY();
Map<String,Object> map = new HashMap<>();
@@ -601,7 +588,6 @@
* @return
*/
@PostMapping ("/searchPayStatus")
- @Operation(summary = "浜ゆ槗鐘舵�佹煡璇�" , description = "浜ゆ槗鐘舵�佹煡璇�" )
public Object searchPayStatus(String txnOrderId,String txnOrderTime){
OutPark outPark = outParkService.findByOrderId(txnOrderId);
if(outPark == null){
--
Gitblit v1.9.1