Merge remote-tracking branch 'origin/master'

business-service/src/main/java/com/ozs/service/BaseVehicleService.java

@@ -43,4 +43,6 @@ public interface BaseVehicleService extends IService<BaseVehicle> {
      * /列表，不分页
      */
     List<BaseVehicleTerminalDto> vehicleList();
+
+    AjaxResult vehicleTerminalUnmount(BaseTerminal baseTerminal);
 }

business-service/src/main/java/com/ozs/service/impl/BaseCameraManagementServiceImpl.java

@@ -90,7 +90,7 @@ public class BaseCameraManagementServiceImpl extends ServiceImpl<BaseCameraManag
                     accountManagement.setCreateBy(userId);
                     Long deptId = baseDeptMapper.selectDeptByDeptName(accountManagement.getDeptName());
                     log.debug(accountManagement.getDeptName() + "主键id:" + deptId);
-                    if (!ObjectUtils.isEmpty(deptId)) {
+//                    if (!ObjectUtils.isEmpty(deptId)) {
                         accountManagement.setDeptId(deptId);
                         LambdaQueryWrapper<BaseRailwayManagement> queryWrapper = new LambdaQueryWrapper<BaseRailwayManagement>();
                         if (!ObjectUtils.isEmpty(accountManagement.getRailwayName())) {
@@ -126,37 +126,36 @@ public class BaseCameraManagementServiceImpl extends ServiceImpl<BaseCameraManag
                             failureMsg.append(msg);
                             log.error(msg);
                         }
-                    } else {
-                        failureNum++;
-                        String msg = failureNum + "、相机所属工务段 " + accountManagement.getDeptName() + "不存在， 导入失败：";
-                        failureMsg.append(msg);
-                        log.error(msg);
-                    }
+//                    } else {
+//                        failureNum++;
+//                        String msg = failureNum + "、相机所属工务段 " + accountManagement.getDeptName() + "不存在， 导入失败：";
+//                        failureMsg.append(msg);
+//                        log.error(msg);
+//                    }
                 } else if (updateSupport) {
                     BeanValidators.validateWithException(validator, accountManagement);
                     accountManagement.setUpdateBy(userId);
                     Long deptId = baseDeptMapper.selectDeptByDeptName(accountManagement.getDeptName());
                     log.debug(accountManagement.getDeptName() + "主键id:" + deptId);
-                    if (!ObjectUtils.isEmpty(deptId)) {
-                        accountManagement.setDeptId(deptId);
-                        baseCameraManagementMapper.update(accountManagement, lw);
-                        LambdaQueryWrapper<BaseDeviceDynamicManagement> wrapper = new LambdaQueryWrapper<BaseDeviceDynamicManagement>();
-                        if (!ObjectUtils.isEmpty(baseAccountManagement.getCameraCode())) {
-                            wrapper.eq(BaseDeviceDynamicManagement::getCameraCode, baseAccountManagement.getCameraCode());
-                        }
-                        BaseDeviceDynamicManagement baseDeviceDynamicManagement = baseDeviceDynamicManagementMapper.selectOne(wrapper);
-                        baseDeviceDynamicManagement.setCameraCode(accountManagement.getCameraCode());
-                        baseDeviceDynamicManagement.setUpdateBy(userId);
-                        baseDeviceDynamicManagementMapper.updateById(baseDeviceDynamicManagement);
-                        successNum++;
-                        successMsg.append(successNum + "、相机编码 " + accountManagement.getCameraCode() + " 更新成功");
-                    } else {
-                        failureNum++;
-                        String msg = failureNum + "、相机所属工务段 " + accountManagement.getDeptName() + "不存在， 导入失败：";
-                        failureMsg.append(msg);
-                        log.error(msg);
+//                    if (!ObjectUtils.isEmpty(deptId)) {
+                    accountManagement.setDeptId(deptId);
+                    baseCameraManagementMapper.update(accountManagement, lw);
+                    LambdaQueryWrapper<BaseDeviceDynamicManagement> wrapper = new LambdaQueryWrapper<BaseDeviceDynamicManagement>();
+                    if (!ObjectUtils.isEmpty(baseAccountManagement.getCameraCode())) {
+                        wrapper.eq(BaseDeviceDynamicManagement::getCameraCode, baseAccountManagement.getCameraCode());
                     }
-
+                    BaseDeviceDynamicManagement baseDeviceDynamicManagement = baseDeviceDynamicManagementMapper.selectOne(wrapper);
+                    baseDeviceDynamicManagement.setCameraCode(accountManagement.getCameraCode());
+                    baseDeviceDynamicManagement.setUpdateBy(userId);
+                    baseDeviceDynamicManagementMapper.updateById(baseDeviceDynamicManagement);
+                    successNum++;
+                    successMsg.append(successNum + "、相机编码 " + accountManagement.getCameraCode() + " 更新成功");
+//                    } else {
+//                        failureNum++;
+//                        String msg = failureNum + "、相机所属工务段 " + accountManagement.getDeptName() + "不存在， 导入失败：";
+//                        failureMsg.append(msg);
+//                        log.error(msg);
+//                    }
                 } else {
                     failureNum++;
                     failureMsg.append(failureNum + "、相机编码 " + accountManagement.getCameraCode() + " 已存在");

business-service/src/main/java/com/ozs/service/impl/BaseDeviceDynamicManagementServiceImpl.java

@@ -82,9 +82,11 @@ public class BaseDeviceDynamicManagementServiceImpl extends ServiceImpl<BaseDevi
 
 
                 if (!ObjectUtils.isEmpty(map.get(o.getRailwayCode()))) {
-                    CameraTree cameraTree1 = map.get(o.getInstallMile() + "-" + (o.getLineDir().equals("1") ? "上行" : "下行"));
+                    CameraTree cameraTree1 = map.get(o.getRailwayCode()+"-"+o.getInstallMile() + "-" + (o.getLineDir().equals("1") ? "上行" : "下行"));
                     if (ObjectUtils.isEmpty(cameraTree1)) {
-                        map.put(o.getInstallMile() + "-" + (o.getLineDir().equals("1") ? "上行" : "下行"), build1);
+                        map.put(o.getRailwayCode()+"-"+o.getInstallMile() + "-" + (o.getLineDir().equals("1") ? "上行" : "下行"), build1);
+                        map.get(o.getRailwayCode()).getChildren().add(build1);
+                    }else {
                         map.get(o.getRailwayCode()).getChildren().add(build1);
                     }
                 }
@@ -98,8 +100,8 @@ public class BaseDeviceDynamicManagementServiceImpl extends ServiceImpl<BaseDevi
                         .build();
 
 
-                if (!ObjectUtils.isEmpty(map.get(o.getInstallMile() + "-" + (o.getLineDir().equals("1") ? "上行" : "下行")))) {
-                    map.get(o.getInstallMile() + "-" + (o.getLineDir().equals("1") ? "上行" : "下行")).getChildren().add(build2);
+                if (!ObjectUtils.isEmpty(map.get(o.getRailwayCode()+"-"+o.getInstallMile() + "-" + (o.getLineDir().equals("1") ? "上行" : "下行")))) {
+                    map.get(o.getRailwayCode()+"-"+o.getInstallMile() + "-" + (o.getLineDir().equals("1") ? "上行" : "下行")).getChildren().add(build2);
                 }
             }
         }

business-service/src/main/java/com/ozs/service/impl/BaseVehicleServiceImpl.java

@@ -334,4 +334,14 @@ public class BaseVehicleServiceImpl extends ServiceImpl<BaseVehicleMapper, BaseV
         }
         return dtoList;
     }
+
+    @Override
+    public AjaxResult vehicleTerminalUnmount(BaseTerminal baseTerminal) {
+        LambdaQueryWrapper<BaseTerminal> wrapper = new LambdaQueryWrapper<>();
+        if (!StringUtils.isEmptySunhh(baseTerminal) && !StringUtils.isEmptySunhh(baseTerminal.getVehicleCode())) {
+            wrapper.eq(BaseTerminal::getVehicleCode, baseTerminal.getVehicleCode());
+        }
+        baseTerminalMapper.delete(wrapper);
+        return AjaxResult.success();
+    }
 }

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

@@ -24,23 +24,6 @@
 			<if test="mils != null and mils != ''">
 				concat(a.install_mile, a.begin_mile, a.end_mile) = #{mils}
 			</if>
-			<if test="!dsFlay">
-				and
-				<trim prefix="(" prefixOverrides="or" suffix=")">
-					<if test="dsUserId != null and dsUserId != ''">
-						or a.create_by=#{dsUserId}
-					</if>
-					<if test="dsDeptId != null and dsDeptId != 0">
-						or  a.dept_id=#{dsDeptId}
-					</if>
-					<if test="dsDeptIds != null">
-						or a.dept_id in
-						<foreach item="item" collection="dsDeptIds" separator="," open="(" close=")" index="">
-							#{item}
-						</foreach>
-					</if>
-				</trim>
-			</if>
 		</where>
 	</select>
 

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

@@ -23,7 +23,6 @@ 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 com.ozs.web.common.Constant;
@@ -38,12 +37,7 @@ 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.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -105,6 +99,22 @@ public class BaseVehicleController extends BaseController {
         return AjaxResult.success(isMount);
     }
 
+    /**
+     * 车载终端挂载 取消挂载
+     *
+     * @param baseTerminal
+     * @return
+     */
+    @ApiOperation(value = "车载终端挂载 取消挂载")
+    @PostMapping("/vehicleTerminalUnmount")
+    @Log(title = "机车信息管理", businessType = BusinessType.INSERT)
+    public AjaxResult vehicleTerminalUnmount(@RequestBody BaseTerminal baseTerminal) {
+        if (StringUtils.isEmptySunhh(baseTerminal) || StringUtils.isEmptySunhh(baseTerminal.getVehicleCode())) {
+            return AjaxResult.error("机车编码、终端编码不能为空！");
+        }
+        return baseVehicleService.vehicleTerminalUnmount(baseTerminal);
+    }
+
     /**
      * 车载终端挂载 保存
      *

vehicle-admin/src/main/java/com/ozs/web/core/config/CaneraConfig.java

@@ -40,4 +40,7 @@ public class CaneraConfig {
 
     @Value("${base.bakUrl:rtsp://124.70.58.209:8554}")
     private String bakUrlRtsp;
+
+    @Value("${base.wsUrl:http://124.70.58.209:18891}")
+    private String wsUrl;
 }

vehicle-admin/src/main/java/com/ozs/web/core/util/CameraUtil.java

@@ -10,7 +10,7 @@ import com.ozs.common.exception.base.BaseException;
 import com.ozs.common.utils.DateUtils;
 import com.ozs.common.utils.HttpClientUtil;
 import com.ozs.common.utils.http.HttpUtils;
-import com.ozs.service.BaseCameraManagementService;
+import com.ozs.framework.config.ServerConfig;
 import com.ozs.system.mapper.SysDictDataMapper;
 import com.ozs.web.core.config.CaneraConfig;
 import lombok.SneakyThrows;
@@ -46,7 +46,10 @@ public class CameraUtil {
     private static String webUrl;
     private static String bakUrl;
     private static String bakUrlRtsp;
+    private static String wsUrl;
     private static CmdCameraUtil cUtil;
+    private static RedisCache rc;
+    private static ServerConfig sc;
 
     @Autowired
     private CaneraConfig caneraConfig;
@@ -57,9 +60,10 @@ public class CameraUtil {
     @Autowired
     private SysDictDataMapper dictDataMapper;
 
-    private static RedisCache rc;
     @Autowired
     private RedisCache redisCache;
+    @Autowired
+    private ServerConfig serverConfig;
 
     public final static String tsFilekey = "mergeVideoTsFile";
 
@@ -459,9 +463,11 @@ ffmpeg -i "concat:1.ts|2.ts" -c copy output.mp4
         transcribeFilePath = caneraConfig.getTranscribeFilePath();
         webUrl = caneraConfig.getWebUrl();
         bakUrl = caneraConfig.getBakUrl();
-        bakUrlRtsp=caneraConfig.getBakUrlRtsp();
+        bakUrlRtsp = caneraConfig.getBakUrlRtsp();
         rc = redisCache;
         cUtil = cmdCameraUtil;
+        sc = serverConfig;
+        wsUrl = caneraConfig.getWsUrl();
     }
 
     /**

vehicle-admin/src/main/resources/application.yml

@@ -14,11 +14,15 @@ base:
   addressEnabled: true
   # 验证码类型 math 数组计算 char 字符验证
   captchaType: math
-#  sqlType: kingbasees  # 数据库类型
+  #  sqlType: kingbasees  # 数据库类型
   dbname: vehicle #数据库名
   #图片路径前缀
   imgUrl: http://124.71.171.71:18801/picbucket
-  historyUrl: http://124.70.58.209:18812
+  ffmpegPath: /usr/local/ffmpeg/bin/ffmpeg
+  filePath: /opt/streams/record/flv/
+  webUrl: http://124.70.58.209:18812
+  bakUrl: http://124.70.58.209:18891
+  wsUrl: ws://124.70.58.209:9080
 
 server:
   # 服务器的HTTP端口，默认为8080