From e2a744307c3d5b5e2b58c1a64cf4b4827996c29b Mon Sep 17 00:00:00 2001 From: kongdeqiang <123456> Date: 星期一, 22 四月 2024 10:51:35 +0800 Subject: [PATCH] fix : 提交差异 --- src/main/java/com/boying/controller/OutParkController.java | 147 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 140 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/boying/controller/OutParkController.java b/src/main/java/com/boying/controller/OutParkController.java index adf15a8..b6934fb 100644 --- a/src/main/java/com/boying/controller/OutParkController.java +++ b/src/main/java/com/boying/controller/OutParkController.java @@ -3,11 +3,14 @@ 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.*; import com.boying.service.*; import com.boying.util.DateUtilOther; +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 com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -28,12 +31,14 @@ import java.text.SimpleDateFormat; import java.time.LocalDateTime; import java.time.ZoneOffset; +import java.time.format.DateTimeFormatter; import java.util.*; import java.util.concurrent.TimeUnit; @RestController @RequestMapping("ffzf/outpark") @RequiredArgsConstructor +@Tag(description = "ffzf/outpark" , name = "鍑哄満琛ㄦ帴鍙�" ) public class OutParkController { @@ -52,18 +57,43 @@ 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)); + @Operation(summary = "鍒嗛〉鏌ヨ" , description = "鍒嗛〉鏌ヨ" ) + 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); + System.out.println(list); + 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); } - + //getById + @PostMapping("/getById") + @Operation(summary = "鏍规嵁id鏌ヨ" , description = "鏍规嵁id鏌ヨ" ) + public Object getById(Long id) { + return R.ok(outParkService.getById(id)); + } //閬撻椄code @PostMapping("/findByBarrierCode") + @Operation(summary = "鏍规嵁閬撻椄code鏌ヨ鍑哄満锛堝凡搴熷純锛�" , description = "鏍规嵁閬撻椄code鏌ヨ鍑哄満锛堝凡搴熷純锛�" ) public Object findById(String code) { + if(StringUtils.isBlank(code)){ + return R.failed(null,"鍙傛暟閿欒"); + } QueryWrapper<Barrier> wrapper = new QueryWrapper<>(); wrapper.lambda() .eq(Barrier::getCode2,code); + System.out.println("code :" +code); List<Barrier> all = barrierService.list(wrapper); if(all.size()==0){ return R.failed("鏈壘鍒拌璁惧"); @@ -79,7 +109,40 @@ if(outPark.getTime() > 0){ outPark.setTimeStr(DateUtilOther.millisToDayHrMinSec(new Double(outPark.getTime()).longValue())); }else { - outPark.setTimeStr("0"); + outPark.setTimeStr("涓嶈冻涓�鍒嗛挓"); + } + return R.ok(outPark); + } + } + } + + //閬撻椄code + @PostMapping("/findByBarrierCode2") + @Operation(summary = "鏍规嵁閬撻椄code鏌ヨ鍑哄満" , description = "鏍规嵁閬撻椄code鏌ヨ鍑哄満" ) + public Object findById2(String code2) { + if(StringUtils.isBlank(code2)){ + return R.failed(null,"鍙傛暟閿欒"); + } + System.out.println("code2 :"+code2); + QueryWrapper<Barrier> wrapper = new QueryWrapper<>(); + wrapper.lambda() + .eq(Barrier::getCode2,code2); + List<Barrier> all = barrierService.list(wrapper); + if(all.size()==0){ + return R.failed("鏈壘鍒拌璁惧"); + }else{ + Barrier barrier = all.get(0); + String carNo = barrier.getCarNo(); + + OutPark outPark = outParkService.findByCarNoAndBarrierId(carNo,barrier.getId()); + if(outPark==null){ + return R.failed("鏈瘑鍒埌杞︾墝鍙�"); + }else{ + outPark.setParkName(barrier.getName()); + if(outPark.getTime() > 0){ + outPark.setTimeStr(DateUtilOther.millisToDayHrMinSec(new Double(outPark.getTime()).longValue())); + }else { + outPark.setTimeStr("涓嶈冻涓�鍒嗛挓"); } return R.ok(outPark); } @@ -87,12 +150,14 @@ } @PostMapping("/delete") + @Operation(summary = "鍒犻櫎鍑哄満" , description = "鍒犻櫎鍑哄満" ) public Object delete(Long id) { outParkService.removeById(id); return R.ok("鍒犻櫎鎴愬姛"); } @PostMapping("enterPark2") + @Operation(summary = "鏂板鍏ュ満锛堝簾寮冿級" , description = "鏂板鍏ュ満锛堝簾寮冿級" ) public Object enterPark(String carNo,Integer barrierId,Integer parkId,String code2) { Barrier barrier1 = findBarrier(code2); barrierId = barrier1.getId(); @@ -133,6 +198,7 @@ } @PostMapping("outPark2") + @Operation(summary = "鏂板鍑哄満锛堝簾寮冿級" , description = "鏂板鍑哄満锛堝簾寮冿級" ) public Object outPark(String carNo,Integer barrierId,Integer parkId,String code2) { String s = "寮�濮嬫墽琛屽嚭鍦烘帴鍙�------>\n"; Barrier barrier1 = findBarrier(code2); @@ -198,9 +264,10 @@ } @GetMapping("/statisticParkOrder/count") + @Operation(summary = "缁熻鐢ㄦ埛绠$悊鐨勫仠杞﹀満璁㈠崟鏁伴噺" , description = "缁熻鐢ㄦ埛绠$悊鐨勫仠杞﹀満璁㈠崟鏁伴噺" ) public R statisticParkOrder(String parkIds) { Map<String,Object> resultMap = new HashMap<>(); - if(parkIds != null){ + if(StringUtils.isNotBlank(parkIds)){ String[] split = parkIds.split(","); long[] array = Arrays.stream(split).mapToLong(Long::parseLong).toArray(); List<Long> parkIdList = new ArrayList<>(); @@ -234,6 +301,7 @@ } @GetMapping("/isJS") + @Operation(summary = "鍍靛案杞︽煡璇�" , description = "鍍靛案杞︽煡璇�" ) public Object isJS(String carNo ,Integer parkId) { List<EnterPark> byCarNo = enterParkService.findByCarNo(carNo, parkId); if(byCarNo.size() > 0){ @@ -243,6 +311,71 @@ } } + @GetMapping("/getByCarAndPark") + @Operation(summary = "鏍规嵁杞︾墝鍜屽仠杞﹀満鑾峰彇鏈�鏂板嚭鍦�" , description = "鏍规嵁杞︾墝鍜屽仠杞﹀満鑾峰彇鏈�鏂板嚭鍦�" ) + public Object getByCarAndPark(String carNo ,Integer parkId) { + QueryWrapper<OutPark> wrapper = new QueryWrapper<>(); + wrapper.lambda() + .eq(OutPark::getCarNo,carNo) + .eq(OutPark::getParkId,parkId) + .orderByDesc(OutPark::getCreateTime); + List<OutPark> list = outParkService.list(wrapper); + if(list.size() > 0){ + OutPark outPark = list.get(0); + if(outPark.getTime() > 0){ + outPark.setTimeStr(DateUtilOther.millisToDayHrMinSec(new Double(outPark.getTime()).longValue())); + }else { + outPark.setTimeStr("涓嶈冻涓�鍒嗛挓"); + } + return R.ok(outPark,"鎵惧埌鏁版嵁"); + }else { + return R.failed(null,"鏈壘鍒版暟鎹�"); + } + } + @GetMapping("/editEnterPark") + @Operation(summary = "淇敼鍏ュ満淇℃伅" , description = "淇敼鍏ュ満淇℃伅" ) + public Object editEnterPark(String carNo ,Integer parkId,String time) { + QueryWrapper<Barrier> wrapper = new QueryWrapper<>(); + wrapper.lambda() + .eq(Barrier::getParkId,parkId) + .eq(Barrier::getType,1); + List<Barrier> list = barrierService.list(wrapper); + EnterPark enterPark = new EnterPark(); + enterPark.setCreateTime(LocalDateTime.parse(time, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))); + enterPark.setCarNo(carNo); + enterPark.setParkId(parkId); + enterPark.setBarrierId(list.get(0).getId()); + enterPark.setStatus(0); + enterPark.setIsAdd(1); + enterPark.setIsPay(0); + enterParkService.saveOrUpdate(enterPark); + + OutPark outPark = null; + QueryWrapper<OutPark> wrapper1 = new QueryWrapper<>(); + wrapper1.lambda() + .eq(OutPark::getParkId,parkId) + .eq(OutPark::getCarNo,carNo) + .ge(OutPark::getCreateTime,enterPark.getCreateTime()) + .ne(OutPark::getStatus,1); + List<OutPark> list1 = outParkService.list(wrapper1); + if(list1 !=null&&list1.size()>0){ + outPark = list1.get(0); + outPark.setEnterTime(enterPark.getCreateTime()); + long l = outPark.getCreateTime().toInstant(ZoneOffset.of("+8")).toEpochMilli() - enterPark.getCreateTime().toInstant(ZoneOffset.of("+8")).toEpochMilli(); + outPark.setTime(l/(1000*60)); + try { + outPark.setPrice(costRuleService.getMoney(parkId, outPark.getEnterTime(), outPark.getCreateTime(), 1)); + }catch (Exception e){ + e.printStackTrace(); + } + outParkService.saveOrUpdate(outPark); + return R.ok(null,"淇敼鍑哄満璁板綍鎴愬姛"); + }else { + return R.ok(null,"鏂板鍏ュ満璁板綍鎴愬姛"); + } + + } + public Barrier findBarrier(String code2) { QueryWrapper<Barrier> wrapper = new QueryWrapper<>(); -- Gitblit v1.9.1