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

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

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 
 import java.io.Serializable;
 import java.util.Date;
+import java.util.List;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ozs.common.annotation.Excel;
@@ -163,4 +164,10 @@ public class MsgAlarm extends BaseEntity implements Serializable {
      */
     @TableField(exist = false)
     private Integer alarmCount;
+
+    /**
+     * 报警图片地址网络路径
+     */
+    @TableField(exist = false)
+    private List<String> imageUrls;
 }

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

@@ -5,8 +5,10 @@ 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.BaseCameraManagement;
+import com.ozs.service.entity.BaseDeviceDynamicManagement;
 import com.ozs.service.mapper.BaseCameraManagementMapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ozs.service.mapper.BaseDeviceDynamicManagementMapper;
 import com.ozs.service.service.BaseCameraManagementService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -31,6 +33,8 @@ public class BaseCameraManagementServiceImpl extends ServiceImpl<BaseCameraManag
     protected Validator validator;
     @Resource
     BaseCameraManagementMapper baseCameraManagementMapper;
+    @Autowired
+    BaseDeviceDynamicManagementMapper baseDeviceDynamicManagementMapper;
 
     /**
      * 相机台账管理表导入
@@ -53,17 +57,27 @@ public class BaseCameraManagementServiceImpl extends ServiceImpl<BaseCameraManag
                 // 判断相机编码是否存在
                 LambdaQueryWrapper<BaseCameraManagement> lw = new LambdaQueryWrapper<BaseCameraManagement>();
                 if (!ObjectUtils.isEmpty(accountManagement.getCameraCode())) {
-                    lw.eq(BaseCameraManagement::getId, accountManagement.getCameraCode());
+                    lw.eq(BaseCameraManagement::getCameraCode, accountManagement.getCameraCode());
                 }
                 BaseCameraManagement baseAccountManagement = baseCameraManagementMapper.selectOne(lw);
                 if (ObjectUtils.isEmpty(baseAccountManagement)) {
                     BeanValidators.validateWithException(validator, accountManagement);
                     baseCameraManagementMapper.insert(accountManagement);
+                    BaseDeviceDynamicManagement baseDeviceDynamicManagement = new BaseDeviceDynamicManagement();
+                    baseDeviceDynamicManagement.setCameraCode(accountManagement.getCameraCode());
+                    baseDeviceDynamicManagementMapper.insert(baseDeviceDynamicManagement);
                     successNum++;
                     successMsg.append("<br/>" + successNum + "、相机编码 " + accountManagement.getCameraCode() + " 导入成功");
                 } else if (updateSupport) {
                     BeanValidators.validateWithException(validator, accountManagement);
                     baseCameraManagementMapper.update(accountManagement, lw);
+                    LambdaQueryWrapper<BaseDeviceDynamicManagement> wrapper = new LambdaQueryWrapper<BaseDeviceDynamicManagement>();
+                    if (!ObjectUtils.isEmpty(baseAccountManagement.getCameraCode())) {
+                        wrapper.eq(BaseDeviceDynamicManagement::getCameraCode, baseAccountManagement.getCameraCode());
+                    }
+                    BaseDeviceDynamicManagement baseDeviceDynamicManagement = baseDeviceDynamicManagementMapper.selectOne(wrapper);
+                    baseDeviceDynamicManagement.setCameraCode(accountManagement.getCameraCode());
+                    baseDeviceDynamicManagementMapper.updateById(baseDeviceDynamicManagement);
                     successNum++;
                     successMsg.append("<br/>" + successNum + "、相机编码 " + accountManagement.getCameraCode() + " 更新成功");
                 } else {

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

@@ -218,7 +218,7 @@ public class BaseCameraManagementController extends BaseController {
             lw.eq(BaseCameraManagement::getCameraCode, baseCameraManagement.getCameraCode());
         }
         BaseCameraManagement cameraManagement = baseCameraManagementService.getOne(lw);
-        if (!ObjectUtils.isEmpty(cameraManagement)) {
+        if (!ObjectUtils.isEmpty(cameraManagement) && !cameraManagement.getId().equals(baseCameraManagement.getId())) {
             return error("相机编码已存在,不能进行修改操作");
         }
         int miles = AppendUtils.stringSplit(baseCameraManagement.getBeginMiles());
@@ -228,7 +228,13 @@ public class BaseCameraManagementController extends BaseController {
         int end = AppendUtils.stringSplit(baseCameraManagement.getEndMiles());
         baseCameraManagement.setEndMile(end);
         baseCameraManagement.setUpdateBy(getUserId());
-        if (baseCameraManagementService.updateById(baseCameraManagement)) {
+        LambdaQueryWrapper<BaseDeviceDynamicManagement> queryWrapper = new LambdaQueryWrapper<BaseDeviceDynamicManagement>();
+        if (!ObjectUtils.isEmpty(baseCameraManagement.getCameraCode())) {
+            queryWrapper.eq(BaseDeviceDynamicManagement::getCameraCode, baseCameraManagement.getCameraCode());
+        }
+        BaseDeviceDynamicManagement one = baseDeviceDynamicManagementService.getOne(queryWrapper);
+        one.setCameraCode(baseCameraManagement.getCameraCode());
+        if (baseCameraManagementService.updateById(baseCameraManagement) && baseDeviceDynamicManagementService.updateById(one)) {
             return AjaxResult.success();
         }
         return AjaxResult.error();
@@ -336,7 +342,7 @@ public class BaseCameraManagementController extends BaseController {
     @GetMapping("/downloaExcel")
     public void downloadZip(HttpServletResponse response) {
         try {
-            InputStream resourceAsStream = this.getClass().getResourceAsStream("/template/provisionalPlan.xlsx");
+            InputStream resourceAsStream = this.getClass().getResourceAsStream("/baseCameraManagement.xlsx");
             response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE);
             FileUtils.setAttachmentResponseHeader(response, "相机台账管理信息模板.xlsx");
             FileUtils.writeBytesByInput(resourceAsStream, response.getOutputStream());
@@ -399,11 +405,13 @@ public class BaseCameraManagementController extends BaseController {
     @GetMapping("/endRecording/{id}")
     public AjaxResult endRecording(@PathVariable Long id) {
         BaseCameraManagement baseCameraManagement = baseCameraManagementService.getById(id);
-        log.info("endRecording------------"+baseCameraManagement.getTaskId());
+        log.info("endRecording------------" + baseCameraManagement.getTaskId());
         String start = HttpUtils.sendGet(CameraUtil.endRecording(baseCameraManagement.getTaskId()));
-        log.info("endRecording------------"+start);
+        log.info("endRecording------------" + start);
         if ("success".equals(start)) {
             baseCameraManagement.setStartRecording(2);
+            baseCameraManagement.setTaskId("");
+            baseCameraManagement.setUpdateBy(getUserId());
             if (baseCameraManagementService.updateById(baseCameraManagement)) {
                 return success();
             }
@@ -416,20 +424,21 @@ public class BaseCameraManagementController extends BaseController {
     @GetMapping("/startRecording/{id}")
     public AjaxResult startRecording(@PathVariable Long id) {
         BaseCameraManagement baseCameraManagement = baseCameraManagementService.getById(id);
-        log.info("startRecording------CameraCode------"+baseCameraManagement.getCameraCode());
-        log.info("startRecording------Channel------"+baseCameraManagement.getChannel());
+        log.info("startRecording------CameraCode------" + baseCameraManagement.getCameraCode());
+        log.info("startRecording------Channel------" + baseCameraManagement.getChannel());
         String start = HttpUtils.sendGet(CameraUtil.startRecording(baseCameraManagement.getCameraCode(), baseCameraManagement.getChannel()));
-        log.info("startRecording------------"+start);
+        log.info("startRecording------------" + start);
         if (start.startsWith(baseCameraManagement.getCameraCode() + "/" + baseCameraManagement.getChannel())) {
             log.info("startRecording 返回成功！！1");
             baseCameraManagement.setStartRecording(1);
             baseCameraManagement.setTaskId(start);
+            baseCameraManagement.setUpdateBy(getUserId());
         } else {
             return error("开启视频录制失败");
         }
         if (baseCameraManagementService.updateById(baseCameraManagement)) {
             return success();
-        }else {
+        } else {
             return error("开启视频录制失败");
         }
     }

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

@@ -217,7 +217,7 @@ public class BaseRailwayManagementController extends BaseController {
     @GetMapping("/downloaExcel")
     public void downloadZip(HttpServletResponse response) {
         try {
-            InputStream resourceAsStream = this.getClass().getResourceAsStream("/template/planQuarter.xlsx");
+            InputStream resourceAsStream = this.getClass().getResourceAsStream("/baseRailwayManagement.xlsx");
             response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE);
             FileUtils.setAttachmentResponseHeader(response, "线路管理表信息导入模板.xlsx");
             FileUtils.writeBytesByInput(resourceAsStream, response.getOutputStream());

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

@@ -21,6 +21,7 @@ import com.ozs.service.service.MsgAlarmService;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -32,6 +33,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -55,6 +57,8 @@ public class MsgAlarmController extends BaseController {
     BaseCameraManagementService baseCameraManagementService;
     @Autowired
     BaseRailwayManagementService baseRailwayManagementService;
+    @Value("${base.imgUrl:http://124.71.171.71:18801/picbucket}")
+    private String imgUrl; 
 
     /**
      * 测试消息推送
@@ -124,6 +128,13 @@ public class MsgAlarmController extends BaseController {
         IPage<MsgAlarm> page = msgAlarmService.page(new Page<>(msgAlarmVo.getPageNum(), msgAlarmVo.getPageSize()), lw);
         if(!ObjectUtils.isEmpty(page) && !ObjectUtils.isEmpty(page.getRecords())){
             List<MsgAlarm> dto1 = page.getRecords().stream().map(o -> {
+                ArrayList<String> objects = new ArrayList<>();
+                String[] split = o.getImageUrl().split(";");
+                for (String s : split) {
+                    s=imgUrl+s;
+                    objects.add(s);
+                }
+                o.setImageUrls(objects);
                 LambdaQueryWrapper<BaseCameraManagement> cameraManagementLambdaQueryWrapper = new LambdaQueryWrapper<BaseCameraManagement>();
                 if (!ObjectUtils.isEmpty(o.getCameraCode())) {
                     cameraManagementLambdaQueryWrapper.eq(BaseCameraManagement::getCameraCode, o.getCameraCode());