删除多余代码

performance-web/src/main/java/com/clx/performance/controller/largescreen/LargeScreenController.java

-package com.clx.performance.controller.largescreen;
-
-import cn.hutool.json.JSON;
-import cn.hutool.json.JSONObject;
-import cn.hutool.json.JSONUtil;
-import com.clx.performance.service.OrderChildService;
-import com.clx.user.feign.DriverFeign;
-import com.clx.user.feign.UserClxFeign;
-import com.clx.user.vo.pc.driver.truck.DriverTruckVo;
-import com.msl.common.result.Result;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.AllArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.List;
-
-/**
- * @ClassName GoodsOrderController
- * @Description
- * @Author kavin
- * @Date 2023/9/17 17:16
- * @Version 1.0
- */
-
-@Slf4j
-@RestController
-@RequestMapping("/pc/largescreen")
-@Validated
-@AllArgsConstructor
-@Api(tags = "PC-大屏")
-public class LargeScreenController {
-
-    private final DriverFeign driverFeign;
-
-    private final OrderChildService orderChildService;
-
-
-    @ApiOperation(value = "空车列表", notes = "<br>By:胡宇帆")
-    @GetMapping("/emptyCarList")
-    public String emptyCarList() {
-        List<String> data = driverFeign.driverTruckList().getData();
-        return JSONUtil.toJsonStr(orderChildService.emptyCarList(data));
-    }
-
-    @ApiOperation(value = "重车列表", notes = "<br>By:胡宇帆")
-    @GetMapping("/weightCarList")
-    public String weightCarList() {
-        List<String> data = driverFeign.driverTruckList().getData();
-        return JSONUtil.toJsonStr(orderChildService.weightCarList(data));
-    }
-
-}

performance-web/src/main/java/com/clx/performance/dao/OrderChildDao.java

@@ -156,5 +156,4 @@ public interface OrderChildDao extends BaseDao<OrderChildMapper, OrderChild, Int
 
     Long haveArriveReceiveChild(String orderNo);
 
-    List<OrderChild> selectListWithEmptyCarList();
 }

performance-web/src/main/java/com/clx/performance/dao/impl/OrderChildDaoImpl.java

@@ -487,11 +487,4 @@ public class OrderChildDaoImpl extends BaseDaoImpl<OrderChildMapper, OrderChild,
         return baseMapper.selectCount(query);
     }
 
-    @Override
-    public List<OrderChild> selectListWithEmptyCarList() {
-        return baseMapper.selectList(lQrWrapper()
-                .le(OrderChild :: getStatus,OrderChildEnum.Status.UNSETTLE.getCode())
-                .ge(OrderChild :: getStatus,OrderChildEnum.Status.CREATED.getCode())
-        );
-    }
 }

performance-web/src/main/java/com/clx/performance/service/OrderChildService.java

@@ -83,8 +83,4 @@ public interface OrderChildService {
     List<OrderChild> selectInTransitOrderChild(String orderNo);
 
     DriverCancelOrderChildInfo driverCancelOrderChildInfo(String orderChildNo);
-
-    List<JSONObject> emptyCarList(List<String> data);
-
-    List<JSONObject> weightCarList(List<String> data);
 }

performance-web/src/main/java/com/clx/performance/service/impl/OrderChildServiceImpl.java

@@ -1256,77 +1256,6 @@ public class OrderChildServiceImpl implements OrderChildService {
         return result;
     }
 
-    @Override
-    public List<JSONObject> emptyCarList(List<String> data) {
-        String now = DateUtils.formatDateTime(LocalDateTime.now(), "yyyy-MM-dd HH:mm:ss").get();
-        List<OrderChild> orderChildList = orderChildDao.selectListWithEmptyCarList();
-        if (CollectionUtils.isEmpty(orderChildList)) {
-            return null;
-        }
-        List<String> list = orderChildList.stream().map(OrderChild::getTruckNo).collect(Collectors.toList());
-        List<JSONObject> result = new LinkedList<>();
-        int index = 0;
-        for (String truckNo : data) {
-            if (list.contains(truckNo)) {
-                continue;
-            }
-
-            List<TruckTraceDTO> truckTrace = zjxlGpsService.getTruckTrace(truckNo, now,
-                    now);
-            if(CollectionUtils.isNotEmpty(truckTrace)){
-                JSONObject jsonObject = new JSONObject();
-                BigDecimal[] location = truckTrace.get(truckTrace.size() - 1).getLocation();
-                BigDecimal longitude = location[0].setScale(4, BigDecimal.ROUND_DOWN);
-                BigDecimal latitude = location[1].setScale(4, BigDecimal.ROUND_DOWN);
-                jsonObject.set("id", ++index);
-                jsonObject.set("lng", longitude);
-                jsonObject.set("lat", latitude);
-                jsonObject.set("info", "");
-                jsonObject.set("value", "");
-                jsonObject.set("iconField", "ok");
-                result.add(jsonObject);
-            }
-
-        }
-        return result;
-
-    }
-
-    @Override
-    public List<JSONObject> weightCarList(List<String> data) {
-        String now = DateUtils.formatDateTime(LocalDateTime.now(), "yyyy-MM-dd HH:mm:ss").get();
-        List<OrderChild> orderChildList = orderChildDao.selectListWithEmptyCarList();
-        if (CollectionUtils.isEmpty(orderChildList)) {
-            return null;
-        }
-        List<String> list = orderChildList.stream().map(OrderChild::getTruckNo).collect(Collectors.toList());
-        List<JSONObject> result = new LinkedList<>();
-        int index = 0;
-        for (String truckNo : data) {
-            if (!list.contains(truckNo)) {
-                continue;
-            }
-
-            List<TruckTraceDTO> truckTrace = zjxlGpsService.getTruckTrace(truckNo, now,
-                    now);
-            if(CollectionUtils.isNotEmpty(truckTrace)){
-                JSONObject jsonObject = new JSONObject();
-                BigDecimal[] location = truckTrace.get(truckTrace.size() - 1).getLocation();
-                BigDecimal longitude = location[0].setScale(4, BigDecimal.ROUND_DOWN);
-                BigDecimal latitude = location[1].setScale(4, BigDecimal.ROUND_DOWN);
-                jsonObject.set("id", ++index);
-                jsonObject.set("lng", longitude);
-                jsonObject.set("lat", latitude);
-                jsonObject.set("info", "");
-                jsonObject.set("value", "");
-                jsonObject.set("iconField", "ok");
-                result.add(jsonObject);
-            }
-
-        }
-        return result;
-    }
-
     /**
      * 生成计费单
      */