字段更改

business-service/src/main/resources/mapper/BaseDeviceDynamicManagementMapper.xml

@@ -67,13 +67,12 @@
 		where df.current_time IS NOT NULL and df.vehicle_code = vp.vehicle_code
 		and df.current_time > vp.current_time )
 		GROUP BY vp.vehicle_code ) AS l
-		WHERE a.terminal_code=l.terminal_code
-		ORDER BY l.current_time DESC
 		<where>
+			a.terminal_code=l.terminal_code
 			<if test="railwayCode != null and railwayCode !=''">
-				concat(l.railway_code,a.terminal_code)
-				like concat("%",#{railwayCode},"%")
+				and l.railway_code like concat("%",#{railwayCode},"%")
 			</if>
 		</where>
+		ORDER BY l.current_time DESC
 	</select>
 </mapper>

vehicle-admin/src/main/java/com/ozs/web/controller/accountmanagment/BaseVehicleController.java

@@ -1,26 +1,30 @@
 package com.ozs.web.controller.accountmanagment;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.ozs.common.annotation.Log;
 import com.ozs.common.core.controller.BaseController;
 import com.ozs.common.core.domain.AjaxResult;
+import com.ozs.common.core.domain.entity.SysDictData;
 import com.ozs.common.enums.BusinessType;
 import com.ozs.common.utils.ChineseToPingyin;
 import com.ozs.common.utils.StringUtils;
 import com.ozs.common.utils.file.FileUtils;
 import com.ozs.common.utils.poi.ExcelUtil;
+import com.ozs.entity.BaseRailwayManagement;
 import com.ozs.entity.BaseTerminal;
 import com.ozs.entity.BaseVehicle;
-import com.ozs.entity.CameraTree;
-import com.ozs.entity.VehiclePosition;
 import com.ozs.entity.VehicleTree;
+import com.ozs.entity.vo.BaseRailwayManagementVo;
 import com.ozs.entity.vo.BaseVehicleTerminalVo;
 import com.ozs.entity.vo.BaseVehicleVo;
 import com.ozs.entity.vo.VehicleTreeVo;
 import com.ozs.service.BaseDeviceDynamicManagementService;
+import com.ozs.service.BaseRailwayManagementService;
 import com.ozs.service.BaseVehicleService;
 import com.ozs.service.VehiclePositionService;
 import com.ozs.system.service.DataScoreUtil;
+import com.ozs.system.service.ISysDictTypeService;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -32,9 +36,11 @@ import org.springframework.web.multipart.MultipartFile;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import java.io.InputStream;
+import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.Date;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -48,19 +54,17 @@ import java.util.List;
 @RequestMapping("/baseVehicle")
 @Slf4j
 public class BaseVehicleController extends BaseController {
-
+    @Resource
+    BaseRailwayManagementService baseRailwayManagementService;
+    @Autowired
+    private DataScoreUtil dataScoreUtil;
     @Autowired
     private BaseVehicleService baseVehicleService;
+    @Autowired
+    private ISysDictTypeService dictTypeService;
     @Resource
     BaseDeviceDynamicManagementService baseDeviceDynamicManagementService;
-    @Autowired
-    private VehiclePositionService vehiclePositionService;
-    @Autowired
-    private DataScoreUtil dataScoreUtil;
 
-    public static void main(String[] args) {
-        System.out.println(new Date().getTime());
-    }
 
     /**
      * 车载终端挂载列表
@@ -255,7 +259,7 @@ public class BaseVehicleController extends BaseController {
      * <p>
      * 获取机车列表和线路编码,组成树结构
      */
-    @ApiOperation("视频服务树形结构")
+    @ApiOperation("机车树形结构")
     @PostMapping("/vehicleTree")
     @Log(title = "首页机车列表", businessType = BusinessType.SELECT)
     public AjaxResult vehicleTree(@RequestBody VehicleTreeVo vehicleTreeVo) {
@@ -322,5 +326,38 @@ public class BaseVehicleController extends BaseController {
     public AjaxResult vehicleList() {
         return AjaxResult.success(baseVehicleService.vehicleList());
     }
+
+    /**
+     * 查询线路信息集合
+     *
+     * @param baseRailwayManagementVo
+     * @return
+     */
+    @ApiOperation(value = "查询线路信息集合")
+    @PostMapping("/railwayList")
+    @Log(title = "线路台账管理", businessType = BusinessType.SELECT)
+    public AjaxResult selectBaseLineManagement(@RequestBody BaseRailwayManagementVo baseRailwayManagementVo) {
+        LambdaQueryWrapper<BaseRailwayManagement> lw = new LambdaQueryWrapper<BaseRailwayManagement>();
+        if (!StringUtils.isBlank(baseRailwayManagementVo.getRailwayCode())) {
+            lw.like(BaseRailwayManagement::getRailwayCode, "%" + baseRailwayManagementVo.getRailwayCode() + "%");
+        }
+        if (!ObjectUtils.isEmpty(baseRailwayManagementVo.getRailwayType()) && baseRailwayManagementVo.getRailwayType() != 0) {
+            lw.eq(BaseRailwayManagement::getRailwayType, baseRailwayManagementVo.getRailwayType());
+        }
+        List<BaseRailwayManagement> list = baseRailwayManagementService.list(lw);
+        List<SysDictData> data = dictTypeService.selectDictDataByType("railway_type");
+        List<BaseRailwayManagement> dto1 = new ArrayList<>();
+        if (!ObjectUtils.isEmpty(list)) {
+            dto1 = list.stream().map(o -> {
+                for (SysDictData datum : data) {
+                    if (datum.getDictValue().equals(o.getRailwayType().toString())) {
+                        o.setRailwayTypeName(datum.getDictLabel());
+                    }
+                }
+                return o;
+            }).collect(Collectors.toList());
+        }
+        return AjaxResult.success(dto1);
+    }
 }