数据库表修改

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

@@ -25,7 +25,7 @@ import lombok.NoArgsConstructor;
 @NoArgsConstructor
 @Builder
 @ApiModel("台账管理表")
-public class BaseDynamicManagement extends BaseEntity implements Serializable{
+public class BaseDeviceDynamicManagement extends BaseEntity implements Serializable{
 
     private static final long serialVersionUID = 1L;
 
@@ -33,7 +33,7 @@ public class BaseDynamicManagement extends BaseEntity implements Serializable{
      * 主键ID
      */
     @TableId(value = "account_management_id", type = IdType.AUTO)
-    private Long accountManagementId;
+    private Long id;
 
     /**
      * 相机编码

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

@@ -1,6 +1,6 @@
 package com.ozs.service.mapper;
 
-import com.ozs.service.entity.BaseDynamicManagement;
+import com.ozs.service.entity.BaseDeviceDynamicManagement;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ozs.service.entity.vo.BaseCameraManagementDto;
 import io.lettuce.core.dynamic.annotation.Param;
@@ -17,7 +17,7 @@ import java.util.List;
  * @since 2023-02-22
  */
 @Mapper
-public interface BaseDynamicManagementMapper extends BaseMapper<BaseDynamicManagement> {
+public interface BaseDeviceDynamicManagementMapper extends BaseMapper<BaseDeviceDynamicManagement> {
 
     List<BaseCameraManagementDto> list(@Param("name") String name);
 }

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

@@ -1,6 +1,6 @@
 package com.ozs.service.service;
 
-import com.ozs.service.entity.BaseDynamicManagement;
+import com.ozs.service.entity.BaseDeviceDynamicManagement;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ozs.service.entity.CameraTree;
 
@@ -12,7 +12,7 @@ import com.ozs.service.entity.CameraTree;
  * @author ozs
  * @since 2023-02-22
  */
-public interface BaseDynamicManagementService extends IService<BaseDynamicManagement> {
+public interface BaseDeviceDynamicManagementService extends IService<BaseDeviceDynamicManagement> {
 
     CameraTree cameraTree(String name);
 }

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

@@ -1,10 +1,10 @@
 package com.ozs.service.service.impl;
 
-import com.ozs.service.entity.BaseDynamicManagement;
+import com.ozs.service.entity.BaseDeviceDynamicManagement;
 import com.ozs.service.entity.CameraTree;
 import com.ozs.service.entity.vo.BaseCameraManagementDto;
-import com.ozs.service.mapper.BaseDynamicManagementMapper;
-import com.ozs.service.service.BaseDynamicManagementService;
+import com.ozs.service.mapper.BaseDeviceDynamicManagementMapper;
+import com.ozs.service.service.BaseDeviceDynamicManagementService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -25,9 +25,9 @@ import java.util.stream.Collectors;
  * @since 2023-02-22
  */
 @Service
-public class BaseDynamicManagementServiceImpl extends ServiceImpl<BaseDynamicManagementMapper, BaseDynamicManagement> implements BaseDynamicManagementService {
+public class BaseDeviceDynamicManagementServiceImpl extends ServiceImpl<BaseDeviceDynamicManagementMapper, BaseDeviceDynamicManagement> implements BaseDeviceDynamicManagementService {
     @Autowired
-    BaseDynamicManagementMapper baseDynamicManagementMapper;
+    BaseDeviceDynamicManagementMapper baseDeviceDynamicManagementMapper;
 
     @Override
     public CameraTree cameraTree(String name) {
@@ -40,7 +40,7 @@ public class BaseDynamicManagementServiceImpl extends ServiceImpl<BaseDynamicMan
         Map<String, CameraTree> map = new HashMap<>();
         Map<String, CameraTree> map1 = new HashMap<>();
 
-        List<BaseCameraManagementDto> list = baseDynamicManagementMapper.list(name);
+        List<BaseCameraManagementDto> list = baseDeviceDynamicManagementMapper.list(name);
 
         if (list.size() > 0) {
             for (BaseCameraManagementDto o : list) {

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

@@ -1,6 +1,6 @@
 <?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.BaseDynamicManagementMapper">
+<mapper namespace="com.ozs.service.mapper.BaseDeviceDynamicManagementMapper">
 
     <select id="list" resultType="com.ozs.service.entity.vo.BaseCameraManagementDto">
 		SELECT

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

@@ -11,11 +11,11 @@ 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.BaseCameraManagement;
-import com.ozs.service.entity.BaseDynamicManagement;
+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.BaseDynamicManagementService;
+import com.ozs.service.service.BaseDeviceDynamicManagementService;
 import com.ozs.service.service.BaseLineManagementService;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -55,7 +55,7 @@ public class BaseCameraManagementController extends BaseController {
     @Resource
     BaseCameraManagementService baseCameraManagementService;
     @Resource
-    BaseDynamicManagementService baseDynamicManagementService;
+    BaseDeviceDynamicManagementService baseDeviceDynamicManagementService;
     @Resource
     BaseLineManagementService baseLineManagementService;
 
@@ -113,9 +113,9 @@ public class BaseCameraManagementController extends BaseController {
     @ApiOperation("新增相机信息")
     public AjaxResult saveDistributionModule(@RequestBody BaseCameraManagement baseCameraManagement) {
         baseCameraManagement.setCreateBy(getUsername());
-        BaseDynamicManagement baseDynamicManagement = new BaseDynamicManagement();
+        BaseDeviceDynamicManagement baseDynamicManagement = new BaseDeviceDynamicManagement();
         baseDynamicManagement.setCameraCode(baseCameraManagement.getCameraCode());
-        if (baseCameraManagementService.save(baseCameraManagement) && baseDynamicManagementService.save(baseDynamicManagement)) {
+        if (baseCameraManagementService.save(baseCameraManagement) && baseDeviceDynamicManagementService.save(baseDynamicManagement)) {
             return AjaxResult.success();
         }
         return AjaxResult.error();
@@ -244,13 +244,13 @@ public class BaseCameraManagementController extends BaseController {
     @ApiOperation("视频服务设备数量")
     @GetMapping("/totalNumberOfDevices")
     public AjaxResult totalNumberOfDevices() {
-        long count = baseDynamicManagementService.count();
-        LambdaQueryWrapper<BaseDynamicManagement> lw = new LambdaQueryWrapper<BaseDynamicManagement>();
-        lw.eq(BaseDynamicManagement::getCameraState, 1);
-        long onLine = baseDynamicManagementService.count(lw);
-        LambdaQueryWrapper<BaseDynamicManagement> wrapper = new LambdaQueryWrapper<BaseDynamicManagement>();
-        wrapper.eq(BaseDynamicManagement::getCameraState, 2);
-        long offLine = baseDynamicManagementService.count(wrapper);
+        long count = baseDeviceDynamicManagementService.count();
+        LambdaQueryWrapper<BaseDeviceDynamicManagement> lw = new LambdaQueryWrapper<BaseDeviceDynamicManagement>();
+        lw.eq(BaseDeviceDynamicManagement::getCameraState, 1);
+        long onLine = baseDeviceDynamicManagementService.count(lw);
+        LambdaQueryWrapper<BaseDeviceDynamicManagement> wrapper = new LambdaQueryWrapper<BaseDeviceDynamicManagement>();
+        wrapper.eq(BaseDeviceDynamicManagement::getCameraState, 2);
+        long offLine = baseDeviceDynamicManagementService.count(wrapper);
         List<Long> size = new ArrayList<>();
         size.add(count);
         size.add(onLine);
@@ -262,7 +262,7 @@ public class BaseCameraManagementController extends BaseController {
     @GetMapping("/cameraTree")
     @Cacheable(value = "baseAccountManagement", key = "'cameraTree'")
     public AjaxResult cameraTree(@RequestParam(value = "name",required = false) String name) {
-     return    success(baseDynamicManagementService.cameraTree(name));
+     return    success(baseDeviceDynamicManagementService.cameraTree(name));
     }
 }
 

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

@@ -8,11 +8,11 @@ import com.ozs.common.utils.ApiTokenUtils;
 import com.ozs.common.utils.AppTokenUtils;
 import com.ozs.common.utils.StringUtils;
 import com.ozs.common.utils.stateSecrets.SM4Utils;
-import com.ozs.service.entity.BaseDynamicManagement;
+import com.ozs.service.entity.BaseDeviceDynamicManagement;
 import com.ozs.service.entity.MsgAlarm;
 import com.ozs.service.entity.MsgAlarmVice;
 import com.ozs.service.entity.SvcAddress;
-import com.ozs.service.service.BaseDynamicManagementService;
+import com.ozs.service.service.BaseDeviceDynamicManagementService;
 import com.ozs.service.service.MsgAlarmService;
 import com.ozs.service.service.MsgAlarmViceService;
 import com.ozs.service.service.SvcAddressService;
@@ -50,7 +50,7 @@ public class GeoHazardMonitorTokenController {
     @Resource
     private AppTokenUtils appTokenUtils;
     @Resource
-    BaseDynamicManagementService baseDynamicManagementService;
+    BaseDeviceDynamicManagementService baseDeviceDynamicManagementService;
     @Autowired
     MsgAlarmService msgAlarmService;
     @Autowired
@@ -190,14 +190,14 @@ public class GeoHazardMonitorTokenController {
         String token = apiTokenUtils.getGeoHazardMonitorToken(request);
         if (StringUtils.isNotEmpty(token)) {
             ReqDeviceVo reqDeviceVo = JSON.parseObject(SM4Utils.decryptData_ECB(parameter, "4370780c9a8c43e5"), ReqDeviceVo.class);
-            LambdaQueryWrapper<BaseDynamicManagement> lw = new LambdaQueryWrapper<BaseDynamicManagement>();
+            LambdaQueryWrapper<BaseDeviceDynamicManagement> lw = new LambdaQueryWrapper<BaseDeviceDynamicManagement>();
             if (!ObjectUtils.isEmpty(reqDeviceVo.getCameraCode())) {
-                lw.eq(BaseDynamicManagement::getCameraCode, reqDeviceVo.getCameraCode());
+                lw.eq(BaseDeviceDynamicManagement::getCameraCode, reqDeviceVo.getCameraCode());
             }
-            BaseDynamicManagement baseDynamicManagement = baseDynamicManagementService.getOne(lw);
+            BaseDeviceDynamicManagement baseDynamicManagement = baseDeviceDynamicManagementService.getOne(lw);
             baseDynamicManagement.setElectricity(reqDeviceVo.getElectricity());
             baseDynamicManagement.setUpdateTime(new Date(reqDeviceVo.getTime()));
-            if (baseDynamicManagementService.updateById(baseDynamicManagement)) {
+            if (baseDeviceDynamicManagementService.updateById(baseDynamicManagement)) {
                 jsonObject.put("resultCode",1);
                 jsonObject.put("message","成功");
                 return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), "4370780c9a8c43e5");