lzq
/
njzscloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://git.njzscloud.com/lzq/njzscloud

localizer
ljw 2025-10-15 09:27:44 +08:00
parent fec1bdc479 55efc16afe
commit 4b3d77b152
5 changed files with 45 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/controller/BizTruckController.java
View File

@ -5,6 +5,7 @@ import com.njzscloud.common.mp.support.PageParam;
import com.njzscloud.common.mp.support.PageResult;
import com.njzscloud.supervisory.biz.constant.AuditStatus;
import com.njzscloud.supervisory.biz.pojo.entity.BizTruckEntity;
import com.njzscloud.supervisory.biz.pojo.param.ModifyBizTruckParam;
import com.njzscloud.supervisory.biz.pojo.param.SearchTruckParam;
import com.njzscloud.supervisory.biz.pojo.result.SearchTruckResult;
import com.njzscloud.supervisory.biz.service.BizTruckService;
@ -40,12 +41,10 @@ public class BizTruckController {
/**
* 修改
*
* @param bizTruckEntity 数据
*/
@PostMapping("/modify")
public R<?> modify(@RequestBody BizTruckEntity bizTruckEntity) {
bizTruckService.modify(bizTruckEntity);
public R<?> modify(@RequestBody ModifyBizTruckParam modifyBizTruckParam) {
bizTruckService.modify(modifyBizTruckParam);
return R.success();
}

25
njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/pojo/param/ModifyBizTruckParam.java 100644
View File

@ -0,0 +1,25 @@
package com.njzscloud.supervisory.biz.pojo.param;
import lombok.Getter;
import lombok.Setter;
import lombok.experimental.Accessors;
/**
* 车辆信息
*/
@Getter
@Setter
@Accessors(chain = true)
public class ModifyBizTruckParam {
/**
* Id
*/
private Long id;
/**
* gps编码
*/
private String gps;
}

10
njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/service/BizTruckService.java
View File

@ -18,6 +18,7 @@ import com.njzscloud.supervisory.biz.constant.AuditStatus;
import com.njzscloud.supervisory.biz.constant.BizObj;
import com.njzscloud.supervisory.biz.mapper.BizTruckMapper;
import com.njzscloud.supervisory.biz.pojo.entity.BizTruckEntity;
import com.njzscloud.supervisory.biz.pojo.param.ModifyBizTruckParam;
import com.njzscloud.supervisory.biz.pojo.param.SearchTruckParam;
import com.njzscloud.supervisory.biz.pojo.result.SearchCompanyResult;
import com.njzscloud.supervisory.biz.pojo.result.SearchTruckResult;
@ -25,7 +26,6 @@ import com.njzscloud.supervisory.device.pojo.entity.DeviceLocalizerEntity;
import com.njzscloud.supervisory.device.service.DeviceLocalizerService;
import com.njzscloud.supervisory.sys.auth.pojo.result.MyResult;
import com.njzscloud.supervisory.sys.dict.pojo.DictItemEntity;
import com.njzscloud.supervisory.sys.dict.pojo.ObtainDictDataResult;
import com.njzscloud.supervisory.sys.dict.service.DictItemService;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@ -72,11 +72,9 @@ public class BizTruckService extends ServiceImpl<BizTruckMapper, BizTruckEntity>
* @param bizTruckEntity 数据
*/
@Transactional(rollbackFor = Exception.class)
public void modify(BizTruckEntity bizTruckEntity) {
this.updateById(bizTruckEntity
.setAuditStatus(AuditStatus.DaiShenHe)
);
BizTruckEntity bizTruck = this.getById(bizTruckEntity.getId());
public void modify(ModifyBizTruckParam modifyBizTruckParam) {
this.updateById(BeanUtil.copyProperties(modifyBizTruckParam, BizTruckEntity.class));
BizTruckEntity bizTruck = this.getById(modifyBizTruckParam.getId());
String gps = bizTruck.getGps();
if (StrUtil.isNotBlank(gps)) {
long count = deviceLocalizerService.count(Wrappers.<DeviceLocalizerEntity>query().eq("terminal_id", gps));

18
njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/service/TruckLocationTrackService.java
View File

@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.njzscloud.common.core.thread.ThreadPool;
import com.njzscloud.common.core.tuple.Tuple3;
import com.njzscloud.common.core.utils.R;
import com.njzscloud.common.mp.support.PageParam;
@ -30,10 +31,8 @@ import java.time.format.DateTimeFormatter;
import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;
import java.util.concurrent.ArrayBlockingQueue;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.locks.ReentrantLock;
import java.util.stream.Collectors;
@ -43,7 +42,15 @@ import java.util.stream.Collectors;
@Slf4j
@Service
public class TruckLocationTrackService extends ServiceImpl<TruckLocationTrackMapper, TruckLocationTrackEntity> implements IService<TruckLocationTrackEntity> {
ThreadPoolExecutor threadPoolExecutor = new ThreadPoolExecutor(5, 5, 0, TimeUnit.SECONDS, new ArrayBlockingQueue<>(1));
ThreadPoolExecutor threadPoolExecutor = ThreadPool.createThreadPool(
"GPS 数据",
10,
200,
60,
1,
1,
new ThreadPoolExecutor.CallerRunsPolicy()
);
HashMap<String, List<SseEmitter>> emitters = new HashMap<>();
ReentrantLock lock = new ReentrantLock();
List<Tuple3<String, String, String>> realtimeDataListener = new LinkedList<>();
@ -531,7 +538,7 @@ public class TruckLocationTrackService extends ServiceImpl<TruckLocationTrackMap
realtimeDataListenerLock.unlock();
}
CompletableFuture.runAsync(() -> {
/* CompletableFuture.runAsync(() -> {
while (true) {
ThreadUtil.sleep(3000);
realtimeDataListenerLock.lock();
@ -556,8 +563,7 @@ public class TruckLocationTrackService extends ServiceImpl<TruckLocationTrackMap
);
}
}
}, threadPoolExecutor);
}, threadPoolExecutor); */
/* CompletableFuture.runAsync(() -> {
try {

2
njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/service/OrderInfoService.java
View File

@ -609,7 +609,7 @@ public class OrderInfoService extends ServiceImpl<OrderInfoMapper, OrderInfoEnti
.setCheckerId(SecurityUtil.currentUserId())
);
truckLeaving(new TruckLeavingOrderParam().setOrderId(orderId), 0);
// truckLeaving(new TruckLeavingOrderParam().setOrderId(orderId), 0);
}
@Transactional(rollbackFor = Exception.class)