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

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

@@ -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) {
+    public R<?> modify(@RequestBody ModifyBizTruckParam modifyBizTruckParam) {
-        bizTruckService.modify(bizTruckEntity);
+        bizTruckService.modify(modifyBizTruckParam);
         return R.success();
     }
 

njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/pojo/param/ModifyBizTruckParam.java

@@ -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;
+
+}

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

@@ -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) {
+    public void modify(ModifyBizTruckParam modifyBizTruckParam) {
-        this.updateById(bizTruckEntity
+        this.updateById(BeanUtil.copyProperties(modifyBizTruckParam, BizTruckEntity.class));
-                .setAuditStatus(AuditStatus.DaiShenHe)
+        BizTruckEntity bizTruck = this.getById(modifyBizTruckParam.getId());
-        );
-        BizTruckEntity bizTruck = this.getById(bizTruckEntity.getId());
         String gps = bizTruck.getGps();
         if (StrUtil.isNotBlank(gps)) {
             long count = deviceLocalizerService.count(Wrappers.<DeviceLocalizerEntity>query().eq("terminal_id", gps));

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

@@ -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 {

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

@@ -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)