通过URL传参访问车辆和通道信息

liujun001
1 parent 6fdc25b4
Showing 10 changed files with 52 additions and 4 deletions
src/main/java/com/bsth/controller/video/VideoController.java
src/main/java/com/bsth/entity/Cars.java
src/main/java/com/bsth/entity/video/VideoTree.java
src/main/java/com/bsth/filter/BaseFilter.java
src/main/java/com/bsth/repository/CarsRepository.java
src/main/java/com/bsth/service/CarDeviceService.java
src/main/java/com/bsth/service/CarsService.java
src/main/java/com/bsth/service/impl/CarsServiceImpl.java
src/main/java/com/bsth/service/impl/videoimpl/VideoServiceImpl.java
src/main/java/com/bsth/service/schedule/impl/CarsServiceImpl.java
@@ -5,12 +5,15 @@ import com.alibaba.fastjson.JSON;
 import com.bsth.common.ResponseCode;
 import com.bsth.controller.schedule.basicinfo.legacy.CarsController;
 import com.bsth.entity.Business;
+import com.bsth.entity.CarDevice;
 import com.bsth.entity.Cars;
 import com.bsth.entity.Line;
 import com.bsth.entity.video.CarsTreeTable;
 import com.bsth.entity.video.VideoChannel;
 import com.bsth.entity.video.VideoTree;
 import com.bsth.service.BusinessService;
+import com.bsth.service.CarDeviceService;
+import com.bsth.service.CarsService;
 import com.bsth.service.LineService;
 import com.bsth.service.impl.videoimpl.WvpConfig;
 import com.bsth.service.video.VideoService;
@@ -41,6 +44,8 @@ public class VideoController {
     @Autowired
     private WvpConfig wvpConfig;
+    @Autowired
+    private CarsService carsService;
     @GetMapping("/tree")
     public Map<String, Object> combinationTree() {
@@ -59,9 +64,23 @@ public class VideoController {
     @GetMapping("/tree/carNo/{parentId}")
     public List<VideoTree> layTreeNodeCarNo(@PathVariable("parentId") String parentId) {
-        return videoService.combinationTreeOfCar(parentId, false,false);
+        return videoService.combinationTreeOfCar(parentId, false, false);
+    }
+
+    @GetMapping("/tree/caNO/sim/{zbh}")
+    public Map<String, String> queryZBH(@PathVariable String zbh) {
+        Map<String, String> result = new HashMap<>();
+
+
+        Cars cars = carsService.queryCarsByInsideCode(zbh);
+
+        String sim = Objects.nonNull(cars)?cars.getSimNo():null;
+        result.put("sim", sim);
+        result.put("status", "1");
+        return result;
     }
+
     @GetMapping("/tree/search")
     public Map<String, Object> searchLayTreeNode(HttpServletRequest request) {
         Map<String, Object> result = new HashMap<>();
@@ -71,7 +90,7 @@ public class VideoController {
         }
         List<VideoTree> groups = null;
         try {
-            groups = videoService.searchTreeDataByCarNo(carNo, Boolean.TRUE,Boolean.TRUE);
+            groups = videoService.searchTreeDataByCarNo(carNo, Boolean.TRUE, Boolean.TRUE);
             setAttributeToPage(result);
@@ -151,7 +170,7 @@ public class VideoController {
     public Map<String, Object> queryChannelsTree(@PathVariable String carNo) {
         Map<String, Object> result = new HashMap<>();
         try {
-            List<VideoTree> trees = videoService.queryChannelsTree(carNo, Boolean.TRUE,Boolean.FALSE);
+            List<VideoTree> trees = videoService.queryChannelsTree(carNo, Boolean.TRUE, Boolean.FALSE);
             setAttributeToPage(result);
             result.put("data", trees);
             result.put("status", ResponseCode.SUCCESS);
@@ -144,6 +144,8 @@ public class Cars extends BEntity implements Serializable {
 	private Integer isSwitch;
     /** 线路名称（TODO：在原系统里没有，这里暂时留着，并且不做线路关联，只保留个名字） */
     private String xlmc;
+    /**sim 卡号*/
+    private String simNo;
     public Cars() {}
@@ -532,4 +534,12 @@ public class Cars extends BEntity implements Serializable {
 	public void setHydrogen(Boolean hydrogen) {
 		this.hydrogen = hydrogen;
 	}
+
+    public String getSimNo() {
+        return simNo;
+    }
+
+    public void setSimNo(String simNo) {
+        this.simNo = simNo;
+    }
 }
@@ -64,6 +64,9 @@ public class VideoTree implements Serializable {
     @Transient
     private String spread;
+    @Transient
+    private String name;
+
     private boolean initChild=false;
     private String wvpLiveBroadcast;
@@ -20,7 +20,7 @@ public abstract class BaseFilter implements Filter {
 			Constants.ASSETS_URL, Constants.FAVICON_URL, Constants.METRONIC_URL, Constants.LOGIN, Constants.LOGIN_FAILURE,
 			Constants.UPSTREAM_URL, Constants.XD_CHILD_PAGES, Constants.XD_REAL_GPS, Constants.UP_RFID_URL,
 			Constants.STATION_AND_SECTION_COUNT, Constants.ACTUATOR_MANAGEMENT_HEALTH, Constants.VEHICLE_DATA_SYNC_URL,
-			Constants.FILE_AUTH, Constants.I18N_LOGIN};
+			Constants.FILE_AUTH, Constants.I18N_LOGIN,"/video/**"};
 	@Override
 	public void destroy() {
@@ -18,4 +18,7 @@ public interface CarsRepository extends BaseRepository&lt;Cars, Integer&gt;{
 	@Query(value="select s from Cars s where s.insideCode=?1")
 	List<Cars> findCarsByCode(String insideCode);
+
+	@Query(value="select s from Cars s where s.insideCode=?1")
+	Cars findByInsideCode(String simNo);
 }
@@ -6,4 +6,5 @@ import com.bsth.entity.CarDevice;
  * Created by xu on 16/6/15.
  */
 public interface CarDeviceService extends BaseService<CarDevice, Long> {
+
 }
@@ -6,4 +6,5 @@ import com.bsth.entity.Cars;
  * Created by xu on 16/5/31.
  */
 public interface CarsService extends BaseService<Cars, Integer> {
+    Cars queryCarsByInsideCode(String zbh);
 }
 package com.bsth.service.impl;
 import com.bsth.entity.Cars;
+import com.bsth.repository.CarsRepository;
 import com.bsth.service.CarsService;
 import org.springframework.stereotype.Service;
+import javax.annotation.Resource;
+
 /**
  * Created by xu on 16/5/31.
  */
 @Service
 public class CarsServiceImpl extends BaseServiceImpl<Cars, Integer> implements CarsService {
+    @Resource
+    private CarsRepository carsRepository;
+
+    public Cars queryCarsByInsideCode(String zbh) {
+        return carsRepository.findByInsideCode(zbh);
+    }
 }
@@ -289,6 +289,7 @@ public class VideoServiceImpl implements VideoService {
         videoTree.setCode(code);
         videoTree.setInitChild(asyn);
         videoTree.setSpread(String.valueOf(spread));
+        videoTree.setName(text);
         return videoTree;
     }
@@ -143,4 +143,5 @@ public class CarsServiceImpl extends BServiceImpl&lt;Cars, Integer&gt; implements Cars
             throw new ScheduleException("设备编号重复");
         }
     }
+
 }