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

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

@@ -68,6 +68,7 @@ public class BaseCameraVersionVo {
     /**
      * 创建时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date createTime;
 
     /**

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

@@ -0,0 +1,12 @@
+package com.ozs.service.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ozs.service.entity.BaseCameraVersion;
+import com.ozs.service.entity.BaseVersionCameraParam;
+
+/**
+ * @Author : sunhh
+ * @create 2023/4/26 16:12
+ */
+public interface BaseVersionCameraParamService extends IService<BaseVersionCameraParam> {
+}

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

@@ -0,0 +1,18 @@
+package com.ozs.service.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ozs.service.entity.BaseCameraManagement;
+import com.ozs.service.entity.BaseVersionCameraParam;
+import com.ozs.service.mapper.BaseCameraManagementMapper;
+import com.ozs.service.mapper.BaseVersionCameraParamMapper;
+import com.ozs.service.service.BaseCameraManagementService;
+import com.ozs.service.service.BaseVersionCameraParamService;
+import org.springframework.stereotype.Service;
+
+/**
+ * @Author : sunhh
+ * @create 2023/4/26 16:15
+ */
+@Service
+public class BaseVersionCameraParamServiceImpl extends ServiceImpl<BaseVersionCameraParamMapper, BaseVersionCameraParam> implements BaseVersionCameraParamService {
+}

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

@@ -10,10 +10,12 @@ import com.ozs.common.utils.StringUtils;
 import com.ozs.common.utils.bean.BeanUtils;
 import com.ozs.service.entity.BaseCameraManagement;
 import com.ozs.service.entity.BaseCameraVersion;
+import com.ozs.service.entity.BaseVersionCameraParam;
 import com.ozs.service.entity.vo.BaseCameraManagementHomeVo;
 import com.ozs.service.entity.vo.BaseCameraVersionVo;
 import com.ozs.service.service.BaseCameraManagementService;
 import com.ozs.service.service.BaseCameraVersionService;
+import com.ozs.service.service.BaseVersionCameraParamService;
 import com.ozs.system.service.ISysDictDataService;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -41,6 +43,8 @@ public class BaseCameraVersionController extends BaseController {
     private BaseCameraManagementService baseCameraManagementService;
     @Autowired
     private ISysDictDataService dictDataService;
+    @Autowired
+    private BaseVersionCameraParamService baseVersionCameraParamService;
 
     /**
      * 相机版本管理 版本升级
@@ -93,11 +97,19 @@ public class BaseCameraVersionController extends BaseController {
             List<BaseCameraVersionVo> dto1 = page.getResult().stream().map(o -> {
                 BaseCameraVersionVo baseCameraVersionVo1 = new BaseCameraVersionVo();
                 BeanUtils.copyProperties(o, baseCameraVersionVo1);
-                // 升级类型 1:算法升级,2:硬件升级,3:算法及硬件升级
+                // 升级类型 0.固件 1.算法 2:算法及硬件升级 3:摄像头系统参数
                 String upgradeTypeName = dictDataService.selectDictLabel("upgrade_type", o.getUpgradeType());
                 if (!StringUtils.isEmptySunhh(upgradeTypeName)) {
                     baseCameraVersionVo1.setUpgradeTypename(upgradeTypeName);
                 }
+                if ("3".equals(o.getUpgradeType())) {
+                    LambdaQueryWrapper<BaseVersionCameraParam> wrapperBaseVersionCameraParam = new LambdaQueryWrapper<>();
+                    if (!StringUtils.isEmptySunhh(baseCameraVersionVo) && !StringUtils.isEmptySunhh(baseCameraVersionVo.getId())) {
+                        wrapperBaseVersionCameraParam.eq(BaseVersionCameraParam::getVersionId, baseCameraVersionVo.getId());
+                    }
+                    List<BaseVersionCameraParam> baseVersionCameraParams = baseVersionCameraParamService.list(wrapperBaseVersionCameraParam);
+                    baseCameraVersionVo1.setBaseVersionCameraParamList(baseVersionCameraParams);
+                }
                 return baseCameraVersionVo1;
             }).collect(Collectors.toList());
             pageR.setRecords(dto1);

hazard-admin/src/main/java/com/ozs/web/controller/common/PictureController.java

@@ -43,7 +43,7 @@ public class PictureController {
     MsgAlarmService msgAlarmService;
     @Resource
     MinioUtils minioUtils;
-    public final long timeout = 10000;
+
     /**
      * 获取图片
      *
@@ -61,9 +61,9 @@ public class PictureController {
                 queryWrapper.lambda().eq(MsgAlarm::getIsLock,2);
                 List<MsgAlarm> msgAlarmList = msgAlarmService.list(queryWrapper);
                 try {
-                    System.out.println("http://124.70.58.209:18891/api/snap?stream="+l.getCameraCode()+"/"+l.getChannel()+"&timeout="+timeout);
-                    log.info("请求url"+"http://124.70.58.209:18891/api/snap?stream="+l.getCameraCode()+"/"+l.getChannel()+"&timeout="+timeout);
-                    URL url = new URL("http://124.70.58.209:18891/api/snap?stream="+l.getCameraCode()+"/"+l.getChannel()+"&timeout="+timeout);
+                    System.out.println("http://124.70.58.209:18891/snap/"+l.getCameraCode()+"/"+l.getChannel());
+                    log.info("请求url"+"http://124.70.58.209:18891/snap/"+l.getCameraCode()+"/"+l.getChannel());
+                    URL url = new URL("http://124.70.58.209:18891/snap/"+l.getCameraCode()+"/"+l.getChannel());
                     String fileName = "cameraPicture/"+l.getCameraCode()+"_"+uuid +".jpg";
                     log.info("fileName="+fileName);
                     getCapture(url, fileName);