From a41b28d983f46f90a41ff7d2aa47179541c1be99 Mon Sep 17 00:00:00 2001
From: kongdeqiang <123456>
Date: 星期一, 05 六月 2023 17:59:13 +0800
Subject: [PATCH] 修改
---
src/main/java/com/boying/controller/phone/TicketController.java | 72 +++-
src/main/java/com/boying/service/impl/BarrierServiceImpl.java | 13
src/main/java/com/boying/service/impl/OutParkServiceImpl.java | 10
src/main/java/com/boying/controller/EnterParkController.java | 142 ++++++++++
src/main/java/com/boying/controller/WhiteListController.java | 2
src/main/java/com/boying/controller/BarrierController.java | 16 +
src/main/java/com/boying/controller/phone/NoticeController.java | 2
src/main/java/com/boying/util/NumberToCN.java | 108 +++++++
src/main/resources/mapper/OutParkMapper.xml | 69 ++++
src/main/java/com/boying/controller/CostRuleController.java | 2
src/main/java/com/boying/controller/FileInfoController.java | 3
src/main/java/com/boying/entity/OutPark.java | 4
src/main/java/com/boying/controller/ViolationTypeController.java | 2
src/main/java/com/boying/controller/UserController.java | 2
src/main/java/com/boying/service/BarrierService.java | 1
src/main/java/com/boying/service/impl/EnterParkServiceImpl.java | 10
src/main/java/com/boying/entity/EnterPark.java | 4
src/main/java/com/boying/entity/OrderRecord.java | 19 +
src/main/java/com/boying/entity/Ticket.java | 51 +++
src/main/java/com/boying/controller/phone/UpdateAppController.java | 2
src/main/java/com/boying/controller/ParkController.java | 2
src/main/java/com/boying/util/StringUtil.java | 105 ++++++
src/main/java/com/boying/mapper/OutParkMapper.java | 8
src/main/java/com/boying/controller/car/PlateServlet2.java | 12
src/main/java/com/boying/mapper/EnterParkMapper.java | 9
src/main/java/com/boying/service/OutParkService.java | 7
src/main/java/com/boying/controller/OrderRecordController.java | 34 ++
src/main/java/com/boying/entity/Barrier.java | 7
src/main/java/com/boying/controller/StreetController.java | 2
src/main/java/com/boying/controller/OutParkController.java | 24 +
src/main/resources/mapper/EnterParkMapper.xml | 49 +++
src/main/java/com/boying/service/EnterParkService.java | 5
32 files changed, 743 insertions(+), 55 deletions(-)
diff --git a/src/main/java/com/boying/controller/BarrierController.java b/src/main/java/com/boying/controller/BarrierController.java
index bc1e5ea..3858b25 100644
--- a/src/main/java/com/boying/controller/BarrierController.java
+++ b/src/main/java/com/boying/controller/BarrierController.java
@@ -7,6 +7,7 @@
import com.boying.entity.OutPark;
import com.boying.service.BarrierService;
import com.boying.service.OutParkService;
+import com.boying.service.ParkService;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -17,12 +18,13 @@
import java.util.List;
@RestController
-@RequestMapping("barrier")
+@RequestMapping("ffzf/barrier")
@RequiredArgsConstructor
public class BarrierController {
private final BarrierService barrierService;
private final OutParkService outParkService;
+ private final ParkService parkService;
@PostMapping("findPage")
public Object findPage(Page page, String parkId) {
@@ -78,6 +80,18 @@
return R.ok("璇锋眰鎴愬姛");
}
+ @PostMapping("getByCode")
+ public Object getByCode(String code) {
+ Barrier b= barrierService.findByCode2(code);
+ if (b==null) {
+ return R.failed("鏈壘鍒拌閬撻椄");
+ }
+ b.setParkName(parkService.getById(b.getParkId()).getName());
+ return R.ok(b,"璇锋眰鎴愬姛");
+ }
+
+
+
@PostMapping("openBarrier")
public Object openBarrier(Long barrierId,Integer type) {
Barrier b= barrierService.getById(barrierId);
diff --git a/src/main/java/com/boying/controller/CostRuleController.java b/src/main/java/com/boying/controller/CostRuleController.java
index 9155a99..1d198a1 100644
--- a/src/main/java/com/boying/controller/CostRuleController.java
+++ b/src/main/java/com/boying/controller/CostRuleController.java
@@ -23,7 +23,7 @@
@RestController
-@RequestMapping("rule")
+@RequestMapping("ffzf/rule")
@RequiredArgsConstructor
public class CostRuleController{
diff --git a/src/main/java/com/boying/controller/EnterParkController.java b/src/main/java/com/boying/controller/EnterParkController.java
new file mode 100644
index 0000000..ec9488d
--- /dev/null
+++ b/src/main/java/com/boying/controller/EnterParkController.java
@@ -0,0 +1,142 @@
+package com.boying.controller;
+
+import cn.hutool.core.date.DateUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.boying.common.R;
+import com.boying.entity.Barrier;
+import com.boying.entity.EnterPark;
+import com.boying.entity.OutPark;
+import com.boying.service.BarrierService;
+import com.boying.service.EnterParkService;
+import com.boying.service.ParkService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+
+import org.springframework.web.bind.annotation.*;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 鍏ュ満琛�
+ *
+ * @author kdq
+ * @date 2023-01-23 09:46:32
+ */
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("ffzf/enterpark" )
+@Api(value = "enterpark", tags = "鍏ュ満琛ㄧ鐞�")
+public class EnterParkController {
+
+ private final EnterParkService enterParkService;
+ private final BarrierService barrierService;
+ private final ParkService parkService;
+
+ /**
+ * 鍒嗛〉鏌ヨ
+ * @param page 娉婅溅鍒嗛〉瀵硅薄
+ * @param
+ * @return
+ */
+// @ApiOperation(value = "鍒嗛〉鏌ヨ", notes = "鍒嗛〉鏌ヨ")
+// @GetMapping("/page" )
+// public R getEnterParkPage(Page page, EnterPark enterPark, String date) throws ParseException {
+// List<EnterPark> list = enterParkService.getList(page.getCurrent(), page.getSize(), enterPark.getCarNo(),enterPark.getParkId(), date);
+// long count = enterParkService.getCount(enterPark.getCarNo(), enterPark.getParkId(), date);
+// Page page1 = new Page();
+// for (EnterPark record : list) {
+// record.setParkName(parkService.getById(record.getParkId()).getName());
+// if(record.getImgId() != null){
+// record.setImgPath("/ffzf/fileinfo/showImgById/"+record.getImgId());
+// }
+// }
+// page1.setRecords(list);
+// page1.setCurrent(page.getCurrent());
+// page1.setSize(page.getSize());
+// page1.setTotal(count);
+// return R.ok(page1);
+// }
+
+ @PostMapping("/findPage")
+ public Object findPage(Page page, String carNo,Integer parkId,String date) throws ParseException {
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+ if(StringUtils.isNotBlank(date)){
+ System.out.println(date);
+ Date parse = sdf.parse(date);
+ date = sdf.format(parse);
+ }
+ List<EnterPark> list = enterParkService.getList(page.getCurrent(), page.getSize(), carNo,parkId, date);
+ long count = enterParkService.getCount(carNo,parkId, date);
+ for (EnterPark record : list) {
+ record.setParkName(parkService.getById(record.getParkId()).getName());
+ if(record.getImgId() != null){
+ record.setImgPath("/ffzf/fileinfo/showImgById/"+record.getImgId());
+ }
+ }
+ page.setRecords(list);
+ page.setTotal(count);
+ return R.ok(page);
+ }
+
+ /**
+ * 閫氳繃id鏌ヨ鍏ュ満琛�
+ * @param id id
+ * @return R
+ */
+ @ApiOperation(value = "閫氳繃id鏌ヨ", notes = "閫氳繃id鏌ヨ")
+ @GetMapping("/{id}" )
+ public R getById(@PathVariable("id" ) Integer id) {
+ return R.ok(enterParkService.getById(id));
+ }
+
+ /**
+ * 鏂板鍏ュ満琛�
+ * @param enterPark 鍏ュ満琛�
+ * @return R
+ */
+ @ApiOperation(value = "鏂板鍏ュ満琛�", notes = "鏂板鍏ュ満琛�")
+ @PostMapping
+ public R save(@RequestBody EnterPark enterPark) {
+ return R.ok(enterParkService.save(enterPark));
+ }
+
+ /**
+ * 淇敼鍏ュ満琛�
+ * @param enterPark 鍏ュ満琛�
+ * @return R
+ */
+ @ApiOperation(value = "淇敼鍏ュ満琛�", notes = "淇敼鍏ュ満琛�")
+ @PutMapping
+ public R updateById(@RequestBody EnterPark enterPark) {
+ return R.ok(enterParkService.updateById(enterPark));
+ }
+
+ /**
+ * 閫氳繃id鍒犻櫎鍏ュ満琛�
+ * @param id id
+ * @return R
+ */
+ @ApiOperation(value = "閫氳繃id鍒犻櫎鍏ュ満琛�", notes = "閫氳繃id鍒犻櫎鍏ュ満琛�")
+ @DeleteMapping("/{id}" )
+ public R removeById(@PathVariable Integer id) {
+ return R.ok(enterParkService.removeById(id));
+ }
+
+
+ /**
+ * 瀵煎嚭excel 琛ㄦ牸
+ * @param enterPark 鏌ヨ鏉′欢
+ * @return excel 鏂囦欢娴�
+ */
+ @GetMapping("/export")
+ public List<EnterPark> export(EnterPark enterPark) {
+ return enterParkService.list(Wrappers.query(enterPark));
+ }
+}
diff --git a/src/main/java/com/boying/controller/FileInfoController.java b/src/main/java/com/boying/controller/FileInfoController.java
index 93b54af..7086667 100644
--- a/src/main/java/com/boying/controller/FileInfoController.java
+++ b/src/main/java/com/boying/controller/FileInfoController.java
@@ -15,7 +15,7 @@
import java.util.List;
@RestController
-@RequestMapping("fileInfo")
+@RequestMapping("ffzf/fileInfo")
@RequiredArgsConstructor
public class FileInfoController {
@@ -58,7 +58,6 @@
public void showImg(String path,HttpServletResponse response) {
fileInfoService.getFile(path,response);
}
-
@GetMapping("/showImgById/{fileId}")
public void showImgById(@PathVariable Long fileId,HttpServletResponse response) {
diff --git a/src/main/java/com/boying/controller/OrderRecordController.java b/src/main/java/com/boying/controller/OrderRecordController.java
index 90c6d2d..b20267f 100644
--- a/src/main/java/com/boying/controller/OrderRecordController.java
+++ b/src/main/java/com/boying/controller/OrderRecordController.java
@@ -13,6 +13,7 @@
import com.boying.service.OutParkService;
import com.boying.service.ParkService;
import com.boying.service.UserService;
+import io.swagger.annotations.ApiOperation;
import io.swagger.models.auth.In;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.BeanUtils;
@@ -29,7 +30,7 @@
import java.util.stream.Collectors;
@RestController
-@RequestMapping("orderrecord")
+@RequestMapping("ffzf/orderrecord")
@RequiredArgsConstructor
public class OrderRecordController {
@@ -38,6 +39,37 @@
private final ParkService parkService;
private final UserService userService;
+ /**
+ * 鍒嗛〉鏌ヨ
+ * @param page 鍒嗛〉瀵硅薄
+ * @param orderRecord 璁㈠崟琛�
+ * @return
+ */
+ @ApiOperation(value = "鍒嗛〉鏌ヨ", notes = "鍒嗛〉鏌ヨ")
+ @PostMapping("/findPage" )
+ public R getOrderRecordPage(Page page, OrderRecord orderRecord) {
+ QueryWrapper<OrderRecord> wrapper = new QueryWrapper<>();
+ wrapper.lambda()
+ .eq(OrderRecord::getType,orderRecord.getType())
+ .eq(OrderRecord::getStatus,1)
+ .eq(StringUtils.isNotBlank(orderRecord.getCarNo()),OrderRecord::getCarNo,orderRecord.getCarNo())
+ .isNotNull(OrderRecord::getPayCode)
+ .orderByDesc(OrderRecord::getCreateTime);
+ Page page1 = orderRecordService.page(page, wrapper);
+ List<OrderRecord> records = page1.getRecords();
+ for (OrderRecord record : records) {
+ if(record.getImgInId() != null){
+ record.setImgInPath("/ffzf/fileinfo/showImgById/"+record.getImgInId());
+ }
+ if(record.getImgOutId() != null){
+ record.setImgOutPath("/ffzf/fileinfo/showImgById/"+record.getImgOutId());
+ }
+ }
+ page1.setRecords(records);
+ return R.ok(page1);
+ }
+
+
@PostMapping("/getByCarNo")
public Object getByCarNo(Page page,String carNo,String month,String phone) {
List<OrderRecordVo> recordVos = new ArrayList<>();
diff --git a/src/main/java/com/boying/controller/OutParkController.java b/src/main/java/com/boying/controller/OutParkController.java
index adf15a8..673ba49 100644
--- a/src/main/java/com/boying/controller/OutParkController.java
+++ b/src/main/java/com/boying/controller/OutParkController.java
@@ -3,6 +3,7 @@
import cn.hutool.core.date.DateUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.boying.common.R;
import com.boying.common.SystemConfigProperties;
import com.boying.entity.*;
@@ -52,10 +53,23 @@
private StringRedisTemplate redisTemplate;
@PostMapping("/findPage")
- public Object findPage(Page page,OutPark outPark) {
- QueryWrapper<OutPark> wrapper = new QueryWrapper<>();
- wrapper.lambda().orderByDesc(OutPark::getId);
- return R.ok(outParkService.page(page,wrapper));
+ public Object findPage(Page page, String carNo,Long parkId,String payCode,String date) throws ParseException {
+ List<OutPark> list = outParkService.getList(page.getCurrent(), page.getSize(), carNo,parkId,payCode, date);
+ long count = outParkService.getCount(carNo,parkId,payCode, date);
+ for (OutPark record : list) {
+ record.setParkName(parkService.getById(record.getParkId()).getName());
+ if(record.getEnterTime() != null){
+ record.setTimeStr(DateUtilOther.millisToDayHrMinSec(new Double(record.getTime()).longValue()));
+ }else {
+ record.setTimeStr("鏈彂鐜板叆鍦鸿褰�");
+ }
+ if(record.getImgId() != null){
+ record.setImgPath("/ffzf/fileinfo/showImgById/"+record.getImgId());
+ }
+ }
+ page.setRecords(list);
+ page.setTotal(count);
+ return R.ok(page);
}
//閬撻椄code
@@ -79,7 +93,7 @@
if(outPark.getTime() > 0){
outPark.setTimeStr(DateUtilOther.millisToDayHrMinSec(new Double(outPark.getTime()).longValue()));
}else {
- outPark.setTimeStr("0");
+ outPark.setTimeStr("涓嶈冻涓�鍒嗛挓");
}
return R.ok(outPark);
}
diff --git a/src/main/java/com/boying/controller/ParkController.java b/src/main/java/com/boying/controller/ParkController.java
index f10f6ba..d4a0192 100644
--- a/src/main/java/com/boying/controller/ParkController.java
+++ b/src/main/java/com/boying/controller/ParkController.java
@@ -24,7 +24,7 @@
import java.util.stream.Collectors;
@RestController
-@RequestMapping("/park")
+@RequestMapping("ffzf/park")
@RequiredArgsConstructor
public class ParkController {
diff --git a/src/main/java/com/boying/controller/StreetController.java b/src/main/java/com/boying/controller/StreetController.java
index 6a1c8f8..b6a8390 100644
--- a/src/main/java/com/boying/controller/StreetController.java
+++ b/src/main/java/com/boying/controller/StreetController.java
@@ -24,7 +24,7 @@
@RestController
-@RequestMapping("street")
+@RequestMapping("ffzf/street")
@RequiredArgsConstructor
public class StreetController {
diff --git a/src/main/java/com/boying/controller/UserController.java b/src/main/java/com/boying/controller/UserController.java
index bb6d64f..c741915 100644
--- a/src/main/java/com/boying/controller/UserController.java
+++ b/src/main/java/com/boying/controller/UserController.java
@@ -23,7 +23,7 @@
import java.util.List;
@RestController
-@RequestMapping("/user")
+@RequestMapping("/ffzf/user")
@RequiredArgsConstructor
public class UserController{
diff --git a/src/main/java/com/boying/controller/ViolationTypeController.java b/src/main/java/com/boying/controller/ViolationTypeController.java
index 53660a1..8f11f7a 100644
--- a/src/main/java/com/boying/controller/ViolationTypeController.java
+++ b/src/main/java/com/boying/controller/ViolationTypeController.java
@@ -10,7 +10,7 @@
import org.springframework.web.bind.annotation.*;
@RestController
-@RequestMapping("violationType")
+@RequestMapping("ffzf/violationType")
@RequiredArgsConstructor
public class ViolationTypeController {
diff --git a/src/main/java/com/boying/controller/WhiteListController.java b/src/main/java/com/boying/controller/WhiteListController.java
index e4d27a3..c914ff9 100644
--- a/src/main/java/com/boying/controller/WhiteListController.java
+++ b/src/main/java/com/boying/controller/WhiteListController.java
@@ -15,7 +15,7 @@
@RestController
-@RequestMapping("whiteList")
+@RequestMapping("ffzf/whiteList")
@RequiredArgsConstructor
public class WhiteListController{
diff --git a/src/main/java/com/boying/controller/car/PlateServlet2.java b/src/main/java/com/boying/controller/car/PlateServlet2.java
index ef3314b..1d17a39 100644
--- a/src/main/java/com/boying/controller/car/PlateServlet2.java
+++ b/src/main/java/com/boying/controller/car/PlateServlet2.java
@@ -502,19 +502,23 @@
.execute()
.body();
ResultData resultData = JSON.parseObject(s1,ResultData.class);
+ System.out.println(resultData);
String[] split = resultData.getDatas().split("-");
String[] dataX = new String[resultData.getLenth()];
System.arraycopy(split,0,dataX,0,resultData.getLenth());
String s2 = StringUtil.toStr(dataX);
- byte[] bytes = StringUtil.HexString2Bytes(s2);
+ //byte[] bytes = StringUtil.HexString2Bytes(s2);
+ byte[] bytes1 = StringUtil.hex2Byte(resultData.getDatas());
+ byte[] bytes = StringUtil.byte2hex(bytes1);
for (byte aByte : bytes) {
System.out.print(aByte+" ");
}
System.out.println();
- String data1 = new String("gb2312");
- data1 = Base64.getMimeEncoder().encodeToString(bytes);
+ System.out.println("bytes.length: "+bytes.length);
+ //String data1 = new String("gb2312");
+ String data1 = Base64.getMimeEncoder().encodeToString(bytes);
// String data2 = data1.replace("\n", "");
- String data3 = data1.replaceAll("\r\n", "");
+ String data3 = data1.replaceAll("\r\n", "") + "=";
System.out.println();
System.out.println(data3);
open(request,response,data3);//鍏ュ満寮�闂�
diff --git a/src/main/java/com/boying/controller/phone/NoticeController.java b/src/main/java/com/boying/controller/phone/NoticeController.java
index 518189d..6e6aec6 100644
--- a/src/main/java/com/boying/controller/phone/NoticeController.java
+++ b/src/main/java/com/boying/controller/phone/NoticeController.java
@@ -15,7 +15,7 @@
import java.util.List;
@RestController
-@RequestMapping("notice")
+@RequestMapping("ffzf/notice")
@RequiredArgsConstructor
public class NoticeController {
diff --git a/src/main/java/com/boying/controller/phone/TicketController.java b/src/main/java/com/boying/controller/phone/TicketController.java
index 18be733..5eb5219 100644
--- a/src/main/java/com/boying/controller/phone/TicketController.java
+++ b/src/main/java/com/boying/controller/phone/TicketController.java
@@ -10,15 +10,14 @@
import com.boying.entity.*;
import com.boying.service.*;
import com.boying.util.DateUtilOther;
+import com.boying.util.NumberToCN;
+import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.FilenameUtils;
import org.apache.commons.io.IOUtils;
import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest;
@@ -28,10 +27,11 @@
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
+import java.math.BigDecimal;
import java.util.*;
@RestController
-@RequestMapping("ticket")
+@RequestMapping("ffzf/ticket")
@RequiredArgsConstructor
public class TicketController{
@@ -68,23 +68,16 @@
}
@PostMapping("findPage")
- public Object findPage(Page page, Integer type){
- if(type==null){
- QueryWrapper<Ticket> wrapper = new QueryWrapper<>();
- wrapper.lambda()
- .eq(Ticket::getType,1)
- .orderByDesc(Ticket::getId);
- return R.ok(ticketService.page(page, wrapper));
- }else{
- QueryWrapper<Ticket> wrapper = new QueryWrapper<>();
- wrapper.lambda()
- .eq(Ticket::getType,type)
- .orderByDesc(Ticket::getId);
- return R.ok(ticketService.page(page, wrapper));
- }
-
+ public Object findPage(Page page, Ticket ticket){
+ QueryWrapper<Ticket> wrapper = new QueryWrapper<>();
+ wrapper.lambda()
+ .eq(StringUtils.isNotBlank(ticket.getCarNo()),Ticket::getCarNo,ticket.getCarNo())
+ .eq(ticket.getType() != null,Ticket::getType,ticket.getType())
+ .eq(ticket.getViolationTypeId() != null,Ticket::getViolationTypeId,ticket.getViolationTypeId())
+ .eq(ticket.getPayStatus() != null,Ticket::getPayStatus,ticket.getPayStatus())
+ .orderByDesc(Ticket::getCreateTime);
+ return R.ok(ticketService.page(page, wrapper));
}
-
@PostMapping("/save")
public Object save(Ticket ticket,HttpServletRequest request) throws IOException{
@@ -160,12 +153,36 @@
return R.ok(ticket);
}
+ /**
+ * 閫氳繃id鏌ヨ绁ㄦ嵁琛�
+ * @param id id
+ * @return R
+ */
+ @ApiOperation(value = "閫氳繃id鏌ヨ", notes = "閫氳繃id鏌ヨ")
+ @GetMapping("/{id}" )
+ public R getById(@PathVariable("id" ) Integer id) {
+ Ticket byId = ticketService.getById(id);
+ byId.setContent(violationTypeService.getById(byId.getViolationTypeId()).getContent());
+ return R.ok(byId);
+ }
+
+
@PostMapping("/delete")
public Object delete(Long id){
Ticket ticket =ticketService.getById(id);
ticket.setStatus(3);
ticketService.saveOrUpdate(ticket);
return R.ok("鎿嶄綔鎴愬姛");
+ }
+
+ @PostMapping("/updateById")
+ public Object updateById(@RequestBody Ticket ticket){
+ if(ticket.getMoney() >0){
+ BigDecimal numberOfMoney = new BigDecimal(ticket.getMoney()+"");
+ String s = NumberToCN.number2CNMontrayUnit(numberOfMoney);
+ ticket.setMoneyStr(s.toString());
+ }
+ return R.ok(ticketService.updateById(ticket));
}
public void saveLogo(String name,String lng,String lat){
@@ -298,4 +315,17 @@
}
return R.ok(ticket);
}
+
+ /**
+ * 鎵嬪姩缂磋垂
+ * @param id id
+ * @return R
+ */
+ @ApiOperation(value = "鎵嬪姩缂磋垂", notes = "鎵嬪姩缂磋垂")
+ @PostMapping("/jiaofei" )
+ public R jiaofei(Integer id) {
+ Ticket byId = ticketService.getById(id);
+ byId.setContent(violationTypeService.getById(byId.getViolationTypeId()).getContent());
+ return R.ok(byId);
+ }
}
diff --git a/src/main/java/com/boying/controller/phone/UpdateAppController.java b/src/main/java/com/boying/controller/phone/UpdateAppController.java
index dc1349a..21a6bc4 100644
--- a/src/main/java/com/boying/controller/phone/UpdateAppController.java
+++ b/src/main/java/com/boying/controller/phone/UpdateAppController.java
@@ -11,7 +11,7 @@
import java.util.List;
@RestController
-@RequestMapping("updateApp")
+@RequestMapping("ffzf/updateApp")
@RequiredArgsConstructor
public class UpdateAppController{
diff --git a/src/main/java/com/boying/entity/Barrier.java b/src/main/java/com/boying/entity/Barrier.java
index cf93030..e968fbd 100644
--- a/src/main/java/com/boying/entity/Barrier.java
+++ b/src/main/java/com/boying/entity/Barrier.java
@@ -1,5 +1,6 @@
package com.boying.entity;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.boying.common.BaseEntity;
import io.swagger.annotations.ApiModel;
@@ -9,6 +10,7 @@
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
+import javax.persistence.Transient;
@Data
@TableName("barrier")
@@ -58,4 +60,9 @@
@Column(columnDefinition = "int comment '绔彛'")
private int port;
+
+ @Transient
+ @TableField(exist = false)
+ private String parkName;
+
}
diff --git a/src/main/java/com/boying/entity/EnterPark.java b/src/main/java/com/boying/entity/EnterPark.java
index e430ee6..af1404e 100644
--- a/src/main/java/com/boying/entity/EnterPark.java
+++ b/src/main/java/com/boying/entity/EnterPark.java
@@ -56,4 +56,8 @@
@TableField(exist = false)
private String imgPath;
+ @Transient
+ @TableField(exist = false)
+ private String date;
+
}
diff --git a/src/main/java/com/boying/entity/OrderRecord.java b/src/main/java/com/boying/entity/OrderRecord.java
index 4a5be03..c4959a9 100644
--- a/src/main/java/com/boying/entity/OrderRecord.java
+++ b/src/main/java/com/boying/entity/OrderRecord.java
@@ -1,5 +1,6 @@
package com.boying.entity;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.boying.common.BaseEntity;
import io.swagger.annotations.ApiModel;
@@ -8,6 +9,7 @@
import javax.persistence.Column;
import javax.persistence.Entity;
+import javax.persistence.Transient;
/**
* @author kdq
@@ -102,6 +104,23 @@
@Column(columnDefinition = "int comment 'png'")
private Integer billfiletype;
+ //鍥剧墖id
+ @ApiModelProperty(value = "鍏ュ満鍥剧墖id")
+ @Column(columnDefinition = "int comment '鍏ュ満鍥剧墖id'")
+ private Long imgInId;
+
+ //鍥剧墖id
+ @ApiModelProperty(value = "鍑哄満鍥剧墖id")
+ @Column(columnDefinition = "int comment '鍑哄満鍥剧墖id'")
+ private Long imgOutId;
+
+ @Transient
+ @TableField(exist = false)
+ private String imgInPath;
+
+ @Transient
+ @TableField(exist = false)
+ private String imgOutPath;
diff --git a/src/main/java/com/boying/entity/OutPark.java b/src/main/java/com/boying/entity/OutPark.java
index b0e44fc..ffd9fde 100644
--- a/src/main/java/com/boying/entity/OutPark.java
+++ b/src/main/java/com/boying/entity/OutPark.java
@@ -108,4 +108,8 @@
@Transient
@TableField(exist = false)
private String imgPath;
+
+ @Transient
+ @TableField(exist = false)
+ private String date;
}
diff --git a/src/main/java/com/boying/entity/Ticket.java b/src/main/java/com/boying/entity/Ticket.java
index f70bcaf..0098650 100644
--- a/src/main/java/com/boying/entity/Ticket.java
+++ b/src/main/java/com/boying/entity/Ticket.java
@@ -1,5 +1,6 @@
package com.boying.entity;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.boying.common.BaseEntity;
import com.fasterxml.jackson.annotation.JsonFormat;
@@ -8,6 +9,7 @@
import org.springframework.format.annotation.DateTimeFormat;
import javax.persistence.Entity;
+import javax.persistence.Transient;
import java.util.Date;
/**
@@ -49,7 +51,7 @@
/**
* 鐘舵�侊紙0:鏈鐞嗭紝1:宸插鐞嗭紝2:鏈畬鎴� 3锛氭挙閿�锛�
*/
- private int status;
+ private Integer status;
/**
* 鍦扮偣
*/
@@ -57,7 +59,7 @@
/**
* 0:鐜板満澶勭綒 1:涓婄骇浠诲姟 2:杩濈珷鎷栬溅
*/
- private int type;
+ private Integer type;
private String lng;
@@ -85,11 +87,15 @@
/**
* 缂存鐘舵�侊紙0锛氬緟缂磋垂 1锛氬凡缂磋垂 2:鏀粯澶辫触锛�
*/
- private int payStatus;
+ private Integer payStatus;
/**
* 澶勭綒閲戦
*/
private double money;
+ /**
+ * 澶勭綒閲戦澶у啓
+ */
+ private String moneyStr;
/**
* 缂磋垂鏃堕棿
*/
@@ -106,4 +112,43 @@
private String userName;
private String violationTypeName;
private String qrUrl;
+
+
+ //骞翠唤
+ private String year;
+
+ //鏂囦功鍙�
+ private String number;
+
+ //褰撲簨浜哄鍚�
+ private String personName;
+
+ //褰撲簨浜鸿韩浠借瘉鍙�
+ private String idCard;
+
+ //褰撲簨浜轰綇鍧�
+ private String personAddress;
+
+ //鎵ф硶浜�1濮撳悕
+ private String zfName1;
+ //鎵ф硶浜�2濮撳悕
+ private String zfName2;
+
+ //鎵ф硶浜哄憳1璇佸彿
+ private String zfNum1;
+ //鎵ф硶浜哄憳2璇佸彿
+ private String zfNum2;
+
+ //鏈�鍚庢墽琛屾棩鏈�
+ private String days;
+
+ /**
+ * 娴佹按鍙�
+ */
+ private String code2;
+
+ @Transient
+ @TableField(exist = false)
+ private String content;
+
}
diff --git a/src/main/java/com/boying/mapper/EnterParkMapper.java b/src/main/java/com/boying/mapper/EnterParkMapper.java
index ece75a6..5ea7937 100644
--- a/src/main/java/com/boying/mapper/EnterParkMapper.java
+++ b/src/main/java/com/boying/mapper/EnterParkMapper.java
@@ -3,6 +3,10 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.boying.entity.EnterPark;
import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
/**
* @author kdq
@@ -13,4 +17,9 @@
*/
@Mapper
public interface EnterParkMapper extends BaseMapper<EnterPark> {
+
+ List<EnterPark> getList(@Param("current")long current, @Param("size")long size, @Param("carNo")String carNo, @Param("parkId")Integer parkId, @Param("date")String date);
+
+
+ long getCount(@Param("carNo")String carNo,@Param("parkId")Integer parkId,@Param("date")String date);
}
diff --git a/src/main/java/com/boying/mapper/OutParkMapper.java b/src/main/java/com/boying/mapper/OutParkMapper.java
index f23aec9..c33d836 100644
--- a/src/main/java/com/boying/mapper/OutParkMapper.java
+++ b/src/main/java/com/boying/mapper/OutParkMapper.java
@@ -3,6 +3,9 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.boying.entity.OutPark;
import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
/**
* @author kdq
@@ -13,4 +16,9 @@
*/
@Mapper
public interface OutParkMapper extends BaseMapper<OutPark> {
+
+ List<OutPark> getList(@Param("current")long current, @Param("size")long size, @Param("carNo")String carNo, @Param("parkId")Long parkId, @Param("payCode")String payCode, @Param("date")String date);
+
+ long getCount(@Param("carNo")String carNo, @Param("parkId")Long parkId, @Param("payCode")String payCode, @Param("date")String date);
+
}
diff --git a/src/main/java/com/boying/service/BarrierService.java b/src/main/java/com/boying/service/BarrierService.java
index 1b05c4d..02d9fbb 100644
--- a/src/main/java/com/boying/service/BarrierService.java
+++ b/src/main/java/com/boying/service/BarrierService.java
@@ -12,6 +12,7 @@
*/
public interface BarrierService extends IService<Barrier> {
Barrier findByCode(String code);
+ Barrier findByCode2(String code);
boolean getDateDifIn(Integer barrierId);
boolean getDateDifOut(Integer barrierId);
}
diff --git a/src/main/java/com/boying/service/EnterParkService.java b/src/main/java/com/boying/service/EnterParkService.java
index 02254b1..b182fb2 100644
--- a/src/main/java/com/boying/service/EnterParkService.java
+++ b/src/main/java/com/boying/service/EnterParkService.java
@@ -14,6 +14,11 @@
* @createTime 2022骞�11鏈�20鏃� 10:21:00
*/
public interface EnterParkService extends IService<EnterPark> {
+
+ List<EnterPark> getList(long current,long size,String carNo,Integer parkId,String date);
+
+ long getCount(String carNo,Integer parkId,String date);
+
int count1();
List<EnterPark> findByCarNo(String carNo,Integer parkId);
@Transactional(readOnly = false)
diff --git a/src/main/java/com/boying/service/OutParkService.java b/src/main/java/com/boying/service/OutParkService.java
index cbccba0..b636c48 100644
--- a/src/main/java/com/boying/service/OutParkService.java
+++ b/src/main/java/com/boying/service/OutParkService.java
@@ -4,6 +4,8 @@
import com.boying.entity.OutPark;
import com.boying.entity.Statistic;
+import java.util.List;
+
/**
* @author kdq
* @version 1.0.0
@@ -12,6 +14,11 @@
* @createTime 2022骞�11鏈�20鏃� 10:19:00
*/
public interface OutParkService extends IService<OutPark> {
+ List<OutPark> getList(long current, long size, String carNo, Long parkId, String payCode, String date);
+
+ long getCount(String carNo, Long parkId, String payCode, String date);
+
+
int count1();
int count2();
diff --git a/src/main/java/com/boying/service/impl/BarrierServiceImpl.java b/src/main/java/com/boying/service/impl/BarrierServiceImpl.java
index 4e6a807..1d83789 100644
--- a/src/main/java/com/boying/service/impl/BarrierServiceImpl.java
+++ b/src/main/java/com/boying/service/impl/BarrierServiceImpl.java
@@ -51,6 +51,19 @@
}
@Override
+ public Barrier findByCode2(String code) {
+ QueryWrapper<Barrier> wrapper = new QueryWrapper<>();
+ wrapper.lambda()
+ .eq(Barrier::getCode2,code);
+ List<Barrier> list = list(wrapper);
+ if(list.size()>0){
+ return list.get(0);
+ }else {
+ return null;
+ }
+ }
+
+ @Override
public boolean getDateDifIn(Integer barrierId) {
QueryWrapper<EnterPark> wrapper = new QueryWrapper<>();
wrapper.lambda()
diff --git a/src/main/java/com/boying/service/impl/EnterParkServiceImpl.java b/src/main/java/com/boying/service/impl/EnterParkServiceImpl.java
index 93c835a..1b9e7a2 100644
--- a/src/main/java/com/boying/service/impl/EnterParkServiceImpl.java
+++ b/src/main/java/com/boying/service/impl/EnterParkServiceImpl.java
@@ -28,6 +28,16 @@
private final EnterParkMapper enterParkMapper;
@Override
+ public List<EnterPark> getList(long current, long size, String carNo, Integer parkId, String date) {
+ return enterParkMapper.getList(current-1,size,carNo,parkId,date);
+ }
+
+ @Override
+ public long getCount( String carNo, Integer parkId, String date) {
+ return enterParkMapper.getCount(carNo,parkId,date);
+ }
+
+ @Override
public int count1() {
QueryWrapper<EnterPark> wrapper = new QueryWrapper<>();
wrapper.lambda()
diff --git a/src/main/java/com/boying/service/impl/OutParkServiceImpl.java b/src/main/java/com/boying/service/impl/OutParkServiceImpl.java
index c2dd593..99b5036 100644
--- a/src/main/java/com/boying/service/impl/OutParkServiceImpl.java
+++ b/src/main/java/com/boying/service/impl/OutParkServiceImpl.java
@@ -137,4 +137,14 @@
return null;
}
}
+
+ @Override
+ public List<OutPark> getList(long current, long size, String carNo, Long parkId, String payCode, String date) {
+ return outParkMapper.getList(current-1,size,carNo,parkId,payCode,date);
+ }
+
+ @Override
+ public long getCount(String carNo, Long parkId, String payCode, String date) {
+ return outParkMapper.getCount(carNo,parkId,payCode,date);
+ }
}
diff --git a/src/main/java/com/boying/util/NumberToCN.java b/src/main/java/com/boying/util/NumberToCN.java
new file mode 100644
index 0000000..3ab30a5
--- /dev/null
+++ b/src/main/java/com/boying/util/NumberToCN.java
@@ -0,0 +1,108 @@
+package com.boying.util;
+
+import java.math.BigDecimal;
+
+/**
+ * @author kdq
+ * @version 1.0.0
+ * @ClassName NumberToCN.java
+ * @Description 閲戦澶у啓
+ * @createTime 2023骞�02鏈�06鏃� 17:21:00
+ */
+public class NumberToCN {
+ private static final String[] CN_UPPER_NUMBER = { "闆�", "澹�", "璐�", "鍙�", "鑲�", "浼�", "闄�", "鏌�", "鎹�", "鐜�" };
+ private static final String[] CN_UPPER_MONETRAY_UNIT = { "鍒�", "瑙�", "鍦�", "鎷�", "浣�", "浠�", "涓�", "鎷�", "浣�", "浠�", "浜�", "鎷�", "浣�", "浠�", "鍏�", "鎷�","浣�", "浠�" };
+ private static final String CN_FULL = "鏁�";
+ private static final String CN_NEGATIVE = "璐�";
+ private static final int MONEY_PRECISION = 2;
+ private static final String CN_ZEOR_FULL = "闆跺厓" + CN_FULL;
+
+ /**
+ * 鎶婅緭鍏ョ殑閲戦杞崲涓烘眽璇腑浜烘皯甯佺殑澶у啓
+ *
+ * @param numberOfMoney
+ * 杈撳叆鐨勯噾棰�
+ * @return 瀵瑰簲鐨勬眽璇ぇ鍐�
+ */
+ public static String number2CNMontrayUnit(BigDecimal numberOfMoney) {
+ StringBuffer sb = new StringBuffer();
+ // -1, 0, or 1 as the value of this BigDecimal is negative, zero, or
+ // positive.
+ int signum = numberOfMoney.signum();
+ // 闆跺厓鏁寸殑鎯呭喌
+ if (signum == 0) {
+ return CN_ZEOR_FULL;
+ }
+ // 杩欓噷浼氳繘琛岄噾棰濈殑鍥涜垗浜斿叆
+ long number = numberOfMoney.movePointRight(MONEY_PRECISION)
+ .setScale(0, 4).abs().longValue();
+ // 寰楀埌灏忔暟鐐瑰悗涓や綅鍊�
+ long scale = number % 100;
+ int numUnit = 0;
+ int numIndex = 0;
+ boolean getZero = false;
+ // 鍒ゆ柇鏈�鍚庝袱浣嶆暟锛屼竴鍏辨湁鍥涗腑鎯呭喌锛�00 = 0, 01 = 1, 10, 11
+ if (!(scale > 0)) {
+ numIndex = 2;
+ number = number / 100;
+ getZero = true;
+ }
+ if ((scale > 0) && (!(scale % 10 > 0))) {
+ numIndex = 1;
+ number = number / 10;
+ getZero = true;
+ }
+ int zeroSize = 0;
+ while (true) {
+ if (number <= 0) {
+ break;
+ }
+ // 姣忔鑾峰彇鍒版渶鍚庝竴涓暟
+ numUnit = (int) (number % 10);
+ if (numUnit > 0) {
+ if ((numIndex == 9) && (zeroSize >= 3)) {
+ sb.insert(0, CN_UPPER_MONETRAY_UNIT[6]);
+ }
+ if ((numIndex == 13) && (zeroSize >= 3)) {
+ sb.insert(0, CN_UPPER_MONETRAY_UNIT[10]);
+ }
+ sb.insert(0, CN_UPPER_MONETRAY_UNIT[numIndex]);
+ sb.insert(0, CN_UPPER_NUMBER[numUnit]);
+ getZero = false;
+ zeroSize = 0;
+ } else {
+ ++zeroSize;
+ if (!(getZero)) {
+ sb.insert(0, CN_UPPER_NUMBER[numUnit]);
+ }
+ if (numIndex == 2) {
+ if (number > 0) {
+ sb.insert(0, CN_UPPER_MONETRAY_UNIT[numIndex]);
+ }
+ } else if (((numIndex - 2) % 4 == 0) && (number % 1000 > 0)) {
+ sb.insert(0, CN_UPPER_MONETRAY_UNIT[numIndex]);
+ }
+ getZero = true;
+ }
+ // 璁﹏umber姣忔閮藉幓鎺夋渶鍚庝竴涓暟
+ number = number / 10;
+ ++numIndex;
+ }
+ // 濡傛灉signum == -1锛屽垯璇存槑杈撳叆鐨勬暟瀛椾负璐熸暟锛屽氨鍦ㄦ渶鍓嶉潰杩藉姞鐗规畩瀛楃锛氳礋
+ if (signum == -1) {
+ sb.insert(0, CN_NEGATIVE);
+ }
+ // 杈撳叆鐨勬暟瀛楀皬鏁扮偣鍚庝袱浣嶄负"00"鐨勬儏鍐碉紝鍒欒鍦ㄦ渶鍚庤拷鍔犵壒娈婂瓧绗︼細鏁�
+ if (!(scale > 0)) {
+ sb.append(CN_FULL);
+ }
+ return sb.toString();
+ }
+
+ public static void main(String[] args) {
+ double d = 123654.25d;
+ BigDecimal numberOfMoney = new BigDecimal(d+"");
+ String s = NumberToCN.number2CNMontrayUnit(numberOfMoney);
+ System.out.println(s.toString());
+ }
+}
diff --git a/src/main/java/com/boying/util/StringUtil.java b/src/main/java/com/boying/util/StringUtil.java
index 2075beb..929bd9c 100644
--- a/src/main/java/com/boying/util/StringUtil.java
+++ b/src/main/java/com/boying/util/StringUtil.java
@@ -5,6 +5,12 @@
public class StringUtil {
+ /** 16杩涘埗涓殑瀛楃闆� */
+ private static final String HEX_CHAR = "0123456789ABCDEF";
+
+ /** 16杩涘埗涓殑瀛楃闆嗗搴旂殑瀛楄妭鏁扮粍 */
+ private static final byte[] HEX_STRING_BYTE = HEX_CHAR.getBytes();
+
public static boolean isNullOrEmpty(String str) {
if (null == str || "".equalsIgnoreCase(str.trim())
|| "null".equals(str.trim())) {
@@ -29,6 +35,27 @@
String s1 = substring.replaceAll(",", "");
String s2 = s1.replaceAll(" ", "");
return s2;
+ }
+
+ public static byte[] toBytes(String strs){
+ String[] split = strs.split("-");
+ byte[] bytes = new byte[split.length];
+ for (int i = 0; i < split.length; i++) {
+ String s = split[i];
+ bytes[i] = (byte) Byte.parseByte(s);
+ }
+ return bytes;
+ }
+
+ public static byte[] hex2Byte(String hex) {
+ System.out.println();
+ String[] parts = hex.split("-");
+ byte[] bytes = new byte[parts.length];
+ for (int i = 0; i < parts.length; i++) {
+ bytes[i] = (byte) (Integer.parseInt(parts[i],10));
+ System.out.print(bytes[i]+ " ");
+ }
+ return bytes;
}
public static String getUUID() {
@@ -80,11 +107,11 @@
if (null == src || 0 == src.length()) {
return null;
}
- String s1 = src.replaceAll("-", "");
- byte[] ret = new byte[s1.length() / 2];
- byte[] tmp = s1.getBytes();
+ // String s1 = src.replaceAll("-", "");
+ byte[] ret = new byte[src.length() / 2];
+ byte[] tmp = src.getBytes();
for (int i = 0; i < (tmp.length / 2); i++) {
- ret[i] = uniteBytes(tmp[i * 2], tmp[i * 2 + 1]);
+ ret[i] = (byte)uniteBytes(tmp[i * 2], tmp[i * 2 + 1]);
}
return ret;
}
@@ -104,12 +131,70 @@
return ret;
}
- public static void main(String[] args) {
- String s = "00-64-FF-FF-6E-78-00-04-00-01-01-02-00-FF-00-00-00-09-E4-BA-AC-41-38-38-38-38-38-0D-01-01-01-02-00-FF-00-00-00-09-E4-B8-B4-E6-97-B6-E8-BD-A6-0D-02-01-01-02-00-FF-00-00-00-0C-E6-AC-A2-E8-BF-8E-E5-85-89-E4-B8-B4-0D-03-01-01-02-00-FF-00-00-00-09-E4-BD-99-E4-BD-8D-3A-37-34-00-0A-20-E4-B8-B4-E6-97-B6-E8-BD-A6-2C-E4-BA-AC-41-38-38-38-38-38-2C-E6-AC-A2-E8-BF-8E-E5-85-89-E4-B8-B4-00-6B-E7";
- String s1 = s.replaceAll("-", "");
- byte[] bytes = HexString2Bytes(s1);
- for (byte aByte : bytes) {
- System.out.print(aByte + " ");
+ /**
+ * 10杩涘埗瀛楄妭鏁扮粍杞崲涓�16杩涘埗瀛楄妭鏁扮粍
+ *
+ * byte鐢ㄤ簩杩涘埗琛ㄧず鍗犵敤8浣嶏紝16杩涘埗鐨勬瘡涓瓧绗﹂渶瑕佺敤4浣嶄簩杩涘埗浣嶆潵琛ㄧず锛屽垯鍙互鎶婃瘡涓猙yte
+ * 杞崲鎴愪袱涓浉搴旂殑16杩涘埗瀛楃锛屽嵆鎶奲yte鐨勯珮4浣嶅拰浣�4浣嶅垎鍒浆鎹㈡垚鐩稿簲鐨�16杩涘埗瀛楃锛屽啀鍙栧搴�16杩涘埗瀛楃鐨勫瓧鑺�
+ *
+ * @param b 10杩涘埗瀛楄妭鏁扮粍
+ * @return 16杩涘埗瀛楄妭鏁扮粍
+ */
+ public static byte[] byte2hex(byte[] b) {
+ int length = b.length;
+ byte[] b2 = new byte[length << 1];
+ int pos;
+ for(int i=0; i<length; i++) {
+ pos = 2*i;
+ b2[pos] = HEX_STRING_BYTE[(b[i] & 0xf0) >> 4];
+ b2[pos+1] = HEX_STRING_BYTE[b[i] & 0x0f];
}
+ return b2;
+ }
+
+ /**
+ * 16杩涘埗瀛楄妭鏁扮粍杞崲涓�10杩涘埗瀛楄妭鏁扮粍
+ *
+ * 涓や釜16杩涘埗瀛楄妭瀵瑰簲涓�涓�10杩涘埗瀛楄妭锛屽垯灏嗙涓�涓�16杩涘埗瀛楄妭瀵瑰簲鎴�16杩涘埗瀛楃琛ㄤ腑鐨勪綅缃�(0~15)骞跺悜宸︾Щ鍔�4浣嶏紝
+ * 鍐嶄笌绗簩涓�16杩涘埗瀛楄妭瀵瑰簲鎴�16杩涘埗瀛楃琛ㄤ腑鐨勪綅缃�(0~15)杩涜鎴栬繍绠楋紝鍒欏緱鍒板搴旂殑10杩涘埗瀛楄妭
+ * @param b 10杩涘埗瀛楄妭鏁扮粍
+ * @return 16杩涘埗瀛楄妭鏁扮粍
+ */
+ public static byte[] hex2byte(byte[] b) {
+ if(b.length%2 != 0) {
+ throw new IllegalArgumentException("byte array length is not even!");
+ }
+
+ int length = b.length >> 1;
+ byte[] b2 = new byte[length];
+ int pos;
+ for(int i=0; i<length; i++) {
+ pos = i << 1;
+ b2[i] = (byte) (HEX_CHAR.indexOf( b[pos] ) << 4 | HEX_CHAR.indexOf( b[pos+1] ) );
+ }
+ return b2;
+ }
+
+ /**
+ * 灏�16杩涘埗瀛楄妭鏁扮粍杞垚10杩涘埗瀛楃涓�
+ * @param b 16杩涘埗瀛楄妭鏁扮粍
+ * @return 10杩涘埗瀛楃涓�
+ */
+ public static String hex2Str(byte[] b) {
+ return new String(hex2byte(b));
+ }
+
+ /**
+ * 灏�10杩涘埗瀛楄妭鏁扮粍杞垚16杩涘埗瀛楃涓�
+ * @param b 10杩涘埗瀛楄妭鏁扮粍
+ * @return 16杩涘埗瀛楃涓�
+ */
+ public static String byte2HexStr(byte[] b) {
+ return Integer.toHexString(Integer.parseInt(new String(b)));
+ }
+
+
+ public static void main(String[] args) {
+
}
}
diff --git a/src/main/resources/mapper/EnterParkMapper.xml b/src/main/resources/mapper/EnterParkMapper.xml
new file mode 100644
index 0000000..826e25a
--- /dev/null
+++ b/src/main/resources/mapper/EnterParkMapper.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.boying.mapper.EnterParkMapper">
+
+ <resultMap id="enterParkMap" type="com.boying.entity.EnterPark">
+ <id property="id" column="id"/>
+ <result property="createTime" column="create_time"/>
+ <result property="delFlag" column="del_flag"/>
+ <result property="updateTime" column="update_time"/>
+ <result property="barrierId" column="barrier_id"/>
+ <result property="carNo" column="car_no"/>
+ <result property="parkId" column="park_id"/>
+ <result property="status" column="status"/>
+ </resultMap>
+ <select id="getList" resultType="com.boying.entity.EnterPark">
+ select * from enter_park
+ <where>
+ 1=1
+ <if test="carNo != null and carNo != ''">
+ and car_no = #{carNo}
+ </if>
+ <if test="parkId != null and parkId != ''">
+ and park_id = #{parkId}
+ </if>
+ <if test="date != null and date != ''">
+ and DATE_FORMAT(create_time,'%Y-%m-%d') >= DATE_FORMAT(#{date},'%Y-%m-%d')
+ and DATE_FORMAT(create_time,'%Y-%m-%d') <= DATE_FORMAT(#{date},'%Y-%m-%d')
+ </if>
+ </where>
+ order by create_time desc limit #{current},#{size}
+ </select>
+ <select id="getCount" resultType="java.lang.Long">
+ select count(*) from enter_park
+ <where>
+ 1=1
+ <if test="carNo != null and carNo != ''">
+ and car_no = #{carNo}
+ </if>
+ <if test="parkId != null and parkId != ''">
+ and park_id = #{parkId}
+ </if>
+ <if test="date != null and date != ''">
+ and DATE_FORMAT(create_time,'%Y-%m-%d') >= DATE_FORMAT(#{date},'%Y-%m-%d')
+ and DATE_FORMAT(create_time,'%Y-%m-%d') <= DATE_FORMAT(#{date},'%Y-%m-%d')
+ </if>
+ </where>
+ </select>
+</mapper>
diff --git a/src/main/resources/mapper/OutParkMapper.xml b/src/main/resources/mapper/OutParkMapper.xml
new file mode 100644
index 0000000..9921d25
--- /dev/null
+++ b/src/main/resources/mapper/OutParkMapper.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.boying.mapper.OutParkMapper">
+
+ <resultMap id="outParkMap" type="com.boying.entity.OutPark">
+ <id property="id" column="id"/>
+ <result property="createTime" column="create_time"/>
+ <result property="delFlag" column="del_flag"/>
+ <result property="updateTime" column="update_time"/>
+ <result property="barrierId" column="barrier_id"/>
+ <result property="carNo" column="car_no"/>
+ <result property="code" column="code"/>
+ <result property="enterTime" column="enter_time"/>
+ <result property="parkId" column="park_id"/>
+ <result property="payCode" column="pay_code"/>
+ <result property="price" column="price"/>
+ <result property="remark" column="remark"/>
+ <result property="status" column="status"/>
+ <result property="status2" column="status2"/>
+ <result property="status3" column="status3"/>
+ <result property="time" column="time"/>
+ <result property="code2" column="code2"/>
+ </resultMap>
+ <select id="getList" resultType="com.boying.entity.OutPark">
+ select * from out_park
+ <where>
+ 1=1
+ <if test="carNo != null and carNo != ''">
+ and car_no = #{carNo}
+ </if>
+ <if test="payCode != null and payCode != ''">
+ and pay_code = #{payCode}
+ </if>
+ <if test="parkId != null and parkId != ''">
+ and park_id = #{parkId}
+ </if>
+ <if test="date != null and date != ''">
+ and DATE_FORMAT(create_time,'%Y-%m-%d') >= DATE_FORMAT(#{date},'%Y-%m-%d')
+ and DATE_FORMAT(create_time,'%Y-%m-%d') <= DATE_FORMAT(#{date},'%Y-%m-%d')
+ </if>
+ </where>
+ order by create_time desc limit #{current},#{size}
+ </select>
+
+ <select id="getCount" resultType="java.lang.Long">
+ select count(*) from out_park
+ <where>
+ 1=1
+ <if test="carNo != null and carNo != ''">
+ and car_no = #{carNo}
+ </if>
+ <if test="payCode != null and payCode != ''">
+ and pay_code = #{payCode}
+ </if>
+ <if test="parkId != null and parkId != ''">
+ and park_id = #{parkId}
+ </if>
+ <if test="date != null and date != ''">
+ and DATE_FORMAT(create_time,'%Y-%m-%d') >= DATE_FORMAT(#{date},'%Y-%m-%d')
+ and DATE_FORMAT(create_time,'%Y-%m-%d') <= DATE_FORMAT(#{date},'%Y-%m-%d')
+ </if>
+ </where>
+ </select>
+ <select id="getOneByBarrierId" resultType="com.boying.entity.OutPark">
+ select id,car_no,status2 from out_park
+ where barrier_id = #{barrierId} and `status` = 1 and status2 = 0 and del_flag = 0 limit 1;
+ </select>
+</mapper>
--
Gitblit v1.9.1