相机模板和上传下载修改

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

@@ -66,19 +66,16 @@ public class BaseCameraManagement extends BaseEntity implements Serializable {
     /**
      * 监控相机安装里程位置
      */
-    @Excel(name = "监控相机安装里程位置")
     private Integer installMile;
 
     /**
      * 监控范围开始里程位置
      */
-    @Excel(name = "监控范围开始里程位置")
     private Integer beginMile;
 
     /**
      * 监控范围结束里程位置
      */
-    @Excel(name = "监控范围结束里程位置")
     private Integer endMile;
 
     /**
@@ -96,7 +93,6 @@ public class BaseCameraManagement extends BaseEntity implements Serializable {
     /**
      * 线路编码
      */
-    @Excel(name = "线路编码")
     private String railwayCode;
 
     /**
@@ -120,24 +116,28 @@ public class BaseCameraManagement extends BaseEntity implements Serializable {
      * 监控相机安装里程位置字符串形式
      */
     @TableField(exist = false)
+    @Excel(name = "监控相机安装里程位置")
     private String installMiles;
 
     /**
      * 监控范围开始里程位置字符串形式
      */
     @TableField(exist = false)
+    @Excel(name = "监控范围开始里程位置")
     private String beginMiles;
 
     /**
      * 监控范围结束里程位置字符串形式
      */
     @TableField(exist = false)
+    @Excel(name = "监控范围结束里程位置")
     private String endMiles;
 
     /**
      *线路名称
      */
     @TableField(exist = false)
+    @Excel(name = "线路名称")
     private String railwayName;
 
     /**

business-service/src/main/java/com/ozs/service/entity/vo/BaseCameraManagementVos.java

@@ -50,24 +50,6 @@ public class BaseCameraManagementVos implements Serializable {
     @Excel(name = "行别",readConverterExp = "1=上行,2=下行")
     private Integer lineDir;
 
-    /**
-     * 监控相机安装里程位置
-     */
-    @Excel(name = "监控相机安装里程位置")
-    private Integer installMile;
-
-    /**
-     * 监控范围开始里程位置
-     */
-    @Excel(name = "监控范围开始里程位置")
-    private Integer beginMile;
-
-    /**
-     * 监控范围结束里程位置
-     */
-    @Excel(name = "监控范围结束里程位置")
-    private Integer endMile;
-
     /**
      * 监视相机经度
      */
@@ -79,13 +61,7 @@ public class BaseCameraManagementVos implements Serializable {
      */
     @Excel(name = "监视相机纬度")
     private String installLatitude;
-
-    /**
-     * 线路编码
-     */
-    @Excel(name = "线路编码")
-    private String railwayCode;
-
+    
     /**
      * 物联网卡号
      */
@@ -97,4 +73,28 @@ public class BaseCameraManagementVos implements Serializable {
      */
     @Excel(name = "所属工务段名称")
     private String deptName;
+
+    /**
+     * 监控相机安装里程位置字符串形式
+     */
+    @Excel(name = "监控相机安装里程位置")
+    private String installMiles;
+
+    /**
+     * 监控范围开始里程位置字符串形式
+     */
+    @Excel(name = "监控范围开始里程位置")
+    private String beginMiles;
+
+    /**
+     * 监控范围结束里程位置字符串形式
+     */
+    @Excel(name = "监控范围结束里程位置")
+    private String endMiles;
+
+    /**
+     *线路名称
+     */
+    @Excel(name = "线路名称")
+    private String railwayName;
 }

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

@@ -3,11 +3,13 @@ package com.ozs.service.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.ozs.common.core.domain.AjaxResult;
 import com.ozs.common.exception.ServiceException;
+import com.ozs.common.utils.AppendUtils;
 import com.ozs.common.utils.StringUtils;
 import com.ozs.common.utils.bean.BeanUtils;
 import com.ozs.common.utils.bean.BeanValidators;
 import com.ozs.service.entity.BaseCameraManagement;
 import com.ozs.service.entity.BaseDeviceDynamicManagement;
+import com.ozs.service.entity.BaseRailwayManagement;
 import com.ozs.service.entity.BaseUser;
 import com.ozs.service.entity.MsgAlarm;
 import com.ozs.service.entity.vo.BaseCameraManagementHomeVo;
@@ -19,6 +21,7 @@ import com.ozs.service.mapper.BaseDeviceDynamicManagementMapper;
 import com.ozs.service.mapper.BaseUserMapper;
 import com.ozs.service.mapper.MsgAlarmMapper;
 import com.ozs.service.service.BaseCameraManagementService;
+import com.ozs.service.service.BaseRailwayManagementService;
 import com.ozs.service.service.BaseUserService;
 import com.ozs.service.utils.DataPermissionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -53,6 +56,8 @@ public class BaseCameraManagementServiceImpl extends ServiceImpl<BaseCameraManag
     private MsgAlarmMapper msgAlarmMapper;
     @Autowired
     private BaseDeptMapper baseDeptMapper;
+    @Autowired
+    private BaseRailwayManagementService baseRailwayManagementService;
 
     /**
      * 相机台账管理表导入
@@ -86,6 +91,18 @@ public class BaseCameraManagementServiceImpl extends ServiceImpl<BaseCameraManag
                     accountManagement.setCreateBy(userId);
                     Long deptId = baseDeptMapper.selectDeptByDeptName(accountManagement.getDeptName());
                     accountManagement.setDeptId(deptId);
+                    LambdaQueryWrapper<BaseRailwayManagement> queryWrapper = new LambdaQueryWrapper<BaseRailwayManagement>();
+                    if (!ObjectUtils.isEmpty(accountManagement.getRailwayName())) {
+                        queryWrapper.eq(BaseRailwayManagement::getRailwayName, accountManagement.getRailwayName());
+                    }
+                    BaseRailwayManagement baseRailwayManagement = baseRailwayManagementService.getOne(queryWrapper);
+                    accountManagement.setRailwayCode(baseRailwayManagement.getRailwayCode());
+                    Integer mils = AppendUtils.stringSplit(accountManagement.getInstallMiles());
+                    accountManagement.setInstallMile(mils);
+                    Integer end = AppendUtils.stringSplit(accountManagement.getEndMiles());
+                    accountManagement.setEndMile(end);
+                    Integer begin = AppendUtils.stringSplit(accountManagement.getBeginMiles());
+                    accountManagement.setBeginMile(begin);
                     baseCameraManagementMapper.insert(accountManagement);
                     BaseDeviceDynamicManagement baseDeviceDynamicManagement = new BaseDeviceDynamicManagement();
                     baseDeviceDynamicManagement.setCameraCode(accountManagement.getCameraCode());

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

@@ -358,11 +358,17 @@ public class BaseCameraManagementController extends BaseController {
             wrapper.eq(BaseRailwayManagement::getRailwayCode, baseCameraManagement.getRailwayCode());
         }
         BaseRailwayManagement baseRailwayManagement = baseRailwayManagementService.getOne(wrapper);
+        if (ObjectUtils.isEmpty(baseRailwayManagement)){
+            return error("线路表中没有该线路编码:"+baseCameraManagement.getRailwayCode()+"的数据");
+        }
         LambdaQueryWrapper<BaseDeviceDynamicManagement> queryWrapper = new LambdaQueryWrapper<BaseDeviceDynamicManagement>();
         if (!ObjectUtils.isEmpty(baseCameraManagement.getCameraCode())) {
             queryWrapper.eq(BaseDeviceDynamicManagement::getCameraCode, baseCameraManagement.getCameraCode());
         }
         BaseDeviceDynamicManagement baseDeviceDynamicManagement = baseDeviceDynamicManagementService.getOne(queryWrapper);
+        if (ObjectUtils.isEmpty(baseRailwayManagement)){
+            return error("设备动态管理表中没有该相机编码:"+baseCameraManagement.getCameraCode()+"的数据");
+        }
         List<Object> list = new ArrayList<>();
         list.add(baseRailwayManagement.getRailwayName());
         list.add(AppendUtils.stringAppend(baseCameraManagement.getInstallMile()));
@@ -418,8 +424,20 @@ public class BaseCameraManagementController extends BaseController {
         }
         List<BaseCameraManagement> list = baseCameraManagementService.list(lw);
         for (BaseCameraManagement baseCameraManagement : list) {
-        SysDept sysDept = deptService.selectDeptById(baseCameraManagement.getDeptId());
+            SysDept sysDept = deptService.selectDeptById(baseCameraManagement.getDeptId());
             baseCameraManagement.setDeptName(sysDept.getDeptName());
+            LambdaQueryWrapper<BaseRailwayManagement> queryWrapper = new LambdaQueryWrapper<BaseRailwayManagement>();
+            if (!ObjectUtils.isEmpty(baseCameraManagement.getRailwayCode())) {
+                queryWrapper.eq(BaseRailwayManagement::getRailwayCode, baseCameraManagement.getRailwayCode());
+            }
+            BaseRailwayManagement baseRailwayManagement = baseRailwayManagementService.getOne(queryWrapper);
+            baseCameraManagement.setRailwayName(baseRailwayManagement.getRailwayName());
+            String mils = AppendUtils.stringAppend(baseCameraManagement.getInstallMile());
+            baseCameraManagement.setInstallMiles(mils);
+            String end = AppendUtils.stringAppend(baseCameraManagement.getEndMile());
+            baseCameraManagement.setEndMiles(end);
+            String begin = AppendUtils.stringAppend(baseCameraManagement.getBeginMile());
+            baseCameraManagement.setBeginMiles(begin);
         }
         ExcelUtil<BaseCameraManagement> util = new ExcelUtil<>(BaseCameraManagement.class);
         util.exportExcel(response, list, "台账管理相机数据");