相机台账管理

.idea/jarRepositories.xml

@@ -41,5 +41,10 @@
       <option name="name" value="Nexus Repository" />
       <option name="url" value="http://124.71.171.71:18881/repository/custom_group/" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Central Repository" />
+      <option name="url" value="https://maven.aliyun.com/repository/public" />
+    </remote-repository>
   </component>
 </project>

business-service/src/main/java/com/ozs/entity/BaseCameraManagement.java

@@ -61,7 +61,7 @@ public class BaseCameraManagement extends BaseEntity implements Serializable {
     /**
      * 行别(1上行2下行）
      */
-    @Excel(name = "行别",readConverterExp = "1=上行,2=下行")
+    @Excel(name = "行别", readConverterExp = "1=上行,2=下行")
     private Integer lineDir;
 
     /**
@@ -113,19 +113,37 @@ public class BaseCameraManagement extends BaseEntity implements Serializable {
     private String endMiles;
 
     /**
-     *线路名称
+     * 里程范围
+     */
+    @TableField(exist = false)
+    private String milesRange;
+
+    /**
+     * 经纬度
+     */
+    @TableField(exist = false)
+    private String longitudeAndLatitude;
+
+    /**
+     * 线路名称
      */
     @TableField(exist = false)
     @Excel(name = "线路名称")
     private String railwayName;
 
     /**
-     *所属工务段名称
+     * 所属工务段名称
      */
     @TableField(exist = false)
     @Excel(name = "所属工务段名称")
     private String deptName;
 
+    /**
+     * 行别 字符串
+     */
+    @TableField(exist = false)
+    private String lineDirStr;
+
 //    /**
 //     *是否显示启用录像按钮(1显示2不显示)
 //     */

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

@@ -54,7 +54,7 @@ import java.util.stream.Collectors;
 @RequestMapping("/service/baseCameraManagement")
 @Slf4j
 public class BaseCameraManagementController extends BaseController {
-//    public static final String PATTERN = "^[0-9]*$";
+    //    public static final String PATTERN = "^[0-9]*$";
     public static final String PATTERN = "^(\\d+.\\d{1,3}|\\d+)$";
     @Resource
     BaseCameraManagementService baseCameraManagementService;
@@ -184,6 +184,9 @@ public class BaseCameraManagementController extends BaseController {
                 o.setEndMiles(end);
                 String begin = AppendUtils.stringAppend(o.getBeginMile());
                 o.setBeginMiles(begin);
+                o.setLineDirStr(o.getLineDir() == 1 ? "上行" : "下行");
+                o.setMilesRange(begin + "-" + end);
+                o.setLongitudeAndLatitude(o.getInstallLongitude() + "," + o.getInstallLongitude());
 //                if (roleKey.size() > 0 || "admin".equals(baseUser.getUserName())) {
 //                    o.setIsStartRecording(1);
 //                    for (String s : roleKey) {
@@ -319,18 +322,27 @@ public class BaseCameraManagementController extends BaseController {
         if (!ObjectUtils.isEmpty(cameraManagement) && !cameraManagement.getId().equals(baseCameraManagement.getId())) {
             return error("相机编码已存在,不能进行修改操作");
         }
-        if (!baseCameraManagement.getBeginMile().toString().matches(PATTERN)) {
+        if (!baseCameraManagement.getBeginMiles().matches(PATTERN)) {
             return error("监控范围开始里程位置填写格式不正确");
+        } else {
+            double begin = Double.parseDouble(baseCameraManagement.getBeginMiles());
+            baseCameraManagement.setBeginMile((int) (begin * 1000));
         }
-        if (!baseCameraManagement.getInstallMile().toString().matches(PATTERN)) {
+        if (!baseCameraManagement.getInstallMiles().matches(PATTERN)) {
             return error("监控相机安装里程位置填写格式不正确");
+        } else {
+            double install = Double.parseDouble(baseCameraManagement.getInstallMiles());
+            baseCameraManagement.setInstallMile((int) (install * 1000));
         }
-        if (!baseCameraManagement.getEndMile().toString().matches(PATTERN)) {
+        if (!baseCameraManagement.getEndMiles().matches(PATTERN)) {
             return error("监控范围结束里程位置填写格式不正确");
+        } else {
+            double end = Double.parseDouble(baseCameraManagement.getEndMiles());
+            baseCameraManagement.setEndMile((int) (end * 1000));
+        }
+        if (baseCameraManagement.getBeginMile() > baseCameraManagement.getEndMile()) {
+            return error("监控范围开始里程位置不能大于监控范围结束里程位置");
         }
-        baseCameraManagement.setBeginMile(baseCameraManagement.getBeginMile() * 1000);
-        baseCameraManagement.setInstallMile(baseCameraManagement.getInstallMile() * 1000);
-        baseCameraManagement.setEndMile(baseCameraManagement.getEndMile() * 1000);
         baseCameraManagement.setUpdateBy(getUserId());
         LambdaQueryWrapper<BaseDeviceDynamicManagement> queryWrapper = new LambdaQueryWrapper<BaseDeviceDynamicManagement>();
         BaseCameraManagement management = baseCameraManagementService.getById(baseCameraManagement.getId());
@@ -358,8 +370,8 @@ public class BaseCameraManagementController extends BaseController {
             queryWrapper.eq(BaseRailwayManagement::getRailwayCode, baseCameraManagement.getRailwayCode());
         }
         BaseRailwayManagement baseRailwayManagement = baseRailwayManagementService.getOne(queryWrapper);
-        SysDept sysDept = deptService.selectDeptById(baseCameraManagement.getDeptId());
-        baseCameraManagement.setDeptName(sysDept.getDeptName());
+//        SysDept sysDept = deptService.selectDeptById(baseCameraManagement.getDeptId());
+//        baseCameraManagement.setDeptName(sysDept.getDeptName());
         baseCameraManagement.setRailwayName(baseRailwayManagement.getRailwayName());
         String mils = AppendUtils.stringAppend(baseCameraManagement.getInstallMile());
         baseCameraManagement.setInstallMiles(mils);
@@ -367,6 +379,9 @@ public class BaseCameraManagementController extends BaseController {
         baseCameraManagement.setEndMiles(end);
         String begin = AppendUtils.stringAppend(baseCameraManagement.getBeginMile());
         baseCameraManagement.setBeginMiles(begin);
+        baseCameraManagement.setLineDirStr(baseCameraManagement.getLineDir() == 1 ? "上行" : "下行");
+        baseCameraManagement.setMilesRange(begin + "-" + end);
+        baseCameraManagement.setLongitudeAndLatitude(baseCameraManagement.getInstallLongitude() + "," + baseCameraManagement.getInstallLongitude());
         return AjaxResult.success(baseCameraManagement);
     }
 
@@ -445,10 +460,10 @@ public class BaseCameraManagementController extends BaseController {
     public void exportBaseAccountManagement(HttpServletResponse response, @RequestBody BaseCameraManagementVo baseCameraManagementVo) {
         baseCameraManagementVo = (BaseCameraManagementVo) dataScoreUtil.setDataScore(getUserId(), baseCameraManagementVo);
         if (!ObjectUtils.isEmpty(baseCameraManagementVo.getBeginMile())) {
-                baseCameraManagementVo.setBeginMile(baseCameraManagementVo.getBeginMile() * 1000);
+            baseCameraManagementVo.setBeginMile(baseCameraManagementVo.getBeginMile() * 1000);
         }
         if (!ObjectUtils.isEmpty(baseCameraManagementVo.getEndMile())) {
-                baseCameraManagementVo.setEndMile(baseCameraManagementVo.getEndMile() * 1000);
+            baseCameraManagementVo.setEndMile(baseCameraManagementVo.getEndMile() * 1000);
         }
         List<BaseCameraManagement> baseCameraManagementList = baseCameraManagementService.baseCameraManagementList(baseCameraManagementVo);
         for (BaseCameraManagement baseCameraManagement : baseCameraManagementList) {
@@ -594,7 +609,7 @@ public class BaseCameraManagementController extends BaseController {
         cameraTreeVo = (CameraTreeVo) dataScoreUtil.setDataScore(getUserId(), cameraTreeVo);
         int count = 0;
         if (!ObjectUtils.isEmpty(cameraTreeVo.getMils())) {
-            cameraTreeVo.setMils(cameraTreeVo.getMils()*1000);
+            cameraTreeVo.setMils(cameraTreeVo.getMils() * 1000);
         }
         CameraTree cameraTree = baseDeviceDynamicManagementService.cameraTree(cameraTreeVo);
         List<CameraTree> children = cameraTree.getChildren();

vehicle-admin/src/main/resources/logback.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
     <!-- 日志存放路径 -->
-	<property name="log.path" value="/home/base/logs" />
-<!--    <property name="log.path" value="/Users/sunhuanhuan/Documents/project/106/project/logs"/>-->
+<!--	<property name="log.path" value="/home/base/logs" />-->
+    <property name="log.path" value="/Users/sunhuanhuan/Documents/project/106/project/logs"/>
     <!-- 日志输出格式 -->
 	<property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />