代码整合

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

@@ -18,7 +18,6 @@ import com.ozs.service.mapper.BaseRailwayManagementMapper;
 import com.ozs.service.mapper.MsgAlarmCloudMapper;
 import com.ozs.service.mapper.MsgAlarmMapper;
 import com.ozs.service.service.MsgAlarmCloudService;
-import com.ozs.service.service.MsgAlarmService;
 import com.ozs.service.service.RedisService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -3,17 +3,12 @@ package com.ozs.web.controller.accountmanagment;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ozs.common.annotation.Log;
-import com.ozs.common.constant.Constants;
 import com.ozs.common.core.controller.BaseController;
 import com.ozs.common.core.domain.AjaxResult;
 import com.ozs.common.core.domain.entity.SysDept;
 import com.ozs.common.core.domain.entity.SysDictData;
-import com.ozs.common.core.domain.entity.SysDictType;
-import com.ozs.common.core.domain.entity.SysUser;
-import com.ozs.common.core.domain.model.LoginUser;
-import com.ozs.common.core.redis.RedisCache;
+
 import com.ozs.common.enums.BusinessType;
 import com.ozs.common.utils.AppendUtils;
 import com.ozs.common.utils.StringUtils;
@@ -322,65 +317,65 @@ public class MsgAlarmController extends BaseController {
             msgAlarmVo.setEndMile(msgAlarmVo.getEndMile() * 1000);
         }
         List<MsgAlarmCloud> msgAlarmList = msgAlarmCloudService.msgAlarmList(msgAlarmVo);
-        for (MsgAlarmCloud msgAlarm : msgAlarmList) {
-            String[] split = msgAlarm.getImageUrl().split(";");
+        for (MsgAlarmCloud msgAlarmCloud : msgAlarmList) {
+            String[] split = msgAlarmCloud.getImageUrl().split(";");
             ArrayList<String> objects = new ArrayList<>(Arrays.asList(split));
-            msgAlarm.setImageUrls(objects);
+            msgAlarmCloud.setImageUrls(objects);
             LambdaQueryWrapper<BaseCameraManagement> cameraManagementLambdaQueryWrapper = new LambdaQueryWrapper<BaseCameraManagement>();
-            if (!ObjectUtils.isEmpty(msgAlarm.getCameraCode())) {
-                cameraManagementLambdaQueryWrapper.eq(BaseCameraManagement::getCameraCode, msgAlarm.getCameraCode());
+            if (!ObjectUtils.isEmpty(msgAlarmCloud.getCameraCode())) {
+                cameraManagementLambdaQueryWrapper.eq(BaseCameraManagement::getCameraCode, msgAlarmCloud.getCameraCode());
             }
             BaseCameraManagement cameraManagement = baseCameraManagementService.getOne(cameraManagementLambdaQueryWrapper);
-            msgAlarm.setVersionNum(cameraManagement.getVersionNum());
-            msgAlarm.setVersionName(cameraManagement.getVersionName());
+            msgAlarmCloud.setVersionNum(cameraManagement.getVersionNum());
+            msgAlarmCloud.setVersionName(cameraManagement.getVersionName());
             LambdaQueryWrapper<BaseRailwayManagement> queryWrapper = new LambdaQueryWrapper<BaseRailwayManagement>();
             if (!ObjectUtils.isEmpty(cameraManagement.getRailwayCode())) {
                 queryWrapper.eq(BaseRailwayManagement::getRailwayCode, cameraManagement.getRailwayCode());
             }
             BaseRailwayManagement baseRailwayManagement = baseRailwayManagementService.getOne(queryWrapper);
-            msgAlarm.setRailwayName(baseRailwayManagement.getRailwayName());
-            if (StringUtils.isNotEmpty(msgAlarm.getReleasedBy())) {
-                BaseUser user = baseUserService.getUser(msgAlarm.getReleasedBy());
-                msgAlarm.setReleasedByName(user.getNickName());
+            msgAlarmCloud.setRailwayName(baseRailwayManagement.getRailwayName());
+            if (StringUtils.isNotEmpty(msgAlarmCloud.getReleasedBy())) {
+                BaseUser user = baseUserService.getUser(msgAlarmCloud.getReleasedBy());
+                msgAlarmCloud.setReleasedByName(user.getNickName());
             }
             String mils = AppendUtils.stringAppend(cameraManagement.getInstallMile());
-            msgAlarm.setAlarmMiles(mils);
+            msgAlarmCloud.setAlarmMiles(mils);
             if (!ObjectUtils.isEmpty(cameraManagement.getEndMile())) {
                 String end = AppendUtils.stringAppend(cameraManagement.getEndMile());
-                msgAlarm.setEndMile(end);
+                msgAlarmCloud.setEndMile(end);
             }
             if (!ObjectUtils.isEmpty(cameraManagement.getBeginMile())) {
                 String begin = AppendUtils.stringAppend(cameraManagement.getBeginMile());
-                msgAlarm.setBeginMile(begin);
+                msgAlarmCloud.setBeginMile(begin);
             }
             LambdaQueryWrapper<MsgAlarmFrequencyCloud> wrapper = new LambdaQueryWrapper<MsgAlarmFrequencyCloud>();
-            if (!ObjectUtils.isEmpty(msgAlarm.getAlarmId())) {
-                wrapper.eq(MsgAlarmFrequencyCloud::getAlarmId, msgAlarm.getAlarmId());
+            if (!ObjectUtils.isEmpty(msgAlarmCloud.getAlarmId())) {
+                wrapper.eq(MsgAlarmFrequencyCloud::getAlarmId, msgAlarmCloud.getAlarmId());
             }
-            msgAlarm.setAlarmCount((int) msgAlarmFrequencyCloudService.count(wrapper));
-            if (!ObjectUtils.isEmpty(msgAlarm.getReleasedType())) {
-                msgAlarm.setReleasedTypeName(msgAlarm.getReleasedType() == 1 ? "实报" : "误报");
+            msgAlarmCloud.setAlarmCount((int) msgAlarmFrequencyCloudService.count(wrapper));
+            if (!ObjectUtils.isEmpty(msgAlarmCloud.getReleasedType())) {
+                msgAlarmCloud.setReleasedTypeName(msgAlarmCloud.getReleasedType() == 1 ? "实报" : "误报");
             }
-            if (msgAlarm.getLineDir() == 1) {
-                msgAlarm.setLineDirName("上行");
-            } else if (msgAlarm.getLineDir() == 2) {
-                msgAlarm.setLineDirName( "下行");
-            } else if (msgAlarm.getLineDir() == 3) {
-                msgAlarm.setLineDirName( "上下行");
+            if (msgAlarmCloud.getLineDir() == 1) {
+                msgAlarmCloud.setLineDirName("上行");
+            } else if (msgAlarmCloud.getLineDir() == 2) {
+                msgAlarmCloud.setLineDirName( "下行");
+            } else if (msgAlarmCloud.getLineDir() == 3) {
+                msgAlarmCloud.setLineDirName( "上下行");
             }
 
 
-            msgAlarm.setIsLockName(msgAlarm.getIsLock() == 1 ? "已解除" : "未解除");
+            msgAlarmCloud.setIsLockName(msgAlarmCloud.getIsLock() == 1 ? "已解除" : "未解除");
             LambdaQueryWrapper<SysDictData> dict = new LambdaQueryWrapper<>();
             dict.eq(SysDictData::getDictType, "sys_alarm_type");
-            dict.eq(SysDictData::getDictValue, msgAlarm.getAlarmType());
+            dict.eq(SysDictData::getDictValue, msgAlarmCloud.getAlarmType());
             SysDictData one = dictDataService.getOne(dict);
-            msgAlarm.setAlarmTypeName(one.getDictLabel());
-            String[] split1 = msgAlarm.getAlarmAttr().split(",");
+            msgAlarmCloud.setAlarmTypeName(one.getDictLabel());
+            String[] split1 = msgAlarmCloud.getAlarmAttr().split(",");
             String stringBuilder = "画面,大小为" + split1[0] + "×" + split1[1] + "," +
                     "泥石流范围为左上角坐标(" + split1[2] + "," + split1[3] + ")" +
                     "大小" + split1[4] + "×" + split1[5];
-            msgAlarm.setAlarmAttr(stringBuilder);
+            msgAlarmCloud.setAlarmAttr(stringBuilder);
         }
         ExcelUtil<MsgAlarmCloud> util = new ExcelUtil<>(MsgAlarmCloud.class);
         util.exportExcel(response, msgAlarmList, "报警信息管理");
@@ -389,11 +384,11 @@ public class MsgAlarmController extends BaseController {
     @GetMapping(value = "/getByAlarmId/{alarmId}")
     @Log(title = "报警信息管理", businessType = BusinessType.MESSAGE)
     public AjaxResult getByAlarmId(@PathVariable String alarmId) {
-        MsgAlarmCloud msgAlarm = msgAlarmCloudService.getByAlarmId(alarmId);
-        if (!ObjectUtils.isEmpty(msgAlarm)) {
+        MsgAlarmCloud msgAlarmCloud = msgAlarmCloudService.getByAlarmId(alarmId);
+        if (!ObjectUtils.isEmpty(msgAlarmCloud)) {
             LambdaQueryWrapper<BaseCameraManagement> lw = new LambdaQueryWrapper<BaseCameraManagement>();
-            if (!ObjectUtils.isEmpty(msgAlarm.getCameraCode())) {
-                lw.eq(BaseCameraManagement::getCameraCode, msgAlarm.getCameraCode());
+            if (!ObjectUtils.isEmpty(msgAlarmCloud.getCameraCode())) {
+                lw.eq(BaseCameraManagement::getCameraCode, msgAlarmCloud.getCameraCode());
             }
             BaseCameraManagement baseCameraManagement = baseCameraManagementService.getOne(lw);
             LambdaQueryWrapper<BaseRailwayManagement> wrapper = new LambdaQueryWrapper<BaseRailwayManagement>();
@@ -402,14 +397,14 @@ public class MsgAlarmController extends BaseController {
             }
             BaseRailwayManagement baseRailwayManagement = baseRailwayManagementService.getOne(wrapper);
             MsgAlarmResp msgAlarmResp = new MsgAlarmResp();
-            String[] split = msgAlarm.getImageUrl().split(";");
+            String[] split = msgAlarmCloud.getImageUrl().split(";");
             ArrayList<String> objects = new ArrayList<>(Arrays.asList(split));
-            msgAlarm.setImageUrls(objects);
-            if (StringUtils.isNotEmpty(msgAlarm.getReleasedBy())) {
-                BaseUser user = baseUserService.getUser(msgAlarm.getReleasedBy());
-                msgAlarm.setReleasedByName(user.getNickName());
+            msgAlarmCloud.setImageUrls(objects);
+            if (StringUtils.isNotEmpty(msgAlarmCloud.getReleasedBy())) {
+                BaseUser user = baseUserService.getUser(msgAlarmCloud.getReleasedBy());
+                msgAlarmCloud.setReleasedByName(user.getNickName());
             }
-            BeanUtils.copyProperties(msgAlarm, msgAlarmResp);
+            BeanUtils.copyProperties(msgAlarmCloud, msgAlarmResp);
             msgAlarmResp.setRailwayName(baseRailwayManagement.getRailwayName());
             msgAlarmResp.setDeptId(baseCameraManagement.getDeptId());
             if (!ObjectUtils.isEmpty(baseCameraManagement.getEndMile())&&!ObjectUtils.isEmpty(baseCameraManagement.getBeginMile())) {
@@ -420,7 +415,7 @@ public class MsgAlarmController extends BaseController {
             }
             String mile = AppendUtils.stringAppend(baseCameraManagement.getInstallMile());
             msgAlarmResp.setAlarmMile(mile);
-            if (!ObjectUtils.isEmpty(msgAlarm.getReleasedType())) {
+            if (!ObjectUtils.isEmpty(msgAlarmCloud.getReleasedType())) {
                 msgAlarmResp.setReleasedTypeName(msgAlarmResp.getReleasedType() == 1 ? "实报" : "误报");
             }
             msgAlarmResp.setInstallLongitude(baseCameraManagement.getInstallLongitude() + "," + baseCameraManagement.getInstallLatitude());
@@ -433,11 +428,11 @@ public class MsgAlarmController extends BaseController {
     @GetMapping(value = "/{id}")
     @Log(title = "报警信息管理", businessType = BusinessType.MESSAGE)
     public AjaxResult getInfo(@PathVariable Long id) {
-        MsgAlarmCloud msgAlarm = msgAlarmCloudService.getById(id);
-        if (!ObjectUtils.isEmpty(msgAlarm)) {
+        MsgAlarmCloud msgAlarmCloud = msgAlarmCloudService.getById(id);
+        if (!ObjectUtils.isEmpty(msgAlarmCloud)) {
             LambdaQueryWrapper<BaseCameraManagement> lw = new LambdaQueryWrapper<BaseCameraManagement>();
-            if (!ObjectUtils.isEmpty(msgAlarm.getCameraCode())) {
-                lw.eq(BaseCameraManagement::getCameraCode, msgAlarm.getCameraCode());
+            if (!ObjectUtils.isEmpty(msgAlarmCloud.getCameraCode())) {
+                lw.eq(BaseCameraManagement::getCameraCode, msgAlarmCloud.getCameraCode());
             }
             BaseCameraManagement baseCameraManagement = baseCameraManagementService.getOne(lw);
             LambdaQueryWrapper<BaseRailwayManagement> wrapper = new LambdaQueryWrapper<BaseRailwayManagement>();
@@ -446,17 +441,17 @@ public class MsgAlarmController extends BaseController {
             }
             BaseRailwayManagement baseRailwayManagement = baseRailwayManagementService.getOne(wrapper);
             MsgAlarmResp msgAlarmResp = new MsgAlarmResp();
-            String[] split = msgAlarm.getImageUrl().split(";");
+            String[] split = msgAlarmCloud.getImageUrl().split(";");
             ArrayList<String> objects = new ArrayList<>(Arrays.asList(split));
-            msgAlarm.setImageUrls(objects);
-            if (StringUtils.isNotEmpty(msgAlarm.getReleasedBy())) {
-                BaseUser user = baseUserService.getUser(msgAlarm.getReleasedBy());
-                msgAlarm.setReleasedByName(user.getNickName());
+            msgAlarmCloud.setImageUrls(objects);
+            if (StringUtils.isNotEmpty(msgAlarmCloud.getReleasedBy())) {
+                BaseUser user = baseUserService.getUser(msgAlarmCloud.getReleasedBy());
+                msgAlarmCloud.setReleasedByName(user.getNickName());
             }
-            if (!ObjectUtils.isEmpty(msgAlarm.getReleasedType())) {
-                msgAlarm.setReleasedTypeName(msgAlarm.getReleasedType() == 1 ? "实报" : "误报");
+            if (!ObjectUtils.isEmpty(msgAlarmCloud.getReleasedType())) {
+                msgAlarmCloud.setReleasedTypeName(msgAlarmCloud.getReleasedType() == 1 ? "实报" : "误报");
             }
-            BeanUtils.copyProperties(msgAlarm, msgAlarmResp);
+            BeanUtils.copyProperties(msgAlarmCloud, msgAlarmResp);
             msgAlarmResp.setRailwayName(baseRailwayManagement.getRailwayName());
             msgAlarmResp.setDeptId(baseCameraManagement.getDeptId());
             if (!ObjectUtils.isEmpty(baseCameraManagement.getEndMile())&&!ObjectUtils.isEmpty(baseCameraManagement.getBeginMile())) {
@@ -470,7 +465,7 @@ public class MsgAlarmController extends BaseController {
             msgAlarmResp.setInstallLongitude(baseCameraManagement.getInstallLongitude() + "," + baseCameraManagement.getInstallLatitude());
             SysDept sysDept = deptService.selectDeptById(baseCameraManagement.getDeptId());
             msgAlarmResp.setDeptName(sysDept.getDeptName());
-            String[] split1 = msgAlarm.getAlarmAttr().split(",");
+            String[] split1 = msgAlarmCloud.getAlarmAttr().split(",");
             String stringBuilder = "画面,大小为" + split1[0] + "×" + split1[1] + "," +
                     "泥石流范围为左上角坐标(" + split1[2] + "," + split1[3] + ")" +
                     "大小" + split1[4] + "×" + split1[5];
@@ -490,44 +485,44 @@ public class MsgAlarmController extends BaseController {
     public AjaxResult updateIsLock(@RequestParam(value = "id") Long id,
                                    @RequestParam(value = "releasedType", required = false) Integer releasedType,
                                    @RequestParam(value = "releasedReason", required = false) String releasedReason) {
-        MsgAlarmCloud msgAlarm = msgAlarmCloudService.getById(id);
-        if (msgAlarm.getIsLock() == 1) {
+        MsgAlarmCloud msgAlarmCloud = msgAlarmCloudService.getById(id);
+        if (msgAlarmCloud.getIsLock() == 1) {
             return AjaxResult.error("501", "报警已解除");
         }
-        msgAlarm.setIsLock(1);
-        msgAlarm.setUpdateBy(getUserId());
-        msgAlarm.setReleasedBy(getUserId());
-        msgAlarm.setReleasedTime(new Date());
+        msgAlarmCloud.setIsLock(1);
+        msgAlarmCloud.setUpdateBy(getUserId());
+        msgAlarmCloud.setReleasedBy(getUserId());
+        msgAlarmCloud.setReleasedTime(new Date());
         if (!ObjectUtils.isEmpty(releasedReason)) {
-            msgAlarm.setReleasedReason(releasedReason);
+            msgAlarmCloud.setReleasedReason(releasedReason);
         }
         if (!ObjectUtils.isEmpty(releasedType)) {
-            msgAlarm.setReleasedType(releasedType);
+            msgAlarmCloud.setReleasedType(releasedType);
         }
         //添加报警视频url
         LambdaQueryWrapper<BaseCameraManagement> base = new LambdaQueryWrapper<>();
-        base.eq(BaseCameraManagement::getCameraCode, msgAlarm.getCameraCode());
+        base.eq(BaseCameraManagement::getCameraCode, msgAlarmCloud.getCameraCode());
         BaseCameraManagement baseCameraManagement = baseCameraManagementService.getOne(base);
 //        String url = null;
 //        try {
 //            url = CameraUtil.historyPlayListStr(baseCameraManagement.getChannel(),
-//                    msgAlarm.getAlarmTime(),
-//                    msgAlarm.getReleasedTime(),
+//                    msgAlarmCloud.getAlarmTime(),
+//                    msgAlarmCloud.getReleasedTime(),
 //                    true);
 //        } catch (Exception exception) {
 //            log.error(exception.getMessage());
 //        }
 //        log.info("updateIsLock-------url" + url);
-//        msgAlarm.setReleasedUrl(url);
-        log.info("updateIsLock----------msgAlarm" + msgAlarm);
-        boolean b = msgAlarmCloudService.updateById(msgAlarm);
+//        msgAlarmCloud.setReleasedUrl(url);
+        log.info("updateIsLock----------msgAlarmCloud" + msgAlarmCloud);
+        boolean b = msgAlarmCloudService.updateById(msgAlarmCloud);
 //        LambdaQueryWrapper<MsgAppPush> wrapper = new LambdaQueryWrapper<>();
-//        wrapper.eq(MsgAppPush::getAlarmId, msgAlarm.getAlarmId());
+//        wrapper.eq(MsgAppPush::getAlarmId, msgAlarmCloud.getAlarmId());
 //        MsgAppPush app = new MsgAppPush();
 //        app.setStatus(1);
 //        boolean update = msgAppPushService.update(app, wrapper);
         LambdaQueryWrapper<MsgWebPush> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(MsgWebPush::getAlarmId, msgAlarm.getAlarmId());
+        queryWrapper.eq(MsgWebPush::getAlarmId, msgAlarmCloud.getAlarmId());
         MsgWebPush web = new MsgWebPush();
         web.setOnline("1");
         boolean update1 = msgWebPushService.update(web, queryWrapper);
@@ -580,8 +575,8 @@ public class MsgAlarmController extends BaseController {
         wrapper.orderByDesc("alarm_time");
         List<MsgAlarmCloud> list = msgAlarmCloudService.list(wrapper);
 //        if (list.size() > 0) {
-//            for (MsgAlarmCloud msgAlarm : list) {
-//                msgAlarm.setFailureToAlarm(1);
+//            for (MsgAlarmCloud msgAlarmCloud : list) {
+//                msgAlarmCloud.setFailureToAlarm(1);
 //            }
 //            return AjaxResult.success(list);
 //        } 

hazard-admin/src/main/java/com/ozs/web/controller/app/JPushAppController.java

@@ -4,16 +4,13 @@ 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.UserRegistrationid;
-import com.ozs.service.entity.vo.BaseCameraManagementVo;
 import com.ozs.service.entity.vo.MsgAlarmVo;
-import com.ozs.service.service.MsgAlarmService;
-import com.ozs.service.service.MsgAppPushService;
+import com.ozs.service.service.MsgAlarmCloudService;
 import com.ozs.service.service.UserRegistrationidService;
 import com.ozs.system.service.DataScoreUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
 
 /**
  * @Author : sunhh
@@ -26,7 +23,7 @@ public class JPushAppController extends BaseController {
     @Autowired
     private UserRegistrationidService userRegistrationidService;
     @Autowired
-    private MsgAlarmService msgAlarmService;
+    private MsgAlarmCloudService msgAlarmcloudService;
     @Autowired
     private DataScoreUtil dataScoreUtil;
 
@@ -36,7 +33,7 @@ public class JPushAppController extends BaseController {
     @GetMapping("/appAlarmNum")
     public AjaxResult appAlarmNum() {
         MsgAlarmVo msgAlarmVo = (MsgAlarmVo) dataScoreUtil.setDataScore(getUserId(), new MsgAlarmVo());
-        Integer appAlarmNum = msgAlarmService.appAlarmNum(msgAlarmVo);
+        Integer appAlarmNum = msgAlarmcloudService.appAlarmNum(msgAlarmVo);
         return AjaxResult.success(appAlarmNum);
     }
 

hazard-admin/src/main/java/com/ozs/web/controller/home/HomeController.java

@@ -3,14 +3,12 @@ package com.ozs.web.controller.home;
 import com.ozs.common.core.controller.BaseController;
 import com.ozs.common.core.domain.AjaxResult;
 import com.ozs.service.entity.vo.MsgAlarmVo;
-import com.ozs.service.service.MsgAlarmService;
+import com.ozs.service.service.MsgAlarmCloudService;
 import com.ozs.system.service.DataScoreUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
 /**
@@ -22,7 +20,7 @@ import java.util.Map;
 public class HomeController extends BaseController {
 
     @Resource
-    private MsgAlarmService msgAlarmService;
+    private MsgAlarmCloudService msgAlarmCloudService;
     @Autowired
     private DataScoreUtil dataScoreUtil;
 
@@ -32,7 +30,7 @@ public class HomeController extends BaseController {
     @GetMapping("/statisticsNum")
     public AjaxResult statisticsNum() {
         MsgAlarmVo msgAlarmVo = (MsgAlarmVo) dataScoreUtil.setDataScore(getUserId(), new MsgAlarmVo());
-        Map<String, Integer> map = msgAlarmService.statisticsNum(msgAlarmVo);
+        Map<String, Integer> map = msgAlarmCloudService.statisticsNum(msgAlarmVo);
         return AjaxResult.success(map);
     }
 }

hazard-admin/src/main/java/com/ozs/web/controller/shotschedule/TaskService.java

@@ -1,28 +1,9 @@
 package com.ozs.web.controller.shotschedule;
 
-import com.ozs.common.constant.Constants;
-import com.ozs.common.core.domain.entity.SysDictData;
-import com.ozs.common.utils.DictUtils;
-import com.ozs.common.utils.uuid.IdUtils;
-import com.ozs.service.entity.vo.BaseCameraVO;
-import com.ozs.service.service.MsgAlarmService;
-import com.ozs.service.service.RedisService;
-import com.ozs.service.service.impl.CameraCaptureService;
-import com.ozs.system.service.ISysDictTypeService;
+
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
-import org.springframework.util.ObjectUtils;
 
-import javax.annotation.Resource;
-import java.net.URL;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.List;
-import java.util.Objects;
-import java.util.Set;
 
 /**
  * @author wyy

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

@@ -9,7 +9,6 @@ import com.ozs.service.entity.BaseCameraManagement;
 import com.ozs.service.entity.BaseRailwayManagement;
 import com.ozs.service.service.BaseCameraManagementService;
 import com.ozs.service.service.BaseRailwayManagementService;
-import com.ozs.service.service.MsgAlarmService;
 import com.ozs.web.core.util.FileMd5;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;