相机导入修改

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

@@ -55,7 +55,6 @@ public class BaseCameraManagement extends BaseEntity implements Serializable {
     /**
      * 所属工务段编码(单位id)
      */
-    @Excel(name = "所属工务段编码(单位id)")
     private Long deptId;
 
     /**
@@ -109,13 +108,11 @@ public class BaseCameraManagement extends BaseEntity implements Serializable {
     /**
      * 是否开启录像(1开启2不开启)
      */
-    @Excel(name = "是否开启录像",readConverterExp = "1=开启,2=不开启")
     private Integer startRecording;
 
     /**
      * 录像接口返回的任务ID
      */
-    @Excel(name = "录像接口返回的任务ID")
     private String taskId;
 
 
@@ -147,5 +144,6 @@ public class BaseCameraManagement extends BaseEntity implements Serializable {
      *所属工务段名称
      */
     @TableField(exist = false)
+    @Excel(name = "所属工务段名称")
     private String deptName;
 }

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

@@ -0,0 +1,100 @@
+package com.ozs.service.entity.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.ozs.common.annotation.Excel;
+import com.ozs.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 相机台账管理表
+ * </p>
+ *
+ * @author ozs
+ * @since 2023-02-17
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+@ApiModel("相机台账管理表")
+public class BaseCameraManagementVos implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+   
+    /**
+     * 相机编码
+     */
+    @Excel(name = "相机编码")
+    private String cameraCode;
+
+    /**
+     * 通道编号
+     */
+    @Excel(name = "通道编号")
+    private String channel;
+    
+
+    /**
+     * 行别(1上行2下行）
+     */
+    @Excel(name = "行别",readConverterExp = "1=上行,2=下行")
+    private Integer lineDir;
+
+    /**
+     * 监控相机安装里程位置
+     */
+    @Excel(name = "监控相机安装里程位置")
+    private Integer installMile;
+
+    /**
+     * 监控范围开始里程位置
+     */
+    @Excel(name = "监控范围开始里程位置")
+    private Integer beginMile;
+
+    /**
+     * 监控范围结束里程位置
+     */
+    @Excel(name = "监控范围结束里程位置")
+    private Integer endMile;
+
+    /**
+     * 监视相机经度
+     */
+    @Excel(name = "监视相机经度")
+    private String installLongitude;
+
+    /**
+     * 监视相机纬度
+     */
+    @Excel(name = "监视相机纬度")
+    private String installLatitude;
+
+    /**
+     * 线路编码
+     */
+    @Excel(name = "线路编码")
+    private String railwayCode;
+
+    /**
+     * 物联网卡号
+     */
+    @Excel(name = "物联网卡号")
+    private String cardNum;
+    
+    /**
+     *所属工务段名称
+     */
+    @Excel(name = "所属工务段名称")
+    private String deptName;
+}

business-service/src/main/java/com/ozs/service/mapper/BaseDeptMapper.java

@@ -0,0 +1,22 @@
+package com.ozs.service.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ozs.common.core.domain.entity.SysDept;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * 部门管理 数据层
+ *
+ * @author hx
+ */
+@Mapper
+public interface BaseDeptMapper extends BaseMapper<SysDept> {
+    
+    /**
+     * 根据部门名称查询信息
+     * @param deptName
+     * @return
+     */
+    Long selectDeptByDeptName(@Param("deptName") String deptName);
+}

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

@@ -4,6 +4,7 @@ import com.ozs.common.core.domain.AjaxResult;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ozs.service.entity.BaseCameraManagement;
 import com.ozs.service.entity.vo.BaseCameraManagementHomeVo;
+import com.ozs.service.entity.vo.BaseCameraManagementVos;
 
 import java.util.List;
 
@@ -23,7 +24,7 @@ public interface BaseCameraManagementService extends IService<BaseCameraManageme
      * @param userId
      * @return
      */
-    String importBaseAccountManagement(List<BaseCameraManagement> accountManageList, boolean updateSupport,String userId);
+    String importBaseAccountManagement(List<BaseCameraManagementVos> accountManageList, boolean updateSupport, String userId);
 
     List<BaseCameraManagementHomeVo> selectCameraAll(String userId);
 

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

@@ -11,8 +11,10 @@ import com.ozs.service.entity.BaseDeviceDynamicManagement;
 import com.ozs.service.entity.BaseUser;
 import com.ozs.service.entity.MsgAlarm;
 import com.ozs.service.entity.vo.BaseCameraManagementHomeVo;
+import com.ozs.service.entity.vo.BaseCameraManagementVos;
 import com.ozs.service.mapper.BaseCameraManagementMapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ozs.service.mapper.BaseDeptMapper;
 import com.ozs.service.mapper.BaseDeviceDynamicManagementMapper;
 import com.ozs.service.mapper.BaseUserMapper;
 import com.ozs.service.mapper.MsgAlarmMapper;
@@ -49,6 +51,8 @@ public class BaseCameraManagementServiceImpl extends ServiceImpl<BaseCameraManag
     private BaseUserMapper baseUserMapper;
     @Resource
     private MsgAlarmMapper msgAlarmMapper;
+    @Autowired
+    private BaseDeptMapper baseDeptMapper;
 
     /**
      * 相机台账管理表导入
@@ -58,7 +62,7 @@ public class BaseCameraManagementServiceImpl extends ServiceImpl<BaseCameraManag
      * @return
      */
     @Override
-    public String importBaseAccountManagement(List<BaseCameraManagement> accountManageList, boolean updateSupport, String userId) {
+    public String importBaseAccountManagement(List<BaseCameraManagementVos> accountManageList, boolean updateSupport, String userId) {
         if (com.ozs.common.utils.StringUtils.isNull(accountManageList) || accountManageList.size() == 0) {
             throw new ServiceException("导入相机台账列表信息不能为空！");
         }
@@ -66,8 +70,10 @@ public class BaseCameraManagementServiceImpl extends ServiceImpl<BaseCameraManag
         int failureNum = 0;
         StringBuilder successMsg = new StringBuilder();
         StringBuilder failureMsg = new StringBuilder();
-        for (BaseCameraManagement accountManagement : accountManageList) {
+        for (BaseCameraManagementVos cameraManagementVos : accountManageList) {
             try {
+                BaseCameraManagement accountManagement = new BaseCameraManagement();
+                BeanUtils.copyProperties(cameraManagementVos, accountManagement);
                 // 判断相机编码是否存在
                 LambdaQueryWrapper<BaseCameraManagement> lw = new LambdaQueryWrapper<BaseCameraManagement>();
                 if (!ObjectUtils.isEmpty(accountManagement.getCameraCode())) {
@@ -78,6 +84,8 @@ public class BaseCameraManagementServiceImpl extends ServiceImpl<BaseCameraManag
                     BeanValidators.validateWithException(validator, accountManagement);
                     accountManagement.setUpdateBy(userId);
                     accountManagement.setCreateBy(userId);
+                    Long deptId = baseDeptMapper.selectDeptByDeptName(accountManagement.getDeptName());
+                    accountManagement.setDeptId(deptId);
                     baseCameraManagementMapper.insert(accountManagement);
                     BaseDeviceDynamicManagement baseDeviceDynamicManagement = new BaseDeviceDynamicManagement();
                     baseDeviceDynamicManagement.setCameraCode(accountManagement.getCameraCode());
@@ -89,6 +97,8 @@ public class BaseCameraManagementServiceImpl extends ServiceImpl<BaseCameraManag
                 } else if (updateSupport) {
                     BeanValidators.validateWithException(validator, accountManagement);
                     accountManagement.setUpdateBy(userId);
+                    Long deptId = baseDeptMapper.selectDeptByDeptName(accountManagement.getDeptName());
+                    accountManagement.setDeptId(deptId);
                     baseCameraManagementMapper.update(accountManagement, lw);
                     LambdaQueryWrapper<BaseDeviceDynamicManagement> wrapper = new LambdaQueryWrapper<BaseDeviceDynamicManagement>();
                     if (!ObjectUtils.isEmpty(baseAccountManagement.getCameraCode())) {
@@ -106,7 +116,7 @@ public class BaseCameraManagementServiceImpl extends ServiceImpl<BaseCameraManag
                 }
             } catch (Exception e) {
                 failureNum++;
-                String msg = "<br/>" + failureNum + "、相机编码 " + accountManagement.getCameraCode() + " 导入失败：";
+                String msg = "<br/>" + failureNum + "、相机编码 " + cameraManagementVos.getCameraCode() + " 导入失败：";
                 failureMsg.append(msg + e.getMessage());
                 log.error(msg, e);
             }

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

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ozs.service.mapper.BaseDeptMapper">
+    <select id="selectDeptByDeptName" parameterType="string"  resultType="java.lang.Long">
+		select dept_id from sys_dept where dept_name = #{deptName}
+	</select>
+</mapper>

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

@@ -27,6 +27,7 @@ import com.ozs.service.entity.CameraTree;
 import com.ozs.service.entity.MsgAlarm;
 import com.ozs.service.entity.vo.BaseCameraManagementHomeVo;
 import com.ozs.service.entity.vo.BaseCameraManagementVo;
+import com.ozs.service.entity.vo.BaseCameraManagementVos;
 import com.ozs.service.entity.vo.BaseCameraResVo;
 import com.ozs.service.entity.vo.MsgAlarmResp;
 import com.ozs.service.service.BaseCameraManagementService;
@@ -385,9 +386,9 @@ public class BaseCameraManagementController extends BaseController {
     @ApiOperation("相机台账管理信息导入")
     @PostMapping("/importBaseAccountManagement")
     public AjaxResult importBaseAccountManagement(MultipartFile file, boolean updateSupport) throws Exception {
-        ExcelUtil<BaseCameraManagement> util = new ExcelUtil<BaseCameraManagement>(BaseCameraManagement.class);
-        List<BaseCameraManagement> AccountManageList = util.importExcel(file.getInputStream());
-        String message = baseCameraManagementService.importBaseAccountManagement(AccountManageList, updateSupport, getUserId());
+        ExcelUtil<BaseCameraManagementVos> util = new ExcelUtil<BaseCameraManagementVos>(BaseCameraManagementVos.class);
+        List<BaseCameraManagementVos> accountManageList = util.importExcel(file.getInputStream());
+        String message = baseCameraManagementService.importBaseAccountManagement(accountManageList, updateSupport, getUserId());
         return AjaxResult.success(message);
     }
 
@@ -416,6 +417,10 @@ public class BaseCameraManagementController extends BaseController {
             lw.le(BaseCameraManagement::getEndMile, baseAccountManagementVo.getEndMile());
         }
         List<BaseCameraManagement> list = baseCameraManagementService.list(lw);
+        for (BaseCameraManagement baseCameraManagement : list) {
+        SysDept sysDept = deptService.selectDeptById(baseCameraManagement.getDeptId());
+            baseCameraManagement.setDeptName(sysDept.getDeptName());
+        }
         ExcelUtil<BaseCameraManagement> util = new ExcelUtil<>(BaseCameraManagement.class);
         util.exportExcel(response, list, "台账管理相机数据");
     }