相机版本升级 查询

business-service/pom.xml

@@ -50,6 +50,12 @@
             <artifactId>fastjson</artifactId>
             <version>1.2.54</version>
         </dependency>
+        <dependency>
+            <groupId>com.ozs</groupId>
+            <artifactId>base-system</artifactId>
+            <version>3.8.5</version>
+            <scope>compile</scope>
+        </dependency>
 
     </dependencies>
 

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

@@ -0,0 +1,72 @@
+package com.ozs.service.entity.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.ozs.common.vo.PageVo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @Author : sunhh
+ * @create 2023/4/24 11:58
+ */
+@Data
+public class BaseCameraVersionVo {
+    @ApiModelProperty("页数")
+    private Long pageNum;
+    @ApiModelProperty("页大小")
+    private Long pageSize;
+
+    /**
+     * 主键ID
+     */
+    private Long id;
+
+    /**
+     * 版本号
+     */
+    private String versionNum;
+
+    /**
+     * 版本名称
+     */
+    private String versionName;
+
+    /**
+     * 升级类型 1:算法升级,2:硬件升级,3:算法及硬件升级
+     */
+    private String upgradeType;
+    private String upgradeTypename;
+
+    /**
+     * 版本地址
+     */
+    private String versionAddress;
+
+    /**
+     * 创建人
+     */
+    private String createBy;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 修改人
+     */
+    private String updateBy;
+
+    /**
+     * 修改时间
+     */
+    private Date updateTime;
+
+    /**
+     * 备注
+     */
+    private String remark;
+}

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

@@ -1,8 +1,10 @@
 package com.ozs.service.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ozs.common.core.domain.AjaxResult;
 import com.ozs.service.entity.BaseCameraVersion;
+import com.ozs.service.entity.vo.BaseCameraVersionVo;
 
 /**
  * @Author : sunhh
@@ -10,4 +12,6 @@ import com.ozs.service.entity.BaseCameraVersion;
  */
 public interface BaseCameraVersionService extends IService<BaseCameraVersion> {
     AjaxResult cameraVersionAdd(BaseCameraVersion baseCameraVersion, String userId);
+
+    IPage<BaseCameraVersionVo> cameraVersionList(BaseCameraVersionVo baseCameraVersionVo);
 }

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

@@ -1,20 +1,24 @@
 package com.ozs.service.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.pagehelper.PageHelper;
 import com.ozs.common.core.domain.AjaxResult;
 import com.ozs.common.utils.StringUtils;
-import com.ozs.service.entity.BaseCameraManagement;
+import com.ozs.common.utils.bean.BeanUtils;
 import com.ozs.service.entity.BaseCameraVersion;
-import com.ozs.service.entity.vo.Data;
-import com.ozs.service.mapper.BaseCameraManagementMapper;
+import com.ozs.service.entity.vo.BaseCameraVersionVo;
 import com.ozs.service.mapper.BaseCameraVersionMapper;
 import com.ozs.service.service.BaseCameraVersionService;
-import net.bytebuddy.asm.Advice;
+import com.ozs.system.service.ISysDictDataService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.ObjectUtils;
 
 import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * @Author : sunhh
@@ -25,6 +29,8 @@ public class BaseCameraVersionServiceImpl extends ServiceImpl<BaseCameraVersionM
 
     @Autowired
     private BaseCameraVersionMapper baseCameraVersionMapper;
+    @Autowired
+    private ISysDictDataService dictDataService;
 
     @Override
     public AjaxResult cameraVersionAdd(BaseCameraVersion baseCameraVersion, String userId) {
@@ -48,4 +54,38 @@ public class BaseCameraVersionServiceImpl extends ServiceImpl<BaseCameraVersionM
         }
         return AjaxResult.success();
     }
+
+    @Override
+    public IPage<BaseCameraVersionVo> cameraVersionList(BaseCameraVersionVo baseCameraVersionVo) {
+        LambdaQueryWrapper<BaseCameraVersion> wrapper = new LambdaQueryWrapper<>();
+        if (!StringUtils.isEmptySunhh(baseCameraVersionVo) && !StringUtils.isEmptySunhh(baseCameraVersionVo.getVersionNum())) {
+            wrapper.eq(BaseCameraVersion::getVersionNum, baseCameraVersionVo.getVersionNum());
+        }
+        if (!StringUtils.isEmptySunhh(baseCameraVersionVo) && !StringUtils.isEmptySunhh(baseCameraVersionVo.getVersionName())) {
+            wrapper.eq(BaseCameraVersion::getVersionName, baseCameraVersionVo.getVersionName());
+        }
+        if (!StringUtils.isEmptySunhh(baseCameraVersionVo) && !StringUtils.isEmptySunhh(baseCameraVersionVo.getUpgradeType())) {
+            wrapper.eq(BaseCameraVersion::getUpgradeType, baseCameraVersionVo.getUpgradeType());
+        }
+        int pageNum = Integer.parseInt(baseCameraVersionVo.getPageNum().toString());
+        int pageSize = Integer.parseInt(baseCameraVersionVo.getPageSize().toString());
+        com.github.pagehelper.Page<BaseCameraVersion> page = PageHelper.startPage(pageNum, pageSize)
+                .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:算法及硬件升级
+                String upgradeTypeName = dictDataService.selectDictLabel("upgrade_type", o.getUpgradeType());
+                if (!StringUtils.isEmptySunhh(upgradeTypeName)) {
+                    baseCameraVersionVo1.setUpgradeTypename(upgradeTypeName);
+                }
+                return baseCameraVersionVo1;
+            }).collect(Collectors.toList());
+            pageR.setRecords(dto1);
+        }
+        return pageR;
+    }
 }

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

@@ -1,11 +1,13 @@
 package com.ozs.web.controller.accountmanagment;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.ozs.common.annotation.Log;
 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.service.entity.BaseCameraVersion;
+import com.ozs.service.entity.vo.BaseCameraVersionVo;
 import com.ozs.service.service.BaseCameraVersionService;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -27,6 +29,20 @@ public class BaseCameraVersionController extends BaseController {
     @Autowired
     private BaseCameraVersionService baseCameraVersionService;
 
+    /**
+     * 相机版本管理 分页查询
+     *
+     * @param baseCameraVersionVo
+     * @return
+     */
+    @ApiOperation(value = "相机版本管理 分页查询")
+    @PostMapping("/cameraVersionList")
+    @Log(title = "相机版本管理", businessType = BusinessType.SELECT)
+    public AjaxResult cameraVersionList(@RequestBody BaseCameraVersionVo baseCameraVersionVo) {
+        IPage<BaseCameraVersionVo> baseCameraVersionIPage = baseCameraVersionService.cameraVersionList(baseCameraVersionVo);
+        return AjaxResult.success(baseCameraVersionIPage);
+    }
+
     /**
      * 相机版本管理 新增
      *