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

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

@@ -61,7 +61,7 @@ public class BaseCameraManagement extends BaseEntity implements Serializable {
      * 行别
      */
     @Excel(name = "行别")
-    private Integer lineType;
+    private Integer lineDir;
 
     /**
      * 监控相机安装里程位置
@@ -93,13 +93,19 @@ public class BaseCameraManagement extends BaseEntity implements Serializable {
     @Excel(name = "监视相机纬度")
     private String installLatitude;
     /**
-     * 线路
+     * 线路编码
      */
-    @Excel(name = "线路")
-    private String railway;
+    @Excel(name = "线路编码")
+    private String railwayCode;
 
     /**
-     * 线路
+     * 线路名称
+     */
+    @Excel(name = "线路名称")
+    private String railwayName;
+
+    /**
+     * 物联网卡号
      */
     @Excel(name = "物联网卡号")
     private String cardNo;

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

@@ -32,7 +32,7 @@ public class BaseDeviceDynamicManagement extends BaseEntity implements Serializa
     /**
      * 主键ID
      */
-    @TableId(value = "account_management_id", type = IdType.AUTO)
+    @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 
     /**

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

@@ -26,31 +26,31 @@ import lombok.NoArgsConstructor;
 @NoArgsConstructor
 @Builder
 @ApiModel("线路台账管理表")
-public class BaseLineManagement extends BaseEntity implements Serializable {
+public class BaseRailwayManagement extends BaseEntity implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
     /**
      * 主键ID
      */
-    @TableId(value = "line_id", type = IdType.AUTO)
-    private Long lineId;
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
 
     /**
-     * 编码（四位数字）
+     * 线路编码（四位数字）
      */
     @Excel(name = "编码")
-    private Long lineCode;
+    private Long railwayCode;
 
     /**
      * 线路类型（普铁/高铁 ）
      */
     @Excel(name = "线路类型")
-    private Integer lineType;
+    private Integer railwayType;
 
     /**
      * 线路名称
      */
     @Excel(name = "线路名称")
-    private String lineName;
+    private String railwayName;
 }

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

@@ -38,14 +38,14 @@ public class MsgAlarm extends BaseEntity implements Serializable {
     private Long id;
 
     /**
-     * UUID(报警唯一识别)
+     * 报警唯一标识
      */
     private Long alarmId;
 
     /**
      * 相机编码
      */
-    private Integer alarmCamera;
+    private Integer cameraCode;
 
     /**
      * 报警时间

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

@@ -27,7 +27,7 @@ import lombok.NoArgsConstructor;
 @NoArgsConstructor
 @Builder
 @ApiModel("预报警信息管理记录表")
-public class MsgAlarmVice extends BaseEntity implements Serializable {
+public class MsgAlarmFrequency extends BaseEntity implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
@@ -38,7 +38,7 @@ public class MsgAlarmVice extends BaseEntity implements Serializable {
     private Long id;
 
     /**
-     * 报警唯一识别
+     * 报警唯一标识
      */
     private Long alarmId;
 

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

@@ -44,7 +44,7 @@ public class BaseCameraManagementDto extends BaseEntity implements Serializable
      * 行别
      */
     @Excel(name = "行别")
-    private String lineType;
+    private String lineDir;
 
     /**
      * 监控相机安装里程位置
@@ -55,11 +55,11 @@ public class BaseCameraManagementDto extends BaseEntity implements Serializable
      * 线路名称
      */
     @Excel(name = "线路名称")
-    private String lineName;
+    private String railwayName;
     /**
      * 线路编码（四位数字）
      */
     @Excel(name = "线路编码")
-    private Long lineCode;
+    private Long railwayCode;
     
 }

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

@@ -33,13 +33,13 @@ public class BaseCameraManagementVo extends PageVo implements Serializable {
     /**
      * 行别
      */
-    private String lineType;
+    private String lineDir;
 
   
     /**
-     * 线路
+     * 线路名称
      */
-    private String line;
+    private String railwayName;
 
     /**
      * 监控范围开始里程位置

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

@@ -14,17 +14,17 @@ import java.io.Serializable;
  * @since 2023-02-17
  */
 @Data
-public class BaseLineManagementVo extends PageVo implements Serializable {
+public class BaseRailwayManagementVo extends PageVo implements Serializable {
 
     private static final long serialVersionUID = 1L;
     
     /**
      * 线路类型（普铁/高铁 ）
      */
-    private Integer lineType;
+    private Integer railwayType;
 
     /**
      * 线路名称
      */
-    private String lineName;
+    private String railwayName;
 }

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

@@ -1,7 +1,7 @@
 package com.ozs.service.mapper;
 
-import com.ozs.service.entity.BaseLineManagement;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ozs.service.entity.BaseRailwayManagement;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
@@ -13,6 +13,6 @@ import org.apache.ibatis.annotations.Mapper;
  * @since 2023-02-17
  */
 @Mapper
-public interface BaseLineManagementMapper extends BaseMapper<BaseLineManagement> {
+public interface BaseRailwayManagementMapper extends BaseMapper<BaseRailwayManagement> {
 
 }

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

@@ -1,6 +1,6 @@
 package com.ozs.service.mapper;
 
-import com.ozs.service.entity.MsgAlarmVice;
+import com.ozs.service.entity.MsgAlarmFrequency;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -13,6 +13,6 @@ import org.apache.ibatis.annotations.Mapper;
  * @since 2023-02-23
  */
 @Mapper
-public interface MsgAlarmViceMapper extends BaseMapper<MsgAlarmVice> {
+public interface MsgAlarmFrequencyMapper extends BaseMapper<MsgAlarmFrequency> {
 
 }

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

@@ -22,18 +22,4 @@ public interface BaseCameraManagementService extends IService<BaseCameraManageme
      * @return
      */
     String importBaseAccountManagement(List<BaseCameraManagement> accountManageList, boolean updateSupport);
-
-    /**
-     * 获取视频服务二级菜单
-     * @param lineName
-     * @return 
-     */
-    AjaxResult secondaryMenu(String lineName);
-
-    /**
-     * 获取视频服务三级菜单
-     * @param secondaryMenuName
-     * @return
-     */
-    AjaxResult threeLevelMenu(String secondaryMenuName,String lineName);
 }

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

@@ -1,7 +1,7 @@
 package com.ozs.service.service;
 
-import com.ozs.service.entity.BaseLineManagement;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.ozs.service.entity.BaseRailwayManagement;
 
 import java.util.List;
 
@@ -13,12 +13,12 @@ import java.util.List;
  * @author ozs
  * @since 2023-02-17
  */
-public interface BaseLineManagementService extends IService<BaseLineManagement> {
+public interface BaseRailwayManagementService extends IService<BaseRailwayManagement> {
     /**
      * 线路台账导入
      * @param accountManageList
      * @param updateSupport
      * @return
      */
-    String importBaseLineManagement(List<BaseLineManagement> accountManageList, boolean updateSupport);
+    String importBaseLineManagement(List<BaseRailwayManagement> accountManageList, boolean updateSupport);
 }

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

@@ -1,6 +1,6 @@
 package com.ozs.service.service;
 
-import com.ozs.service.entity.MsgAlarmVice;
+import com.ozs.service.entity.MsgAlarmFrequency;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
@@ -11,6 +11,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @author ozs
  * @since 2023-02-23
  */
-public interface MsgAlarmViceService extends IService<MsgAlarmVice> {
+public interface MsgAlarmFrequencyService extends IService<MsgAlarmFrequency> {
 
 }

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

@@ -6,7 +6,6 @@ import com.ozs.common.exception.ServiceException;
 import com.ozs.common.utils.bean.BeanValidators;
 import com.ozs.service.entity.BaseCameraManagement;
 import com.ozs.service.mapper.BaseCameraManagementMapper;
-import com.ozs.service.mapper.BaseLineManagementMapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ozs.service.service.BaseCameraManagementService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -32,8 +31,6 @@ public class BaseCameraManagementServiceImpl extends ServiceImpl<BaseCameraManag
     protected Validator validator;
     @Resource
     BaseCameraManagementMapper baseCameraManagementMapper;
-    @Resource
-    BaseLineManagementMapper baseLineManagementMapper;
 
     /**
      * 台账管理导入
@@ -88,55 +85,4 @@ public class BaseCameraManagementServiceImpl extends ServiceImpl<BaseCameraManag
         }
         return successMsg.toString();
     }
-
-    @Override
-    public AjaxResult secondaryMenu(String lineName) {
-        LambdaQueryWrapper<BaseCameraManagement> lw = new LambdaQueryWrapper<BaseCameraManagement>();
-        if (!ObjectUtils.isEmpty(lineName)) {
-            lw.eq(BaseCameraManagement::getRailway, lineName);
-        }
-        List<String> secondaryMenuName = new ArrayList<>();
-        List<BaseCameraManagement> baseAccountManagementList = baseCameraManagementMapper.selectList(lw);
-        if (baseAccountManagementList.size() > 0) {
-            StringBuilder stringBuilder = new StringBuilder();
-            for (BaseCameraManagement baseAccountManagement : baseAccountManagementList) {
-                stringBuilder.append(baseAccountManagement.getInstallMile());
-                stringBuilder.append("-");
-                stringBuilder.append(baseAccountManagement.getLineType());
-                secondaryMenuName.add(stringBuilder.toString());
-            }
-        }else {
-            AjaxResult.error("该线路没有摄像头");
-        }
-        return AjaxResult.success(secondaryMenuName);
-    }
-
-    @Override
-    public AjaxResult threeLevelMenu(String secondaryMenuName,String lineName) {
-        String[] split = secondaryMenuName.split("-");
-        LambdaQueryWrapper<BaseCameraManagement> lw = new LambdaQueryWrapper<BaseCameraManagement>();
-        if (!ObjectUtils.isEmpty(split[0])) {
-            lw.eq(BaseCameraManagement::getInstallMile, split[0]);
-        }
-        if (!ObjectUtils.isEmpty(split[1])) {
-            lw.eq(BaseCameraManagement::getLineType, split[0]);
-        }
-        if (!ObjectUtils.isEmpty(lineName)) {
-            lw.eq(BaseCameraManagement::getRailway, lineName);
-        }
-        List<String> threeLevelMenuName = new ArrayList<>();
-        List<BaseCameraManagement> baseAccountManagementList = baseCameraManagementMapper.selectList(lw);
-        if (baseAccountManagementList.size() > 0) {
-            StringBuilder stringBuilder = new StringBuilder();
-            for (BaseCameraManagement baseAccountManagement : baseAccountManagementList) {
-                stringBuilder.append("摄像机");
-                stringBuilder.append(baseAccountManagement.getCameraCode());
-                threeLevelMenuName.add(stringBuilder.toString());
-            }
-        }
-        else {
-            AjaxResult.error("该线路没有摄像头");
-        }
-        return AjaxResult.success(threeLevelMenuName);
-    }
 }

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

@@ -46,8 +46,8 @@ public class BaseDeviceDynamicManagementServiceImpl extends ServiceImpl<BaseDevi
             for (BaseCameraManagementDto o : list) {
                 // 线路
                 CameraTree build = CameraTree.builder()
-                        .code(o.getLineCode().toString())
-                        .name(o.getLineName())
+                        .code(o.getRailwayCode().toString())
+                        .name(o.getRailwayName())
                         .flay(true)
                         .children(new ArrayList<>())
                         .build();
@@ -57,21 +57,21 @@ public class BaseDeviceDynamicManagementServiceImpl extends ServiceImpl<BaseDevi
                         .collect(Collectors.toList())
                         .contains(build.getCode())) {
                     cameraTree.getChildren().add(build);
-                    map.put(o.getLineCode().toString(), build);
+                    map.put(o.getRailwayCode().toString(), build);
                 }
 
                 // 里程
                 CameraTree build1 = CameraTree.builder()
-                        .code(o.getInstallMile() + "-" + (o.getLineType().equals("1") ? "上行" : "下行"))
-                        .name(o.getInstallMile() + "-" + (o.getLineType().equals("1") ? "上行" : "下行"))
+                        .code(o.getInstallMile() + "-" + (o.getLineDir().equals("1") ? "上行" : "下行"))
+                        .name(o.getInstallMile() + "-" + (o.getLineDir().equals("1") ? "上行" : "下行"))
                         .flay(true)
                         .children(new ArrayList<>())
                         .build();
 
 
-                if (!ObjectUtils.isEmpty(map.get(o.getLineCode().toString()))) {
-                    map.get(o.getLineCode().toString()).getChildren().add(build1);
-                    map1.put(o.getInstallMile() + "-" + (o.getLineType().equals("1") ? "上行" : "下行"), build1);
+                if (!ObjectUtils.isEmpty(map.get(o.getRailwayCode().toString()))) {
+                    map.get(o.getRailwayCode().toString()).getChildren().add(build1);
+                    map1.put(o.getInstallMile() + "-" + (o.getLineDir().equals("1") ? "上行" : "下行"), build1);
                 }
 
                 // 摄像头
@@ -83,8 +83,8 @@ public class BaseDeviceDynamicManagementServiceImpl extends ServiceImpl<BaseDevi
                         .build();
 
 
-                if (!ObjectUtils.isEmpty(map1.get(o.getInstallMile() + "-" + (o.getLineType().equals("1") ? "上行" : "下行")))) {
-                    map1.get(o.getInstallMile() + "-" + (o.getLineType().equals("1") ? "上行" : "下行")).getChildren().add(build2);
+                if (!ObjectUtils.isEmpty(map1.get(o.getInstallMile() + "-" + (o.getLineDir().equals("1") ? "上行" : "下行")))) {
+                    map1.get(o.getInstallMile() + "-" + (o.getLineDir().equals("1") ? "上行" : "下行")).getChildren().add(build2);
                 }
             }
         }

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

@@ -1,12 +1,12 @@
 package com.ozs.service.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ozs.common.exception.ServiceException;
 import com.ozs.common.utils.bean.BeanValidators;
-import com.ozs.service.entity.BaseLineManagement;
-import com.ozs.service.mapper.BaseLineManagementMapper;
-import com.ozs.service.service.BaseLineManagementService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ozs.service.entity.BaseRailwayManagement;
+import com.ozs.service.mapper.BaseRailwayManagementMapper;
+import com.ozs.service.service.BaseRailwayManagementService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
@@ -24,10 +24,10 @@ import java.util.List;
  * @since 2023-02-17
  */
 @Service
-public class BaseLineManagementServiceImpl extends ServiceImpl<BaseLineManagementMapper, BaseLineManagement> implements BaseLineManagementService {
+public class BaseRailwayManagementServiceImpl extends ServiceImpl<BaseRailwayManagementMapper, BaseRailwayManagement> implements BaseRailwayManagementService {
    
     @Resource
-    BaseLineManagementMapper baseLineManagementMapper;
+    BaseRailwayManagementMapper baseRailwayManagementMapper;
     @Autowired
     protected Validator validator;
 
@@ -38,7 +38,7 @@ public class BaseLineManagementServiceImpl extends ServiceImpl<BaseLineManagemen
      * @return
      */
     @Override
-    public String importBaseLineManagement(List<BaseLineManagement> accountManageList, boolean updateSupport) {
+    public String importBaseLineManagement(List<BaseRailwayManagement> accountManageList, boolean updateSupport) {
         if (com.ozs.common.utils.StringUtils.isNull(accountManageList) || accountManageList.size() == 0) {
             throw new ServiceException("导入线路台账信息不能为空！");
         }
@@ -46,31 +46,31 @@ public class BaseLineManagementServiceImpl extends ServiceImpl<BaseLineManagemen
         int failureNum = 0;
         StringBuilder successMsg = new StringBuilder();
         StringBuilder failureMsg = new StringBuilder();
-        for (BaseLineManagement lineManagement : accountManageList) {
+        for (BaseRailwayManagement railwayManagement : accountManageList) {
             try {
                 // 判断相机编码是否存在
-                LambdaQueryWrapper<BaseLineManagement> lw = new LambdaQueryWrapper<BaseLineManagement>();
-                if (!ObjectUtils.isEmpty(lineManagement.getLineCode())) {
-                    lw.eq(BaseLineManagement::getLineCode, lineManagement.getLineCode());
+                LambdaQueryWrapper<BaseRailwayManagement> lw = new LambdaQueryWrapper<BaseRailwayManagement>();
+                if (!ObjectUtils.isEmpty(railwayManagement.getRailwayCode())) {
+                    lw.eq(BaseRailwayManagement::getRailwayCode, railwayManagement.getRailwayCode());
                 }
-                BaseLineManagement baseLineManagement = baseLineManagementMapper.selectOne(lw);
+                BaseRailwayManagement baseLineManagement = baseRailwayManagementMapper.selectOne(lw);
                 if (!ObjectUtils.isEmpty(baseLineManagement)) {
-                    BeanValidators.validateWithException(validator, lineManagement);
-                    baseLineManagementMapper.insert(lineManagement);
+                    BeanValidators.validateWithException(validator, railwayManagement);
+                    baseRailwayManagementMapper.insert(railwayManagement);
                     successNum++;
-                    successMsg.append("<br/>" + successNum + "、线路编码 " + lineManagement.getLineCode() + " 导入成功");
+                    successMsg.append("<br/>" + successNum + "、线路编码 " + railwayManagement.getRailwayCode() + " 导入成功");
                 } else if (updateSupport) {
-                    BeanValidators.validateWithException(validator, lineManagement);
-                    baseLineManagementMapper.update(lineManagement,lw);
+                    BeanValidators.validateWithException(validator, railwayManagement);
+                    baseRailwayManagementMapper.update(railwayManagement,lw);
                     successNum++;
-                    successMsg.append("<br/>" + successNum + "、线路编码 " + lineManagement.getLineCode()  + " 更新成功");
+                    successMsg.append("<br/>" + successNum + "、线路编码 " + railwayManagement.getRailwayCode()  + " 更新成功");
                 } else {
                     failureNum++;
-                    failureMsg.append("<br/>" + failureNum + "、线路编码 " + lineManagement.getLineCode() + " 已存在");
+                    failureMsg.append("<br/>" + failureNum + "、线路编码 " + railwayManagement.getRailwayCode() + " 已存在");
                 }
             } catch (Exception e) {
                 failureNum++;
-                String msg = "<br/>" + failureNum + "、线路编码 " + lineManagement.getLineCode() + " 导入失败：";
+                String msg = "<br/>" + failureNum + "、线路编码 " + railwayManagement.getRailwayCode() + " 导入失败：";
                 failureMsg.append(msg + e.getMessage());
                 log.error(msg, e);
             }

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

@@ -0,0 +1,20 @@
+package com.ozs.service.service.impl;
+
+import com.ozs.service.entity.MsgAlarmFrequency;
+import com.ozs.service.mapper.MsgAlarmFrequencyMapper;
+import com.ozs.service.service.MsgAlarmFrequencyService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 预报警信息管理记录表 服务实现类
+ * </p>
+ *
+ * @author ozs
+ * @since 2023-02-23
+ */
+@Service
+public class MsgAlarmFrequencyServiceImpl extends ServiceImpl<MsgAlarmFrequencyMapper, MsgAlarmFrequency> implements MsgAlarmFrequencyService {
+
+}

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

@@ -1,20 +0,0 @@
-package com.ozs.service.service.impl;
-
-import com.ozs.service.entity.MsgAlarmVice;
-import com.ozs.service.mapper.MsgAlarmViceMapper;
-import com.ozs.service.service.MsgAlarmViceService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 预报警信息管理记录表 服务实现类
- * </p>
- *
- * @author ozs
- * @since 2023-02-23
- */
-@Service
-public class MsgAlarmViceServiceImpl extends ServiceImpl<MsgAlarmViceMapper, MsgAlarmVice> implements MsgAlarmViceService {
-
-}

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

@@ -4,20 +4,20 @@
 
     <select id="list" resultType="com.ozs.service.entity.vo.BaseCameraManagementDto">
 		SELECT
-			l.line_code AS lineCode, 
-			l.line_name AS lineName, 
+			l.railway_code AS railwayCode, 
+			l.railway_name AS railwayName, 
 			a.camera_code AS cameraCode, 
-			a.line_type AS lineType, 
+			a.line_dir AS lineDir, 
 			a.install_mile AS installMile, 
-			a.account_management_id AS id, 
-			a.line
+			a.id AS id, 
+			a.public_works_section
 		FROM
-			base_account_management AS a left join  
-			base_line_management AS l  on  a.line=l.line_code
+		    base_camera_management AS a left join
+		    base_railway_management AS l  on  a.railway_code=l.railway_code
 		<where>
 
 			<if test="name != null and name !=''">
-				concat(l.line_name,a.camera_code)
+				concat(l.railway_name,a.camera_code)
 				like concat("%",#{name},"%")
 			</if>
 			

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

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ozs.service.mapper.BaseLineManagementMapper">
+<mapper namespace="com.ozs.service.mapper.BaseRailwayManagementMapper">
 
 </mapper>

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

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ozs.service.mapper.MsgAlarmViceMapper">
+<mapper namespace="com.ozs.service.mapper.MsgAlarmFrequencyMapper">
 
 </mapper>

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

@@ -12,11 +12,10 @@ import com.ozs.common.utils.http.HttpUtils;
 import com.ozs.common.utils.poi.ExcelUtil;
 import com.ozs.service.entity.BaseCameraManagement;
 import com.ozs.service.entity.BaseDeviceDynamicManagement;
-import com.ozs.service.entity.BaseLineManagement;
 import com.ozs.service.entity.vo.BaseCameraManagementVo;
 import com.ozs.service.service.BaseCameraManagementService;
 import com.ozs.service.service.BaseDeviceDynamicManagementService;
-import com.ozs.service.service.BaseLineManagementService;
+import com.ozs.service.service.BaseRailwayManagementService;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.cache.annotation.Cacheable;
@@ -38,7 +37,6 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -57,7 +55,7 @@ public class BaseCameraManagementController extends BaseController {
     @Resource
     BaseDeviceDynamicManagementService baseDeviceDynamicManagementService;
     @Resource
-    BaseLineManagementService baseLineManagementService;
+    BaseRailwayManagementService baseLineManagementService;
 
     /**
      * 相机台账管理分页
@@ -69,11 +67,11 @@ public class BaseCameraManagementController extends BaseController {
     @PostMapping("/list")
     public AjaxResult selectBaseAccountManagement(@RequestBody BaseCameraManagementVo baseCameraManagementVo) {
         LambdaQueryWrapper<BaseCameraManagement> lw = new LambdaQueryWrapper<BaseCameraManagement>();
-        if (!StringUtils.isBlank(baseCameraManagementVo.getLine())) {
-            lw.eq(BaseCameraManagement::getRailway, baseCameraManagementVo.getLine());
+        if (!StringUtils.isBlank(baseCameraManagementVo.getLineDir())) {
+            lw.eq(BaseCameraManagement::getLineDir, baseCameraManagementVo.getLineDir());
         }
-        if (!StringUtils.isBlank(baseCameraManagementVo.getLineType())) {
-            lw.eq(BaseCameraManagement::getLineType, baseCameraManagementVo.getLineType());
+        if (!StringUtils.isBlank(baseCameraManagementVo.getRailwayName())) {
+            lw.eq(BaseCameraManagement::getRailwayCode, baseCameraManagementVo.getRailwayName());
         }
         if (!StringUtils.isBlank(baseCameraManagementVo.getPublicWorksSection())) {
             lw.eq(BaseCameraManagement::getPublicWorksSection, baseCameraManagementVo.getPublicWorksSection());
@@ -169,11 +167,11 @@ public class BaseCameraManagementController extends BaseController {
     @PostMapping("/exportBaseAccountManagement")
     public void exportBaseAccountManagement(HttpServletResponse response, @RequestBody BaseCameraManagementVo baseAccountManagementVo) {
         LambdaQueryWrapper<BaseCameraManagement> lw = new LambdaQueryWrapper<BaseCameraManagement>();
-        if (!StringUtils.isBlank(baseAccountManagementVo.getLine())) {
-            lw.eq(BaseCameraManagement::getRailway, baseAccountManagementVo.getLine());
+        if (!StringUtils.isBlank(baseAccountManagementVo.getLineDir())) {
+            lw.eq(BaseCameraManagement::getLineDir, baseAccountManagementVo.getLineDir());
         }
-        if (!StringUtils.isBlank(baseAccountManagementVo.getLineType())) {
-            lw.eq(BaseCameraManagement::getLineType, baseAccountManagementVo.getLineType());
+        if (!StringUtils.isBlank(baseAccountManagementVo.getRailwayName())) {
+            lw.eq(BaseCameraManagement::getRailwayCode, baseAccountManagementVo.getRailwayName());
         }
         if (!StringUtils.isBlank(baseAccountManagementVo.getPublicWorksSection())) {
             lw.eq(BaseCameraManagement::getPublicWorksSection, baseAccountManagementVo.getPublicWorksSection());
@@ -203,27 +201,6 @@ public class BaseCameraManagementController extends BaseController {
         }
     }
 
-    @ApiOperation("获取视频服务一级菜单")
-    @GetMapping("/firstLevelMenu")
-    public AjaxResult firstLevelMenu() {
-        List<BaseLineManagement> list = baseLineManagementService.list();
-        List<String> collect = list.stream().map(BaseLineManagement::getLineName).collect(Collectors.toList());
-        return success(collect);
-    }
-
-    @ApiOperation("获取视频服务二级菜单")
-    @GetMapping("/secondaryMenu/{lineName}")
-    public AjaxResult secondaryMenu(@PathVariable String lineName) {
-        return baseCameraManagementService.secondaryMenu(lineName);
-    }
-
-    @ApiOperation("获取视频服务三级菜单")
-    @GetMapping("/threeLevelMenu/{secondaryMenuName}/{lineName}")
-    public AjaxResult threeLevelMenu(@PathVariable String secondaryMenuName, @PathVariable String lineName) {
-        return baseCameraManagementService.threeLevelMenu(secondaryMenuName, lineName);
-    }
-
-
     @ApiOperation("查询录像")
     @GetMapping("/api/records")
     public AjaxResult apiRecords() {

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

@@ -9,9 +9,9 @@ import com.ozs.common.core.domain.AjaxResult;
 import com.ozs.common.utils.StringUtils;
 import com.ozs.common.utils.file.FileUtils;
 import com.ozs.common.utils.poi.ExcelUtil;
-import com.ozs.service.entity.BaseLineManagement;
-import com.ozs.service.entity.vo.BaseLineManagementVo;
-import com.ozs.service.service.BaseLineManagementService;
+import com.ozs.service.entity.BaseRailwayManagement;
+import com.ozs.service.entity.vo.BaseRailwayManagementVo;
+import com.ozs.service.service.BaseRailwayManagementService;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.MediaType;
@@ -40,29 +40,29 @@ import java.util.List;
  * @since 2023-02-17
  */
 @RestController
-@RequestMapping("/service/baseLineManagement")
+@RequestMapping("/service/baseRailwayManagement")
 @Slf4j
-public class BaseLineManagementController extends BaseController {
+public class BaseRailwayManagementController extends BaseController {
     @Resource
-    BaseLineManagementService baseLineManagementService;
+    BaseRailwayManagementService baseRailwayManagementService;
 
     /**
      * 线路台账管理分页
      *
-     * @param baseLineManagementVo
+     * @param baseRailwayManagementVo
      * @return
      */
     @ApiOperation(value = "线路台账管理分页")
     @PostMapping("/list")
-    public AjaxResult selectBaseLineManagement(@RequestBody BaseLineManagementVo baseLineManagementVo) {
-        LambdaQueryWrapper<BaseLineManagement> lw = new LambdaQueryWrapper<BaseLineManagement>();
-        if (!StringUtils.isBlank(baseLineManagementVo.getLineName())) {
-            lw.eq(BaseLineManagement::getLineName, baseLineManagementVo.getLineName());
+    public AjaxResult selectBaseLineManagement(@RequestBody BaseRailwayManagementVo baseRailwayManagementVo) {
+        LambdaQueryWrapper<BaseRailwayManagement> lw = new LambdaQueryWrapper<BaseRailwayManagement>();
+        if (!StringUtils.isBlank(baseRailwayManagementVo.getRailwayName())) {
+            lw.eq(BaseRailwayManagement::getRailwayName, baseRailwayManagementVo.getRailwayName());
         }
-        if (!ObjectUtils.isEmpty(baseLineManagementVo.getLineType())) {
-            lw.like(BaseLineManagement::getLineType, "%" + baseLineManagementVo.getLineType() + "%");
+        if (!ObjectUtils.isEmpty(baseRailwayManagementVo.getRailwayType())) {
+            lw.like(BaseRailwayManagement::getRailwayType, "%" + baseRailwayManagementVo.getRailwayType() + "%");
         }
-        IPage<BaseLineManagement> page = baseLineManagementService.page(new Page<BaseLineManagement>(baseLineManagementVo.getPageNum(), baseLineManagementVo.getPageSize()), lw);
+        IPage<BaseRailwayManagement> page = baseRailwayManagementService.page(new Page<BaseRailwayManagement>(baseRailwayManagementVo.getPageNum(), baseRailwayManagementVo.getPageSize()), lw);
         return AjaxResult.success(page);
     }
 
@@ -75,7 +75,7 @@ public class BaseLineManagementController extends BaseController {
     @DeleteMapping("/{lineIds}")
     @ApiOperation("删除线路台账信息")
     public AjaxResult removeLineManagement(@PathVariable List<Long> lineIds) {
-        if (baseLineManagementService.removeByIds(lineIds)) {
+        if (baseRailwayManagementService.removeByIds(lineIds)) {
             return AjaxResult.success();
         }
         return AjaxResult.error();
@@ -84,14 +84,14 @@ public class BaseLineManagementController extends BaseController {
     /**
      * 新增线路台账信息
      *
-     * @param baseLineManagement
+     * @param baseRailwayManagement
      * @return
      */
     @PostMapping("/saveLineManagement")
     @ApiOperation("新增线路台账信息")
-    public AjaxResult saveLineManagement(@RequestBody BaseLineManagement baseLineManagement) {
-        baseLineManagement.setCreateBy(getUsername());
-        if (baseLineManagementService.save(baseLineManagement)) {
+    public AjaxResult saveLineManagement(@RequestBody BaseRailwayManagement baseRailwayManagement) {
+        baseRailwayManagement.setCreateBy(getUsername());
+        if (baseRailwayManagementService.save(baseRailwayManagement)) {
             return AjaxResult.success();
         }
         return AjaxResult.error();
@@ -100,14 +100,14 @@ public class BaseLineManagementController extends BaseController {
     /**
      * 修改线路台账信息
      *
-     * @param baseLineManagement
+     * @param baseRailwayManagement
      * @return
      */
     @PutMapping("/editLineManagement")
     @ApiOperation("修改线路台账信息")
-    public AjaxResult editLineManagement(@RequestBody BaseLineManagement baseLineManagement) {
-        baseLineManagement.setUpdateBy(getUsername());
-        if (baseLineManagementService.updateById(baseLineManagement)) {
+    public AjaxResult editLineManagement(@RequestBody BaseRailwayManagement baseRailwayManagement) {
+        baseRailwayManagement.setUpdateBy(getUsername());
+        if (baseRailwayManagementService.updateById(baseRailwayManagement)) {
             return AjaxResult.success();
         }
         return AjaxResult.error();
@@ -116,7 +116,7 @@ public class BaseLineManagementController extends BaseController {
     @GetMapping(value = "/{lineId}")
     @ApiOperation("根据台账ID获取详细信息")
     public AjaxResult getInfo(@PathVariable Long lineId) {
-        return AjaxResult.success(baseLineManagementService.getById(lineId));
+        return AjaxResult.success(baseRailwayManagementService.getById(lineId));
     }
 
     /**
@@ -130,9 +130,9 @@ public class BaseLineManagementController extends BaseController {
     @ApiOperation("线路台账导入")
     @PostMapping("/importBaseLineManagement")
     public AjaxResult importBaseLineManagement(MultipartFile file, boolean updateSupport) throws Exception {
-        ExcelUtil<BaseLineManagement> util = new ExcelUtil<BaseLineManagement>(BaseLineManagement.class);
-        List<BaseLineManagement> AccountManageList = util.importExcel(file.getInputStream());
-        String message = baseLineManagementService.importBaseLineManagement(AccountManageList, updateSupport);
+        ExcelUtil<BaseRailwayManagement> util = new ExcelUtil<BaseRailwayManagement>(BaseRailwayManagement.class);
+        List<BaseRailwayManagement> AccountManageList = util.importExcel(file.getInputStream());
+        String message = baseRailwayManagementService.importBaseLineManagement(AccountManageList, updateSupport);
         return AjaxResult.success(message);
     }
 
@@ -143,16 +143,16 @@ public class BaseLineManagementController extends BaseController {
      */
     @ApiOperation("导出线路台账")
     @PostMapping("/exportBaseLineManagement")
-    public void exportBaseLineManagement(HttpServletResponse response, @RequestBody BaseLineManagementVo baseLineManagementVo) {
-        LambdaQueryWrapper<BaseLineManagement> lw = new LambdaQueryWrapper<BaseLineManagement>();
-        if (!StringUtils.isBlank(baseLineManagementVo.getLineName())) {
-            lw.eq(BaseLineManagement::getLineName, baseLineManagementVo.getLineName());
+    public void exportBaseLineManagement(HttpServletResponse response, @RequestBody BaseRailwayManagementVo baseRailwayManagementVo) {
+        LambdaQueryWrapper<BaseRailwayManagement> lw = new LambdaQueryWrapper<BaseRailwayManagement>();
+        if (!StringUtils.isBlank(baseRailwayManagementVo.getRailwayName())) {
+            lw.eq(BaseRailwayManagement::getRailwayName, baseRailwayManagementVo.getRailwayName());
         }
-        if (!ObjectUtils.isEmpty(baseLineManagementVo.getLineType())) {
-            lw.like(BaseLineManagement::getLineType, "%" + baseLineManagementVo.getLineType() + "%");
+        if (!ObjectUtils.isEmpty(baseRailwayManagementVo.getRailwayType())) {
+            lw.like(BaseRailwayManagement::getRailwayType, "%" + baseRailwayManagementVo.getRailwayType() + "%");
         }
-        List<BaseLineManagement> list = baseLineManagementService.list(lw);
-        ExcelUtil<BaseLineManagement> util = new ExcelUtil<>(BaseLineManagement.class);
+        List<BaseRailwayManagement> list = baseRailwayManagementService.list(lw);
+        ExcelUtil<BaseRailwayManagement> util = new ExcelUtil<>(BaseRailwayManagement.class);
         util.exportExcel(response, list, "线路台账数据");
     }
 

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

@@ -9,11 +9,11 @@ import com.ozs.common.core.controller.BaseController;
 import com.ozs.common.core.domain.AjaxResult;
 import com.ozs.common.utils.StringUtils;
 import com.ozs.service.entity.MsgAlarm;
-import com.ozs.service.entity.MsgAlarmVice;
+import com.ozs.service.entity.MsgAlarmFrequency;
 import com.ozs.service.entity.vo.HistoricalAlarmVo;
 import com.ozs.service.entity.vo.MsgAlarmVo;
+import com.ozs.service.service.MsgAlarmFrequencyService;
 import com.ozs.service.service.MsgAlarmService;
-import com.ozs.service.service.MsgAlarmViceService;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.BeanUtils;
 import org.springframework.util.ObjectUtils;
@@ -45,7 +45,7 @@ public class MsgAlarmController extends BaseController {
     @Resource
     MsgAlarmService msgAlarmService;
     @Resource
-    MsgAlarmViceService msgAlarmViceService;
+    MsgAlarmFrequencyService msgAlarmFrequencyService;
 
 
     /**
@@ -107,28 +107,24 @@ public class MsgAlarmController extends BaseController {
         return AjaxResult.success(msgAlarmService.updateById(msgAlarm));
     }
 
-    @GetMapping(value = "/historicalAlarm/{id}")
-    @ApiOperation("历史报警次数信息")
-    public AjaxResult historicalAlarm(@PathVariable Long id) {
-        MsgAlarm msgAlarm = msgAlarmService.getById(id);
-        List<HistoricalAlarmVo> historicalAlarmVoList=new ArrayList<>();
-        HistoricalAlarmVo historicalAlarmVo = new HistoricalAlarmVo();
-        historicalAlarmVo.setAlarmTime(msgAlarm.getAlarmTime());
-        historicalAlarmVo.setAlarmType(msgAlarm.getAlarmType());
-        historicalAlarmVo.setIsLock(msgAlarm.getIsLock());
-        historicalAlarmVoList.add(historicalAlarmVo);
-        QueryWrapper<MsgAlarmVice> wrapper = new QueryWrapper<>();
-        wrapper.eq("alarm_id",msgAlarm.getAlarmId());
+    @GetMapping(value = "/alarmHistoricalAlarm/{alarmId}")
+    @ApiOperation("报警消息详情历史报警次数信息")
+    public AjaxResult alarmHistoricalAlarm(@PathVariable Long alarmId) {
+        QueryWrapper<MsgAlarmFrequency> wrapper = new QueryWrapper<>();
+        wrapper.eq("alarm_id",alarmId);
         wrapper.orderByDesc("alarm_time");
-        List<MsgAlarmVice> list = msgAlarmViceService.list(wrapper);
-        for (MsgAlarmVice msgAlarmVice : list) {
-            historicalAlarmVo = new HistoricalAlarmVo();
-            historicalAlarmVo.setAlarmTime(msgAlarmVice.getAlarmTime());
-            historicalAlarmVo.setAlarmType(msgAlarmVice.getAlarmType());
-            historicalAlarmVo.setIsLock(2);
-            historicalAlarmVoList.add(historicalAlarmVo);
-        }
-        return AjaxResult.success(historicalAlarmVoList);
+        List<MsgAlarmFrequency> list = msgAlarmFrequencyService.list(wrapper);
+        return AjaxResult.success(list);
+    }
+
+    @GetMapping(value = "/videoHistoricalAlarm/{alarmCamera}")
+    @ApiOperation("视频服务历史报警信息")
+    public AjaxResult videoHistoricalAlarm(@PathVariable Long alarmCamera) {
+        QueryWrapper<MsgAlarm> wrapper = new QueryWrapper<>();
+        wrapper.eq("alarm_camera",alarmCamera);
+        wrapper.orderByDesc("alarm_time");
+        List<MsgAlarm> list = msgAlarmService.list(wrapper);
+        return AjaxResult.success(list);
     }
 }
 

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

@@ -1,32 +0,0 @@
-package com.ozs.web.controller.accountmanagment;
-
-
-import com.ozs.common.core.domain.AjaxResult;
-import com.ozs.service.service.SvcAddressService;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author ozs
- * @since 2023-02-28
- */
-@RestController
-@RequestMapping("/service/svcAddress")
-public class SvcAddressController {
-   @Autowired
-    SvcAddressService svcAddressService;
-
-    @GetMapping("/test")
-    public AjaxResult getInfo() {
-        return AjaxResult.success(svcAddressService.list());
-    }
-}
-

hazard-admin/src/main/java/com/ozs/web/controller/system/SysUserController.java

@@ -3,6 +3,7 @@ package com.ozs.web.controller.system;
 import java.util.List;
 import java.util.stream.Collectors;
 import javax.servlet.http.HttpServletResponse;
+
 import org.apache.commons.lang3.ArrayUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -40,8 +41,7 @@ import com.ozs.system.service.ISysUserService;
  */
 @RestController
 @RequestMapping("/system/user")
-public class SysUserController extends BaseController
-{
+public class SysUserController extends BaseController {
     @Autowired
     private ISysUserService userService;
 
@@ -59,8 +59,7 @@ public class SysUserController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:user:list')")
     @GetMapping("/list")
-    public TableDataInfo list(SysUser user)
-    {
+    public TableDataInfo list(SysUser user) {
         startPage();
         List<SysUser> list = userService.selectUserList(user);
         return getDataTable(list);
@@ -69,8 +68,7 @@ public class SysUserController extends BaseController
     @Log(title = "用户管理", businessType = BusinessType.EXPORT)
     @PreAuthorize("@ss.hasPermi('system:user:export')")
     @PostMapping("/export")
-    public void export(HttpServletResponse response, SysUser user)
-    {
+    public void export(HttpServletResponse response, SysUser user) {
         List<SysUser> list = userService.selectUserList(user);
         ExcelUtil<SysUser> util = new ExcelUtil<SysUser>(SysUser.class);
         util.exportExcel(response, list, "用户数据");
@@ -79,8 +77,7 @@ public class SysUserController extends BaseController
     @Log(title = "用户管理", businessType = BusinessType.IMPORT)
     @PreAuthorize("@ss.hasPermi('system:user:import')")
     @PostMapping("/importData")
-    public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception
-    {
+    public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception {
         ExcelUtil<SysUser> util = new ExcelUtil<SysUser>(SysUser.class);
         List<SysUser> userList = util.importExcel(file.getInputStream());
         String operName = getUsername();
@@ -89,8 +86,7 @@ public class SysUserController extends BaseController
     }
 
     @PostMapping("/importTemplate")
-    public void importTemplate(HttpServletResponse response)
-    {
+    public void importTemplate(HttpServletResponse response) {
         ExcelUtil<SysUser> util = new ExcelUtil<SysUser>(SysUser.class);
         util.importTemplateExcel(response, "用户数据");
     }
@@ -99,19 +95,15 @@ public class SysUserController extends BaseController
      * 根据用户编号获取详细信息
      */
     @PreAuthorize("@ss.hasPermi('system:user:query')")
-    @GetMapping(value = { "/", "/{userId}" })
-    public AjaxResult getInfo(@PathVariable(value = "userId", required = false) Long userId)
-    {
+    @GetMapping(value = {"/", "/{userId}"})
+    public AjaxResult getInfo(@PathVariable(value = "userId", required = false) Long userId) {
         userService.checkUserDataScope(userId);
         AjaxResult ajax = AjaxResult.success();
         List<SysRole> roles = roleService.selectRoleAll();
         ajax.put("roles", SysUser.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList()));
-        ajax.put("posts", postService.selectPostAll());
-        if (StringUtils.isNotNull(userId))
-        {
+        if (StringUtils.isNotNull(userId)) {
             SysUser sysUser = userService.selectUserById(userId);
             ajax.put(AjaxResult.DATA_TAG, sysUser);
-            ajax.put("postIds", postService.selectPostListByUserId(userId));
             ajax.put("roleIds", sysUser.getRoles().stream().map(SysRole::getRoleId).collect(Collectors.toList()));
         }
         return ajax;
@@ -123,25 +115,16 @@ public class SysUserController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:user:add')")
     @Log(title = "用户管理", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@Validated @RequestBody SysUser user)
-    {
-        if (UserConstants.NOT_UNIQUE.equals(userService.checkUserNameUnique(user)))
-        {
+    public AjaxResult add(@Validated @RequestBody SysUser user) {
+        if (UserConstants.NOT_UNIQUE.equals(userService.checkUserNameUnique(user))) {
             return error("新增用户'" + user.getUserName() + "'失败，登录账号已存在");
-        }
-        else if (StringUtils.isNotEmpty(user.getPhonenumber())
-                && UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user)))
-        {
+        } else if (StringUtils.isNotEmpty(user.getPhonenumber())
+                && UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user))) {
             return error("新增用户'" + user.getUserName() + "'失败，手机号码已存在");
         }
-        else if (StringUtils.isNotEmpty(user.getEmail())
-                && UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user)))
-        {
-            return error("新增用户'" + user.getUserName() + "'失败，邮箱账号已存在");
-        }
         user.setCreateBy(getUsername());
         user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
-        return toAjax(userService.insertUser(user));
+        return toAjax(userService.saveUser(user));
     }
 
     /**
@@ -150,26 +133,20 @@ public class SysUserController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:user:edit')")
     @Log(title = "用户管理", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@Validated @RequestBody SysUser user)
-    {
+    public AjaxResult edit(@Validated @RequestBody SysUser user) {
         userService.checkUserAllowed(user);
         userService.checkUserDataScope(user.getUserId());
-        if (UserConstants.NOT_UNIQUE.equals(userService.checkUserNameUnique(user)))
-        {
+        if (UserConstants.NOT_UNIQUE.equals(userService.checkUserNameUnique(user))) {
             return error("修改用户'" + user.getUserName() + "'失败，登录账号已存在");
-        }
-        else if (StringUtils.isNotEmpty(user.getPhonenumber())
-                && UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user)))
-        {
+        } else if (StringUtils.isNotEmpty(user.getPhonenumber())
+                && UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user))) {
             return error("修改用户'" + user.getUserName() + "'失败，手机号码已存在");
-        }
-        else if (StringUtils.isNotEmpty(user.getEmail())
-                && UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user)))
-        {
+        } else if (StringUtils.isNotEmpty(user.getEmail())
+                && UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user))) {
             return error("修改用户'" + user.getUserName() + "'失败，邮箱账号已存在");
         }
         user.setUpdateBy(getUsername());
-        return toAjax(userService.updateUser(user));
+        return toAjax(userService.updateUsers(user));
     }
 
     /**
@@ -178,14 +155,28 @@ public class SysUserController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:user:remove')")
     @Log(title = "用户管理", businessType = BusinessType.DELETE)
     @DeleteMapping("/{userIds}")
-    public AjaxResult remove(@PathVariable Long[] userIds)
-    {
-        if (ArrayUtils.contains(userIds, getUserId()))
-        {
+    public AjaxResult remove(@PathVariable Long[] userIds) {
+        if (ArrayUtils.contains(userIds, getUserId())) {
             return error("当前用户不能删除");
         }
         return toAjax(userService.deleteUserByIds(userIds));
     }
+    ///**
+    // * 删除用户
+    // */
+    //@PreAuthorize("@ss.hasPermi('system:user:remove')")
+    //@Log(title = "用户管理", businessType = BusinessType.DELETE)
+    //@PostMapping("/del")
+    //public AjaxResult remove(@RequestBody List<SysUser> users) {
+    //    Long[] userIds = new Long[users.size()];
+    //    for (int i = 0; i < users.size(); i++) {
+    //        userIds[i] = users.get(i).getUserId();
+    //    }
+    //    if (ArrayUtils.contains(userIds, getUserId())) {
+    //        return error("当前用户不能删除");
+    //    }
+    //    return toAjax(userService.deleteUserByIds(userIds));
+    //}
 
     /**
      * 重置密码
@@ -193,8 +184,7 @@ public class SysUserController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:user:resetPwd')")
     @Log(title = "用户管理", businessType = BusinessType.UPDATE)
     @PutMapping("/resetPwd")
-    public AjaxResult resetPwd(@RequestBody SysUser user)
-    {
+    public AjaxResult resetPwd(@RequestBody SysUser user) {
         userService.checkUserAllowed(user);
         userService.checkUserDataScope(user.getUserId());
         user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
@@ -208,8 +198,7 @@ public class SysUserController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:user:edit')")
     @Log(title = "用户管理", businessType = BusinessType.UPDATE)
     @PutMapping("/changeStatus")
-    public AjaxResult changeStatus(@RequestBody SysUser user)
-    {
+    public AjaxResult changeStatus(@RequestBody SysUser user) {
         userService.checkUserAllowed(user);
         userService.checkUserDataScope(user.getUserId());
         user.setUpdateBy(getUsername());
@@ -221,8 +210,7 @@ public class SysUserController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:user:query')")
     @GetMapping("/authRole/{userId}")
-    public AjaxResult authRole(@PathVariable("userId") Long userId)
-    {
+    public AjaxResult authRole(@PathVariable("userId") Long userId) {
         AjaxResult ajax = AjaxResult.success();
         SysUser user = userService.selectUserById(userId);
         List<SysRole> roles = roleService.selectRolesByUserId(userId);
@@ -237,8 +225,7 @@ public class SysUserController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:user:edit')")
     @Log(title = "用户管理", businessType = BusinessType.GRANT)
     @PutMapping("/authRole")
-    public AjaxResult insertAuthRole(Long userId, Long[] roleIds)
-    {
+    public AjaxResult insertAuthRole(Long userId, Long[] roleIds) {
         userService.checkUserDataScope(userId);
         userService.insertUserAuth(userId, roleIds);
         return success();
@@ -249,8 +236,7 @@ public class SysUserController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:user:list')")
     @GetMapping("/deptTree")
-    public AjaxResult deptTree(SysDept dept)
-    {
+    public AjaxResult deptTree(SysDept dept) {
         return success(deptService.selectDeptTreeList(dept));
     }
 }

hazard-admin/src/main/java/com/ozs/web/controller/upload/UploadController.java

@@ -50,7 +50,7 @@ public class UploadController {
             if (StringUtils.isNotBlank(imageName)) {
                 LambdaQueryWrapper<MsgAlarm> lw = new LambdaQueryWrapper<MsgAlarm>();
                 if (!ObjectUtils.isEmpty(cameraCode)) {
-                    lw.eq(MsgAlarm::getAlarmCamera, cameraCode);
+                    lw.eq(MsgAlarm::getCameraCode, cameraCode);
                     lw.orderByDesc(MsgAlarm::getAlarmTime);
                 }
                 List<MsgAlarm> list = msgAlarmService.list(lw);

hazard-sdk/src/main/java/com/ozs/controller/upload/GeoHazardMonitorTokenController.java

@@ -10,11 +10,11 @@ import com.ozs.common.utils.StringUtils;
 import com.ozs.common.utils.stateSecrets.SM4Utils;
 import com.ozs.service.entity.BaseDeviceDynamicManagement;
 import com.ozs.service.entity.MsgAlarm;
-import com.ozs.service.entity.MsgAlarmVice;
+import com.ozs.service.entity.MsgAlarmFrequency;
 import com.ozs.service.entity.SvcAddress;
 import com.ozs.service.service.BaseDeviceDynamicManagementService;
+import com.ozs.service.service.MsgAlarmFrequencyService;
 import com.ozs.service.service.MsgAlarmService;
-import com.ozs.service.service.MsgAlarmViceService;
 import com.ozs.service.service.SvcAddressService;
 import com.ozs.vo.ReqDeviceVo;
 import com.ozs.vo.ReqMsgAlarmVo;
@@ -25,6 +25,7 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.ObjectUtils;
 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;
 
@@ -54,7 +55,7 @@ public class GeoHazardMonitorTokenController {
     @Autowired
     MsgAlarmService msgAlarmService;
     @Autowired
-    MsgAlarmViceService msgAlarmViceService;
+    MsgAlarmFrequencyService msgAlarmFrequencyService;
     @Autowired
     SvcAddressService svcAddressService;
 
@@ -62,30 +63,25 @@ public class GeoHazardMonitorTokenController {
     /**
      * 获取web访问令牌
      *
-     * @param grantType    授权类型，客户端模式（client_credentials）
-     * @param clientId     客户端编号
-     * @param clientSecret 客户端密钥
      * @return
      */
     @PostMapping("/IPAddress/token")
-    public String getWebToken(@RequestParam(value = "grantType", required = false) String grantType,
-                              @RequestParam(value = "clientId", required = false) String clientId,
-                              @RequestParam(value = "clientSecret", required = false) String clientSecret) {
+    public String getWebToken(@RequestBody SvcAddress svcAddress) {
         // 生成令牌
-        JSONObject jsonObject=new JSONObject();
+        JSONObject jsonObject = new JSONObject();
         LambdaQueryWrapper<SvcAddress> lw = new LambdaQueryWrapper<SvcAddress>();
-        if (!ObjectUtils.isEmpty(grantType)) {
-            lw.eq(SvcAddress::getGrantType, grantType);
+        if (!ObjectUtils.isEmpty(svcAddress.getGrantType())) {
+            lw.eq(SvcAddress::getGrantType, svcAddress.getGrantType());
         }
-        if (!ObjectUtils.isEmpty(clientId)) {
-            lw.eq(SvcAddress::getClientId, clientId);
+        if (!ObjectUtils.isEmpty(svcAddress.getClientId())) {
+            lw.eq(SvcAddress::getClientId, svcAddress.getClientId());
         }
-        if (!ObjectUtils.isEmpty(clientSecret)) {
-            lw.eq(SvcAddress::getClientSecret, clientSecret);
+        if (!ObjectUtils.isEmpty(svcAddress.getClientSecret())) {
+            lw.eq(SvcAddress::getClientSecret, svcAddress.getClientSecret());
         }
         List<SvcAddress> list = svcAddressService.list(lw);
         if (list.size() > 0) {
-            ArrayList<String> objects = apiTokenUtils.createGeoHazardMonitorToken(grantType, clientId, clientSecret);
+            ArrayList<String> objects = apiTokenUtils.createGeoHazardMonitorToken(svcAddress.getGrantType(), svcAddress.getClientId(), svcAddress.getClientSecret());
             if (objects.size() > 0) {
                 RespGeoHazardMonitorVo respGeoHazardMonitorVo = new RespGeoHazardMonitorVo();
                 respGeoHazardMonitorVo.setAccessToken(objects.get(1));
@@ -153,16 +149,16 @@ public class GeoHazardMonitorTokenController {
 //                msgAlarm.setCreateBy(getUsername());
                 msgAlarmService.save(msgAlarm);
                 respMsgAlarmVo.setAlarmId(reqMsgAlarmVo.getAlarmId());
-                respMsgAlarmVo.setAlarmCamera(reqMsgAlarmVo.getAlarmCamera());
+                respMsgAlarmVo.setCameraCode(reqMsgAlarmVo.getCameraCode());
                 respMsgAlarmVo.setIsCancel(2);
                 respMsgAlarmVo.setCancelTime(null);
             } else {
-                MsgAlarmVice msgAlarmVice = new MsgAlarmVice();
+                MsgAlarmFrequency msgAlarmVice = new MsgAlarmFrequency();
                 BeanUtils.copyProperties(reqMsgAlarmVo, msgAlarmVice);
 //                msgAlarmVice.setCreateBy(getUsername());
-                msgAlarmViceService.save(msgAlarmVice);
+                msgAlarmFrequencyService.save(msgAlarmVice);
                 respMsgAlarmVo.setAlarmId(reqMsgAlarmVo.getAlarmId());
-                respMsgAlarmVo.setAlarmCamera(reqMsgAlarmVo.getAlarmCamera());
+                respMsgAlarmVo.setCameraCode(reqMsgAlarmVo.getCameraCode());
                 respMsgAlarmVo.setIsCancel(alarm.getIsLock());
                 respMsgAlarmVo.setCancelTime(alarm.getReleasedTime());
             }

hazard-sdk/src/main/java/com/ozs/controller/upload/UploadController.java

@@ -50,7 +50,7 @@ public class UploadController {
             if (StringUtils.isNotBlank(imageName)) {
                 LambdaQueryWrapper<MsgAlarm> lw = new LambdaQueryWrapper<MsgAlarm>();
                 if (!ObjectUtils.isEmpty(cameraCode)) {
-                    lw.eq(MsgAlarm::getAlarmCamera, cameraCode);
+                    lw.eq(MsgAlarm::getCameraCode, cameraCode);
                     lw.orderByDesc(MsgAlarm::getAlarmTime);
                 }
                 List<MsgAlarm> list = msgAlarmService.list(lw);

hazard-sdk/src/main/java/com/ozs/vo/ReqMsgAlarmVo.java

@@ -23,7 +23,7 @@ public class ReqMsgAlarmVo implements Serializable {
     private Long alarmTime;
 
     /** 相机编码 */
-    private Integer alarmCamera;
+    private Integer cameraCode;
 
     /** 报警里程位置 */
     private String alarmMile;

hazard-sdk/src/main/java/com/ozs/vo/RespMsgAlarmVo.java

@@ -20,7 +20,7 @@ public class RespMsgAlarmVo implements Serializable {
     private Long cancelTime;
 
     /** 相机编码 */
-    private Integer alarmCamera;
+    private Integer cameraCode;
     
     /** 报警是否解除 1已解除2未解除 */
     private Integer isCancel;