表名称修改

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

@@ -18,7 +18,7 @@ import lombok.NoArgsConstructor;
 
 /**
  * <p>
- * 台账管理表
+ * 相机台账管理表
  * </p>
  *
  * @author ozs
@@ -28,7 +28,7 @@ import lombok.NoArgsConstructor;
 @AllArgsConstructor
 @NoArgsConstructor
 @Builder
-@ApiModel("台账管理表")
+@ApiModel("相机台账管理表")
 public class BaseCameraManagement extends BaseEntity implements Serializable {
 
     private static final long serialVersionUID = 1L;

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

@@ -14,7 +14,7 @@ import lombok.NoArgsConstructor;
 
 /**
  * <p>
- * 台账管理表
+ * 设备动态管理表
  * </p>
  *
  * @author ozs
@@ -24,7 +24,7 @@ import lombok.NoArgsConstructor;
 @AllArgsConstructor
 @NoArgsConstructor
 @Builder
-@ApiModel("台账管理表")
+@ApiModel("设备动态管理表")
 public class BaseDeviceDynamicManagement extends BaseEntity implements Serializable{
 
     private static final long serialVersionUID = 1L;

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

@@ -15,7 +15,7 @@ import lombok.NoArgsConstructor;
 
 /**
  * <p>
- * 线路台账管理表
+ * 线路管理表
  * </p>
  *
  * @author ozs
@@ -25,7 +25,7 @@ import lombok.NoArgsConstructor;
 @AllArgsConstructor
 @NoArgsConstructor
 @Builder
-@ApiModel("线路台账管理表")
+@ApiModel("线路管理表")
 public class BaseRailwayManagement extends BaseEntity implements Serializable {
 
     private static final long serialVersionUID = 1L;

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

@@ -8,7 +8,7 @@ import java.io.Serializable;
 import java.util.List;
 
 /**
- * @author Administrator
+ * 视频服务树形结构表 @author Administrator
  */
 @Data
 @Builder

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

@@ -16,7 +16,7 @@ import lombok.NoArgsConstructor;
 
 /**
  * <p>
- * 预报警信息管理表
+ * 报警信息表
  * </p>
  *
  * @author ozs
@@ -26,7 +26,7 @@ import lombok.NoArgsConstructor;
 @AllArgsConstructor
 @NoArgsConstructor
 @Builder
-@ApiModel("预报警信息管理表")
+@ApiModel("报警信息表")
 public class MsgAlarm extends BaseEntity implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -68,7 +68,7 @@ public class MsgAlarm extends BaseEntity implements Serializable {
     private Integer alarmConfidence;
 
     /**
-     * 报警行别
+     * 报警行别(1上行2下行)
      */
     private Integer lineDir;
 
@@ -108,5 +108,8 @@ public class MsgAlarm extends BaseEntity implements Serializable {
      * 剩余电量（必填）
      */
     private Integer electricity;
-
+    /**
+     * 推送消息是否已读（1已读2未读）
+     */
+    private Integer readState;
 }

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

@@ -16,7 +16,7 @@ import lombok.NoArgsConstructor;
 
 /**
  * <p>
- * 预报警信息管理记录表
+ * 预报警频次表
  * </p>
  *
  * @author ozs
@@ -26,7 +26,7 @@ import lombok.NoArgsConstructor;
 @AllArgsConstructor
 @NoArgsConstructor
 @Builder
-@ApiModel("预报警信息管理记录表")
+@ApiModel("预报警频次表")
 public class MsgAlarmFrequency extends BaseEntity implements Serializable {
 
     private static final long serialVersionUID = 1L;

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

@@ -14,7 +14,7 @@ import lombok.NoArgsConstructor;
 
 /**
  * <p>
- *
+ *报警消息访问令牌参数验证表
  * </p>
  *
  * @author ozs
@@ -24,7 +24,7 @@ import lombok.NoArgsConstructor;
 @AllArgsConstructor
 @NoArgsConstructor
 @Builder
-@ApiModel("登录字段表")
+@ApiModel("报警消息访问令牌参数验证表")
 public class SvcAddress implements Serializable {
 
     private static final long serialVersionUID = 1L;

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

@@ -1,22 +1,14 @@
 package com.ozs.service.entity.vo;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
+
 import com.ozs.common.annotation.Excel;
 import com.ozs.common.core.domain.BaseEntity;
-import io.swagger.annotations.ApiModel;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
-import lombok.NoArgsConstructor;
-
 import java.io.Serializable;
-import java.util.List;
 
 /**
  * <p>
- * 台账管理表
+ * 线路和相机台账联合表
  * </p>
  *
  * @author ozs

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

@@ -1,20 +1,12 @@
 package com.ozs.service.entity.vo;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.ozs.common.core.domain.BaseEntity;
 import com.ozs.common.vo.PageVo;
-import io.swagger.annotations.ApiModel;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
-import lombok.NoArgsConstructor;
-
 import java.io.Serializable;
 
 /**
  * <p>
- * 台账管理表
+ * 相机台账管理请求参数表
  * </p>
  *
  * @author ozs

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

@@ -7,7 +7,7 @@ import java.io.Serializable;
 
 /**
  * <p>
- * 线路台账管理表
+ * 线路管理请求参数表
  * </p>
  *
  * @author ozs

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

@@ -1,7 +1,5 @@
 package com.ozs.service.entity.vo;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.Data;
 
 import java.io.Serializable;

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

@@ -15,7 +15,7 @@ import java.util.Date;
 
 /**
  * <p>
- * 预报警信息管理表
+ * 报警信息请求参数表
  * </p>
  *
  * @author ozs
@@ -62,7 +62,7 @@ public class MsgAlarmVo extends PageVo implements Serializable {
     private String beginAlarmTime;
 
     /**
-     * 开始报警时间
+     * 结束报警时间
      */
     private String endAlarmTime;
 

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

@@ -6,7 +6,7 @@ import org.apache.ibatis.annotations.Mapper;
 
 /**
  * <p>
- * 台账管理表 Mapper 接口
+ * 相机台账管理表 Mapper 接口
  * </p>
  *
  * @author ozs

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

@@ -10,7 +10,7 @@ import java.util.List;
 
 /**
  * <p>
- * 台账管理表 Mapper 接口
+ * 设备动态管理表 Mapper 接口
  * </p>
  *
  * @author ozs

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

@@ -6,7 +6,7 @@ import org.apache.ibatis.annotations.Mapper;
 
 /**
  * <p>
- *  Mapper 接口
+ *   线路管理表 Mapper 接口
  * </p>
  *
  * @author ozs

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

@@ -6,7 +6,7 @@ import org.apache.ibatis.annotations.Mapper;
 
 /**
  * <p>
- * 预报警信息管理记录表 Mapper 接口
+ * 预报警频次表 Mapper 接口
  * </p>
  *
  * @author ozs

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

@@ -6,7 +6,7 @@ import org.apache.ibatis.annotations.Mapper;
 
 /**
  * <p>
- * 预报警信息管理表 Mapper 接口
+ * 报警信息表 Mapper 接口
  * </p>
  *
  * @author ozs

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

@@ -6,7 +6,7 @@ import org.apache.ibatis.annotations.Mapper;
 
 /**
  * <p>
- *  Mapper 接口
+ * 报警消息访问令牌参数验证表 Mapper 接口
  * </p>
  *
  * @author ozs

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

@@ -8,7 +8,7 @@ import java.util.List;
 
 /**
  * <p>
- * 台账管理表 服务类
+ * 相机台账管理表 服务类
  * </p>
  *
  * @author ozs
@@ -16,7 +16,7 @@ import java.util.List;
  */
 public interface BaseCameraManagementService extends IService<BaseCameraManagement> {
     /**
-     * 台账管理导入
+     * 相机台账管理表导入
      * @param accountManageList
      * @param updateSupport
      * @return

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

@@ -6,7 +6,7 @@ import com.ozs.service.entity.CameraTree;
 
 /**
  * <p>
- * 台账管理表 服务类
+ * 设备动态管理表 服务类
  * </p>
  *
  * @author ozs

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

@@ -7,7 +7,7 @@ import java.util.List;
 
 /**
  * <p>
- *  服务类
+ *   线路管理表 服务类
  * </p>
  *
  * @author ozs
@@ -15,7 +15,7 @@ import java.util.List;
  */
 public interface BaseRailwayManagementService extends IService<BaseRailwayManagement> {
     /**
-     * 线路台账导入
+     * 线路管理表导入
      * @param accountManageList
      * @param updateSupport
      * @return

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

@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
  * <p>
- * 预报警信息管理记录表 服务类
+ * 预报警频次表 服务类
  * </p>
  *
  * @author ozs

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

@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
  * <p>
- * 预报警信息管理表 服务类
+ * 报警信息表 服务类
  * </p>
  *
  * @author ozs

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

@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
  * <p>
- *  服务类
+ * 报警消息访问令牌参数验证表 服务类
  * </p>
  *
  * @author ozs

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

@@ -19,7 +19,7 @@ import java.util.List;
 
 /**
  * <p>
- * 台账管理表 服务实现类
+ * 相机台账管理表 服务实现类
  * </p>
  *
  * @author ozs
@@ -33,16 +33,16 @@ public class BaseCameraManagementServiceImpl extends ServiceImpl<BaseCameraManag
     BaseCameraManagementMapper baseCameraManagementMapper;
 
     /**
-     * 台账管理导入
+     * 相机台账管理表导入
      *
-     * @param accountManageList 台账相机列表
+     * @param accountManageList 相机台账列表
      * @param updateSupport     是否更新支持，如果已存在，则进行更新数据
      * @return
      */
     @Override
     public String importBaseAccountManagement(List<BaseCameraManagement> accountManageList, boolean updateSupport) {
         if (com.ozs.common.utils.StringUtils.isNull(accountManageList) || accountManageList.size() == 0) {
-            throw new ServiceException("导入台账管理相机信息不能为空！");
+            throw new ServiceException("导入相机台账列表信息不能为空！");
         }
         int successNum = 0;
         int failureNum = 0;

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

@@ -18,7 +18,7 @@ import java.util.stream.Collectors;
 
 /**
  * <p>
- * 台账管理表 服务实现类
+ * 设备动态管理表 服务实现类
  * </p>
  *
  * @author ozs

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

@@ -17,7 +17,7 @@ import java.util.List;
 
 /**
  * <p>
- *  服务实现类
+ *  线路管理表 服务实现类
  * </p>
  *
  * @author ozs
@@ -32,15 +32,15 @@ public class BaseRailwayManagementServiceImpl extends ServiceImpl<BaseRailwayMan
     protected Validator validator;
 
     /**
-     * 导出线路台账
-     * @param accountManageList 线路台账列表
+     * 导出线路管理表信息
+     * @param accountManageList 线路管理表信息列表
      * @param updateSupport 是否更新支持，如果已存在，则进行更新数据
      * @return
      */
     @Override
     public String importBaseLineManagement(List<BaseRailwayManagement> accountManageList, boolean updateSupport) {
         if (com.ozs.common.utils.StringUtils.isNull(accountManageList) || accountManageList.size() == 0) {
-            throw new ServiceException("导入线路台账信息不能为空！");
+            throw new ServiceException("导入线路管理信息不能为空！");
         }
         int successNum = 0;
         int failureNum = 0;

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

@@ -8,7 +8,7 @@ import org.springframework.stereotype.Service;
 
 /**
  * <p>
- * 预报警信息管理记录表 服务实现类
+ * 预报警频次表 服务实现类
  * </p>
  *
  * @author ozs

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

@@ -8,7 +8,7 @@ import org.springframework.stereotype.Service;
 
 /**
  * <p>
- * 预报警信息管理表 服务实现类
+ * 报警信息表 服务实现类
  * </p>
  *
  * @author ozs

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

@@ -8,7 +8,7 @@ import org.springframework.stereotype.Service;
 
 /**
  * <p>
- *  服务实现类
+ * 报警消息访问令牌参数验证表 服务实现类
  * </p>
  *
  * @author ozs

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

@@ -40,7 +40,7 @@ import java.util.List;
 
 /**
  * <p>
- * 台账管理表 前端控制器
+ * 相机台账管理表 前端控制器
  * </p>
  *
  * @author ozs
@@ -54,8 +54,6 @@ public class BaseCameraManagementController extends BaseController {
     BaseCameraManagementService baseCameraManagementService;
     @Resource
     BaseDeviceDynamicManagementService baseDeviceDynamicManagementService;
-    @Resource
-    BaseRailwayManagementService baseLineManagementService;
 
     /**
      * 相机台账管理分页
@@ -87,13 +85,13 @@ public class BaseCameraManagementController extends BaseController {
     }
 
     /**
-     * 删除相机信息
+     * 删除相机台账管理信息
      *
      * @param accountManagementIds
      * @return
      */
     @DeleteMapping("/{accountManagementIds}")
-    @ApiOperation("删除相机信息")
+    @ApiOperation("删除相机台账管理信息")
     public AjaxResult removeAccountManagement(@PathVariable List<Long> accountManagementIds) {
         if (baseCameraManagementService.removeByIds(accountManagementIds)) {
             return AjaxResult.success();
@@ -102,13 +100,13 @@ public class BaseCameraManagementController extends BaseController {
     }
 
     /**
-     * 新增相机信息
+     * 新增相机台账管理信息
      *
      * @param baseCameraManagement
      * @return
      */
     @PostMapping("/saveAccountManagement")
-    @ApiOperation("新增相机信息")
+    @ApiOperation("新增相机台账管理信息")
     public AjaxResult saveDistributionModule(@RequestBody BaseCameraManagement baseCameraManagement) {
         baseCameraManagement.setCreateBy(getUsername());
         BaseDeviceDynamicManagement baseDynamicManagement = new BaseDeviceDynamicManagement();
@@ -120,13 +118,13 @@ public class BaseCameraManagementController extends BaseController {
     }
 
     /**
-     * 修改相机信息
+     * 修改相机台账管理信息
      *
      * @param baseCameraManagement
      * @return
      */
     @PutMapping("/editAccountManagement")
-    @ApiOperation("修改相机信息")
+    @ApiOperation("修改相机台账管理信息")
     public AjaxResult editAccountManagement(@RequestBody BaseCameraManagement baseCameraManagement) {
         baseCameraManagement.setUpdateBy(getUsername());
         if (baseCameraManagementService.updateById(baseCameraManagement)) {
@@ -135,10 +133,10 @@ public class BaseCameraManagementController extends BaseController {
         return AjaxResult.error();
     }
 
-    @GetMapping(value = "/{accountManagementId}")
-    @ApiOperation("根据相机ID获取详细信息")
-    public AjaxResult getInfo(@PathVariable Long accountManagementId) {
-        return AjaxResult.success(baseCameraManagementService.getById(accountManagementId));
+    @GetMapping(value = "/{id}")
+    @ApiOperation("根据相机ID获取相机台账管理信息")
+    public AjaxResult getInfo(@PathVariable Long id) {
+        return AjaxResult.success(baseCameraManagementService.getById(id));
     }
 
     /**
@@ -149,7 +147,7 @@ public class BaseCameraManagementController extends BaseController {
      * @return
      * @throws Exception
      */
-    @ApiOperation("台账管理导入")
+    @ApiOperation("相机台账管理信息导入")
     @PostMapping("/importBaseAccountManagement")
     public AjaxResult importBaseAccountManagement(MultipartFile file, boolean updateSupport) throws Exception {
         ExcelUtil<BaseCameraManagement> util = new ExcelUtil<BaseCameraManagement>(BaseCameraManagement.class);
@@ -163,7 +161,7 @@ public class BaseCameraManagementController extends BaseController {
      *
      * @param response
      */
-    @ApiOperation("导出台账管理")
+    @ApiOperation("导出相机台账管理信息")
     @PostMapping("/exportBaseAccountManagement")
     public void exportBaseAccountManagement(HttpServletResponse response, @RequestBody BaseCameraManagementVo baseAccountManagementVo) {
         LambdaQueryWrapper<BaseCameraManagement> lw = new LambdaQueryWrapper<BaseCameraManagement>();
@@ -188,13 +186,13 @@ public class BaseCameraManagementController extends BaseController {
     }
 
 
-    @ApiOperation("模板下载")
+    @ApiOperation("相机台账管理信息模板下载")
     @GetMapping("/downloaExcel")
     public void downloadZip(HttpServletResponse response) {
         try {
             InputStream resourceAsStream = this.getClass().getResourceAsStream("/template/provisionalPlan.xlsx");
             response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE);
-            FileUtils.setAttachmentResponseHeader(response, "临时计划导入模板.xlsx");
+            FileUtils.setAttachmentResponseHeader(response, "相机台账管理信息模板.xlsx");
             FileUtils.writeBytesByInput(resourceAsStream, response.getOutputStream());
         } catch (Exception e) {
             log.error("下载文件失败", e);
@@ -202,18 +200,18 @@ public class BaseCameraManagementController extends BaseController {
     }
 
     @ApiOperation("查询录像")
-    @GetMapping("/api/records")
-    public AjaxResult apiRecords() {
-        String param = "id=34020000001320000002&channel=34020000001320000002";
+    @GetMapping("/api/records/{cameraCode}/{channel}")
+    public AjaxResult apiRecords(@PathVariable String cameraCode,@PathVariable String channel) {
+        String param = "id="+cameraCode+"&channel="+channel;
         String s = HttpUtils.sendGet("http://47.106.159.135:8554/gb28181/api/records", param);
         System.out.println(s);
         return success(HttpUtils.sendGet("http://47.106.159.135:8554/gb28181/api/records", param));
     }
 
     @ApiOperation("播放回放")
-    @GetMapping("/api/invite")
-    public AjaxResult apiInvite() {
-        String param = "id=34020000001320000002&channel=34020000001320000002&startTime=1677230469&endTime=1677230513";
+    @GetMapping("/api/invite/{cameraCode}/{channel}/{startTime}/{endTime}")
+    public AjaxResult apiInvite(@PathVariable String cameraCode,@PathVariable String channel,@PathVariable String startTime,@PathVariable String endTime) {
+        String param = "id="+cameraCode+"&channel="+channel+"&startTime="+startTime+"&endTime="+endTime;
         return success(HttpUtils.sendGet("http://47.106.159.135:8554/gb28181/api/invite/", param));
     }
 

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

@@ -33,7 +33,7 @@ import java.util.List;
 
 /**
  * <p>
- * 线路台账管理表前端控制器
+ * 线路管理表前端控制器
  * </p>
  *
  * @author ozs
@@ -47,12 +47,12 @@ public class BaseRailwayManagementController extends BaseController {
     BaseRailwayManagementService baseRailwayManagementService;
 
     /**
-     * 线路台账管理分页
+     * 线路管理表分页
      *
      * @param baseRailwayManagementVo
      * @return
      */
-    @ApiOperation(value = "线路台账管理分页")
+    @ApiOperation(value = "线路管理表分页")
     @PostMapping("/list")
     public AjaxResult selectBaseLineManagement(@RequestBody BaseRailwayManagementVo baseRailwayManagementVo) {
         LambdaQueryWrapper<BaseRailwayManagement> lw = new LambdaQueryWrapper<BaseRailwayManagement>();
@@ -67,13 +67,13 @@ public class BaseRailwayManagementController extends BaseController {
     }
 
     /**
-     * 删除线路台账信息
+     * 删除线路管理表信息
      *
      * @param lineIds
      * @return
      */
     @DeleteMapping("/{lineIds}")
-    @ApiOperation("删除线路台账信息")
+    @ApiOperation("删除线路管理表信息")
     public AjaxResult removeLineManagement(@PathVariable List<Long> lineIds) {
         if (baseRailwayManagementService.removeByIds(lineIds)) {
             return AjaxResult.success();
@@ -82,13 +82,13 @@ public class BaseRailwayManagementController extends BaseController {
     }
 
     /**
-     * 新增线路台账信息
+     * 新增线路管理表信息
      *
      * @param baseRailwayManagement
      * @return
      */
     @PostMapping("/saveLineManagement")
-    @ApiOperation("新增线路台账信息")
+    @ApiOperation("新增线路管理表信息")
     public AjaxResult saveLineManagement(@RequestBody BaseRailwayManagement baseRailwayManagement) {
         baseRailwayManagement.setCreateBy(getUsername());
         if (baseRailwayManagementService.save(baseRailwayManagement)) {
@@ -98,13 +98,13 @@ public class BaseRailwayManagementController extends BaseController {
     }
 
     /**
-     * 修改线路台账信息
+     * 修改线路管理表信息
      *
      * @param baseRailwayManagement
      * @return
      */
     @PutMapping("/editLineManagement")
-    @ApiOperation("修改线路台账信息")
+    @ApiOperation("修改线路管理表信息")
     public AjaxResult editLineManagement(@RequestBody BaseRailwayManagement baseRailwayManagement) {
         baseRailwayManagement.setUpdateBy(getUsername());
         if (baseRailwayManagementService.updateById(baseRailwayManagement)) {
@@ -113,21 +113,21 @@ public class BaseRailwayManagementController extends BaseController {
         return AjaxResult.error();
     }
 
-    @GetMapping(value = "/{lineId}")
-    @ApiOperation("根据台账ID获取详细信息")
-    public AjaxResult getInfo(@PathVariable Long lineId) {
-        return AjaxResult.success(baseRailwayManagementService.getById(lineId));
+    @GetMapping(value = "/{id}")
+    @ApiOperation("根据台账ID获取线路管理表详细信息")
+    public AjaxResult getInfo(@PathVariable Long id) {
+        return AjaxResult.success(baseRailwayManagementService.getById(id));
     }
 
     /**
-     * 线路台账导入
+     * 线路管理表信息导入
      *
      * @param file
      * @param updateSupport
      * @return
      * @throws Exception
      */
-    @ApiOperation("线路台账导入")
+    @ApiOperation("线路管理表信息导入")
     @PostMapping("/importBaseLineManagement")
     public AjaxResult importBaseLineManagement(MultipartFile file, boolean updateSupport) throws Exception {
         ExcelUtil<BaseRailwayManagement> util = new ExcelUtil<BaseRailwayManagement>(BaseRailwayManagement.class);
@@ -137,11 +137,11 @@ public class BaseRailwayManagementController extends BaseController {
     }
 
     /**
-     * 导出线路台账
+     * 导出线路管理表信息
      *
      * @param response
      */
-    @ApiOperation("导出线路台账")
+    @ApiOperation("导出线路管理表信息")
     @PostMapping("/exportBaseLineManagement")
     public void exportBaseLineManagement(HttpServletResponse response, @RequestBody BaseRailwayManagementVo baseRailwayManagementVo) {
         LambdaQueryWrapper<BaseRailwayManagement> lw = new LambdaQueryWrapper<BaseRailwayManagement>();
@@ -156,13 +156,13 @@ public class BaseRailwayManagementController extends BaseController {
         util.exportExcel(response, list, "线路台账数据");
     }
 
-    @ApiOperation("模板下载")
+    @ApiOperation("线路管理表信息模板下载")
     @GetMapping("/downloaExcel")
     public void downloadZip(HttpServletResponse response) {
         try {
             InputStream resourceAsStream = this.getClass().getResourceAsStream("/template/planQuarter.xlsx");
             response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE);
-            FileUtils.setAttachmentResponseHeader(response, "台账线路管理导入模板.xlsx");
+            FileUtils.setAttachmentResponseHeader(response, "线路管理表信息导入模板.xlsx");
             FileUtils.writeBytesByInput(resourceAsStream, response.getOutputStream());
         } catch (Exception e) {
             log.error("下载文件失败", e);

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

@@ -33,7 +33,7 @@ import java.util.List;
 
 /**
  * <p>
- * 预报警信息管理表 前端控制器
+ * 报警信息表 前端控制器
  * </p>
  *
  * @author ozs
@@ -49,12 +49,12 @@ public class MsgAlarmController extends BaseController {
 
 
     /**
-     * 预报警信息分页
+     * 报警信息分页
      *
      * @param msgAlarmVo
      * @return
      */
-    @ApiOperation(value = "预报警信息分页")
+    @ApiOperation(value = "报警信息分页")
     @PostMapping("/list")
     public AjaxResult selectMsgAlarm(@RequestBody MsgAlarmVo msgAlarmVo) {
         LambdaQueryWrapper<MsgAlarm> lw = new LambdaQueryWrapper<MsgAlarm>();
@@ -90,14 +90,14 @@ public class MsgAlarmController extends BaseController {
     }
 
     @GetMapping(value = "/{id}")
-    @ApiOperation("根据预报警信息ID获取详细信息")
+    @ApiOperation("根据报警信息ID获取详细信息")
     public AjaxResult getInfo(@PathVariable Long id) {
         return AjaxResult.success(msgAlarmService.getById(id));
     }
 
 
     @PutMapping(value = "/{id}")
-    @ApiOperation("根据预报警信息ID解除报警")
+    @ApiOperation("根据报警信息ID解除报警")
     public AjaxResult updateIsLock(@PathVariable Long id) {
         MsgAlarm msgAlarm = msgAlarmService.getById(id);
         msgAlarm.setIsLock(1);

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

@@ -87,44 +87,24 @@ public class GeoHazardMonitorTokenController {
                 respGeoHazardMonitorVo.setAccessToken(objects.get(1));
                 respGeoHazardMonitorVo.setExpiresIn(Long.valueOf(objects.get(0)));
                 respGeoHazardMonitorVo.setTokenType("令牌类型");
-                jsonObject.put("resultCode",1);
-                jsonObject.put("message","成功");
-                jsonObject.put("data",respGeoHazardMonitorVo);
+                jsonObject.put("resultCode", 1);
+                jsonObject.put("message", "成功");
+                jsonObject.put("data", respGeoHazardMonitorVo);
                 return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), "4370780c9a8c43e5");
             } else {
-                jsonObject.put("resultCode",2);
-                jsonObject.put("message","失败");
-                jsonObject.put("data","生成token失败");
+                jsonObject.put("resultCode", 2);
+                jsonObject.put("message", "失败");
+                jsonObject.put("data", "生成token失败");
                 return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), "4370780c9a8c43e5");
             }
         } else {
-            jsonObject.put("resultCode",2);
-            jsonObject.put("message","失败");
-            jsonObject.put("data","参数验证失败");
+            jsonObject.put("resultCode", 2);
+            jsonObject.put("message", "失败");
+            jsonObject.put("data", "参数验证失败");
             return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), "4370780c9a8c43e5");
         }
     }
 
-    /**
-     * 获取app访问令牌
-     *
-     * @return
-     */
-    @PostMapping("/App/token")
-    public Result getAppToken(@RequestParam("parameter") String parameter) {
-        // 生成令牌
-        ArrayList<String> objects = appTokenUtils.createGeoHazardMonitorToken();
-        if (objects.size() > 0) {
-            RespGeoHazardMonitorVo respGeoHazardMonitorVo = new RespGeoHazardMonitorVo();
-            respGeoHazardMonitorVo.setAccessToken(objects.get(1));
-            respGeoHazardMonitorVo.setExpiresIn(Long.valueOf(objects.get(0)));
-            respGeoHazardMonitorVo.setTokenType("令牌类型");
-            return new Result(1, "成功", respGeoHazardMonitorVo);
-        } else {
-            return new Result(2, "失败", "生成token失败！！");
-        }
-    }
-
     /**
      * 报警信息数据传输
      *
@@ -162,14 +142,14 @@ public class GeoHazardMonitorTokenController {
                 respMsgAlarmVo.setIsCancel(alarm.getIsLock());
                 respMsgAlarmVo.setCancelTime(alarm.getReleasedTime());
             }
-            jsonObject.put("resultCode",1);
-            jsonObject.put("message","成功");
-            jsonObject.put("data",respMsgAlarmVo);
+            jsonObject.put("resultCode", 1);
+            jsonObject.put("message", "成功");
+            jsonObject.put("data", respMsgAlarmVo);
             return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), "4370780c9a8c43e5");
         } else {
-            jsonObject.put("resultCode",2);
-            jsonObject.put("message","失败");
-            jsonObject.put("data","token验证失败");
+            jsonObject.put("resultCode", 2);
+            jsonObject.put("message", "失败");
+            jsonObject.put("data", "token验证失败");
             return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), "4370780c9a8c43e5");
         }
     }
@@ -181,7 +161,8 @@ public class GeoHazardMonitorTokenController {
      * @return
      */
     @PostMapping("/IPAddress/device/state")
-    public String deviceState(@RequestParam("parameter") String parameter, HttpServletRequest request) throws ParseException {
+    public String deviceState(@RequestParam("parameter") String parameter, HttpServletRequest request) throws
+            ParseException {
         JSONObject jsonObject = new JSONObject();
         String token = apiTokenUtils.getGeoHazardMonitorToken(request);
         if (StringUtils.isNotEmpty(token)) {
@@ -194,16 +175,16 @@ public class GeoHazardMonitorTokenController {
             baseDynamicManagement.setElectricity(reqDeviceVo.getElectricity());
             baseDynamicManagement.setUpdateTime(new Date(reqDeviceVo.getTime()));
             if (baseDeviceDynamicManagementService.updateById(baseDynamicManagement)) {
-                jsonObject.put("resultCode",1);
-                jsonObject.put("message","成功");
+                jsonObject.put("resultCode", 1);
+                jsonObject.put("message", "成功");
                 return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), "4370780c9a8c43e5");
             }
-            jsonObject.put("resultCode",2);
-            jsonObject.put("message","设备状态数据传输失败");
-            return  SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), "4370780c9a8c43e5");
+            jsonObject.put("resultCode", 2);
+            jsonObject.put("message", "设备状态数据传输失败");
+            return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), "4370780c9a8c43e5");
         } else {
-            jsonObject.put("resultCode",2);
-            jsonObject.put("message","token验证失败");
+            jsonObject.put("resultCode", 2);
+            jsonObject.put("message", "token验证失败");
             return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), "4370780c9a8c43e5");
         }
     }