添加视频上方显示的数据

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

@@ -25,7 +25,7 @@ public class BaseCameraManagementVo extends PageVo implements Serializable {
     /**
      * 行别
      */
-    private String lineDir;
+    private Integer lineDir;
 
 
     /**

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

@@ -28,6 +28,7 @@ import com.ozs.service.service.MsgAlarmService;
 import com.ozs.web.core.util.CameraUtil;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.checkerframework.checker.units.qual.A;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cache.annotation.Cacheable;
@@ -48,6 +49,7 @@ import org.springframework.web.multipart.MultipartFile;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import java.io.InputStream;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -86,7 +88,7 @@ public class BaseCameraManagementController extends BaseController {
     @PostMapping("/list")
     public AjaxResult selectBaseAccountManagement(@RequestBody BaseCameraManagementVo baseCameraManagementVo) {
         LambdaQueryWrapper<BaseCameraManagement> lw = new LambdaQueryWrapper<BaseCameraManagement>();
-        if (!StringUtils.isBlank(baseCameraManagementVo.getLineDir())) {
+        if (!ObjectUtils.isEmpty(baseCameraManagementVo.getLineDir()) && baseCameraManagementVo.getLineDir() != 0) {
             lw.eq(BaseCameraManagement::getLineDir, baseCameraManagementVo.getLineDir());
         }
         if (!StringUtils.isBlank(baseCameraManagementVo.getRailwayName())) {
@@ -102,7 +104,7 @@ public class BaseCameraManagementController extends BaseController {
             lw.le(BaseCameraManagement::getEndMile, baseCameraManagementVo.getEndMile());
         }
         IPage<BaseCameraManagement> page = baseCameraManagementService.page(new Page<>(baseCameraManagementVo.getPageNum(), baseCameraManagementVo.getPageSize()), lw);
-        if(!ObjectUtils.isEmpty(page) && !ObjectUtils.isEmpty(page.getRecords())){
+        if (!ObjectUtils.isEmpty(page) && !ObjectUtils.isEmpty(page.getRecords())) {
             List<BaseCameraManagement> dto1 = page.getRecords().stream().map(o -> {
                 LambdaQueryWrapper<BaseCameraManagement> cameraManagementLambdaQueryWrapper = new LambdaQueryWrapper<BaseCameraManagement>();
                 String mils = AppendUtils.stringAppend(o.getInstallMile());
@@ -149,7 +151,7 @@ public class BaseCameraManagementController extends BaseController {
         int end = AppendUtils.stringSplit(baseCameraManagement.getEndMiles());
         baseCameraManagement.setEndMile(end);
         baseCameraManagement.setCreateBy(getUserId());
-        baseCameraManagement.setUpdateBy(getUserId());    
+        baseCameraManagement.setUpdateBy(getUserId());
         BaseDeviceDynamicManagement baseDynamicManagement = new BaseDeviceDynamicManagement();
         baseDynamicManagement.setCameraCode(baseCameraManagement.getCameraCode());
         baseDynamicManagement.setUpdateBy(getUserId());
@@ -195,6 +197,35 @@ public class BaseCameraManagementController extends BaseController {
         return AjaxResult.success(baseCameraManagement);
     }
 
+    @GetMapping("/getDate/{cameraCode}")
+    @ApiOperation("视频上方显示的数据")
+    public AjaxResult getDate(@PathVariable String cameraCode) {
+        LambdaQueryWrapper<BaseCameraManagement> lw = new LambdaQueryWrapper<BaseCameraManagement>();
+        if (!ObjectUtils.isEmpty(cameraCode)) {
+            lw.eq(BaseCameraManagement::getCameraCode, cameraCode);
+        }
+        BaseCameraManagement baseCameraManagement = baseCameraManagementService.getOne(lw);
+        LambdaQueryWrapper<BaseRailwayManagement> wrapper = new LambdaQueryWrapper<BaseRailwayManagement>();
+        if (!ObjectUtils.isEmpty(baseCameraManagement.getRailwayCode())) {
+            wrapper.eq(BaseRailwayManagement::getRailwayCode, baseCameraManagement.getRailwayCode());
+        }
+        BaseRailwayManagement baseRailwayManagement = baseRailwayManagementService.getOne(wrapper);
+        LambdaQueryWrapper<BaseDeviceDynamicManagement> queryWrapper = new LambdaQueryWrapper<BaseDeviceDynamicManagement>();
+        if (!ObjectUtils.isEmpty(baseCameraManagement.getCameraCode())) {
+            queryWrapper.eq(BaseDeviceDynamicManagement::getCameraCode, baseCameraManagement.getCameraCode());
+        }
+        BaseDeviceDynamicManagement baseDeviceDynamicManagement = baseDeviceDynamicManagementService.getOne(queryWrapper);
+        List<Object> list = new ArrayList<>();
+        list.add(baseRailwayManagement.getRailwayName());
+        list.add(AppendUtils.stringAppend(baseCameraManagement.getInstallMile()));
+        list.add(baseCameraManagement.getCameraCode());
+        list.add(baseDeviceDynamicManagement.getElectricity());
+        SimpleDateFormat dateFormat1 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        String format1 = dateFormat1.format(new Date());
+        list.add(format1);
+        return AjaxResult.success(list);
+    }
+
     /**
      * 台账管理导入
      *
@@ -221,7 +252,7 @@ public class BaseCameraManagementController extends BaseController {
     @PostMapping("/exportBaseAccountManagement")
     public void exportBaseAccountManagement(HttpServletResponse response, @RequestBody BaseCameraManagementVo baseAccountManagementVo) {
         LambdaQueryWrapper<BaseCameraManagement> lw = new LambdaQueryWrapper<BaseCameraManagement>();
-        if (!StringUtils.isBlank(baseAccountManagementVo.getLineDir())) {
+        if (!ObjectUtils.isEmpty(baseAccountManagementVo.getLineDir())) {
             lw.eq(BaseCameraManagement::getLineDir, baseAccountManagementVo.getLineDir());
         }
         if (!StringUtils.isBlank(baseAccountManagementVo.getRailwayName())) {
@@ -319,13 +350,13 @@ public class BaseCameraManagementController extends BaseController {
         msgAlarmResp.setDeptId(baseCameraManagement.getDeptId());
         String begin = AppendUtils.stringAppend(baseCameraManagement.getBeginMile());
         String end = AppendUtils.stringAppend(baseCameraManagement.getEndMile());
-        String endMile=begin+end;
+        String endMile = begin + end;
         msgAlarmResp.setBeginMile(endMile);
         String mile = AppendUtils.stringAppend(baseCameraManagement.getInstallMile());
         msgAlarmResp.setAlarmMile(mile);
-        msgAlarmResp.setInstallLongitude(baseCameraManagement.getInstallLongitude()+","+baseCameraManagement.getInstallLatitude());
+        msgAlarmResp.setInstallLongitude(baseCameraManagement.getInstallLongitude() + "," + baseCameraManagement.getInstallLatitude());
         msgAlarmResp.setLineDir(baseCameraManagement.getLineDir());
-       msgAlarmResp.setAlarmMile(baseCameraManagement.getInstallMile().toString());
+        msgAlarmResp.setAlarmMile(baseCameraManagement.getInstallMile().toString());
         return AjaxResult.success(msgAlarmResp);
     }
 }

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

@@ -67,7 +67,7 @@ public class UploadController {
                 String date = new SimpleDateFormat("yyyyMMddHHmmss").format(new Date());
                 String filename = IdUtils.fastSimpleUUID() + image.getOriginalFilename().substring(image.getOriginalFilename().lastIndexOf("."));
                 SimpleDateFormat dateFormat1 = new SimpleDateFormat("yyyy-MM-dd");
-                String format1 = dateFormat1.format(dateFormat1.format(date));
+                String format1 = dateFormat1.format(date);
                 String imgName = baseRailwayManagement.getRailwayName() + "/" + lineType + "/" + baseCameraManagement.getInstallMile() + format1 + "/" + filename;
                 minioUtils.minIoClientUpload(image.getInputStream(), imgName);
                 uploadFile = "/" + baseRailwayManagement.getRailwayName() + "/" + lineType + "/" + baseCameraManagement.getInstallMile() + "/" + format1 + "/" + filename;