数据库表修改

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

@@ -29,7 +29,7 @@ import lombok.NoArgsConstructor;
 @NoArgsConstructor
 @Builder
 @ApiModel("台账管理表")
-public class BaseAccountManagement extends BaseEntity implements Serializable {
+public class BaseCameraManagement extends BaseEntity implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
@@ -37,7 +37,7 @@ public class BaseAccountManagement extends BaseEntity implements Serializable {
      * 主键ID
      */
     @TableId(type = IdType.AUTO)
-    private Long accountManagementId;
+    private Long id;
 
     /**
      * 相机编码
@@ -96,7 +96,7 @@ public class BaseAccountManagement extends BaseEntity implements Serializable {
      * 线路
      */
     @Excel(name = "线路")
-    private String line;
+    private String railway;
 
     /**
      * 线路

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

@@ -23,7 +23,7 @@ import java.util.List;
  * @since 2023-02-17
  */
 @Data
-public class BaseAccountManagementDto extends BaseEntity implements Serializable {
+public class BaseCameraManagementDto extends BaseEntity implements Serializable {
 
     private static final long serialVersionUID = 1L;
 

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

@@ -21,7 +21,7 @@ import java.io.Serializable;
  * @since 2023-02-17
  */
 @Data
-public class BaseAccountManagementVo extends PageVo implements Serializable {
+public class BaseCameraManagementVo extends PageVo implements Serializable {
 
     private static final long serialVersionUID = 1L;
     

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

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

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

@@ -2,7 +2,7 @@ package com.ozs.service.mapper;
 
 import com.ozs.service.entity.BaseDynamicManagement;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ozs.service.entity.vo.BaseAccountManagementDto;
+import com.ozs.service.entity.vo.BaseCameraManagementDto;
 import io.lettuce.core.dynamic.annotation.Param;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -19,5 +19,5 @@ import java.util.List;
 @Mapper
 public interface BaseDynamicManagementMapper extends BaseMapper<BaseDynamicManagement> {
 
-    List<BaseAccountManagementDto> list(@Param("name") String name);
+    List<BaseCameraManagementDto> list(@Param("name") String name);
 }

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

@@ -1,9 +1,8 @@
 package com.ozs.service.service;
 
 import com.ozs.common.core.domain.AjaxResult;
-import com.ozs.common.core.domain.entity.SysMenu;
-import com.ozs.service.entity.BaseAccountManagement;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.ozs.service.entity.BaseCameraManagement;
 
 import java.util.List;
 
@@ -15,14 +14,14 @@ import java.util.List;
  * @author ozs
  * @since 2023-02-17
  */
-public interface BaseAccountManagementService extends IService<BaseAccountManagement> {
+public interface BaseCameraManagementService extends IService<BaseCameraManagement> {
     /**
      * 台账管理导入
      * @param accountManageList
      * @param updateSupport
      * @return
      */
-    String importBaseAccountManagement(List<BaseAccountManagement> accountManageList, boolean updateSupport);
+    String importBaseAccountManagement(List<BaseCameraManagement> accountManageList, boolean updateSupport);
 
     /**
      * 获取视频服务二级菜单

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

@@ -4,11 +4,11 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.ozs.common.core.domain.AjaxResult;
 import com.ozs.common.exception.ServiceException;
 import com.ozs.common.utils.bean.BeanValidators;
-import com.ozs.service.entity.BaseAccountManagement;
-import com.ozs.service.mapper.BaseAccountManagementMapper;
+import com.ozs.service.entity.BaseCameraManagement;
+import com.ozs.service.mapper.BaseCameraManagementMapper;
 import com.ozs.service.mapper.BaseLineManagementMapper;
-import com.ozs.service.service.BaseAccountManagementService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ozs.service.service.BaseCameraManagementService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
@@ -27,11 +27,11 @@ import java.util.List;
  * @since 2023-02-17
  */
 @Service
-public class BaseAccountManagementServiceImpl extends ServiceImpl<BaseAccountManagementMapper, BaseAccountManagement> implements BaseAccountManagementService {
+public class BaseCameraManagementServiceImpl extends ServiceImpl<BaseCameraManagementMapper, BaseCameraManagement> implements BaseCameraManagementService {
     @Autowired
     protected Validator validator;
     @Resource
-    BaseAccountManagementMapper baseAccountManagementMapper;
+    BaseCameraManagementMapper baseCameraManagementMapper;
     @Resource
     BaseLineManagementMapper baseLineManagementMapper;
 
@@ -43,7 +43,7 @@ public class BaseAccountManagementServiceImpl extends ServiceImpl<BaseAccountMan
      * @return
      */
     @Override
-    public String importBaseAccountManagement(List<BaseAccountManagement> accountManageList, boolean updateSupport) {
+    public String importBaseAccountManagement(List<BaseCameraManagement> accountManageList, boolean updateSupport) {
         if (com.ozs.common.utils.StringUtils.isNull(accountManageList) || accountManageList.size() == 0) {
             throw new ServiceException("导入台账管理相机信息不能为空！");
         }
@@ -51,22 +51,22 @@ public class BaseAccountManagementServiceImpl extends ServiceImpl<BaseAccountMan
         int failureNum = 0;
         StringBuilder successMsg = new StringBuilder();
         StringBuilder failureMsg = new StringBuilder();
-        for (BaseAccountManagement accountManagement : accountManageList) {
+        for (BaseCameraManagement accountManagement : accountManageList) {
             try {
                 // 判断相机编码是否存在
-                LambdaQueryWrapper<BaseAccountManagement> lw = new LambdaQueryWrapper<BaseAccountManagement>();
+                LambdaQueryWrapper<BaseCameraManagement> lw = new LambdaQueryWrapper<BaseCameraManagement>();
                 if (!ObjectUtils.isEmpty(accountManagement.getCameraCode())) {
-                    lw.eq(BaseAccountManagement::getAccountManagementId, accountManagement.getCameraCode());
+                    lw.eq(BaseCameraManagement::getId, accountManagement.getCameraCode());
                 }
-                BaseAccountManagement baseAccountManagement = baseAccountManagementMapper.selectOne(lw);
+                BaseCameraManagement baseAccountManagement = baseCameraManagementMapper.selectOne(lw);
                 if (!ObjectUtils.isEmpty(baseAccountManagement)) {
                     BeanValidators.validateWithException(validator, accountManagement);
-                    baseAccountManagementMapper.insert(accountManagement);
+                    baseCameraManagementMapper.insert(accountManagement);
                     successNum++;
                     successMsg.append("<br/>" + successNum + "、相机编码 " + accountManagement.getCameraCode() + " 导入成功");
                 } else if (updateSupport) {
                     BeanValidators.validateWithException(validator, accountManagement);
-                    baseAccountManagementMapper.update(accountManagement, lw);
+                    baseCameraManagementMapper.update(accountManagement, lw);
                     successNum++;
                     successMsg.append("<br/>" + successNum + "、相机编码 " + accountManagement.getCameraCode() + " 更新成功");
                 } else {
@@ -91,15 +91,15 @@ public class BaseAccountManagementServiceImpl extends ServiceImpl<BaseAccountMan
 
     @Override
     public AjaxResult secondaryMenu(String lineName) {
-        LambdaQueryWrapper<BaseAccountManagement> lw = new LambdaQueryWrapper<BaseAccountManagement>();
+        LambdaQueryWrapper<BaseCameraManagement> lw = new LambdaQueryWrapper<BaseCameraManagement>();
         if (!ObjectUtils.isEmpty(lineName)) {
-            lw.eq(BaseAccountManagement::getLine, lineName);
+            lw.eq(BaseCameraManagement::getRailway, lineName);
         }
         List<String> secondaryMenuName = new ArrayList<>();
-        List<BaseAccountManagement> baseAccountManagementList = baseAccountManagementMapper.selectList(lw);
+        List<BaseCameraManagement> baseAccountManagementList = baseCameraManagementMapper.selectList(lw);
         if (baseAccountManagementList.size() > 0) {
             StringBuilder stringBuilder = new StringBuilder();
-            for (BaseAccountManagement baseAccountManagement : baseAccountManagementList) {
+            for (BaseCameraManagement baseAccountManagement : baseAccountManagementList) {
                 stringBuilder.append(baseAccountManagement.getInstallMile());
                 stringBuilder.append("-");
                 stringBuilder.append(baseAccountManagement.getLineType());
@@ -114,21 +114,21 @@ public class BaseAccountManagementServiceImpl extends ServiceImpl<BaseAccountMan
     @Override
     public AjaxResult threeLevelMenu(String secondaryMenuName,String lineName) {
         String[] split = secondaryMenuName.split("-");
-        LambdaQueryWrapper<BaseAccountManagement> lw = new LambdaQueryWrapper<BaseAccountManagement>();
+        LambdaQueryWrapper<BaseCameraManagement> lw = new LambdaQueryWrapper<BaseCameraManagement>();
         if (!ObjectUtils.isEmpty(split[0])) {
-            lw.eq(BaseAccountManagement::getInstallMile, split[0]);
+            lw.eq(BaseCameraManagement::getInstallMile, split[0]);
         }
         if (!ObjectUtils.isEmpty(split[1])) {
-            lw.eq(BaseAccountManagement::getLineType, split[0]);
+            lw.eq(BaseCameraManagement::getLineType, split[0]);
         }
         if (!ObjectUtils.isEmpty(lineName)) {
-            lw.eq(BaseAccountManagement::getLine, lineName);
+            lw.eq(BaseCameraManagement::getRailway, lineName);
         }
         List<String> threeLevelMenuName = new ArrayList<>();
-        List<BaseAccountManagement> baseAccountManagementList = baseAccountManagementMapper.selectList(lw);
+        List<BaseCameraManagement> baseAccountManagementList = baseCameraManagementMapper.selectList(lw);
         if (baseAccountManagementList.size() > 0) {
             StringBuilder stringBuilder = new StringBuilder();
-            for (BaseAccountManagement baseAccountManagement : baseAccountManagementList) {
+            for (BaseCameraManagement baseAccountManagement : baseAccountManagementList) {
                 stringBuilder.append("摄像机");
                 stringBuilder.append(baseAccountManagement.getCameraCode());
                 threeLevelMenuName.add(stringBuilder.toString());

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

@@ -2,22 +2,18 @@ package com.ozs.service.service.impl;
 
 import com.ozs.service.entity.BaseDynamicManagement;
 import com.ozs.service.entity.CameraTree;
-import com.ozs.service.entity.vo.BaseAccountManagementDto;
+import com.ozs.service.entity.vo.BaseCameraManagementDto;
 import com.ozs.service.mapper.BaseDynamicManagementMapper;
 import com.ozs.service.service.BaseDynamicManagementService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import jdk.nashorn.internal.ir.annotations.Reference;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
 
 import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
-import java.util.stream.Collector;
 import java.util.stream.Collectors;
 
 /**
@@ -44,10 +40,10 @@ public class BaseDynamicManagementServiceImpl extends ServiceImpl<BaseDynamicMan
         Map<String, CameraTree> map = new HashMap<>();
         Map<String, CameraTree> map1 = new HashMap<>();
 
-        List<BaseAccountManagementDto> list = baseDynamicManagementMapper.list(name);
+        List<BaseCameraManagementDto> list = baseDynamicManagementMapper.list(name);
 
         if (list.size() > 0) {
-            for (BaseAccountManagementDto o : list) {
+            for (BaseCameraManagementDto o : list) {
                 // 线路
                 CameraTree build = CameraTree.builder()
                         .code(o.getLineCode().toString())

business-service/src/main/resources/mapper/service/BaseAccountManagementMapper.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.BaseAccountManagementMapper">
+<mapper namespace="com.ozs.service.mapper.BaseCameraManagementMapper">
 
 </mapper>

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

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ozs.service.mapper.BaseDynamicManagementMapper">
 
-    <select id="list" resultType="com.ozs.service.entity.vo.BaseAccountManagementDto">
+    <select id="list" resultType="com.ozs.service.entity.vo.BaseCameraManagementDto">
 		SELECT
 			l.line_code AS lineCode, 
 			l.line_name AS lineName, 

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

@@ -6,16 +6,15 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ozs.common.core.controller.BaseController;
 import com.ozs.common.core.domain.AjaxResult;
-import com.ozs.common.core.domain.entity.SysMenu;
 import com.ozs.common.utils.StringUtils;
 import com.ozs.common.utils.file.FileUtils;
 import com.ozs.common.utils.http.HttpUtils;
 import com.ozs.common.utils.poi.ExcelUtil;
-import com.ozs.service.entity.BaseAccountManagement;
+import com.ozs.service.entity.BaseCameraManagement;
 import com.ozs.service.entity.BaseDynamicManagement;
 import com.ozs.service.entity.BaseLineManagement;
-import com.ozs.service.entity.vo.BaseAccountManagementVo;
-import com.ozs.service.service.BaseAccountManagementService;
+import com.ozs.service.entity.vo.BaseCameraManagementVo;
+import com.ozs.service.service.BaseCameraManagementService;
 import com.ozs.service.service.BaseDynamicManagementService;
 import com.ozs.service.service.BaseLineManagementService;
 import io.swagger.annotations.ApiOperation;
@@ -50,11 +49,11 @@ import java.util.stream.Collectors;
  * @since 2023-02-17
  */
 @RestController
-@RequestMapping("/service/baseAccountManagement")
+@RequestMapping("/service/baseCameraManagement")
 @Slf4j
-public class BaseAccountManagementController extends BaseController {
+public class BaseCameraManagementController extends BaseController {
     @Resource
-    BaseAccountManagementService baseAccountManagementService;
+    BaseCameraManagementService baseCameraManagementService;
     @Resource
     BaseDynamicManagementService baseDynamicManagementService;
     @Resource
@@ -63,29 +62,29 @@ public class BaseAccountManagementController extends BaseController {
     /**
      * 相机台账管理分页
      *
-     * @param baseAccountManagementVo
+     * @param baseCameraManagementVo
      * @return
      */
     @ApiOperation(value = "相机台账管理分页")
     @PostMapping("/list")
-    public AjaxResult selectBaseAccountManagement(@RequestBody BaseAccountManagementVo baseAccountManagementVo) {
-        LambdaQueryWrapper<BaseAccountManagement> lw = new LambdaQueryWrapper<BaseAccountManagement>();
-        if (!StringUtils.isBlank(baseAccountManagementVo.getLine())) {
-            lw.eq(BaseAccountManagement::getLine, baseAccountManagementVo.getLine());
+    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(baseAccountManagementVo.getLineType())) {
-            lw.eq(BaseAccountManagement::getLineType, baseAccountManagementVo.getLineType());
+        if (!StringUtils.isBlank(baseCameraManagementVo.getLineType())) {
+            lw.eq(BaseCameraManagement::getLineType, baseCameraManagementVo.getLineType());
         }
-        if (!StringUtils.isBlank(baseAccountManagementVo.getPublicWorksSection())) {
-            lw.eq(BaseAccountManagement::getPublicWorksSection, baseAccountManagementVo.getPublicWorksSection());
+        if (!StringUtils.isBlank(baseCameraManagementVo.getPublicWorksSection())) {
+            lw.eq(BaseCameraManagement::getPublicWorksSection, baseCameraManagementVo.getPublicWorksSection());
         }
-        if (!ObjectUtils.isEmpty(baseAccountManagementVo.getBeginMile())) {
-            lw.ge(BaseAccountManagement::getBeginMile, baseAccountManagementVo.getBeginMile());
+        if (!ObjectUtils.isEmpty(baseCameraManagementVo.getBeginMile())) {
+            lw.ge(BaseCameraManagement::getBeginMile, baseCameraManagementVo.getBeginMile());
         }
-        if (!ObjectUtils.isEmpty(baseAccountManagementVo.getEndMile())) {
-            lw.le(BaseAccountManagement::getEndMile, baseAccountManagementVo.getEndMile());
+        if (!ObjectUtils.isEmpty(baseCameraManagementVo.getEndMile())) {
+            lw.le(BaseCameraManagement::getEndMile, baseCameraManagementVo.getEndMile());
         }
-        IPage<BaseAccountManagement> page = baseAccountManagementService.page(new Page<>(baseAccountManagementVo.getPageNum(), baseAccountManagementVo.getPageSize()), lw);
+        IPage<BaseCameraManagement> page = baseCameraManagementService.page(new Page<>(baseCameraManagementVo.getPageNum(), baseCameraManagementVo.getPageSize()), lw);
         return AjaxResult.success(page);
     }
 
@@ -98,7 +97,7 @@ public class BaseAccountManagementController extends BaseController {
     @DeleteMapping("/{accountManagementIds}")
     @ApiOperation("删除相机信息")
     public AjaxResult removeAccountManagement(@PathVariable List<Long> accountManagementIds) {
-        if (baseAccountManagementService.removeByIds(accountManagementIds)) {
+        if (baseCameraManagementService.removeByIds(accountManagementIds)) {
             return AjaxResult.success();
         }
         return AjaxResult.error();
@@ -107,16 +106,16 @@ public class BaseAccountManagementController extends BaseController {
     /**
      * 新增相机信息
      *
-     * @param baseAccountManagement
+     * @param baseCameraManagement
      * @return
      */
     @PostMapping("/saveAccountManagement")
     @ApiOperation("新增相机信息")
-    public AjaxResult saveDistributionModule(@RequestBody BaseAccountManagement baseAccountManagement) {
-        baseAccountManagement.setCreateBy(getUsername());
+    public AjaxResult saveDistributionModule(@RequestBody BaseCameraManagement baseCameraManagement) {
+        baseCameraManagement.setCreateBy(getUsername());
         BaseDynamicManagement baseDynamicManagement = new BaseDynamicManagement();
-        baseDynamicManagement.setCameraCode(baseAccountManagement.getCameraCode());
-        if (baseAccountManagementService.save(baseAccountManagement) && baseDynamicManagementService.save(baseDynamicManagement)) {
+        baseDynamicManagement.setCameraCode(baseCameraManagement.getCameraCode());
+        if (baseCameraManagementService.save(baseCameraManagement) && baseDynamicManagementService.save(baseDynamicManagement)) {
             return AjaxResult.success();
         }
         return AjaxResult.error();
@@ -125,14 +124,14 @@ public class BaseAccountManagementController extends BaseController {
     /**
      * 修改相机信息
      *
-     * @param baseAccountManagement
+     * @param baseCameraManagement
      * @return
      */
     @PutMapping("/editAccountManagement")
     @ApiOperation("修改相机信息")
-    public AjaxResult editAccountManagement(@RequestBody BaseAccountManagement baseAccountManagement) {
-        baseAccountManagement.setUpdateBy(getUsername());
-        if (baseAccountManagementService.updateById(baseAccountManagement)) {
+    public AjaxResult editAccountManagement(@RequestBody BaseCameraManagement baseCameraManagement) {
+        baseCameraManagement.setUpdateBy(getUsername());
+        if (baseCameraManagementService.updateById(baseCameraManagement)) {
             return AjaxResult.success();
         }
         return AjaxResult.error();
@@ -141,7 +140,7 @@ public class BaseAccountManagementController extends BaseController {
     @GetMapping(value = "/{accountManagementId}")
     @ApiOperation("根据相机ID获取详细信息")
     public AjaxResult getInfo(@PathVariable Long accountManagementId) {
-        return AjaxResult.success(baseAccountManagementService.getById(accountManagementId));
+        return AjaxResult.success(baseCameraManagementService.getById(accountManagementId));
     }
 
     /**
@@ -155,9 +154,9 @@ public class BaseAccountManagementController extends BaseController {
     @ApiOperation("台账管理导入")
     @PostMapping("/importBaseAccountManagement")
     public AjaxResult importBaseAccountManagement(MultipartFile file, boolean updateSupport) throws Exception {
-        ExcelUtil<BaseAccountManagement> util = new ExcelUtil<BaseAccountManagement>(BaseAccountManagement.class);
-        List<BaseAccountManagement> AccountManageList = util.importExcel(file.getInputStream());
-        String message = baseAccountManagementService.importBaseAccountManagement(AccountManageList, updateSupport);
+        ExcelUtil<BaseCameraManagement> util = new ExcelUtil<BaseCameraManagement>(BaseCameraManagement.class);
+        List<BaseCameraManagement> AccountManageList = util.importExcel(file.getInputStream());
+        String message = baseCameraManagementService.importBaseAccountManagement(AccountManageList, updateSupport);
         return AjaxResult.success(message);
     }
 
@@ -168,25 +167,25 @@ public class BaseAccountManagementController extends BaseController {
      */
     @ApiOperation("导出台账管理")
     @PostMapping("/exportBaseAccountManagement")
-    public void exportBaseAccountManagement(HttpServletResponse response, @RequestBody BaseAccountManagementVo baseAccountManagementVo) {
-        LambdaQueryWrapper<BaseAccountManagement> lw = new LambdaQueryWrapper<BaseAccountManagement>();
+    public void exportBaseAccountManagement(HttpServletResponse response, @RequestBody BaseCameraManagementVo baseAccountManagementVo) {
+        LambdaQueryWrapper<BaseCameraManagement> lw = new LambdaQueryWrapper<BaseCameraManagement>();
         if (!StringUtils.isBlank(baseAccountManagementVo.getLine())) {
-            lw.eq(BaseAccountManagement::getLine, baseAccountManagementVo.getLine());
+            lw.eq(BaseCameraManagement::getRailway, baseAccountManagementVo.getLine());
         }
         if (!StringUtils.isBlank(baseAccountManagementVo.getLineType())) {
-            lw.eq(BaseAccountManagement::getLineType, baseAccountManagementVo.getLineType());
+            lw.eq(BaseCameraManagement::getLineType, baseAccountManagementVo.getLineType());
         }
         if (!StringUtils.isBlank(baseAccountManagementVo.getPublicWorksSection())) {
-            lw.eq(BaseAccountManagement::getPublicWorksSection, baseAccountManagementVo.getPublicWorksSection());
+            lw.eq(BaseCameraManagement::getPublicWorksSection, baseAccountManagementVo.getPublicWorksSection());
         }
         if (!ObjectUtils.isEmpty(baseAccountManagementVo.getBeginMile())) {
-            lw.ge(BaseAccountManagement::getBeginMile, baseAccountManagementVo.getBeginMile());
+            lw.ge(BaseCameraManagement::getBeginMile, baseAccountManagementVo.getBeginMile());
         }
         if (!ObjectUtils.isEmpty(baseAccountManagementVo.getEndMile())) {
-            lw.le(BaseAccountManagement::getEndMile, baseAccountManagementVo.getEndMile());
+            lw.le(BaseCameraManagement::getEndMile, baseAccountManagementVo.getEndMile());
         }
-        List<BaseAccountManagement> list = baseAccountManagementService.list(lw);
-        ExcelUtil<BaseAccountManagement> util = new ExcelUtil<>(BaseAccountManagement.class);
+        List<BaseCameraManagement> list = baseCameraManagementService.list(lw);
+        ExcelUtil<BaseCameraManagement> util = new ExcelUtil<>(BaseCameraManagement.class);
         util.exportExcel(response, list, "台账管理相机数据");
     }
 
@@ -215,13 +214,13 @@ public class BaseAccountManagementController extends BaseController {
     @ApiOperation("获取视频服务二级菜单")
     @GetMapping("/secondaryMenu/{lineName}")
     public AjaxResult secondaryMenu(@PathVariable String lineName) {
-        return baseAccountManagementService.secondaryMenu(lineName);
+        return baseCameraManagementService.secondaryMenu(lineName);
     }
 
     @ApiOperation("获取视频服务三级菜单")
     @GetMapping("/threeLevelMenu/{secondaryMenuName}/{lineName}")
     public AjaxResult threeLevelMenu(@PathVariable String secondaryMenuName, @PathVariable String lineName) {
-        return baseAccountManagementService.threeLevelMenu(secondaryMenuName, lineName);
+        return baseCameraManagementService.threeLevelMenu(secondaryMenuName, lineName);
     }
 
 

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

@@ -9,9 +9,7 @@ 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.BaseAccountManagement;
 import com.ozs.service.entity.BaseLineManagement;
-import com.ozs.service.entity.vo.BaseAccountManagementVo;
 import com.ozs.service.entity.vo.BaseLineManagementVo;
 import com.ozs.service.service.BaseLineManagementService;
 import io.swagger.annotations.ApiOperation;

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

@@ -4,7 +4,6 @@ import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.ozs.common.core.domain.Result;
-import com.ozs.common.core.domain.entity.SysUser;
 import com.ozs.common.utils.ApiTokenUtils;
 import com.ozs.common.utils.AppTokenUtils;
 import com.ozs.common.utils.StringUtils;
@@ -69,10 +68,11 @@ public class GeoHazardMonitorTokenController {
      * @return
      */
     @PostMapping("/IPAddress/token")
-    public Result getWebToken(@RequestParam(value = "grantType", required = false) String grantType,
+    public String getWebToken(@RequestParam(value = "grantType", required = false) String grantType,
                               @RequestParam(value = "clientId", required = false) String clientId,
                               @RequestParam(value = "clientSecret", required = false) String clientSecret) {
         // 生成令牌
+        JSONObject jsonObject=new JSONObject();
         LambdaQueryWrapper<SvcAddress> lw = new LambdaQueryWrapper<SvcAddress>();
         if (!ObjectUtils.isEmpty(grantType)) {
             lw.eq(SvcAddress::getGrantType, grantType);
@@ -91,12 +91,21 @@ public class GeoHazardMonitorTokenController {
                 respGeoHazardMonitorVo.setAccessToken(objects.get(1));
                 respGeoHazardMonitorVo.setExpiresIn(Long.valueOf(objects.get(0)));
                 respGeoHazardMonitorVo.setTokenType("令牌类型");
-                return new Result(1, "成功", SM4Utils.encryptData_ECB(JSONObject.toJSONString(respGeoHazardMonitorVo), "4370780c9a8c43e5"));
+                jsonObject.put("resultCode",1);
+                jsonObject.put("message","成功");
+                jsonObject.put("data",respGeoHazardMonitorVo);
+                return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), "4370780c9a8c43e5");
             } else {
-                return new Result(2, "失败", "生成token失败！！");
+                jsonObject.put("resultCode",2);
+                jsonObject.put("message","失败");
+                jsonObject.put("data","生成token失败");
+                return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), "4370780c9a8c43e5");
             }
         } else {
-            return new Result(2, "失败", "参数验证失败！！");
+            jsonObject.put("resultCode",2);
+            jsonObject.put("message","失败");
+            jsonObject.put("data","参数验证失败");
+            return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), "4370780c9a8c43e5");
         }
     }
 
@@ -126,8 +135,9 @@ public class GeoHazardMonitorTokenController {
      * @return // 生成令牌
      */
     @PostMapping("/IPAddress/alarm")
-    public Result alarm(@RequestParam("parameter") String parameter, HttpServletRequest request) {
+    public String alarm(@RequestParam("parameter") String parameter, HttpServletRequest request) {
         String token = apiTokenUtils.getGeoHazardMonitorToken(request);
+        JSONObject jsonObject = new JSONObject();
         if (StringUtils.isNotEmpty(token)) {
             String s = SM4Utils.decryptData_ECB(parameter, "4370780c9a8c43e5");
             ReqMsgAlarmVo reqMsgAlarmVo = JSON.parseObject(s, ReqMsgAlarmVo.class);
@@ -156,9 +166,15 @@ public class GeoHazardMonitorTokenController {
                 respMsgAlarmVo.setIsCancel(alarm.getIsLock());
                 respMsgAlarmVo.setCancelTime(alarm.getReleasedTime());
             }
-            return new Result(1, "成功", SM4Utils.encryptData_ECB(JSONObject.toJSONString(respMsgAlarmVo), "4370780c9a8c43e5"));
+            jsonObject.put("resultCode",1);
+            jsonObject.put("message","成功");
+            jsonObject.put("data",respMsgAlarmVo);
+            return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), "4370780c9a8c43e5");
         } else {
-            return new Result(2, "失败", "token验证失败！！");
+            jsonObject.put("resultCode",2);
+            jsonObject.put("message","失败");
+            jsonObject.put("data","token验证失败");
+            return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), "4370780c9a8c43e5");
         }
     }
 
@@ -169,7 +185,8 @@ public class GeoHazardMonitorTokenController {
      * @return
      */
     @PostMapping("/IPAddress/device/state")
-    public Result 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)) {
             ReqDeviceVo reqDeviceVo = JSON.parseObject(SM4Utils.decryptData_ECB(parameter, "4370780c9a8c43e5"), ReqDeviceVo.class);
@@ -181,11 +198,17 @@ public class GeoHazardMonitorTokenController {
             baseDynamicManagement.setElectricity(reqDeviceVo.getElectricity());
             baseDynamicManagement.setUpdateTime(new Date(reqDeviceVo.getTime()));
             if (baseDynamicManagementService.updateById(baseDynamicManagement)) {
-                return new Result(1, "成功");
+                jsonObject.put("resultCode",1);
+                jsonObject.put("message","成功");
+                return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), "4370780c9a8c43e5");
             }
-            return new Result(2, "失败");
+            jsonObject.put("resultCode",2);
+            jsonObject.put("message","设备状态数据传输失败");
+            return  SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), "4370780c9a8c43e5");
         } else {
-            return new Result(2, "失败", "token验证失败！！");
+            jsonObject.put("resultCode",2);
+            jsonObject.put("message","token验证失败");
+            return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), "4370780c9a8c43e5");
         }
     }
 }