Merge branch 'master' of http://124.70.58.209:3000/ytrd-project-management/VehicleMonitor

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

@@ -56,18 +56,19 @@
         a.install_mile AS installMile,
         a.id AS id
         FROM
-        base_camera_management AS a inner join
-        base_railway_management AS l on a.railway_code=l.railway_code
+        base_camera_management AS a
+        inner join
+        base_railway_management AS l
+        on a.railway_code=l.railway_code
         <where>
             <if test="railwayCode != null and railwayCode !=''">
-                concat(l.railway_name,a.camera_code)
-                like concat("%",#{railwayCode},"%")
+                and a.railway_code = #{railwayCode}
             </if>
             <if test="lineDir != null and lineDir != ''">
-                line_dir = #{lineDir}
+                and a.line_dir = #{lineDir}
             </if>
-            <if test="mils != null and mils != ''">
-                concat(a.install_mile, a.begin_mile, a.end_mile) = #{mils}
+            <if test="mils != null and mils != '' ">
+                and a.install_mile = #{mils}
             </if>
         </where>
     </select>

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

@@ -709,7 +709,7 @@ public class BaseCameraManagementController extends BaseController {
     @PostMapping("/cameraTree")
     @Log(title = "相机台账管理", businessType = BusinessType.OTHER)
     public AjaxResult cameraTree(@RequestBody CameraTreeVo cameraTreeVo) {
-        cameraTreeVo = (CameraTreeVo) dataScoreUtil.setDataScore(getUserId(), cameraTreeVo);
+        //cameraTreeVo = (CameraTreeVo) dataScoreUtil.setDataScore(getUserId(), cameraTreeVo);
         int count = 0;
         if (!ObjectUtils.isEmpty(cameraTreeVo.getMils())) {
             cameraTreeVo.setMils(cameraTreeVo.getMils() * 1000);