Преглед изворни кода

机车行驶日志获取机车名称

wyyay пре 1 година
родитељ
комит
5bfc0e84b6

+ 6 - 14
vehicle-admin/src/main/java/com/ozs/web/controller/accountmanagment/VehiclePositionController.java

@@ -7,9 +7,11 @@ import com.ozs.common.core.domain.AjaxResult;
 import com.ozs.common.enums.BusinessType;
 import com.ozs.common.utils.AppendUtils;
 import com.ozs.common.utils.poi.ExcelUtil;
+import com.ozs.entity.BaseVehicle;
 import com.ozs.entity.VehiclePosition;
 import com.ozs.entity.vo.VehiclePositionResp;
 import com.ozs.framework.manager.factory.AsyncFactory;
+import com.ozs.service.BaseVehicleService;
 import com.ozs.service.VehiclePositionService;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -32,6 +34,8 @@ import java.util.List;
 public class VehiclePositionController extends BaseController {
     @Autowired
     private VehiclePositionService vehiclePositionService;
+    @Autowired
+    private BaseVehicleService baseVehicleService;
 
 
     /**
@@ -63,25 +67,13 @@ public class VehiclePositionController extends BaseController {
 
     /**
      * 获取机车行驶日志列表
-     *
-     * @param vehiclePositionResp
      * @return
      */
     @ApiOperation(value = "获取机车日志列表")
     @PostMapping("/listNoPage")
     @Log(title = "报警信息管理", businessType = BusinessType.SELECT)
-    public AjaxResult listNoPage(@RequestBody VehiclePositionResp vehiclePositionResp) {
-        List<VehiclePosition> list = vehiclePositionService.selectVehiclePositionList(vehiclePositionResp);
-        if(!ObjectUtils.isEmpty(list)){
-            list.forEach(l -> {
-                if (!ObjectUtils.isEmpty(l.getTravelMile())) {
-                    l.setTravelMileFormat(AppendUtils.stringAppend(Integer.valueOf(l.getTravelMile())));
-                }
-                if(!ObjectUtils.isEmpty(l.getLineDir())){
-                    l.setLineDirName(l.getLineDir() == 1 ? "上行" : "下行");
-                }
-            });
-        }
+    public AjaxResult listNoPage() {
+        List<BaseVehicle> list = baseVehicleService.list();
         return AjaxResult.success(list);
     }