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

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

@@ -12,6 +12,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 
 /**
  * <p>
@@ -68,16 +69,25 @@ public class BaseCameraManagement extends BaseEntity implements Serializable {
      * 监控相机安装里程位置
      */
     private Integer installMile;
+    @TableField(exist = false)
+    @Excel(name = "监控相机安装里程位置 KM")
+    private BigDecimal installMileBD;
 
     /**
      * 监控范围开始里程位置
      */
     private Integer beginMile;
+    @TableField(exist = false)
+    @Excel(name = "监控范围开始里程位置 KM")
+    private BigDecimal beginMileBD;
 
     /**
      * 监控范围结束里程位置
      */
     private Integer endMile;
+    @TableField(exist = false)
+    @Excel(name = "监控范围结束里程位置 KM")
+    private BigDecimal endMileBD;
 
     /**
      * 监视相机经度
@@ -141,7 +151,6 @@ public class BaseCameraManagement extends BaseEntity implements Serializable {
      * 所属工务段名称
      */
     @TableField(exist = false)
-    @Excel(name = "所属工务段名称")
     private String deptName;
 
     /**

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

@@ -1,8 +1,10 @@
 package com.ozs.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ozs.common.annotation.Excel;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -11,7 +13,7 @@ import java.util.Date;
 
 /**
  * <p>
- * 机车车载终端关联表
+ * 机车车载终端信息表
  * </p>
  *
  * @author ozs
@@ -26,18 +28,28 @@ public class BaseTerminal implements Serializable {
     /**
      * 主键ID
      */
-    @TableId(value = "id", type = IdType.AUTO)
+      @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 
     /**
-     * 机车编码
+     * 终端编码
      */
-    private String vehicleCode;
+    @Excel(name = "终端编码")
+    private String terminalCode;
 
     /**
-     * 终端编码
+     * 终端名称
      */
-    private String terminalCode;
+    @Excel(name = "终端名称")
+    private String terminalName;
+
+    /**
+     * 状态 1在线2离线
+     */
+    private Integer status;
+    @Excel(name = "状态")
+    @TableField(exist = false)
+    private String statusStr;
 
     /**
      * 创建者
@@ -61,8 +73,21 @@ public class BaseTerminal implements Serializable {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date updateTime;
 
+    /**
+     * 终端经度
+     */
+    @Excel(name = "终端经度")
+    private String terminalLongitude;
+
+    /**
+     * 终端纬度
+     */
+    @Excel(name = "终端纬度")
+    private String terminalLatitude;
+
     /**
      * 备注
      */
+    @Excel(name = "备注")
     private String remark;
 }

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

@@ -1,10 +1,8 @@
 package com.ozs.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ozs.common.annotation.Excel;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -13,7 +11,7 @@ import java.util.Date;
 
 /**
  * <p>
- * 机车车载终端信息表
+ * 机车车载终端关联表
  * </p>
  *
  * @author ozs
@@ -28,28 +26,18 @@ public class BaseVehicleTerminal implements Serializable {
     /**
      * 主键ID
      */
-      @TableId(value = "id", type = IdType.AUTO)
+    @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 
     /**
-     * 终端编码
+     * 机车编码
      */
-    @Excel(name = "终端编码")
-    private String terminalCode;
+    private String vehicleCode;
 
     /**
-     * 终端名称
-     */
-    @Excel(name = "终端名称")
-    private String terminalName;
-
-    /**
-     * 状态 1在线2离线
+     * 终端编码
      */
-    private Integer status;
-    @Excel(name = "状态")
-    @TableField(exist = false)
-    private String statusStr;
+    private String terminalCode;
 
     /**
      * 创建者
@@ -73,21 +61,8 @@ public class BaseVehicleTerminal implements Serializable {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date updateTime;
 
-    /**
-     * 终端经度
-     */
-    @Excel(name = "终端经度")
-    private String terminalLongitude;
-
-    /**
-     * 终端纬度
-     */
-    @Excel(name = "终端纬度")
-    private String terminalLatitude;
-
     /**
      * 备注
      */
-    @Excel(name = "备注")
     private String remark;
 }

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

@@ -72,7 +72,7 @@ public class MsgAlarm extends BaseEntity implements Serializable {
     /**
      * 报警级别
      */
-    @Excel(name = "报警级别")
+//    @Excel(name = "报警级别")
     private Integer alarmLevel;
 
     /**
@@ -89,6 +89,9 @@ public class MsgAlarm extends BaseEntity implements Serializable {
      * 报警病害类型（1泥石流2异物侵线 3断轨监测）
      */
     private Integer alarmType;
+    @TableField(exist = false)
+    @Excel(name = "报警病害类型")
+    private String alarmTypeStr;
 
     /**
      * 框定范围
@@ -137,7 +140,7 @@ public class MsgAlarm extends BaseEntity implements Serializable {
     /**
      * 备注
      */
-    @Excel(name = "备注")
+//    @Excel(name = "备注")
     private String remark;
 
     /**

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

@@ -2,6 +2,7 @@ package com.ozs.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ozs.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import lombok.AllArgsConstructor;
@@ -43,6 +44,7 @@ public class MsgAlarmFrequency extends BaseEntity implements Serializable {
     /**
      * 报警时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date alarmTime;
 
     /**
@@ -88,6 +90,7 @@ public class MsgAlarmFrequency extends BaseEntity implements Serializable {
     /**
      * 创建时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date createTime;
 
     /**
@@ -98,6 +101,7 @@ public class MsgAlarmFrequency extends BaseEntity implements Serializable {
     /**
      * 修改时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date updateTime;
 
     /**

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

@@ -59,8 +59,8 @@ public class BaseCameraManagementVos implements Serializable {
     /**
      * 所属工务段名称
      */
-    @Excel(name = "所属工务段名称")
-    private String deptName;
+//    @Excel(name = "所属工务段名称")
+//    private String deptName;
 
     /**
      * 监控相机安装里程位置

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

@@ -38,9 +38,10 @@ public class MsgAlarmResp implements Serializable {
     private String railwayName;
 
     /**
-     * 报警病害类型（目前只有1泥石流，后续可扩展使用）
+     * 报警病害类型（1泥石流2异物侵线 3断轨监测）
      */
     private Integer alarmType;
+    private String alarmTypeStr;
 
     /**
      * 报警行别(1上行2下行)
@@ -72,6 +73,12 @@ public class MsgAlarmResp implements Serializable {
      * 报警是否解除 1已解除2未解除
      */
     private Integer isRelease;
+    private String  isReleaseName;
+
+    /**
+     * 解除内容
+     */
+    private String releaseContent;
 
     /**
      * 解除时间

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

@@ -2,13 +2,10 @@ package com.ozs.mapper;
 
 import com.ozs.entity.BaseTerminal;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
 
 /**
  * <p>
- * 机车车载终端关联表 Mapper 接口
+ * 机车车载终端信息表 Mapper 接口
  * </p>
  *
  * @author ozs
@@ -16,7 +13,4 @@ import java.util.List;
  */
 public interface BaseTerminalMapper extends BaseMapper<BaseTerminal> {
 
-    List<String> selectMountCode(@Param("vehicleCode") String vehicleCode);
-
-    BaseTerminal selectTerminal(@Param("vehicleCode") String vehicleCode);
 }

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

@@ -2,10 +2,13 @@ package com.ozs.mapper;
 
 import com.ozs.entity.BaseVehicleTerminal;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
- * 机车车载终端信息表 Mapper 接口
+ * 机车车载终端关联表 Mapper 接口
  * </p>
  *
  * @author ozs
@@ -13,4 +16,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface BaseVehicleTerminalMapper extends BaseMapper<BaseVehicleTerminal> {
 
+    List<String> selectMountCode(@Param("vehicleCode") String vehicleCode);
+
+    BaseVehicleTerminal selectTerminal(@Param("vehicleCode") String vehicleCode);
 }

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

@@ -1,11 +1,16 @@
 package com.ozs.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.ozs.common.core.domain.AjaxResult;
 import com.ozs.entity.BaseTerminal;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.ozs.entity.vo.BaseVehicleTerminalVo;
+
+import java.util.List;
 
 /**
  * <p>
- * 机车车载终端关联表 服务类
+ * 机车车载终端信息表 服务类
  * </p>
  *
  * @author ozs
@@ -13,4 +18,15 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface BaseTerminalService extends IService<BaseTerminal> {
 
+    IPage<BaseTerminal> vehicleTerminalList(BaseVehicleTerminalVo baseVehicleTerminalleVo);
+
+    AjaxResult baseVehicleTerminalDetails(BaseVehicleTerminalVo baseVehicleTerminalVo);
+
+    AjaxResult vehicleTerminalAdd(BaseTerminal baseVehicleTerminal, String userId);
+
+    AjaxResult vehicleTerminalUpdate(BaseTerminal baseVehicleTerminal, String userId);
+
+    String importBaseVehicleTerminal(List<BaseTerminal> accountManageList, boolean updateSupport, String userId);
+
+    List<BaseTerminal> exportBaseVehicleTerminal(BaseTerminal baseVehicleTerminal);
 }

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

@@ -3,7 +3,7 @@ package com.ozs.service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ozs.common.core.domain.AjaxResult;
-import com.ozs.entity.BaseTerminal;
+import com.ozs.entity.BaseVehicleTerminal;
 import com.ozs.entity.BaseVehicle;
 import com.ozs.entity.vo.BaseVehicleTerminalDto;
 import com.ozs.entity.vo.BaseVehicleTerminalVo;
@@ -35,7 +35,7 @@ public interface BaseVehicleService extends IService<BaseVehicle> {
 
     IPage<BaseVehicleTerminalVo> vehicleTerminal(BaseVehicleVo baseVehicle);
 
-    AjaxResult vehicleTerminalAdd(BaseTerminal baseTerminal, String userId);
+    AjaxResult vehicleTerminalAdd(BaseVehicleTerminal baseTerminal, String userId);
 
     Boolean isMount(BaseVehicleVo baseVehicleVo);
 
@@ -51,5 +51,7 @@ public interface BaseVehicleService extends IService<BaseVehicle> {
      */
     List<BaseVehicle> vehicleListDT();
 
-    AjaxResult vehicleTerminalUnmount(BaseTerminal baseTerminal);
+    AjaxResult vehicleTerminalUnmount(BaseVehicleTerminal baseTerminal);
+
+    AjaxResult removeByIdList(List<Long> ids);
 }

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

@@ -1,16 +1,11 @@
 package com.ozs.service;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.ozs.common.core.domain.AjaxResult;
 import com.ozs.entity.BaseVehicleTerminal;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.ozs.entity.vo.BaseVehicleTerminalVo;
-
-import java.util.List;
 
 /**
  * <p>
- * 机车车载终端信息表 服务类
+ * 机车车载终端关联表 服务类
  * </p>
  *
  * @author ozs
@@ -18,15 +13,4 @@ import java.util.List;
  */
 public interface BaseVehicleTerminalService extends IService<BaseVehicleTerminal> {
 
-    IPage<BaseVehicleTerminal> vehicleTerminalList(BaseVehicleTerminalVo baseVehicleTerminalleVo);
-
-    AjaxResult baseVehicleTerminalDetails(BaseVehicleTerminalVo baseVehicleTerminalVo);
-
-    AjaxResult vehicleTerminalAdd(BaseVehicleTerminal baseVehicleTerminal, String userId);
-
-    AjaxResult vehicleTerminalUpdate(BaseVehicleTerminal baseVehicleTerminal, String userId);
-
-    String importBaseVehicleTerminal(List<BaseVehicleTerminal> accountManageList, boolean updateSupport, String userId);
-
-    List<BaseVehicleTerminal> exportBaseVehicleTerminal(BaseVehicleTerminal baseVehicleTerminal);
 }

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

@@ -21,10 +21,11 @@ import com.ozs.service.BaseRailwayManagementService;
 import com.ozs.service.BaseUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.util.ObjectUtils;
 
 import javax.annotation.Resource;
 import javax.validation.Validator;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
@@ -67,7 +68,7 @@ public class BaseCameraManagementServiceImpl extends ServiceImpl<BaseCameraManag
      */
     @Override
     public String importBaseAccountManagement(List<BaseCameraManagementVos> accountManageList, boolean updateSupport, String userId) {
-        if (StringUtils.isNull(accountManageList) || accountManageList.size() == 0) {
+        if (StringUtils.isEmptySunhh(accountManageList) || accountManageList.size() == 0) {
             throw new ServiceException("导入相机台账列表信息不能为空！");
         }
         int successNum = 0;
@@ -80,52 +81,92 @@ public class BaseCameraManagementServiceImpl extends ServiceImpl<BaseCameraManag
                 BeanUtils.copyProperties(cameraManagementVos, accountManagement);
                 // 判断相机编码是否存在
                 LambdaQueryWrapper<BaseCameraManagement> lw = new LambdaQueryWrapper<BaseCameraManagement>();
-                if (!ObjectUtils.isEmpty(accountManagement.getCameraCode())) {
+                if (!StringUtils.isEmptySunhh(accountManagement.getCameraCode())) {
                     lw.eq(BaseCameraManagement::getCameraCode, accountManagement.getCameraCode());
                 }
                 BaseCameraManagement baseAccountManagement = baseCameraManagementMapper.selectOne(lw);
-                if (ObjectUtils.isEmpty(baseAccountManagement)) {
+                if (StringUtils.isEmptySunhh(baseAccountManagement)) {
                     BeanValidators.validateWithException(validator, accountManagement);
                     accountManagement.setUpdateBy(userId);
                     accountManagement.setCreateBy(userId);
-                    Long deptId = baseDeptMapper.selectDeptByDeptName(accountManagement.getDeptName());
-                    log.debug(accountManagement.getDeptName() + "主键id:" + deptId);
+//                    Long deptId = baseDeptMapper.selectDeptByDeptName(accountManagement.getDeptName());
+//                    log.debug(accountManagement.getDeptName() + "主键id:" + deptId);
 //                    if (!ObjectUtils.isEmpty(deptId)) {
-                        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);
-                        if (!ObjectUtils.isEmpty(baseRailwayManagement)) {
-                            if (!accountManagement.getBeginMile().toString().matches(PATTERN) || !accountManagement.getInstallMile().toString().matches(PATTERN) || !accountManagement.getEndMile().toString().matches(PATTERN)) {
-                                failureNum++;
-                                failureMsg.append(failureNum + "、相机编码为: " + accountManagement.getCameraCode() + "的数据,里程位置填写格式不正确,请填写数字");
-                            } else {
-                                accountManagement.setRailwayCode(baseRailwayManagement.getRailwayCode());
-                                accountManagement.setInstallMile(accountManagement.getInstallMile() * 1000);
-                                accountManagement.setEndMile(accountManagement.getEndMile() * 1000);
-                                accountManagement.setBeginMile(accountManagement.getBeginMile() * 1000);
-                                if (accountManagement.getBeginMile() < accountManagement.getEndMile()) {
-                                    baseCameraManagementMapper.insert(accountManagement);
-                                    BaseDeviceDynamicManagement baseDeviceDynamicManagement = new BaseDeviceDynamicManagement();
-                                    baseDeviceDynamicManagement.setCameraCode(accountManagement.getCameraCode());
-                                    baseDeviceDynamicManagement.setUpdateBy(userId);
-                                    baseDeviceDynamicManagement.setCreateBy(userId);
-                                    baseDeviceDynamicManagementMapper.insert(baseDeviceDynamicManagement);
-                                    successNum++;
-                                    successMsg.append(successNum + "、相机编码 " + accountManagement.getCameraCode() + " 导入成功");
+//                        accountManagement.setDeptId(deptId);
+                    LambdaQueryWrapper<BaseRailwayManagement> queryWrapper = new LambdaQueryWrapper<BaseRailwayManagement>();
+                    if (!StringUtils.isEmptySunhh(accountManagement.getRailwayName())) {
+                        queryWrapper.eq(BaseRailwayManagement::getRailwayName, accountManagement.getRailwayName());
+                    }
+                    // List<BaseRailwayManagement> list = baseRailwayManagementService.list(queryWrapper);
+                    BaseRailwayManagement baseRailwayManagement = baseRailwayManagementService.getOne(queryWrapper);
+                    if (!StringUtils.isEmptySunhh(baseRailwayManagement)) {
+                        if (!accountManagement.getBeginMile().toString().matches(PATTERN) || !accountManagement.getInstallMile().toString().matches(PATTERN) || !accountManagement.getEndMile().toString().matches(PATTERN)) {
+                            failureNum++;
+                            failureMsg.append(failureNum + "、相机编码为: " + accountManagement.getCameraCode() + "的数据,里程位置填写格式不正确,请填写数字");
+                        } else {
+                            accountManagement.setRailwayCode(baseRailwayManagement.getRailwayCode());
+                            if (!StringUtils.isEmptySunhh(accountManagement.getBeginMileBD())) {
+                                if (!accountManagement.getBeginMileBD().toString().matches(PATTERN)) {
+                                    failureNum++;
+                                    String msg = failureNum + "、监控范围开始里程位置填写格式不正确";
+                                    failureMsg.append(msg);
+                                    log.error(msg);
+                                    // return error("监控范围开始里程位置填写格式不正确");
+                                } else {
+                                    BigDecimal begin = accountManagement.getBeginMileBD().setScale(3, RoundingMode.HALF_UP);
+                                    // BigDecimal begin = BigDecimal.parseDouble(baseCameraManagement.getBeginMile().toString());
+                                    accountManagement.setBeginMile(begin.multiply(new BigDecimal("1000")).intValue());
+                                }
+                            }
+                            if (!StringUtils.isEmptySunhh(accountManagement.getInstallMileBD())) {
+                                if (!accountManagement.getInstallMileBD().toString().matches(PATTERN)) {
+                                    failureNum++;
+                                    String msg = failureNum + "、监控相机安装里程位置填写格式不正确";
+                                    failureMsg.append(msg);
+                                    log.error(msg);
+                                    // return error("监控相机安装里程位置填写格式不正确");
                                 } else {
+                                    BigDecimal install = accountManagement.getInstallMileBD().setScale(3, RoundingMode.HALF_UP);
+                                    // double install = Double.parseDouble(baseCameraManagement.getInstallMile().toString());
+                                    accountManagement.setInstallMile(install.multiply(new BigDecimal("1000")).intValue());
+                                }
+                            }
+                            if (!StringUtils.isEmptySunhh(accountManagement.getInstallMileBD())) {
+                                if (!accountManagement.getInstallMileBD().toString().matches(PATTERN)) {
                                     failureNum++;
-                                    failureMsg.append(failureNum + "、相机编码为: " + accountManagement.getCameraCode() + "的数据,监控范围开始里程位置不能大于监控范围结束里程位置");
+                                    String msg = failureNum + "、监控范围结束里程位置填写格式不正确";
+                                    failureMsg.append(msg);
+                                    log.error(msg);
+                                    // return error("监控范围结束里程位置填写格式不正确");
+                                } else {
+                                    BigDecimal end = accountManagement.getInstallMileBD().setScale(3, RoundingMode.HALF_UP);
+                                    // double end = Double.parseDouble(baseCameraManagement.getEndMile().toString());
+                                    accountManagement.setEndMile(end.multiply(new BigDecimal("1000")).intValue());
                                 }
                             }
-                        } else {
-                            failureNum++;
-                            String msg = failureNum + "、相机所属线路名称 " + accountManagement.getRailwayName() + "不存在， 导入失败：";
-                            failureMsg.append(msg);
-                            log.error(msg);
+//                                accountManagement.setInstallMile(accountManagement.getInstallMileBD() * 1000);
+//                                accountManagement.setEndMile(accountManagement.getEndMile() * 1000);
+//                                accountManagement.setBeginMile(accountManagement.getBeginMile() * 1000);
+                            if (accountManagement.getBeginMile() < accountManagement.getEndMile()) {
+                                baseCameraManagementMapper.insert(accountManagement);
+                                BaseDeviceDynamicManagement baseDeviceDynamicManagement = new BaseDeviceDynamicManagement();
+                                baseDeviceDynamicManagement.setCameraCode(accountManagement.getCameraCode());
+                                baseDeviceDynamicManagement.setUpdateBy(userId);
+                                baseDeviceDynamicManagement.setCreateBy(userId);
+                                baseDeviceDynamicManagementMapper.insert(baseDeviceDynamicManagement);
+                                successNum++;
+                                successMsg.append(successNum + "、相机编码 " + accountManagement.getCameraCode() + " 导入成功");
+                            } else {
+                                failureNum++;
+                                failureMsg.append(failureNum + "、相机编码为: " + accountManagement.getCameraCode() + "的数据,监控范围开始里程位置不能大于监控范围结束里程位置");
+                            }
                         }
+                    } else {
+                        failureNum++;
+                        String msg = failureNum + "、相机所属线路名称 " + accountManagement.getRailwayName() + "不存在， 导入失败：";
+                        failureMsg.append(msg);
+                        log.error(msg);
+                    }
 //                    } else {
 //                        failureNum++;
 //                        String msg = failureNum + "、相机所属工务段 " + accountManagement.getDeptName() + "不存在， 导入失败：";
@@ -141,7 +182,7 @@ public class BaseCameraManagementServiceImpl extends ServiceImpl<BaseCameraManag
                     accountManagement.setDeptId(deptId);
                     baseCameraManagementMapper.update(accountManagement, lw);
                     LambdaQueryWrapper<BaseDeviceDynamicManagement> wrapper = new LambdaQueryWrapper<BaseDeviceDynamicManagement>();
-                    if (!ObjectUtils.isEmpty(baseAccountManagement.getCameraCode())) {
+                    if (!StringUtils.isEmptySunhh(baseAccountManagement.getCameraCode())) {
                         wrapper.eq(BaseDeviceDynamicManagement::getCameraCode, baseAccountManagement.getCameraCode());
                     }
                     BaseDeviceDynamicManagement baseDeviceDynamicManagement = baseDeviceDynamicManagementMapper.selectOne(wrapper);

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

@@ -1,14 +1,27 @@
 package com.ozs.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.pagehelper.PageHelper;
+import com.ozs.common.core.domain.AjaxResult;
+import com.ozs.common.exception.ServiceException;
+import com.ozs.common.utils.StringUtils;
+import com.ozs.common.utils.bean.BeanValidators;
 import com.ozs.entity.BaseTerminal;
+import com.ozs.entity.vo.BaseVehicleTerminalVo;
 import com.ozs.mapper.BaseTerminalMapper;
 import com.ozs.service.BaseTerminalService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.validation.Validator;
+import java.util.Date;
+import java.util.List;
+
 /**
  * <p>
- * 机车车载终端关联表 服务实现类
+ * 机车车载终端信息表 服务实现类
  * </p>
  *
  * @author ozs
@@ -17,4 +30,165 @@ import org.springframework.stereotype.Service;
 @Service
 public class BaseTerminalServiceImpl extends ServiceImpl<BaseTerminalMapper, BaseTerminal> implements BaseTerminalService {
 
+    @Autowired
+    private BaseTerminalMapper baseTerminalMapper;
+    @Autowired
+    protected Validator validator;
+
+    @Override
+    public IPage<BaseTerminal> vehicleTerminalList(BaseVehicleTerminalVo baseVehicleTerminalleVo) {
+        LambdaQueryWrapper<BaseTerminal> wrapper = new LambdaQueryWrapper<BaseTerminal>();
+        if (!StringUtils.isEmptySunhh(baseVehicleTerminalleVo) && !StringUtils.isEmptySunhh(baseVehicleTerminalleVo.getTerminalCode())) {
+            wrapper.eq(BaseTerminal::getTerminalCode, baseVehicleTerminalleVo.getTerminalCode());
+        }
+        if (!StringUtils.isEmptySunhh(baseVehicleTerminalleVo) && !StringUtils.isEmptySunhh(baseVehicleTerminalleVo.getTerminalName())) {
+            wrapper.eq(BaseTerminal::getTerminalName, baseVehicleTerminalleVo.getTerminalName());
+        }
+        if (!StringUtils.isEmptySunhh(baseVehicleTerminalleVo) && !StringUtils.isEmptySunhh(baseVehicleTerminalleVo.getStatus())) {
+            wrapper.eq(BaseTerminal::getStatus, baseVehicleTerminalleVo.getStatus());
+        }
+        wrapper.orderByDesc(BaseTerminal::getCreateTime);
+        int pageNum = Integer.parseInt(baseVehicleTerminalleVo.getPageNum().toString());
+        int pageSize = Integer.parseInt(baseVehicleTerminalleVo.getPageSize().toString());
+        com.github.pagehelper.Page<BaseTerminal> page = PageHelper.startPage(pageNum, pageSize)
+                .doSelectPage(() -> baseTerminalMapper.selectList(wrapper));
+        com.baomidou.mybatisplus.extension.plugins.pagination.Page<BaseTerminal> pageR =
+                new com.baomidou.mybatisplus.extension.plugins.pagination.Page<>(pageNum, pageSize);
+        pageR.setRecords(page.getResult());
+        pageR.setTotal(page.getTotal());
+        return pageR;
+    }
+
+    @Override
+    public AjaxResult baseVehicleTerminalDetails(BaseVehicleTerminalVo baseVehicleTerminalVo) {
+        BaseTerminal baseVehicleTerminal = baseTerminalMapper.selectById(baseVehicleTerminalVo.getId());
+        return AjaxResult.success(baseVehicleTerminal);
+    }
+
+    @Override
+    public AjaxResult vehicleTerminalAdd(BaseTerminal baseVehicleTerminal, String userId) {
+        LambdaQueryWrapper<BaseTerminal> wrapper = new LambdaQueryWrapper<BaseTerminal>();
+        if (!StringUtils.isEmptySunhh(baseVehicleTerminal) && !StringUtils.isEmptySunhh(baseVehicleTerminal.getTerminalCode())) {
+            wrapper.eq(BaseTerminal::getTerminalCode, baseVehicleTerminal.getTerminalCode());
+        }
+        List<BaseTerminal> baseVehicles = baseTerminalMapper.selectList(wrapper);
+        if (baseVehicles.size() > 0) {
+            return AjaxResult.error("车载终端编码已存在！");
+        }
+        Date date = new Date();
+        baseVehicleTerminal.setCreateBy(userId);
+        baseVehicleTerminal.setUpdateBy(userId);
+        baseVehicleTerminal.setCreateTime(date);
+        baseVehicleTerminal.setUpdateTime(date);
+        int insert = baseTerminalMapper.insert(baseVehicleTerminal);
+        if (insert > 0) {
+            return AjaxResult.success();
+        } else {
+            return AjaxResult.error();
+        }
+    }
+
+    @Override
+    public AjaxResult vehicleTerminalUpdate(BaseTerminal baseTerminal, String userId) {
+        LambdaQueryWrapper<BaseTerminal> wrapper = new LambdaQueryWrapper<BaseTerminal>();
+        if (!StringUtils.isEmptySunhh(baseTerminal) && !StringUtils.isEmptySunhh(baseTerminal.getTerminalCode())) {
+            wrapper.eq(BaseTerminal::getTerminalCode, baseTerminal.getTerminalCode());
+        }
+        if (!StringUtils.isEmptySunhh(baseTerminal) && !StringUtils.isEmptySunhh(baseTerminal.getId())) {
+            wrapper.ne(BaseTerminal::getId, baseTerminal.getId());
+        }
+        List<BaseTerminal> baseVehicles = baseTerminalMapper.selectList(wrapper);
+        if (baseVehicles.size() > 0) {
+            return AjaxResult.error("机车编码已存在！");
+        }
+        baseTerminal.setUpdateBy(userId);
+        baseTerminal.setUpdateTime(new Date());
+        int update = baseTerminalMapper.updateById(baseTerminal);
+        if (update > 0) {
+            return AjaxResult.success();
+        } else {
+            return AjaxResult.error();
+        }
+    }
+
+    @Override
+    public String importBaseVehicleTerminal(List<BaseTerminal> accountManageList, boolean updateSupport, String userId) {
+        int successNum = 0;
+        int failureNum = 0;
+        StringBuilder successMsg = new StringBuilder();
+        StringBuilder failureMsg = new StringBuilder();
+        for (BaseTerminal baseVehicleTerminal : accountManageList) {
+            try {
+//                BaseVehicle baseVehicle = new BaseVehicle();
+//                BeanUtils.copyProperties(baseVehicleTerminal, baseVehicle);
+                // 判断机车编码是否存在
+                LambdaQueryWrapper<BaseTerminal> lw = new LambdaQueryWrapper<BaseTerminal>();
+                if (!StringUtils.isEmptySunhh(baseVehicleTerminal.getTerminalCode())) {
+                    lw.eq(BaseTerminal::getTerminalCode, baseVehicleTerminal.getTerminalCode());
+                }
+                BaseTerminal baseVehicle1 = baseTerminalMapper.selectOne(lw);
+                if (StringUtils.isEmptySunhh(baseVehicle1)) {
+                    BeanValidators.validateWithException(validator, baseVehicleTerminal);
+                    baseVehicleTerminal.setStatus("在线".equals(baseVehicleTerminal.getStatusStr()) ? 1 : 2);
+                    baseVehicleTerminal.setUpdateBy(userId);
+                    baseVehicleTerminal.setCreateBy(userId);
+                    Date date = new Date();
+                    baseVehicleTerminal.setCreateTime(date);
+                    baseVehicleTerminal.setUpdateTime(date);
+                    int insert = baseTerminalMapper.insert(baseVehicleTerminal);
+                    successNum++;
+                    successMsg.append(successNum + "、终端编码 " + baseVehicleTerminal.getTerminalCode() + " 导入成功");
+                } else if (updateSupport) {
+                    BeanValidators.validateWithException(validator, baseVehicleTerminal);
+                    LambdaQueryWrapper<BaseTerminal> lambdaQueryWrapper = new LambdaQueryWrapper<BaseTerminal>();
+                    if (!StringUtils.isEmptySunhh(baseVehicleTerminal.getTerminalCode())) {
+                        lambdaQueryWrapper.eq(BaseTerminal::getTerminalCode, baseVehicleTerminal.getTerminalCode());
+                    }
+                    BaseTerminal baseVehicle4 = baseTerminalMapper.selectOne(lambdaQueryWrapper);
+                    if (StringUtils.isEmptySunhh(baseVehicle4)) {
+                        baseVehicleTerminal.setUpdateBy(userId);
+                        baseVehicleTerminal.setUpdateTime(new Date());
+                        baseVehicleTerminal.setId(baseVehicle4.getId());
+                        baseTerminalMapper.updateById(baseVehicleTerminal);
+                        successNum++;
+                        successMsg.append(successNum + "、终端编码 " + baseVehicleTerminal.getTerminalCode() + " 更新成功");
+                    } else {
+                        failureNum++;
+                        failureMsg.append(failureNum + "、终端编码 " + baseVehicleTerminal.getTerminalCode() + "不存在");
+                    }
+                }
+            } catch (Exception e) {
+                failureNum++;
+                String msg = failureNum + "、终端编码 " + baseVehicleTerminal.getTerminalCode() + " 导入失败：";
+                failureMsg.append(msg);
+                log.error(msg, e);
+            }
+        }
+        if (failureNum > 0) {
+            failureMsg.insert(0, "很抱歉，导入失败！共 " + failureNum + " 条数据格式不正确，错误如下：");
+            throw new ServiceException(failureMsg.toString());
+        } else {
+            successMsg.insert(0, "恭喜您，数据已全部导入成功！共 " + successNum + " 条。");
+        }
+        return successMsg.toString();
+    }
+
+    @Override
+    public List<BaseTerminal> exportBaseVehicleTerminal(BaseTerminal baseVehicleTerminal) {
+        LambdaQueryWrapper<BaseTerminal> wrapper = new LambdaQueryWrapper<BaseTerminal>();
+        if (!StringUtils.isEmptySunhh(baseVehicleTerminal) && !StringUtils.isEmptySunhh(baseVehicleTerminal.getTerminalName())) {
+            wrapper.eq(BaseTerminal::getTerminalName, baseVehicleTerminal.getTerminalName());
+        }
+        if (!StringUtils.isEmptySunhh(baseVehicleTerminal) && !StringUtils.isEmptySunhh(baseVehicleTerminal.getTerminalCode())) {
+            wrapper.eq(BaseTerminal::getTerminalCode, baseVehicleTerminal.getTerminalCode());
+        }
+        if (!StringUtils.isEmptySunhh(baseVehicleTerminal) && !StringUtils.isEmptySunhh(baseVehicleTerminal.getStatus())) {
+            wrapper.eq(BaseTerminal::getStatus, baseVehicleTerminal.getStatus());
+        }
+        List<BaseTerminal> baseVehicleTerminalList = baseTerminalMapper.selectList(wrapper);
+        for (BaseTerminal baseVehicleTerminal1 : baseVehicleTerminalList) {
+            baseVehicleTerminal1.setStatusStr(baseVehicleTerminal1.getStatus() == 1 ? "在线" : "离线");
+        }
+        return baseVehicleTerminalList;
+    }
 }

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

@@ -9,20 +9,21 @@ import com.ozs.common.exception.ServiceException;
 import com.ozs.common.utils.StringUtils;
 import com.ozs.common.utils.bean.BeanUtils;
 import com.ozs.common.utils.bean.BeanValidators;
-import com.ozs.entity.BaseTerminal;
-import com.ozs.entity.BaseVehicle;
 import com.ozs.entity.BaseVehicleTerminal;
+import com.ozs.entity.BaseVehicle;
+import com.ozs.entity.BaseTerminal;
 import com.ozs.entity.vo.BaseVehicleTerminalDto;
 import com.ozs.entity.vo.BaseVehicleTerminalVo;
 import com.ozs.entity.vo.BaseVehicleVo;
 import com.ozs.entity.vo.VehicleTreeVo;
 import com.ozs.mapper.BaseDeviceDynamicManagementMapper;
-import com.ozs.mapper.BaseTerminalMapper;
-import com.ozs.mapper.BaseVehicleMapper;
 import com.ozs.mapper.BaseVehicleTerminalMapper;
+import com.ozs.mapper.BaseVehicleMapper;
+import com.ozs.mapper.BaseTerminalMapper;
 import com.ozs.service.BaseVehicleService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.ObjectUtils;
 
 import javax.validation.Validator;
@@ -45,11 +46,11 @@ public class BaseVehicleServiceImpl extends ServiceImpl<BaseVehicleMapper, BaseV
     @Autowired
     private BaseVehicleMapper baseVehicleMapper;
     @Autowired
-    private BaseTerminalMapper baseTerminalMapper;
+    private BaseVehicleTerminalMapper baseVehicleTerminalMapper;
     @Autowired
     BaseDeviceDynamicManagementMapper baseDeviceDynamicManagementMapper;
     @Autowired
-    private BaseVehicleTerminalMapper baseVehicleTerminalMapper;
+    private BaseTerminalMapper baseTerminalMapper;
     @Autowired
     protected Validator validator;
 
@@ -69,15 +70,15 @@ public class BaseVehicleServiceImpl extends ServiceImpl<BaseVehicleMapper, BaseV
                 .doSelectPage(() -> baseVehicleMapper.selectList(wrapper));
         if (!StringUtils.isEmptySunhh(page) && page.getResult().size() > 0) {
             List<BaseVehicle> dto1 = page.getResult().stream().map(o -> {
-                BaseTerminal baseTerminal = baseTerminalMapper.selectTerminal(o.getVehicleCode());
-                if (!StringUtils.isEmptySunhh(baseTerminal) && !StringUtils.isEmptySunhh(baseTerminal.getVehicleCode())) {
-                    LambdaQueryWrapper<BaseVehicleTerminal> wrapperBaseVehicleTerminal = new LambdaQueryWrapper<>();
-                    if (!StringUtils.isEmptySunhh(baseTerminal) && !StringUtils.isEmptySunhh(baseTerminal.getTerminalCode())) {
-                        wrapperBaseVehicleTerminal.eq(BaseVehicleTerminal::getTerminalCode, baseTerminal.getTerminalCode());
+                BaseVehicleTerminal baseVehicleTerminal = baseVehicleTerminalMapper.selectTerminal(o.getVehicleCode());
+                if (!StringUtils.isEmptySunhh(baseVehicleTerminal) && !StringUtils.isEmptySunhh(baseVehicleTerminal.getVehicleCode())) {
+                    LambdaQueryWrapper<BaseTerminal> wrapperBaseTerminal = new LambdaQueryWrapper<>();
+                    if (!StringUtils.isEmptySunhh(baseVehicleTerminal) && !StringUtils.isEmptySunhh(baseVehicleTerminal.getTerminalCode())) {
+                        wrapperBaseTerminal.eq(BaseTerminal::getTerminalCode, baseVehicleTerminal.getTerminalCode());
                     }
-                    BaseVehicleTerminal baseVehicleTerminal = baseVehicleTerminalMapper.selectOne(wrapperBaseVehicleTerminal);
-                    if (!StringUtils.isEmptySunhh(baseVehicleTerminal) && !StringUtils.isEmptySunhh(baseVehicleTerminal.getTerminalName())) {
-                        o.setTerminalName(baseVehicleTerminal.getTerminalName());
+                    BaseTerminal baseTerminal1 = baseTerminalMapper.selectOne(wrapperBaseTerminal);
+                    if (!StringUtils.isEmptySunhh(baseTerminal1) && !StringUtils.isEmptySunhh(baseTerminal1.getTerminalName())) {
+                        o.setTerminalName(baseTerminal1.getTerminalName());
                     }
                 }
                 return o;
@@ -214,13 +215,13 @@ public class BaseVehicleServiceImpl extends ServiceImpl<BaseVehicleMapper, BaseV
         }
         List<BaseVehicle> baseVehicles = baseVehicleMapper.selectList(wrapper);
         for (BaseVehicle baseVehicle1 : baseVehicles) {
-            BaseTerminal baseTerminal = baseTerminalMapper.selectTerminal(baseVehicle1.getVehicleCode());
+            BaseVehicleTerminal baseTerminal = baseVehicleTerminalMapper.selectTerminal(baseVehicle1.getVehicleCode());
             if (!StringUtils.isEmptySunhh(baseTerminal) && !StringUtils.isEmptySunhh(baseTerminal.getVehicleCode())) {
-                LambdaQueryWrapper<BaseVehicleTerminal> wrapperBaseVehicleTerminal = new LambdaQueryWrapper<>();
+                LambdaQueryWrapper<BaseTerminal> wrapperBaseVehicleTerminal = new LambdaQueryWrapper<>();
                 if (!StringUtils.isEmptySunhh(baseTerminal) && !StringUtils.isEmptySunhh(baseTerminal.getTerminalCode())) {
-                    wrapperBaseVehicleTerminal.eq(BaseVehicleTerminal::getTerminalCode, baseTerminal.getTerminalCode());
+                    wrapperBaseVehicleTerminal.eq(BaseTerminal::getTerminalCode, baseTerminal.getTerminalCode());
                 }
-                BaseVehicleTerminal baseVehicleTerminal = baseVehicleTerminalMapper.selectOne(wrapperBaseVehicleTerminal);
+                BaseTerminal baseVehicleTerminal = baseTerminalMapper.selectOne(wrapperBaseVehicleTerminal);
                 if (!StringUtils.isEmptySunhh(baseVehicleTerminal) && !StringUtils.isEmptySunhh(baseVehicleTerminal.getTerminalName())) {
                     baseVehicle1.setTerminalName(baseVehicleTerminal.getTerminalName());
                 } else {
@@ -233,18 +234,18 @@ public class BaseVehicleServiceImpl extends ServiceImpl<BaseVehicleMapper, BaseV
 
     @Override
     public IPage<BaseVehicleTerminalVo> vehicleTerminal(BaseVehicleVo baseVehicleVo) {
-        BaseTerminal baseTerminal = baseTerminalMapper.selectTerminal(baseVehicleVo.getVehicleCode());
-        List<String> terminalCodeList = baseTerminalMapper.selectMountCode(baseVehicleVo.getVehicleCode());
+        BaseVehicleTerminal baseTerminal = baseVehicleTerminalMapper.selectTerminal(baseVehicleVo.getVehicleCode());
+        List<String> terminalCodeList = baseVehicleTerminalMapper.selectMountCode(baseVehicleVo.getVehicleCode());
         // List<String> collect = terminalCodeList.stream().map(BaseTerminal::getTerminalCode).collect(Collectors.toList());
-        LambdaQueryWrapper<BaseVehicleTerminal> wrapper = new LambdaQueryWrapper<>();
+        LambdaQueryWrapper<BaseTerminal> wrapper = new LambdaQueryWrapper<>();
         if (!StringUtils.isEmptySunhh(terminalCodeList) && terminalCodeList.size() > 0) {
-            wrapper.notIn(BaseVehicleTerminal::getTerminalCode, terminalCodeList);
+            wrapper.notIn(BaseTerminal::getTerminalCode, terminalCodeList);
         }
 //        List<BaseVehicleTerminal> baseVehicleTerminalList = baseVehicleTerminalMapper.selectList(wrapper);
         int pageNum = Integer.parseInt(baseVehicleVo.getPageNum().toString());
         int pageSize = Integer.parseInt(baseVehicleVo.getPageSize().toString());
-        com.github.pagehelper.Page<BaseVehicleTerminal> page = PageHelper
-                .startPage(pageNum, pageSize).doSelectPage(() -> baseVehicleTerminalMapper.selectList(wrapper));
+        com.github.pagehelper.Page<BaseTerminal> page = PageHelper
+                .startPage(pageNum, pageSize).doSelectPage(() -> baseTerminalMapper.selectList(wrapper));
         com.baomidou.mybatisplus.extension.plugins.pagination.Page<BaseVehicleTerminalVo> pageR =
                 new com.baomidou.mybatisplus.extension.plugins.pagination.Page<>(pageNum, pageSize);
         if (!ObjectUtils.isEmpty(page) && page.getResult().size() > 0) {
@@ -268,26 +269,26 @@ public class BaseVehicleServiceImpl extends ServiceImpl<BaseVehicleMapper, BaseV
     }
 
     @Override
-    public AjaxResult vehicleTerminalAdd(BaseTerminal baseTerminal1, String userId) {
-        LambdaQueryWrapper<BaseTerminal> wrapper1 = new LambdaQueryWrapper<>();
+    public AjaxResult vehicleTerminalAdd(BaseVehicleTerminal baseTerminal1, String userId) {
+        LambdaQueryWrapper<BaseVehicleTerminal> wrapper1 = new LambdaQueryWrapper<>();
         if (!StringUtils.isEmptySunhh(baseTerminal1) && !StringUtils.isEmptySunhh(baseTerminal1.getVehicleCode())) {
-            wrapper1.ne(BaseTerminal::getVehicleCode, baseTerminal1.getVehicleCode());
+            wrapper1.ne(BaseVehicleTerminal::getVehicleCode, baseTerminal1.getVehicleCode());
         }
         if (!StringUtils.isEmptySunhh(baseTerminal1) && !StringUtils.isEmptySunhh(baseTerminal1.getTerminalCode())) {
-            wrapper1.eq(BaseTerminal::getTerminalCode, baseTerminal1.getTerminalCode());
+            wrapper1.eq(BaseVehicleTerminal::getTerminalCode, baseTerminal1.getTerminalCode());
         }
-        List<BaseTerminal> baseTerminals = baseTerminalMapper.selectList(wrapper1);
+        List<BaseVehicleTerminal> baseTerminals = baseVehicleTerminalMapper.selectList(wrapper1);
         if (!StringUtils.isEmptySunhh(baseTerminals) && baseTerminals.size() > 0) {
             return AjaxResult.error("此终端已经挂载其他机车！");
         }
 
-        LambdaQueryWrapper<BaseTerminal> wrapper = new LambdaQueryWrapper<>();
+        LambdaQueryWrapper<BaseVehicleTerminal> wrapper = new LambdaQueryWrapper<>();
         if (!StringUtils.isEmptySunhh(baseTerminal1) && !StringUtils.isEmptySunhh(baseTerminal1.getVehicleCode())) {
-            wrapper.eq(BaseTerminal::getVehicleCode, baseTerminal1.getVehicleCode());
+            wrapper.eq(BaseVehicleTerminal::getVehicleCode, baseTerminal1.getVehicleCode());
         }
-        BaseTerminal baseTerminal = baseTerminalMapper.selectOne(wrapper);
+        BaseVehicleTerminal baseTerminal = baseVehicleTerminalMapper.selectOne(wrapper);
         if (StringUtils.isEmptySunhh(baseTerminal)) {
-            BaseTerminal baseTerminal2 = new BaseTerminal();
+            BaseVehicleTerminal baseTerminal2 = new BaseVehicleTerminal();
             baseTerminal2.setVehicleCode(baseTerminal1.getVehicleCode());
             baseTerminal2.setTerminalCode(baseTerminal1.getTerminalCode());
             baseTerminal2.setCreateBy(userId);
@@ -295,24 +296,24 @@ public class BaseVehicleServiceImpl extends ServiceImpl<BaseVehicleMapper, BaseV
             Date date = new Date();
             baseTerminal2.setCreateTime(date);
             baseTerminal2.setUpdateTime(date);
-            int insert = baseTerminalMapper.insert(baseTerminal2);
+            int insert = baseVehicleTerminalMapper.insert(baseTerminal2);
         } else {
             baseTerminal.setUpdateBy(userId);
             baseTerminal.setUpdateTime(new Date());
             baseTerminal.setVehicleCode(baseTerminal1.getVehicleCode());
             baseTerminal.setTerminalCode(baseTerminal1.getTerminalCode());
-            int updateById = baseTerminalMapper.updateById(baseTerminal);
+            int updateById = baseVehicleTerminalMapper.updateById(baseTerminal);
         }
         return AjaxResult.success();
     }
 
     @Override
     public Boolean isMount(BaseVehicleVo baseVehicleVo) {
-        LambdaQueryWrapper<BaseTerminal> wrapper = new LambdaQueryWrapper<>();
+        LambdaQueryWrapper<BaseVehicleTerminal> wrapper = new LambdaQueryWrapper<>();
         if (!StringUtils.isEmptySunhh(baseVehicleVo) && !StringUtils.isEmptySunhh(baseVehicleVo.getVehicleCode())) {
-            wrapper.eq(BaseTerminal::getVehicleCode, baseVehicleVo.getVehicleCode());
+            wrapper.eq(BaseVehicleTerminal::getVehicleCode, baseVehicleVo.getVehicleCode());
         }
-        BaseTerminal baseTerminal = baseTerminalMapper.selectOne(wrapper);
+        BaseVehicleTerminal baseTerminal = baseVehicleTerminalMapper.selectOne(wrapper);
         if (StringUtils.isEmptySunhh(baseTerminal)) {
             return true;
         }
@@ -346,17 +347,17 @@ public class BaseVehicleServiceImpl extends ServiceImpl<BaseVehicleMapper, BaseV
             List<String> terminalCodeList = new ArrayList<>();
             baseVehicles = baseVehicles.stream().map(o -> {
                 //查到已保存的关联信息
-                BaseTerminal baseTerminal = baseTerminalMapper.selectTerminal(o.getVehicleCode());
-                if (!StringUtils.isEmptySunhh(baseTerminal) && !StringUtils.isEmptySunhh(baseTerminal.getVehicleCode())) {
-                    terminalCodeList.add(baseTerminal.getVehicleCode());
-                    LambdaQueryWrapper<BaseVehicleTerminal> wrapperBaseVehicleTerminal = new LambdaQueryWrapper<>();
-                    if (!StringUtils.isEmptySunhh(baseTerminal) && !StringUtils.isEmptySunhh(baseTerminal.getTerminalCode())) {
-                        wrapperBaseVehicleTerminal.eq(BaseVehicleTerminal::getTerminalCode, baseTerminal.getTerminalCode());
+                BaseVehicleTerminal baseVehicleTerminal = baseVehicleTerminalMapper.selectTerminal(o.getVehicleCode());
+                if (!StringUtils.isEmptySunhh(baseVehicleTerminal) && !StringUtils.isEmptySunhh(baseVehicleTerminal.getVehicleCode())) {
+                    terminalCodeList.add(baseVehicleTerminal.getVehicleCode());
+                    LambdaQueryWrapper<BaseTerminal> wrapperBaseVehicleTerminal = new LambdaQueryWrapper<>();
+                    if (!StringUtils.isEmptySunhh(baseVehicleTerminal) && !StringUtils.isEmptySunhh(baseVehicleTerminal.getTerminalCode())) {
+                        wrapperBaseVehicleTerminal.eq(BaseTerminal::getTerminalCode, baseVehicleTerminal.getTerminalCode());
                     }
                     //根据编码获取终端名称
-                    BaseVehicleTerminal baseVehicleTerminal = baseVehicleTerminalMapper.selectOne(wrapperBaseVehicleTerminal);
-                    if (!StringUtils.isEmptySunhh(baseVehicleTerminal) && !StringUtils.isEmptySunhh(baseVehicleTerminal.getTerminalName())) {
-                        o.setTerminalName(baseVehicleTerminal.getTerminalName());
+                    BaseTerminal baseTerminal = baseTerminalMapper.selectOne(wrapperBaseVehicleTerminal);
+                    if (!StringUtils.isEmptySunhh(baseTerminal) && !StringUtils.isEmptySunhh(baseTerminal.getTerminalName())) {
+                        o.setTerminalName(baseTerminal.getTerminalName());
                     }
                 }
                 return o;
@@ -378,12 +379,27 @@ public class BaseVehicleServiceImpl extends ServiceImpl<BaseVehicleMapper, BaseV
     }
 
     @Override
-    public AjaxResult vehicleTerminalUnmount(BaseTerminal baseTerminal) {
-        LambdaQueryWrapper<BaseTerminal> wrapper = new LambdaQueryWrapper<>();
+    public AjaxResult vehicleTerminalUnmount(BaseVehicleTerminal baseTerminal) {
+        LambdaQueryWrapper<BaseVehicleTerminal> wrapper = new LambdaQueryWrapper<>();
         if (!StringUtils.isEmptySunhh(baseTerminal) && !StringUtils.isEmptySunhh(baseTerminal.getVehicleCode())) {
-            wrapper.eq(BaseTerminal::getVehicleCode, baseTerminal.getVehicleCode());
+            wrapper.eq(BaseVehicleTerminal::getVehicleCode, baseTerminal.getVehicleCode());
         }
-        baseTerminalMapper.delete(wrapper);
+        baseVehicleTerminalMapper.delete(wrapper);
         return AjaxResult.success();
     }
+
+    @Override
+    @Transactional
+    public AjaxResult removeByIdList(List<Long> ids) {
+        for (Long vehicleId : ids) {
+            BaseVehicle baseVehicle = baseVehicleMapper.selectById(vehicleId);
+            if (!StringUtils.isEmptySunhh(baseVehicle) && !StringUtils.isEmptySunhh(baseVehicle.getVehicleCode())) {
+                LambdaQueryWrapper<BaseVehicleTerminal> wrapper = new LambdaQueryWrapper<>();
+                wrapper.eq(BaseVehicleTerminal::getVehicleCode, baseVehicle.getVehicleCode());
+                int delete = baseVehicleTerminalMapper.delete(wrapper);
+                int i = baseVehicleMapper.deleteById(vehicleId);
+            }
+        }
+        return AjaxResult.success(true);
+    }
 }

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

@@ -1,27 +1,14 @@
 package com.ozs.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.github.pagehelper.PageHelper;
-import com.ozs.common.core.domain.AjaxResult;
-import com.ozs.common.exception.ServiceException;
-import com.ozs.common.utils.StringUtils;
-import com.ozs.common.utils.bean.BeanValidators;
 import com.ozs.entity.BaseVehicleTerminal;
-import com.ozs.entity.vo.BaseVehicleTerminalVo;
 import com.ozs.mapper.BaseVehicleTerminalMapper;
 import com.ozs.service.BaseVehicleTerminalService;
-import org.springframework.beans.factory.annotation.Autowired;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
-import javax.validation.Validator;
-import java.util.Date;
-import java.util.List;
-
 /**
  * <p>
- * 机车车载终端信息表 服务实现类
+ * 机车车载终端关联表 服务实现类
  * </p>
  *
  * @author ozs
@@ -30,162 +17,4 @@ import java.util.List;
 @Service
 public class BaseVehicleTerminalServiceImpl extends ServiceImpl<BaseVehicleTerminalMapper, BaseVehicleTerminal> implements BaseVehicleTerminalService {
 
-    @Autowired
-    private BaseVehicleTerminalMapper baseVehicleTerminalMapper;
-    @Autowired
-    protected Validator validator;
-
-    @Override
-    public IPage<BaseVehicleTerminal> vehicleTerminalList(BaseVehicleTerminalVo baseVehicleTerminalleVo) {
-        LambdaQueryWrapper<BaseVehicleTerminal> wrapper = new LambdaQueryWrapper<BaseVehicleTerminal>();
-        if (!StringUtils.isEmptySunhh(baseVehicleTerminalleVo) && !StringUtils.isEmptySunhh(baseVehicleTerminalleVo.getTerminalCode())) {
-            wrapper.eq(BaseVehicleTerminal::getTerminalCode, baseVehicleTerminalleVo.getTerminalCode());
-        }
-        if (!StringUtils.isEmptySunhh(baseVehicleTerminalleVo) && !StringUtils.isEmptySunhh(baseVehicleTerminalleVo.getTerminalName())) {
-            wrapper.eq(BaseVehicleTerminal::getTerminalName, baseVehicleTerminalleVo.getTerminalName());
-        }
-        if (!StringUtils.isEmptySunhh(baseVehicleTerminalleVo) && !StringUtils.isEmptySunhh(baseVehicleTerminalleVo.getStatus())) {
-            wrapper.eq(BaseVehicleTerminal::getStatus, baseVehicleTerminalleVo.getStatus());
-        }
-        wrapper.orderByDesc(BaseVehicleTerminal::getCreateTime);
-        int pageNum = Integer.parseInt(baseVehicleTerminalleVo.getPageNum().toString());
-        int pageSize = Integer.parseInt(baseVehicleTerminalleVo.getPageSize().toString());
-        com.github.pagehelper.Page<BaseVehicleTerminal> page = PageHelper.startPage(pageNum, pageSize)
-                .doSelectPage(() -> baseVehicleTerminalMapper.selectList(wrapper));
-        com.baomidou.mybatisplus.extension.plugins.pagination.Page<BaseVehicleTerminal> pageR =
-                new com.baomidou.mybatisplus.extension.plugins.pagination.Page<>(pageNum, pageSize);
-        pageR.setRecords(page.getResult());
-        pageR.setTotal(page.getTotal());
-        return pageR;
-    }
-
-    @Override
-    public AjaxResult baseVehicleTerminalDetails(BaseVehicleTerminalVo baseVehicleTerminalVo) {
-        BaseVehicleTerminal baseVehicleTerminal = baseVehicleTerminalMapper.selectById(baseVehicleTerminalVo.getId());
-        return AjaxResult.success(baseVehicleTerminal);
-    }
-
-    @Override
-    public AjaxResult vehicleTerminalAdd(BaseVehicleTerminal baseVehicleTerminal, String userId) {
-        LambdaQueryWrapper<BaseVehicleTerminal> wrapper = new LambdaQueryWrapper<BaseVehicleTerminal>();
-        if (!StringUtils.isEmptySunhh(baseVehicleTerminal) && !StringUtils.isEmptySunhh(baseVehicleTerminal.getTerminalCode())) {
-            wrapper.eq(BaseVehicleTerminal::getTerminalCode, baseVehicleTerminal.getTerminalCode());
-        }
-        List<BaseVehicleTerminal> baseVehicles = baseVehicleTerminalMapper.selectList(wrapper);
-        if (baseVehicles.size() > 0) {
-            return AjaxResult.error("车载终端编码已存在！");
-        }
-        Date date = new Date();
-        baseVehicleTerminal.setCreateBy(userId);
-        baseVehicleTerminal.setUpdateBy(userId);
-        baseVehicleTerminal.setCreateTime(date);
-        baseVehicleTerminal.setUpdateTime(date);
-        int insert = baseVehicleTerminalMapper.insert(baseVehicleTerminal);
-        if (insert > 0) {
-            return AjaxResult.success();
-        } else {
-            return AjaxResult.error();
-        }
-    }
-
-    @Override
-    public AjaxResult vehicleTerminalUpdate(BaseVehicleTerminal baseVehicleTerminal, String userId) {
-        LambdaQueryWrapper<BaseVehicleTerminal> wrapper = new LambdaQueryWrapper<BaseVehicleTerminal>();
-        if (!StringUtils.isEmptySunhh(baseVehicleTerminal) && !StringUtils.isEmptySunhh(baseVehicleTerminal.getTerminalCode())) {
-            wrapper.eq(BaseVehicleTerminal::getTerminalCode, baseVehicleTerminal.getTerminalCode());
-        }
-        List<BaseVehicleTerminal> baseVehicles = baseVehicleTerminalMapper.selectList(wrapper);
-        if (baseVehicles.size() > 0) {
-            return AjaxResult.error("机车编码已存在！");
-        }
-        baseVehicleTerminal.setUpdateBy(userId);
-        baseVehicleTerminal.setUpdateTime(new Date());
-        int update = baseVehicleTerminalMapper.updateById(baseVehicleTerminal);
-        if (update > 0) {
-            return AjaxResult.success();
-        } else {
-            return AjaxResult.error();
-        }
-    }
-
-    @Override
-    public String importBaseVehicleTerminal(List<BaseVehicleTerminal> accountManageList, boolean updateSupport, String userId) {
-        int successNum = 0;
-        int failureNum = 0;
-        StringBuilder successMsg = new StringBuilder();
-        StringBuilder failureMsg = new StringBuilder();
-        for (BaseVehicleTerminal baseVehicleTerminal : accountManageList) {
-            try {
-//                BaseVehicle baseVehicle = new BaseVehicle();
-//                BeanUtils.copyProperties(baseVehicleTerminal, baseVehicle);
-                // 判断机车编码是否存在
-                LambdaQueryWrapper<BaseVehicleTerminal> lw = new LambdaQueryWrapper<BaseVehicleTerminal>();
-                if (!StringUtils.isEmptySunhh(baseVehicleTerminal.getTerminalCode())) {
-                    lw.eq(BaseVehicleTerminal::getTerminalCode, baseVehicleTerminal.getTerminalCode());
-                }
-                BaseVehicleTerminal baseVehicle1 = baseVehicleTerminalMapper.selectOne(lw);
-                if (StringUtils.isEmptySunhh(baseVehicle1)) {
-                    BeanValidators.validateWithException(validator, baseVehicleTerminal);
-                    baseVehicleTerminal.setStatus("在线".equals(baseVehicleTerminal.getStatusStr()) ? 1 : 2);
-                    baseVehicleTerminal.setUpdateBy(userId);
-                    baseVehicleTerminal.setCreateBy(userId);
-                    Date date = new Date();
-                    baseVehicleTerminal.setCreateTime(date);
-                    baseVehicleTerminal.setUpdateTime(date);
-                    int insert = baseVehicleTerminalMapper.insert(baseVehicleTerminal);
-                    successNum++;
-                    successMsg.append(successNum + "、终端编码 " + baseVehicleTerminal.getTerminalCode() + " 导入成功");
-                } else if (updateSupport) {
-                    BeanValidators.validateWithException(validator, baseVehicleTerminal);
-                    LambdaQueryWrapper<BaseVehicleTerminal> lambdaQueryWrapper = new LambdaQueryWrapper<BaseVehicleTerminal>();
-                    if (!StringUtils.isEmptySunhh(baseVehicleTerminal.getTerminalCode())) {
-                        lambdaQueryWrapper.eq(BaseVehicleTerminal::getTerminalCode, baseVehicleTerminal.getTerminalCode());
-                    }
-                    BaseVehicleTerminal baseVehicle4 = baseVehicleTerminalMapper.selectOne(lambdaQueryWrapper);
-                    if (StringUtils.isEmptySunhh(baseVehicle4)) {
-                        baseVehicleTerminal.setUpdateBy(userId);
-                        baseVehicleTerminal.setUpdateTime(new Date());
-                        baseVehicleTerminal.setId(baseVehicle4.getId());
-                        baseVehicleTerminalMapper.updateById(baseVehicleTerminal);
-                        successNum++;
-                        successMsg.append(successNum + "、终端编码 " + baseVehicleTerminal.getTerminalCode() + " 更新成功");
-                    } else {
-                        failureNum++;
-                        failureMsg.append(failureNum + "、终端编码 " + baseVehicleTerminal.getTerminalCode() + "不存在");
-                    }
-                }
-            } catch (Exception e) {
-                failureNum++;
-                String msg = failureNum + "、终端编码 " + baseVehicleTerminal.getTerminalCode() + " 导入失败：";
-                failureMsg.append(msg);
-                log.error(msg, e);
-            }
-        }
-        if (failureNum > 0) {
-            failureMsg.insert(0, "很抱歉，导入失败！共 " + failureNum + " 条数据格式不正确，错误如下：");
-            throw new ServiceException(failureMsg.toString());
-        } else {
-            successMsg.insert(0, "恭喜您，数据已全部导入成功！共 " + successNum + " 条。");
-        }
-        return successMsg.toString();
-    }
-
-    @Override
-    public List<BaseVehicleTerminal> exportBaseVehicleTerminal(BaseVehicleTerminal baseVehicleTerminal) {
-        LambdaQueryWrapper<BaseVehicleTerminal> wrapper = new LambdaQueryWrapper<BaseVehicleTerminal>();
-        if (!StringUtils.isEmptySunhh(baseVehicleTerminal) && !StringUtils.isEmptySunhh(baseVehicleTerminal.getTerminalName())) {
-            wrapper.eq(BaseVehicleTerminal::getTerminalName, baseVehicleTerminal.getTerminalName());
-        }
-        if (!StringUtils.isEmptySunhh(baseVehicleTerminal) && !StringUtils.isEmptySunhh(baseVehicleTerminal.getTerminalCode())) {
-            wrapper.eq(BaseVehicleTerminal::getTerminalCode, baseVehicleTerminal.getTerminalCode());
-        }
-        if (!StringUtils.isEmptySunhh(baseVehicleTerminal) && !StringUtils.isEmptySunhh(baseVehicleTerminal.getStatus())) {
-            wrapper.eq(BaseVehicleTerminal::getStatus, baseVehicleTerminal.getStatus());
-        }
-        List<BaseVehicleTerminal> baseVehicleTerminalList = baseVehicleTerminalMapper.selectList(wrapper);
-        for (BaseVehicleTerminal baseVehicleTerminal1 : baseVehicleTerminalList) {
-            baseVehicleTerminal1.setStatusStr(baseVehicleTerminal1.getStatus() == 1 ? "在线" : "离线");
-        }
-        return baseVehicleTerminalList;
-    }
 }

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

@@ -2,11 +2,4 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ozs.mapper.BaseTerminalMapper">
 
-    <select id="selectMountCode" parameterType="java.lang.String" resultType="java.lang.String">
-        select terminal_code terminalCode from base_terminal where vehicle_code != #{vehicleCode}
-    </select>
-
-    <select id="selectTerminal" parameterType="java.lang.String" resultType="com.ozs.entity.BaseTerminal">
-        select * from base_terminal where vehicle_code = #{vehicleCode} limit 1
-    </select>
 </mapper>

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

@@ -2,4 +2,11 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ozs.mapper.BaseVehicleTerminalMapper">
 
+    <select id="selectMountCode" parameterType="java.lang.String" resultType="java.lang.String">
+        select terminal_code terminalCode from base_vehicle_terminal where vehicle_code != #{vehicleCode}
+    </select>
+
+    <select id="selectTerminal" parameterType="java.lang.String" resultType="com.ozs.entity.BaseVehicleTerminal">
+        select * from base_vehicle_terminal where vehicle_code = #{vehicleCode} limit 1
+    </select>
 </mapper>

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

@@ -38,6 +38,8 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.constraints.NotNull;
 import java.io.InputStream;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.List;
@@ -181,10 +183,13 @@ public class BaseCameraManagementController extends BaseController {
                 o.setRailwayName(baseRailwayManagement.getRailwayName());
                 String mils = AppendUtils.stringAppend(o.getInstallMile());
                 o.setInstallMiles(mils);
+                o.setInstallMileBD(new BigDecimal(o.getInstallMile()).divide(new BigDecimal(1000)).setScale(3, RoundingMode.HALF_UP));
                 String end = AppendUtils.stringAppend(o.getEndMile());
                 o.setEndMiles(end);
+                o.setEndMileBD(new BigDecimal(o.getEndMile()).divide(new BigDecimal(1000)).setScale(3, RoundingMode.HALF_UP));
                 String begin = AppendUtils.stringAppend(o.getBeginMile());
                 o.setBeginMiles(begin);
+                o.setBeginMileBD(new BigDecimal(o.getBeginMile()).divide(new BigDecimal(1000)).setScale(3, RoundingMode.HALF_UP));
                 o.setLineDirStr(o.getLineDir() == 1 ? "上行" : "下行");
                 o.setMilesRange(begin + "-" + end);
                 o.setLongitudeAndLatitude(o.getInstallLongitude() + "," + o.getInstallLongitude());
@@ -263,23 +268,32 @@ public class BaseCameraManagementController extends BaseController {
             idempotenceUtils.deleteIdempotence(baseCameraManagement.getCameraCode());
             return error("设备动态管理表该相机编码已存在,不能重复添加");
         }
-        if (!baseCameraManagement.getBeginMile().toString().matches(PATTERN)) {
-            return error("监控范围开始里程位置填写格式不正确");
-        } else {
-            double begin = Double.parseDouble(baseCameraManagement.getBeginMile().toString());
-            baseCameraManagement.setBeginMile((int) (begin * 1000));
+        if (!StringUtils.isEmptySunhh(baseCameraManagement.getBeginMileBD())) {
+            if (!baseCameraManagement.getBeginMileBD().toString().matches(PATTERN)) {
+                return error("监控范围开始里程位置填写格式不正确");
+            } else {
+                BigDecimal begin = baseCameraManagement.getBeginMileBD().setScale(3, RoundingMode.HALF_UP);
+                // BigDecimal begin = BigDecimal.parseDouble(baseCameraManagement.getBeginMile().toString());
+                baseCameraManagement.setBeginMile(begin.multiply(new BigDecimal("1000")).intValue());
+            }
         }
-        if (!baseCameraManagement.getInstallMile().toString().matches(PATTERN)) {
-            return error("监控相机安装里程位置填写格式不正确");
-        } else {
-            double install = Double.parseDouble(baseCameraManagement.getInstallMile().toString());
-            baseCameraManagement.setInstallMile((int) (install * 1000));
+        if (!StringUtils.isEmptySunhh(baseCameraManagement.getInstallMileBD())) {
+            if (!baseCameraManagement.getInstallMileBD().toString().matches(PATTERN)) {
+                return error("监控相机安装里程位置填写格式不正确");
+            } else {
+                BigDecimal install = baseCameraManagement.getInstallMileBD().setScale(3, RoundingMode.HALF_UP);
+                // double install = Double.parseDouble(baseCameraManagement.getInstallMile().toString());
+                baseCameraManagement.setInstallMile(install.multiply(new BigDecimal("1000")).intValue());
+            }
         }
-        if (!baseCameraManagement.getEndMile().toString().matches(PATTERN)) {
-            return error("监控范围结束里程位置填写格式不正确");
-        } else {
-            double end = Double.parseDouble(baseCameraManagement.getEndMile().toString());
-            baseCameraManagement.setEndMile((int) (end * 1000));
+        if (!StringUtils.isEmptySunhh(baseCameraManagement.getInstallMileBD())) {
+            if (!baseCameraManagement.getInstallMileBD().toString().matches(PATTERN)) {
+                return error("监控范围结束里程位置填写格式不正确");
+            } else {
+                BigDecimal end = baseCameraManagement.getInstallMileBD().setScale(3, RoundingMode.HALF_UP);
+                // double end = Double.parseDouble(baseCameraManagement.getEndMile().toString());
+                baseCameraManagement.setEndMile(end.multiply(new BigDecimal("1000")).intValue());
+            }
         }
         if (baseCameraManagement.getBeginMile() > baseCameraManagement.getEndMile()) {
             return error("监控范围开始里程位置不能大于监控范围结束里程位置");
@@ -323,23 +337,32 @@ public class BaseCameraManagementController extends BaseController {
         if (!ObjectUtils.isEmpty(cameraManagement) && !cameraManagement.getId().equals(baseCameraManagement.getId())) {
             return error("相机编码已存在,不能进行修改操作");
         }
-        if (!baseCameraManagement.getBeginMile().toString().matches(PATTERN)) {
-            return error("监控范围开始里程位置填写格式不正确");
-        } else {
-            double begin = Double.parseDouble(baseCameraManagement.getBeginMile().toString());
-            baseCameraManagement.setBeginMile((int) (begin * 1000));
+        if (!StringUtils.isEmptySunhh(baseCameraManagement.getBeginMileBD())) {
+            if (!baseCameraManagement.getBeginMileBD().toString().matches(PATTERN)) {
+                return error("监控范围开始里程位置填写格式不正确");
+            } else {
+                BigDecimal begin = baseCameraManagement.getBeginMileBD().setScale(3, RoundingMode.HALF_UP);
+                // BigDecimal begin = BigDecimal.parseDouble(baseCameraManagement.getBeginMile().toString());
+                baseCameraManagement.setBeginMile(begin.multiply(new BigDecimal("1000")).intValue());
+            }
         }
-        if (!baseCameraManagement.getInstallMile().toString().matches(PATTERN)) {
-            return error("监控相机安装里程位置填写格式不正确");
-        } else {
-            double install = Double.parseDouble(baseCameraManagement.getInstallMile().toString());
-            baseCameraManagement.setInstallMile((int) (install * 1000));
+        if (!StringUtils.isEmptySunhh(baseCameraManagement.getInstallMileBD())) {
+            if (!baseCameraManagement.getInstallMileBD().toString().matches(PATTERN)) {
+                return error("监控相机安装里程位置填写格式不正确");
+            } else {
+                BigDecimal install = baseCameraManagement.getInstallMileBD().setScale(3, RoundingMode.HALF_UP);
+                // double install = Double.parseDouble(baseCameraManagement.getInstallMile().toString());
+                baseCameraManagement.setInstallMile(install.multiply(new BigDecimal("1000")).intValue());
+            }
         }
-        if (!baseCameraManagement.getEndMile().toString().matches(PATTERN)) {
-            return error("监控范围结束里程位置填写格式不正确");
-        } else {
-            double end = Double.parseDouble(baseCameraManagement.getEndMile().toString());
-            baseCameraManagement.setEndMile((int) (end * 1000));
+        if (!StringUtils.isEmptySunhh(baseCameraManagement.getInstallMileBD())) {
+            if (!baseCameraManagement.getInstallMileBD().toString().matches(PATTERN)) {
+                return error("监控范围结束里程位置填写格式不正确");
+            } else {
+                BigDecimal end = baseCameraManagement.getInstallMileBD().setScale(3, RoundingMode.HALF_UP);
+                // double end = Double.parseDouble(baseCameraManagement.getEndMile().toString());
+                baseCameraManagement.setEndMile(end.multiply(new BigDecimal("1000")).intValue());
+            }
         }
         if (baseCameraManagement.getBeginMile() > baseCameraManagement.getEndMile()) {
             return error("监控范围开始里程位置不能大于监控范围结束里程位置");
@@ -381,13 +404,13 @@ public class BaseCameraManagementController extends BaseController {
         String begin = AppendUtils.stringAppend(baseCameraManagement.getBeginMile());
         baseCameraManagement.setBeginMiles(begin);
         if (!StringUtils.isEmptySunhh(baseCameraManagement.getInstallMile())) {
-            baseCameraManagement.setInstallMile(baseCameraManagement.getInstallMile()/1000);
+            baseCameraManagement.setInstallMileBD(new BigDecimal(baseCameraManagement.getInstallMile()).divide(new BigDecimal(1000)).setScale(3, RoundingMode.HALF_UP));
         }
         if (!StringUtils.isEmptySunhh(baseCameraManagement.getBeginMile())) {
-            baseCameraManagement.setBeginMile(baseCameraManagement.getBeginMile()/1000);
+            baseCameraManagement.setBeginMileBD(new BigDecimal(baseCameraManagement.getBeginMile()).divide(new BigDecimal(1000)).setScale(3, RoundingMode.HALF_UP));
         }
         if (!StringUtils.isEmptySunhh(baseCameraManagement.getEndMile())) {
-            baseCameraManagement.setEndMile(baseCameraManagement.getEndMile()/1000);
+            baseCameraManagement.setEndMileBD(new BigDecimal(baseCameraManagement.getEndMile()).divide(new BigDecimal(1000)).setScale(3, RoundingMode.HALF_UP));
         }
         baseCameraManagement.setLineDirStr(baseCameraManagement.getLineDir() == 1 ? "上行" : "下行");
         baseCameraManagement.setMilesRange(begin + "-" + end);
@@ -397,6 +420,7 @@ public class BaseCameraManagementController extends BaseController {
 
     /**
      * ***********************   弃用   ***********************
+     *
      * @param cameraCode
      * @return
      */
@@ -530,7 +554,6 @@ public class BaseCameraManagementController extends BaseController {
     }
 
 
-
     @ApiOperation("视频邀约")
     @GetMapping("/api/invite/{cameraCode}")
     @Log(title = "相机台账管理", businessType = BusinessType.OTHER)
@@ -543,7 +566,7 @@ public class BaseCameraManagementController extends BaseController {
         }
         return new AjaxResult(200, "ok", CameraUtil.invite(cameraCode, one.getChannel()));
     }
-    
+
 
     @ApiOperation("查询录像")
     @GetMapping("/api/records/{cameraCode}/{flay}")
@@ -564,7 +587,7 @@ public class BaseCameraManagementController extends BaseController {
     @Log(title = "相机台账管理", businessType = BusinessType.OTHER)
     public AjaxResult apiRecordsList(@RequestBody
                                      @NotNull(message = "相机编码不能为空")
-                                             List<String> cameraCodes) {
+                                     List<String> cameraCodes) {
         List<String> list = new ArrayList<>();
         for (String cameraCode : cameraCodes) {
             LambdaQueryWrapper<BaseCameraManagement> lw = new LambdaQueryWrapper<BaseCameraManagement>();

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

@@ -9,9 +9,9 @@ import com.ozs.common.enums.BusinessType;
 import com.ozs.common.utils.StringUtils;
 import com.ozs.common.utils.file.FileUtils;
 import com.ozs.common.utils.poi.ExcelUtil;
-import com.ozs.entity.BaseVehicleTerminal;
+import com.ozs.entity.BaseTerminal;
 import com.ozs.entity.vo.BaseVehicleTerminalVo;
-import com.ozs.service.BaseVehicleTerminalService;
+import com.ozs.service.BaseTerminalService;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -34,10 +34,10 @@ import java.util.List;
 @Slf4j
 @RestController
 @RequestMapping("/baseVehicleTerminal")
-public class BaseVehicleTerminalController extends BaseController {
+public class BaseTerminalController extends BaseController {
 
     @Autowired
-    private BaseVehicleTerminalService baseVehicleTerminalService;
+    private BaseTerminalService baseTerminalService;
 
     /**
      * 车载终端信息表 分页查询
@@ -49,7 +49,7 @@ public class BaseVehicleTerminalController extends BaseController {
     @PostMapping("/vehicleTerminalList")
     @Log(title = "车载终端管理", businessType = BusinessType.SELECT)
     public AjaxResult vehicleTerminalList(@RequestBody BaseVehicleTerminalVo baseVehicleTerminalVo) {
-        IPage<BaseVehicleTerminal> baseVehicleTerminalIPage = baseVehicleTerminalService.vehicleTerminalList(baseVehicleTerminalVo);
+        IPage<BaseTerminal> baseVehicleTerminalIPage = baseTerminalService.vehicleTerminalList(baseVehicleTerminalVo);
         return AjaxResult.success(baseVehicleTerminalIPage);
     }
 
@@ -66,7 +66,7 @@ public class BaseVehicleTerminalController extends BaseController {
         if (StringUtils.isEmptySunhh(baseVehicleTerminalVo) || StringUtils.isEmptySunhh(baseVehicleTerminalVo.getId())) {
             return AjaxResult.error("车载终端id不能为空！");
         }
-        return baseVehicleTerminalService.baseVehicleTerminalDetails(baseVehicleTerminalVo);
+        return baseTerminalService.baseVehicleTerminalDetails(baseVehicleTerminalVo);
     }
 
     /**
@@ -78,12 +78,12 @@ public class BaseVehicleTerminalController extends BaseController {
     @ApiOperation(value = "车载终端信息表 新增")
     @PostMapping("/vehicleTerminalAdd")
     @Log(title = "车载终端管理", businessType = BusinessType.INSERT)
-    public AjaxResult vehicleTerminalAdd(@RequestBody BaseVehicleTerminal baseVehicleTerminal) {
+    public AjaxResult vehicleTerminalAdd(@RequestBody BaseTerminal baseVehicleTerminal) {
         if (StringUtils.isEmptySunhh(baseVehicleTerminal) || StringUtils.isEmptySunhh(baseVehicleTerminal.getTerminalCode())
                 || StringUtils.isEmptySunhh(baseVehicleTerminal.getTerminalName())) {
             return AjaxResult.error("车载终端名称、车载终端编码不能为空！");
         }
-        return baseVehicleTerminalService.vehicleTerminalAdd(baseVehicleTerminal, getUserId());
+        return baseTerminalService.vehicleTerminalAdd(baseVehicleTerminal, getUserId());
     }
 
     /**
@@ -95,11 +95,11 @@ public class BaseVehicleTerminalController extends BaseController {
     @ApiOperation(value = "车载终端信息表 修改")
     @PostMapping("/vehicleTerminalUpdate")
     @Log(title = "车载终端管理", businessType = BusinessType.UPDATE)
-    public AjaxResult vehicleTerminalUpdate(@RequestBody BaseVehicleTerminal baseVehicleTerminal) {
+    public AjaxResult vehicleTerminalUpdate(@RequestBody BaseTerminal baseVehicleTerminal) {
         if (StringUtils.isEmptySunhh(baseVehicleTerminal) || StringUtils.isEmptySunhh(baseVehicleTerminal.getId())) {
             return AjaxResult.error("修改ID不能为空！");
         }
-        return baseVehicleTerminalService.vehicleTerminalUpdate(baseVehicleTerminal, getUserId());
+        return baseTerminalService.vehicleTerminalUpdate(baseVehicleTerminal, getUserId());
     }
 
     /**
@@ -115,7 +115,7 @@ public class BaseVehicleTerminalController extends BaseController {
         if (StringUtils.isEmptySunhh(ids)) {
             return AjaxResult.error("删除ID不能为空！");
         }
-        boolean delete = baseVehicleTerminalService.removeByIds(ids);
+        boolean delete = baseTerminalService.removeByIds(ids);
         if (delete) {
             return AjaxResult.success();
         } else {
@@ -135,9 +135,9 @@ public class BaseVehicleTerminalController extends BaseController {
     @PostMapping("/importBaseVehicleTerminal")
     @Log(title = "车载终端管理", businessType = BusinessType.IMPORT)
     public AjaxResult importBaseVehicleTerminal(MultipartFile file, boolean updateSupport) throws Exception {
-        ExcelUtil<BaseVehicleTerminal> util = new ExcelUtil<BaseVehicleTerminal>(BaseVehicleTerminal.class);
-        List<BaseVehicleTerminal> accountManageList = util.importExcel(file.getInputStream());
-        String message = baseVehicleTerminalService.importBaseVehicleTerminal(accountManageList, updateSupport, getUserId());
+        ExcelUtil<BaseTerminal> util = new ExcelUtil<BaseTerminal>(BaseTerminal.class);
+        List<BaseTerminal> accountManageList = util.importExcel(file.getInputStream());
+        String message = baseTerminalService.importBaseVehicleTerminal(accountManageList, updateSupport, getUserId());
         return AjaxResult.success(message);
     }
 
@@ -149,9 +149,9 @@ public class BaseVehicleTerminalController extends BaseController {
     @ApiOperation("车载终端信息导出")
     @PostMapping("/exportBaseVehicleTerminal")
     @Log(title = "车载终端管理", businessType = BusinessType.EXPORT)
-    public void exportBaseVehicleTerminal(HttpServletResponse response, @RequestBody BaseVehicleTerminal baseVehicleTerminal) {
-        List<BaseVehicleTerminal> baseVehicleList = baseVehicleTerminalService.exportBaseVehicleTerminal(baseVehicleTerminal);
-        ExcelUtil<BaseVehicleTerminal> util = new ExcelUtil<>(BaseVehicleTerminal.class);
+    public void exportBaseVehicleTerminal(HttpServletResponse response, @RequestBody BaseTerminal baseVehicleTerminal) {
+        List<BaseTerminal> baseVehicleList = baseTerminalService.exportBaseVehicleTerminal(baseVehicleTerminal);
+        ExcelUtil<BaseTerminal> util = new ExcelUtil<>(BaseTerminal.class);
         util.exportExcel(response, baseVehicleList, "车载终端数据");
     }
 
@@ -183,7 +183,7 @@ public class BaseVehicleTerminalController extends BaseController {
     @PostMapping("/terminalAll")
     @Log(title = "终端信息表 查询", businessType = BusinessType.SELECT)
     public AjaxResult terminalAll() {
-        List<BaseVehicleTerminal> list = baseVehicleTerminalService.list();
+        List<BaseTerminal> list = baseTerminalService.list();
         return AjaxResult.success(list);
     }
 }

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

@@ -1,7 +1,6 @@
 package com.ozs.web.controller.accountmanagment;
 
 import com.alibaba.fastjson2.JSON;
-import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.ozs.common.annotation.Log;
@@ -18,7 +17,7 @@ import com.ozs.common.utils.file.FileUtils;
 import com.ozs.common.utils.poi.ExcelUtil;
 import com.ozs.entity.BaseCameraManagement;
 import com.ozs.entity.BaseRailwayManagement;
-import com.ozs.entity.BaseTerminal;
+import com.ozs.entity.BaseVehicleTerminal;
 import com.ozs.entity.BaseVehicle;
 import com.ozs.entity.VehicleTree;
 import com.ozs.entity.vo.BaseRailwayManagementVo;
@@ -119,7 +118,7 @@ public class BaseVehicleController extends BaseController {
     @ApiOperation(value = "车载终端挂载 取消挂载")
     @PostMapping("/vehicleTerminalUnmount")
     @Log(title = "机车信息管理", businessType = BusinessType.INSERT)
-    public AjaxResult vehicleTerminalUnmount(@RequestBody BaseTerminal baseTerminal) {
+    public AjaxResult vehicleTerminalUnmount(@RequestBody BaseVehicleTerminal baseTerminal) {
         if (StringUtils.isEmptySunhh(baseTerminal) || StringUtils.isEmptySunhh(baseTerminal.getVehicleCode())) {
             return AjaxResult.error("机车编码、终端编码不能为空！");
         }
@@ -135,7 +134,7 @@ public class BaseVehicleController extends BaseController {
     @ApiOperation(value = "车载终端挂载 保存")
     @PostMapping("/vehicleTerminalAdd")
     @Log(title = "机车信息管理", businessType = BusinessType.INSERT)
-    public AjaxResult vehicleTerminalAdd(@RequestBody BaseTerminal baseTerminal) {
+    public AjaxResult vehicleTerminalAdd(@RequestBody BaseVehicleTerminal baseTerminal) {
         if (StringUtils.isEmptySunhh(baseTerminal) || StringUtils.isEmptySunhh(baseTerminal.getVehicleCode())
                 || StringUtils.isEmptySunhh(baseTerminal.getTerminalCode())) {
             return AjaxResult.error("机车编码、终端编码不能为空！");
@@ -219,12 +218,7 @@ public class BaseVehicleController extends BaseController {
         if (StringUtils.isEmptySunhh(ids)) {
             return AjaxResult.error("删除ID不能为空！");
         }
-        boolean delete = baseVehicleService.removeByIds(ids);
-        if (delete) {
-            return AjaxResult.success();
-        } else {
-            return AjaxResult.error();
-        }
+        return baseVehicleService.removeByIdList(ids);
     }
 
     /**

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

@@ -5,14 +5,12 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.ozs.common.annotation.Log;
 import com.ozs.common.core.controller.BaseController;
 import com.ozs.common.core.domain.AjaxResult;
-import com.ozs.common.core.domain.entity.SysUser;
 import com.ozs.common.enums.BusinessType;
 import com.ozs.common.utils.AppendUtils;
 import com.ozs.common.utils.StringUtils;
 import com.ozs.common.utils.poi.ExcelUtil;
 import com.ozs.entity.BaseUser;
-import com.ozs.entity.BaseVehicleTerminal;
-import com.ozs.entity.TerminalIgnoreAlarm;
+import com.ozs.entity.BaseTerminal;
 import com.ozs.entity.vo.*;
 import com.ozs.service.*;
 import com.ozs.system.service.ISysDictDataService;
@@ -31,7 +29,6 @@ import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
-import java.text.DecimalFormat;
 import java.text.NumberFormat;
 import java.util.*;
 
@@ -55,7 +52,7 @@ public class DataStatisticController extends BaseController {
     @Autowired
     private BaseCameraManagementService baseCameraManagementService;
     @Autowired
-    private BaseVehicleTerminalService baseVehicleTerminalService;
+    private BaseTerminalService baseTerminalService;
     /**
      * web数据统计
      *
@@ -215,11 +212,13 @@ public class DataStatisticController extends BaseController {
         Integer pageSize = alarmStatisticResVo.getPageSize().intValue();
         List<AlarmFreqArea> list = msgAlarmService.alarmTypeAreaCount(alarmStatisticResVo.getRailwayCode(), alarmStatisticResVo.getCurrentYear(),
                 alarmStatisticResVo.getCurrentMonth());
-        list.forEach(l -> {
-                    if (!ObjectUtils.isEmpty(l.getAlarmMile())) {
-                        l.setAlarmMiles(AppendUtils.stringAppend(Integer.valueOf(l.getAlarmMile())));
-                    }
-        });
+        if (!CollectionUtils.isEmpty(list) && Objects.nonNull(list.get(0))) {
+            list.forEach(l -> {
+                if (!ObjectUtils.isEmpty(l.getAlarmMile())) {
+                    l.setAlarmMiles(AppendUtils.stringAppend(Integer.valueOf(l.getAlarmMile())));
+                }
+            });
+        }
         IPage page = msgAlarmService.listToPage(list, pageNum, pageSize);
         if (!ObjectUtils.isEmpty(page) && !ObjectUtils.isEmpty(page.getRecords())) {
             return AjaxResult.success(page);
@@ -349,9 +348,9 @@ public class DataStatisticController extends BaseController {
     public AjaxResult getNum() {
         Long alarmNum = msgAlarmService.getAlarmNum();
         Long vehicleNum = baseVehicleService.count();
-        QueryWrapper<BaseVehicleTerminal> wrapper = new QueryWrapper<BaseVehicleTerminal>();
-        wrapper.lambda().eq(BaseVehicleTerminal::getStatus,1);
-        Long terminalNum= baseVehicleTerminalService.count();
+        QueryWrapper<BaseTerminal> wrapper = new QueryWrapper<BaseTerminal>();
+        wrapper.lambda().eq(BaseTerminal::getStatus,1);
+        Long terminalNum= baseTerminalService.count();
         Long cameraNum = baseCameraManagementService.count();
         DataStatisticNum dataStatisticNum =new DataStatisticNum();
         if(!ObjectUtils.isEmpty(alarmNum)){

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

@@ -30,9 +30,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -213,39 +211,30 @@ public class MsgAlarmController extends BaseController {
             msgAlarmVo.setEndMile(msgAlarmVo.getEndMile() * 1000);
         }
         List<MsgAlarm> msgAlarmList = msgAlarmService.msgAlarmList(msgAlarmVo);
-        for (MsgAlarm msgAlarm : msgAlarmList) {
-//            String[] split = msgAlarm.getImageUrl().split(";");
-//            ArrayList<String> objects = new ArrayList<>(Arrays.asList(split));
-//            msgAlarm.setImageUrls(objects);
-//            LambdaQueryWrapper<BaseCameraManagement> cameraManagementLambdaQueryWrapper = new LambdaQueryWrapper<BaseCameraManagement>();
-//            if (!ObjectUtils.isEmpty(msgAlarm.getCameraCode())) {
-//                cameraManagementLambdaQueryWrapper.eq(BaseCameraManagement::getCameraCode, msgAlarm.getCameraCode());
-//            }
-//            BaseCameraManagement cameraManagement = baseCameraManagementService.getOne(cameraManagementLambdaQueryWrapper);
-//            LambdaQueryWrapper<BaseRailwayManagement> queryWrapper = new LambdaQueryWrapper<BaseRailwayManagement>();
-//            if (!ObjectUtils.isEmpty(cameraManagement.getRailwayCode())) {
-//                queryWrapper.eq(BaseRailwayManagement::getRailwayCode, cameraManagement.getRailwayCode());
-//            }
-//            BaseRailwayManagement baseRailwayManagement = baseRailwayManagementService.getOne(queryWrapper);
-//            msgAlarm.setRailwayName(baseRailwayManagement.getRailwayName());
-//            if (StringUtils.isNotEmpty(msgAlarm.getReleasedBy())) {
-//                BaseUser user = baseUserService.getUser(msgAlarm.getReleasedBy());
-//                msgAlarm.setReleasedByName(user.getNickName());
-//            }
-//            String mils = AppendUtils.stringAppend(cameraManagement.getInstallMile());
-//            msgAlarm.setAlarmMiles(mils);
-//            String end = AppendUtils.stringAppend(cameraManagement.getEndMile());
-//            msgAlarm.setEndMile(end);
-//            String begin = AppendUtils.stringAppend(cameraManagement.getBeginMile());
-//            msgAlarm.setBeginMile(begin);
-//            LambdaQueryWrapper<MsgAlarmFrequency> wrapper = new LambdaQueryWrapper<MsgAlarmFrequency>();
-//            if (!ObjectUtils.isEmpty(msgAlarm.getAlarmId())) {
-//                wrapper.eq(MsgAlarmFrequency::getAlarmId, msgAlarm.getAlarmId());
-//            }
-//            msgAlarm.setAlarmCount((int) msgAlarmFrequencyService.count(wrapper));
-//            msgAlarm.setLineDirName(msgAlarm.getLineDir() == 1 ? "上行" : "下行");
-//            msgAlarm.setIsReleaseName(msgAlarm.getIsRelease() == 1 ? "已解除" : "未解除");
-//            msgAlarm.setAlarmTypeName("泥石流");
+        for (MsgAlarm o : msgAlarmList) {
+            LambdaQueryWrapper<BaseRailwayManagement> queryWrapper = new LambdaQueryWrapper<>();
+            if (!StringUtils.isEmptySunhh(o.getRailwayCode())) {
+                queryWrapper.eq(BaseRailwayManagement::getRailwayCode, o.getRailwayCode());
+            }
+            BaseRailwayManagement baseRailwayManagement = baseRailwayManagementService.getOne(queryWrapper);
+            if (!StringUtils.isEmptySunhh(baseRailwayManagement) && !StringUtils.isEmptySunhh(baseRailwayManagement.getRailwayName())) {
+                o.setRailwayName(baseRailwayManagement.getRailwayName());
+            }
+            if (StringUtils.isNotEmpty(o.getReleasedBy())) {
+                BaseUser user = baseUserService.getUser(o.getReleasedBy());
+                o.setReleasedByName(user.getNickName());
+            }
+            String mils = AppendUtils.stringAppend(o.getAlarmMile());
+            o.setAlarmMiles(mils);
+            o.setLineDirName(o.getLineDir() == 1 ? "上行" : "下行");
+            o.setAlarmTypeStr(o.getAlarmType() == 1 ? "泥石流" : (o.getAlarmType() == 2 ? "异物侵线" : (o.getAlarmType() == 3 ? "断轨监测" : "未知")));
+            o.setIsReleaseName(o.getIsRelease() == 1 ? "已解除" : (o.getIsRelease() == 2 ? "未解除" : "未知"));
+            List<SysDictData> data = dictTypeService.selectDictDataByType("sys_alarm_type");
+            data.stream().forEach(sysDictData -> {
+                if (sysDictData.getDictValue().equals(o.getAlarmType().toString())) {
+                    o.setAlarmTypeName(sysDictData.getDictLabel());
+                }
+            });
         }
         ExcelUtil<MsgAlarm> util = new ExcelUtil<>(MsgAlarm.class);
         util.exportExcel(response, msgAlarmList, "报警信息管理");
@@ -311,12 +300,14 @@ public class MsgAlarmController extends BaseController {
 //            String[] split = msgAlarm.getImageUrl().split(";");
 //            ArrayList<String> objects = new ArrayList<>(Arrays.asList(split));
 //            msgAlarm.setImageUrls(objects);
-//            if (StringUtils.isNotEmpty(msgAlarm.getReleasedBy())) {
-//                BaseUser user = baseUserService.getUser(msgAlarm.getReleasedBy());
-//                msgAlarm.setReleasedByName(user.getNickName());
-//            }
             BeanUtils.copyProperties(msgAlarm, msgAlarmResp);
-            msgAlarmResp.setRailwayName(baseRailwayManagement.getRailwayName());
+            if (!StringUtils.isEmptySunhh(msgAlarm.getReleasedBy())) {
+                BaseUser user = baseUserService.getUser(msgAlarm.getReleasedBy());
+                msgAlarmResp.setReleasedByName(user.getNickName());
+            }
+            if (!StringUtils.isEmptySunhh(baseRailwayManagement) && !StringUtils.isEmptySunhh(baseRailwayManagement.getRailwayName())) {
+                msgAlarmResp.setRailwayName(baseRailwayManagement.getRailwayName());
+            }
 //            msgAlarmResp.setDeptId(baseCameraManagement.getDeptId());
 //            String begin = AppendUtils.stringAppend(baseCameraManagement.getBeginMile());
 //            String end = AppendUtils.stringAppend(baseCameraManagement.getEndMile());
@@ -325,6 +316,8 @@ public class MsgAlarmController extends BaseController {
             String mile = AppendUtils.stringAppend(msgAlarm.getAlarmMile());
             msgAlarmResp.setAlarmMile(mile);
             msgAlarmResp.setLineDirStr(msgAlarm.getLineDir() == 1 ? "上行" : "下行");
+            msgAlarmResp.setAlarmTypeStr(msgAlarm.getAlarmType() == 1 ? "泥石流" : (msgAlarm.getAlarmType() == 2 ? "异物侵线" : (msgAlarm.getAlarmType() == 3 ? "断轨监测" : "未知")));
+            msgAlarmResp.setIsReleaseName(msgAlarm.getIsRelease() == 1 ? "已解除" : (msgAlarm.getIsRelease() == 2 ? "未解除" : "未知"));
             List<SysDictData> data = dictTypeService.selectDictDataByType("sys_alarm_type");
             data.stream().forEach(sysDictData -> {
                 if (sysDictData.getDictValue().equals(msgAlarm.getAlarmType().toString())) {

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

@@ -10,12 +10,11 @@ import com.ozs.common.core.domain.AjaxResult;
 import com.ozs.common.enums.BusinessType;
 import com.ozs.common.utils.AppendUtils;
 import com.ozs.common.utils.poi.ExcelUtil;
-import com.ozs.entity.BaseVehicleTerminal;
-import com.ozs.entity.MsgAlarm;
+import com.ozs.entity.BaseTerminal;
 import com.ozs.entity.TerminalIgnoreAlarm;
 import com.ozs.entity.vo.MsgAlarmDTO;
 import com.ozs.entity.vo.TerminalIgnoreVo;
-import com.ozs.service.BaseVehicleTerminalService;
+import com.ozs.service.BaseTerminalService;
 import com.ozs.service.TerminalIgnoreAlarmService;
 import com.ozs.system.service.ISysDictDataService;
 import io.swagger.annotations.ApiOperation;
@@ -46,7 +45,7 @@ public class TerminalIgnoreAlarmController extends BaseController {
     @Autowired
     private ISysDictDataService dictDataService;
     @Autowired
-    private BaseVehicleTerminalService baseVehicleTerminalService;
+    private BaseTerminalService baseTerminalService;
 
     /**
      * 查询终端忽略报警信息列表
@@ -64,10 +63,10 @@ public class TerminalIgnoreAlarmController extends BaseController {
         }
         wrapper.orderByDesc("ignore_time");
         IPage<TerminalIgnoreAlarm> page = terminalIgnoreAlarmService.page(new Page<>(terminalIgnoreVo.getPageNum(), terminalIgnoreVo.getPageSize()), wrapper);
-        List<BaseVehicleTerminal> terminal = baseVehicleTerminalService.list();
+        List<BaseTerminal> terminal = baseTerminalService.list();
         if (!ObjectUtils.isEmpty(page) && !ObjectUtils.isEmpty(page.getRecords())) {
             List<TerminalIgnoreAlarm> dto = page.getRecords().stream().map(o -> {
-            for(BaseVehicleTerminal ter:terminal){
+            for(BaseTerminal ter:terminal){
                 if(ter.getTerminalCode().equals(o.getTerminalCode())){
                     o.setTerminalName(ter.getTerminalName());
                 }

vehicle-admin/src/main/java/com/ozs/web/controller/sdk/GeoHazardMonitorTokenController.java

@@ -1,29 +1,21 @@
 package com.ozs.web.controller.sdk;
 
 import com.alibaba.fastjson2.JSON;
-import com.alibaba.fastjson2.JSONArray;
 import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.google.gson.JsonArray;
-import com.ozs.common.core.domain.AjaxResult;
-import com.ozs.common.core.domain.entity.SysUser;
 import com.ozs.common.core.redis.RedisCache;
-import com.ozs.common.exception.base.BaseException;
 import com.ozs.common.utils.ApiTokenUtils;
 import com.ozs.common.utils.ChineseToPingyin;
 import com.ozs.common.utils.HeartbeatUtils;
-import com.ozs.common.utils.HttpClientUtil;
 import com.ozs.common.utils.IgnoreUtils;
 import com.ozs.common.utils.StringUtils;
 import com.ozs.common.utils.http.HttpUtils;
 import com.ozs.common.utils.stateSecrets.SM4Utils;
 import com.ozs.entity.BaseCameraManagement;
-import com.ozs.entity.BaseDeviceDynamicManagement;
 import com.ozs.entity.BaseRailwayManagement;
 import com.ozs.entity.BaseTerminal;
 import com.ozs.entity.BaseUser;
 import com.ozs.entity.BaseVehicleTerminal;
-import com.ozs.entity.CameraTree;
 import com.ozs.entity.MsgAlarm;
 import com.ozs.entity.MsgAlarmExt;
 import com.ozs.entity.MsgAlarmFrequency;
@@ -37,7 +29,6 @@ import com.ozs.entity.vo.CameraPlayVo;
 import com.ozs.entity.vo.CameraVo;
 import com.ozs.entity.vo.Files;
 import com.ozs.entity.vo.HeartbeatVo;
-import com.ozs.entity.vo.MsgAlarmResp;
 import com.ozs.entity.vo.ParameterVo;
 import com.ozs.entity.vo.QueryAlarmVo;
 import com.ozs.entity.vo.ReleaseAlarmVo;
@@ -50,18 +41,16 @@ import com.ozs.entity.vo.RespMsgAlarmVo;
 import com.ozs.entity.vo.TerminalIgnoreVo;
 import com.ozs.framework.config.ServerConfig;
 import com.ozs.service.BaseCameraManagementService;
-import com.ozs.service.BaseDeviceDynamicManagementService;
 import com.ozs.service.BaseRailwayManagementService;
-import com.ozs.service.BaseTerminalService;
-import com.ozs.service.BaseUserService;
 import com.ozs.service.BaseVehicleTerminalService;
+import com.ozs.service.BaseUserService;
+import com.ozs.service.BaseTerminalService;
 import com.ozs.service.MsgAlarmExtService;
 import com.ozs.service.MsgAlarmFrequencyService;
 import com.ozs.service.MsgAlarmService;
 import com.ozs.service.SvcAddressService;
 import com.ozs.service.TerminalIgnoreAlarmService;
 import com.ozs.service.VehiclePositionService;
-import com.ozs.system.domain.SysUserOnline;
 import com.ozs.system.mapper.SysUserMapper;
 import com.ozs.web.common.Constant;
 import com.ozs.web.controller.monitor.SysUserOnlineController;
@@ -70,27 +59,22 @@ import com.ozs.web.core.util.CameraUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
-import java.text.ParseException;
 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.concurrent.TimeUnit;
-import java.util.stream.Collectors;
 
 /**
  * 1. 获取身份认证控制层
@@ -123,7 +107,7 @@ public class GeoHazardMonitorTokenController {
     @Autowired
     private MsgAlarmExtService msgAlarmExtService;
     @Autowired
-    private BaseTerminalService baseTerminalService;
+    private BaseVehicleTerminalService baseVehicleTerminalService;
     @Autowired
     private VehiclePositionService vehiclePositionService;
     @Autowired
@@ -139,7 +123,7 @@ public class GeoHazardMonitorTokenController {
     @Autowired
     private ServerConfig serverConfig;
     @Autowired
-    private BaseVehicleTerminalService baseVehicleTerminalService;
+    private BaseTerminalService baseTerminalService;
     @Resource
     private SysUserMapper sysUserMapper;
 
@@ -561,9 +545,9 @@ public class GeoHazardMonitorTokenController {
             }
             VehiclePosition vehiclePosition = new VehiclePosition();
             BeanUtils.copyProperties(heartbeatVo, vehiclePosition);
-            LambdaQueryWrapper<BaseTerminal> wrapper = new LambdaQueryWrapper<>();
-            wrapper.eq(BaseTerminal::getTerminalCode, vehiclePosition.getTerminalCode());
-            BaseTerminal baseTerminal = baseTerminalService.getOne(wrapper);
+            LambdaQueryWrapper<BaseVehicleTerminal> wrapper = new LambdaQueryWrapper<>();
+            wrapper.eq(BaseVehicleTerminal::getTerminalCode, vehiclePosition.getTerminalCode());
+            BaseVehicleTerminal baseTerminal = baseVehicleTerminalService.getOne(wrapper);
             if (ObjectUtils.isEmpty(baseTerminal)) {
                 jsonObject.put("resultCode", 0);
                 jsonObject.put("message", "失败");
@@ -579,12 +563,12 @@ public class GeoHazardMonitorTokenController {
             //机车行驶表添加数据
             boolean save = vehiclePositionService.save(vehiclePosition);
             //修改车载终端经度纬度
-            BaseVehicleTerminal baseVehicleTerminal = new BaseVehicleTerminal();
-            baseVehicleTerminal.setTerminalLatitude(heartbeatVo.getLatitude());
-            baseVehicleTerminal.setTerminalLongitude(heartbeatVo.getLongitude());
-            LambdaQueryWrapper<BaseVehicleTerminal> terminal = new LambdaQueryWrapper<>();
-            terminal.eq(BaseVehicleTerminal::getTerminalCode, vehiclePosition.getTerminalCode());
-            boolean update = baseVehicleTerminalService.update(baseVehicleTerminal, terminal);
+            BaseTerminal baseTerminal1 = new BaseTerminal();
+            baseTerminal1.setTerminalLatitude(heartbeatVo.getLatitude());
+            baseTerminal1.setTerminalLongitude(heartbeatVo.getLongitude());
+            LambdaQueryWrapper<BaseTerminal> terminal = new LambdaQueryWrapper<>();
+            terminal.eq(BaseTerminal::getTerminalCode, vehiclePosition.getTerminalCode());
+            boolean update = baseTerminalService.update(baseTerminal1, terminal);
 //            //*******获取终端经度纬度，将车载终端code改为机车的code，便是机车的位置
 //            HeartbeatVo heartbeatVoCH = new HeartbeatVo();
 //            BeanUtils.copyProperties(heartbeatVo, heartbeatVoCH);

vehicle-admin/src/main/java/com/ozs/web/controller/system/SysDeptController.java

@@ -170,13 +170,34 @@ public class SysDeptController extends BaseController {
         return toAjax(deptService.deleteDeptById(deptId));
     }
 
-    @Log(title = "部门管理", businessType = BusinessType.EXPORT)
-    @PreAuthorize("@ss.hasPermi('system:role:export')")
-    @PostMapping("/export")
+    @Log(title = "部门导出", businessType = BusinessType.EXPORT)
+    @PreAuthorize("@ss.hasPermi('system:dept:export')")
     @ApiOperation("部门管理")
-    public void export(HttpServletResponse response, SysDept dept) {
-        List<SysDept> list = deptService.selectDeptListAll(dept);
+    @GetMapping("/export")
+    public void export(SysDept dept, HttpServletResponse response) {
+        List<SysDept> list = forDeptList(dept);
         ExcelUtil<SysDept> util = new ExcelUtil<SysDept>(SysDept.class);
-        util.exportExcel(response, list, "角色数据");
+        util.exportExcel(response, list, "部门数据");
+    }
+
+    /**
+     * 遍历列表，给字段赋值
+     */
+    private List<SysDept> forDeptList(SysDept dept) {
+        List<SysDept> list = deptService.selectDeptListAll(dept);
+        for (SysDept sysDept : list) {
+            for (SysDept dept1 : list) {
+                if (dept1.getDeptId().equals(sysDept.getParentId())) {
+                    sysDept.setParentName(dept1.getDeptName());
+                    break;
+                }
+            }
+        }
+        for (SysDept sysDept : list) {
+            if (ObjectUtils.isEmpty(sysDept.getParentName())) {
+                sysDept.setParentName(sysDept.getDeptName());
+            }
+        }
+        return list;
     }
 }