From 23bc1f7e7728f05d5df625427c9f5e435493c5d8 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期四, 02 十一月 2023 18:05:40 +0800
Subject: [PATCH] zjh 2023/11/02--1
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjTollCollectorController.java | 42 ++++++++++++++++++++++--------------------
1 files changed, 22 insertions(+), 20 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjTollCollectorController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjTollCollectorController.java
index c6a95b3..a76c3d1 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjTollCollectorController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjTollCollectorController.java
@@ -13,6 +13,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ltkj.common.core.domain.entity.SysDictData;
+import com.ltkj.common.core.redis.RedisCache;
import com.ltkj.common.utils.SecurityUtils;
import com.ltkj.common.utils.StringUtils;
import com.ltkj.framework.config.MatchUtils;
@@ -60,7 +61,8 @@
private ITjCustomerService tjCustomerService;
@Resource
private ISysDictDataService dictDataService;
-
+ @Resource
+ private RedisCache redisCache;
/**
* 鏌ヨ鏀惰垂鍛樻棩缁撳垪琛�
*/
@@ -140,10 +142,15 @@
collectorDetail.setAccountId(tjTollCollector.getAccountId());
collectorDetailService.save(collectorDetail);
}
- for (String id : tjTollCollector.getIds()) {
- TjFlowingWater water = tjFlowingWaterService.getById(id);
- water.setIsCheckout("Y");
- tjFlowingWaterService.updateById(water);
+ if(redisCache.hasKey("longList"+tjTollCollector.getTollCollectorId())){
+ List<Long> longList= redisCache.getCacheObject("longList" + tjTollCollector.getTollCollectorId());
+ for (Long id : longList) {
+ TjFlowingWater water = tjFlowingWaterService.getById(id);
+ water.setIsCheckout(tjTollCollector.getId());
+ water.setUpdateTime(new Date());
+ tjFlowingWaterService.updateById(water);
+ }
+ redisCache.deleteObject("longList"+tjTollCollector.getTollCollectorId());
}
return AjaxResult.success(accountId);
}
@@ -160,23 +167,13 @@
if (!userId.equals(tollCollectorId)) {
return AjaxResult.error("闈炲綋鍓嶇敤鎴风姝㈡搷浣�");
}
-// LambdaQueryWrapper<TjTollCollector> wqq = new LambdaQueryWrapper<>();
-// wqq.orderByDesc(TjTollCollector::getCreateTime);
-// List<TjTollCollector> list = tjTollCollectorService.list(wqq);
-// if (null != list && list.size() > 0) {
-// TjTollCollector collector = list.get(0);
-// if (null != collector && !collector.getId().equals(id)) {
-// return AjaxResult.error("璇锋挙閿�鏈�鍚庝竴娆＄粨璐﹁褰�");
-// }
-// }
String ids = tjTollCollectorService.getTjTollCollectorByLastOne();
if (null != ids && !id.equals(ids)) {
return AjaxResult.error("璇锋挙閿�鏈�鍚庝竴娆＄粨璐﹁褰�");
}
-// TjTollCollector collector = tjTollCollectorService.getById(id);
TjTollCollector collector = tjTollCollectorService.getTjTollCollectorById(id);
if (null != collector) {
- if("Y".equals(collector.getIsHz())){
+ if(null !=collector.getIsHz()){
return AjaxResult.error("璇ヨ处鍗曞凡姹囨�讳笉鍙挙閿�");
}
LambdaQueryWrapper<TjTollCollectorDetail> wq = new LambdaQueryWrapper<>();
@@ -184,11 +181,11 @@
collectorDetailService.remove(wq);
tjTollCollectorService.removeById(collector);
LambdaQueryWrapper<TjFlowingWater> wqq1 = new LambdaQueryWrapper<>();
- wqq1.eq(TjFlowingWater::getIsCheckout, "Y");
- wqq1.between(TjFlowingWater::getUpdateTime, collector.getAccountBeginTime(), collector.getAccountEndTime());
+ wqq1.eq(TjFlowingWater::getIsCheckout,id);
List<TjFlowingWater> waterList = tjFlowingWaterService.list(wqq1);
for (TjFlowingWater tjFlowingWater : waterList) {
- tjFlowingWater.setIsCheckout("N");
+ tjFlowingWater.setIsCheckout(null);
+ tjFlowingWater.setUpdateTime(new Date());
tjFlowingWaterService.updateById(tjFlowingWater);
}
return AjaxResult.success("璇ヨ处鍗曞凡鎴愬姛鎾ら攢");
@@ -230,11 +227,16 @@
Map<String, Object> map = new HashMap<>();
LambdaQueryWrapper<TjFlowingWater> wq = new LambdaQueryWrapper<>();
wq.eq(TjFlowingWater::getTollCollectorId, userId);
- wq.eq(TjFlowingWater::getIsCheckout, "N");
+ wq.isNull(TjFlowingWater::getIsCheckout);
wq.ne(TjFlowingWater::getPayStasus,0);
wq.between(TjFlowingWater::getUpdateTime, beginTime, endTime);
Page<TjFlowingWater> page =new Page<>(pageNum,pageSize);
Page<TjFlowingWater> waterPage = tjFlowingWaterService.page(page, wq);
+
+ //缂撳瓨鎵�缁熻鐨勬祦姘磇d
+ List<Long> longList = tjFlowingWaterService.getFlowingWaterIdList(userId, beginTime, endTime);
+ redisCache.setCacheObject("longList"+userId,longList);
+
List<TjFlowingWater> list1 = waterPage.getRecords();
List<TjFlowingWater> list = tjFlowingWaterService.list(wq);
for (TjFlowingWater tjFlowingWater : list1) {
--
Gitblit v1.8.0