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

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

@@ -3,6 +3,7 @@ package com.ozs.service.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ozs.service.entity.BaseCameraManagement;
 import com.ozs.service.entity.MsgAlarm;
+import com.ozs.service.entity.vo.BaseCameraManagementHomeVo;
 import com.ozs.service.entity.vo.BaseCameraManagementVo;
 import com.ozs.service.entity.vo.MsgAlarmVo;
 import org.apache.ibatis.annotations.Mapper;

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

@@ -40,4 +40,6 @@ public interface BaseCameraManagementService extends IService<BaseCameraManageme
     List<BaseCameraManagement> baseCameraManagementList(BaseCameraManagementVo baseCameraManagementVo);
 
     Map<String, Object> getCameraChannelByAlarmId(String alarmId);
+
+    List<BaseCameraManagement> cameraAllList(BaseCameraManagement baseCameraManagement);
 }

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

@@ -10,11 +10,7 @@ import com.ozs.common.utils.AppendUtils;
 import com.ozs.common.utils.StringUtils;
 import com.ozs.common.utils.bean.BeanUtils;
 import com.ozs.common.utils.bean.BeanValidators;
-import com.ozs.service.entity.BaseCameraManagement;
-import com.ozs.service.entity.BaseDeviceDynamicManagement;
-import com.ozs.service.entity.BaseRailwayManagement;
-import com.ozs.service.entity.BaseUser;
-import com.ozs.service.entity.MsgAlarm;
+import com.ozs.service.entity.*;
 import com.ozs.service.entity.vo.BaseCameraManagementHomeVo;
 import com.ozs.service.entity.vo.BaseCameraManagementVo;
 import com.ozs.service.entity.vo.BaseCameraManagementVos;
@@ -314,4 +310,14 @@ public class BaseCameraManagementServiceImpl extends ServiceImpl<BaseCameraManag
     public Map<String, Object> getCameraChannelByAlarmId(String alarmId) {
         return baseCameraManagementMapper.getCameraChannelByAlarmId(alarmId);
     }
+
+    @Override
+    public List<BaseCameraManagement> cameraAllList(BaseCameraManagement baseCameraManagement) {
+        LambdaQueryWrapper<BaseCameraManagement> wrapper = new LambdaQueryWrapper<>();
+        if (!StringUtils.isEmptySunhh(baseCameraManagement) && !StringUtils.isEmptySunhh(baseCameraManagement.getCameraCode())) {
+            wrapper.eq(BaseCameraManagement::getCameraCode, baseCameraManagement.getCameraCode());
+        }
+        List<BaseCameraManagement> baseCameraManagements = baseCameraManagementMapper.selectList(wrapper);
+        return baseCameraManagements;
+    }
 }

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

@@ -28,8 +28,6 @@ public class BaseCameraVersionServiceImpl extends ServiceImpl<BaseCameraVersionM
 
     @Autowired
     private BaseCameraVersionMapper baseCameraVersionMapper;
-//    @Autowired
-//    private ISysDictDataService dictDataService;
 
     @Override
     public AjaxResult cameraVersionAdd(BaseCameraVersion baseCameraVersion, String userId) {
@@ -72,19 +70,19 @@ public class BaseCameraVersionServiceImpl extends ServiceImpl<BaseCameraVersionM
                 .doSelectPage(() -> baseCameraVersionMapper.selectList(wrapper));
         com.baomidou.mybatisplus.extension.plugins.pagination.Page<BaseCameraVersionVo> pageR =
                 new com.baomidou.mybatisplus.extension.plugins.pagination.Page<>(pageNum, pageSize);
-        if (!ObjectUtils.isEmpty(page) && page.getResult().size() > 0) {
-            List<BaseCameraVersionVo> dto1 = page.getResult().stream().map(o -> {
-                BaseCameraVersionVo baseCameraVersionVo1 = new BaseCameraVersionVo();
-                BeanUtils.copyProperties(o, baseCameraVersionVo1);
-                // 升级类型 1:算法升级,2:硬件升级,3:算法及硬件升级
+//        if (!ObjectUtils.isEmpty(page) && page.getResult().size() > 0) {
+//            List<BaseCameraVersionVo> dto1 = page.getResult().stream().map(o -> {
+//                BaseCameraVersionVo baseCameraVersionVo1 = new BaseCameraVersionVo();
+//                BeanUtils.copyProperties(o, baseCameraVersionVo1);
+//                // 升级类型 1:算法升级,2:硬件升级,3:算法及硬件升级
 //                String upgradeTypeName = dictDataService.selectDictLabel("upgrade_type", o.getUpgradeType());
 //                if (!StringUtils.isEmptySunhh(upgradeTypeName)) {
 //                    baseCameraVersionVo1.setUpgradeTypename(upgradeTypeName);
 //                }
-                return baseCameraVersionVo1;
-            }).collect(Collectors.toList());
-            pageR.setRecords(dto1);
-        }
+//                return baseCameraVersionVo1;
+//            }).collect(Collectors.toList());
+//            pageR.setRecords(dto1);
+//        }
         return pageR;
     }
 }

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

@@ -6,15 +6,23 @@ import com.ozs.common.core.controller.BaseController;
 import com.ozs.common.core.domain.AjaxResult;
 import com.ozs.common.enums.BusinessType;
 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.vo.BaseCameraManagementHomeVo;
 import com.ozs.service.entity.vo.BaseCameraVersionVo;
+import com.ozs.service.service.BaseCameraManagementService;
 import com.ozs.service.service.BaseCameraVersionService;
+import com.ozs.system.service.ISysDictDataService;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 相机版本管理
@@ -28,6 +36,24 @@ public class BaseCameraVersionController extends BaseController {
 
     @Autowired
     private BaseCameraVersionService baseCameraVersionService;
+    @Resource
+    private BaseCameraManagementService baseCameraManagementService;
+    @Autowired
+    private ISysDictDataService dictDataService;
+
+    /**
+     * 相机列表
+     *
+     * @param baseCameraManagement
+     * @return
+     */
+    @ApiOperation(value = "相机列表")
+    @GetMapping("/cameraAllList")
+    @Log(title = "相机版本管理", businessType = BusinessType.SELECT)
+    public AjaxResult cameraAllList(@RequestBody BaseCameraManagement baseCameraManagement) {
+        List<BaseCameraManagement> baseCameraManagements = baseCameraManagementService.cameraAllList(baseCameraManagement);
+        return AjaxResult.success(baseCameraManagements);
+    }
 
     /**
      * 相机版本管理 分页查询
@@ -39,8 +65,21 @@ public class BaseCameraVersionController extends BaseController {
     @PostMapping("/cameraVersionList")
     @Log(title = "相机版本管理", businessType = BusinessType.SELECT)
     public AjaxResult cameraVersionList(@RequestBody BaseCameraVersionVo baseCameraVersionVo) {
-        IPage<BaseCameraVersionVo> baseCameraVersionIPage = baseCameraVersionService.cameraVersionList(baseCameraVersionVo);
-        return AjaxResult.success(baseCameraVersionIPage);
+        IPage<BaseCameraVersionVo> page = baseCameraVersionService.cameraVersionList(baseCameraVersionVo);
+        if (!ObjectUtils.isEmpty(page) && page.getRecords().size() > 0) {
+            List<BaseCameraVersionVo> dto1 = page.getRecords().stream().map(o -> {
+//                BaseCameraVersionVo baseCameraVersionVo1 = new BaseCameraVersionVo();
+//                BeanUtils.copyProperties(o, baseCameraVersionVo1);
+                // 升级类型 1:算法升级,2:硬件升级,3:算法及硬件升级
+                String upgradeTypeName = dictDataService.selectDictLabel("upgrade_type", o.getUpgradeType());
+                if (!StringUtils.isEmptySunhh(upgradeTypeName)) {
+                    o.setUpgradeTypename(upgradeTypeName);
+                }
+                return o;
+            }).collect(Collectors.toList());
+//            pageR.setRecords(dto1);
+        }
+        return AjaxResult.success(page);
     }
 
     /**

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

@@ -40,6 +40,8 @@ public class UploadController {
     BaseCameraManagementService baseCameraManagementService;
     @Autowired
     BaseRailwayManagementService baseRailwayManagementService;
+    @Value("${base.imgUrl}")
+    private String imgUrl;
 
     @PostMapping("/upLoadImage")
     public AjaxResult upLoadImage(@RequestParam("file") MultipartFile image,
@@ -102,7 +104,7 @@ public class UploadController {
                 String filename = IdUtils.fastSimpleUUID() + image.getOriginalFilename().substring(image.getOriginalFilename().lastIndexOf("."));
                 SimpleDateFormat dateFormat1 = new SimpleDateFormat("yyyy-MM-dd");
                 String format1 = dateFormat1.format(new Date());
-                String imgName = "cameraVersion" + format1 + "/" + filename;
+                String imgName = "cameraVersion" + "/" + format1 + "/" + filename;
                 minioUtils.minIoClientUpload(image.getInputStream(), imgName);
                 uploadFile = "/cameraVersion/" + format1 + "/" + filename;
             }
@@ -110,7 +112,7 @@ public class UploadController {
             return AjaxResult.error("上传功能出错");
         }
         Map<String, Object> map = new HashMap<>();
-        map.put("url", uploadFile);
+        map.put("url", imgUrl + uploadFile);
         map.put("md5", fileMd5Str);
         return AjaxResult.success(map);
     }