提交全图监控

sckw-modules/sckw-system/src/main/java/com/sckw/system/repository/SysDictRepository.java

@@ -97,7 +97,8 @@ public class SysDictRepository extends ServiceImpl<SysDictDao, SysDict> {
         return list(Wrappers.<SysDict>lambdaQuery()
                 .eq(BaseModel::getDelFlag,0)
                 .eq(BaseModel::getStatus,0)
-                .like (StringUtils.isNotBlank( keyword), SysDict::getLabel, keyword));
+                .like (StringUtils.isNotBlank( keyword), SysDict::getLabel, keyword)
+                .last("limit 100"));
     }
 
     /**
@@ -105,8 +106,9 @@ public class SysDictRepository extends ServiceImpl<SysDictDao, SysDict> {
      */
     public Boolean updateStatus(Long id, Integer status) {
         SysDict sysDict = new SysDict();
-        sysDict.setStatus( status);
-        return update(sysDict, Wrappers.<SysDict>lambdaUpdate().eq(BaseModel::getId, id));
+        sysDict.setId(id);
+        sysDict.setStatus(status);
+        return updateById(sysDict);
     }
 
     public List<SysDict> queryByIds(Set<String> parentIds) {

sckw-modules/sckw-system/src/main/java/com/sckw/system/service/SysDictFlexBusinessService.java

@@ -14,6 +14,7 @@ import com.sckw.system.repository.SysDictRepository;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.jetbrains.annotations.NotNull;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
@@ -69,7 +70,7 @@ public class SysDictFlexBusinessService {
         sysDict.setValue(entity.getValue());
         sysDict.setLabel(entity.getLabel());
         sysDict.setType(entity.getType());
-        sysDict.setDescription(entity.getLabel());
+        sysDict.setDescription(entity.getDescription());
         sysDict.setSort(entity.getSort());
         sysDict.setParentId(entity.getParentId());
         sysDict.setRemark(entity.getRemark());
@@ -211,7 +212,7 @@ public class SysDictFlexBusinessService {
         BeanUtils.copyProperties(entity, resp);
         resp.setStatusName(Objects.equals(entity.getStatus(), 0) ? " 正常" : "锁定");
         // 设置父级字典名称
-        Long parentId = Optional.ofNullable(entity.getParentId()).map(Long::parseLong).orElse(null);
+        Long parentId = Optional.ofNullable(entity.getParentId()).filter(StringUtils::isNotBlank).map(Long::parseLong).orElse(null);
         SysDict parentDict = idAndParentDictMap.getOrDefault(parentId, new SysDict());
         resp.setParentName(parentDict.getLabel());
         return resp;

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/kwfTruckTraceService.java

@@ -760,7 +760,7 @@ public class kwfTruckTraceService {
         vo.setDriverName(order.getDriverName());
         vo.setDriverPhone(order.getDriverPhone());
         vo.setStatus(order.getStatus());
-        vo.setStatusDesc(CarWaybillEnum.getName(order.getStatus()));
+        vo.setStatusDesc(CarWaybillV1Enum.geDesc(order.getStatus()));
 
         // 设置定位状态
         Integer locationStatus = truckLocationStatusMap.getOrDefault(order.getTruckNo(), 0);
@@ -779,8 +779,8 @@ public class kwfTruckTraceService {
         log.info("分页查询地图车辆列表参数：{}", req);
         Set<Long> allEnt = getAllEnt();
         // 处理日期参数，默认为当天
-        Date startDate = getDate(req.getStartDate());
-        Date endDate = getDate(req.getEndDate());
+        Date startDate = getStartDate(req.getStartDate());
+        Date endDate = getEndDate(req.getEndDate());
 
         // 进行中任务状态：已接单(1)、到达装货点(5)、已装货(10)、已离场(15)
         List<Integer> taskingStatus = Lists.newArrayList();
@@ -977,7 +977,7 @@ public class kwfTruckTraceService {
     }
 
     @NotNull
-    private static Date getDate(String date) {
+    private static Date getStartDate(String date) {
         Date startDate;
         if (StringUtils.isBlank(date)) {
             startDate = DateUtils.getStartOfDay(new Date());
@@ -993,6 +993,23 @@ public class kwfTruckTraceService {
         }
         return startDate;
     }
+    @NotNull
+    private static Date getEndDate(String date) {
+        Date startDate;
+        if (StringUtils.isBlank(date)) {
+            startDate = DateUtils.getEndOfDay(new Date());
+        } else {
+            try {
+                SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+                startDate = sdf.parse(date);
+                startDate = DateUtils.getEndOfDay(startDate);
+            } catch (Exception e) {
+                log.error("解析开始日期失败", e);
+                startDate = DateUtils.getEndOfDay(new Date());
+            }
+        }
+        return startDate;
+    }
 
     /**
      * 批量查询车辆定位信息
@@ -1197,7 +1214,7 @@ public class kwfTruckTraceService {
         Set<Long> allEnt = Sets.newHashSet();
         //根据企业类型查询企业
 
-        allEnt.add( LoginUserHolder.getUserId());
+        allEnt.add(253145323650682880L);
         EntCacheResDto entCacheResDto = remoteSystemService.queryEntTreeById(LoginUserHolder.getUserId());
         if (Objects.nonNull(entCacheResDto)) {
             EntCacheResDto entCacheResDto1 = remoteSystemService.queryEntTreeById(entCacheResDto.getId());