root 2 年之前
父節點
當前提交
7c580ce976

+ 1 - 3
simulation-resource-server/src/main/java/com/css/simulation/resource/model/controller/VehicleCtrl.java

@@ -48,9 +48,7 @@ public class VehicleCtrl {
      */
      */
     @RequestMapping("/getVehicleInfo")
     @RequestMapping("/getVehicleInfo")
     public ResponseBodyVO<VehicleVO> getVehicleInfo(@RequestBody VehicleParam vehicleParam) {
     public ResponseBodyVO<VehicleVO> getVehicleInfo(@RequestBody VehicleParam vehicleParam) {
-        ResponseBodyVO<VehicleVO> response = new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS);
-        response.setInfo(vehicleService.getVehicleInfo(vehicleParam));
-        return response;
+        return  new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS,vehicleService.getVehicleInfo(vehicleParam));
     }
     }
 
 
     /**
     /**

+ 7 - 7
simulation-resource-server/src/main/java/com/css/simulation/resource/model/controller/VehicleTempCtrl.java

@@ -6,20 +6,22 @@ import api.common.pojo.po.model.VehicleTempPO;
 import api.common.pojo.vo.model.VehicleTempVO;
 import api.common.pojo.vo.model.VehicleTempVO;
 import com.css.simulation.resource.model.service.VehicleTempService;
 import com.css.simulation.resource.model.service.VehicleTempService;
 import com.github.pagehelper.PageInfo;
 import com.github.pagehelper.PageInfo;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.stereotype.Controller;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.ResponseBody;
 
 
+import javax.annotation.Resource;
+import java.util.List;
+
 @Controller
 @Controller
 @RequestMapping("/vehicleTemp")
 @RequestMapping("/vehicleTemp")
 @PreAuthorize("@AuthorityCheck.admin()")
 @PreAuthorize("@AuthorityCheck.admin()")
 public class VehicleTempCtrl {
 public class VehicleTempCtrl {
 
 
-    @Autowired
-    VehicleTempService vehicleTempService;
+    @Resource
+    private VehicleTempService vehicleTempService;
 
 
     /**
     /**
      * 获取车辆模型下拉
      * 获取车辆模型下拉
@@ -27,10 +29,8 @@ public class VehicleTempCtrl {
     @RequestMapping("/getVehicleTempTree")
     @RequestMapping("/getVehicleTempTree")
     @ResponseBody
     @ResponseBody
     @PreAuthorize("true")
     @PreAuthorize("true")
-    public ResponseBodyVO getVehicleList() {
-        ResponseBodyVO response = new ResponseBodyVO(ResponseBodyVO.Response.SUCCESS);
-        response.setInfo(vehicleTempService.getVehicleTempTree());
-        return response;
+    public ResponseBodyVO<List> getVehicleList() {
+        return new ResponseBodyVO(ResponseBodyVO.Response.SUCCESS,vehicleTempService.getVehicleTempTree());
     }
     }
 
 
     /**
     /**