相机升级日志导出复选框

.idea/encodings.xml

@@ -7,7 +7,5 @@
     <file url="file://$PROJECT_DIR$/hazard-admin/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/hazard-sdk/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/hazard-sdk/src/main/resources" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/src/main/resources" charset="UTF-8" />
   </component>
 </project>

.idea/jarRepositories.xml

@@ -2,8 +2,8 @@
 <project version="4">
   <component name="RemoteRepositoriesConfiguration">
     <remote-repository>
-      <option name="id" value="public" />
-      <option name="name" value="aliyun nexus" />
+      <option name="id" value="central" />
+      <option name="name" value="Central Repository" />
       <option name="url" value="https://maven.aliyun.com/repository/public" />
     </remote-repository>
     <remote-repository>
@@ -11,6 +11,16 @@
       <option name="name" value="Central Repository" />
       <option name="url" value="https://repo.maven.apache.org/maven2" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="public" />
+      <option name="name" value="aliyun nexus" />
+      <option name="url" value="https://maven.aliyun.com/repository/public" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Maven Central repository" />
+      <option name="url" value="https://repo1.maven.org/maven2" />
+    </remote-repository>
     <remote-repository>
       <option name="id" value="central" />
       <option name="name" value="Central Repository" />
@@ -26,11 +36,6 @@
       <option name="name" value="Central Repository" />
       <option name="url" value="http://maven.aliyun.com/nexus/content/repositories/central/" />
     </remote-repository>
-    <remote-repository>
-      <option name="id" value="central" />
-      <option name="name" value="Maven Central repository" />
-      <option name="url" value="https://repo1.maven.org/maven2" />
-    </remote-repository>
     <remote-repository>
       <option name="id" value="custom_group" />
       <option name="name" value="Nexus Repository" />
@@ -41,10 +46,5 @@
       <option name="name" value="JBoss Community repository" />
       <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
     </remote-repository>
-    <remote-repository>
-      <option name="id" value="central" />
-      <option name="name" value="Central Repository" />
-      <option name="url" value="https://maven.aliyun.com/repository/public" />
-    </remote-repository>
   </component>
 </project>

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

@@ -1,9 +1,11 @@
 package com.ozs.service.entity.vo;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * @author wyy
@@ -47,4 +49,9 @@ public class CameraUpdateLogResVo implements Serializable {
      * 关联升级日志id
      */
     private Long logId;
+
+    /**
+     * 复选框选中id
+     */
+    private List<Long> ids;
 }

business-service/src/main/resources/mapper/service/CameraLogDetailMapper.xml

@@ -41,6 +41,12 @@
             <if test="status != null and status != ''">
                 and UPPER(a.status) like UPPER(CONCAT('%',#{status},'%'))
             </if>
+            <if test="ids != null and ids.size()>0">
+                and a.id in
+                <foreach item="items" collection="ids" separator="," open="(" close=")" index="index">
+                    #{items}
+                </foreach>
+            </if>
         </where>
         order by a.update_time desc
     </select>

hazard-admin/src/main/java/com/ozs/web/controller/monitor/CameraUpdateLogController.java

@@ -8,11 +8,13 @@ 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.poi.ExcelUtil;
+import com.ozs.service.entity.BaseCameraManagement;
 import com.ozs.service.entity.BaseUser;
 import com.ozs.service.entity.CameraLogDetail;
 import com.ozs.service.entity.CameraUpdateLog;
 import com.ozs.service.entity.vo.CameraUpdateLogResVo;
 import com.ozs.service.entity.vo.CameraUpdateLogResp;
+import com.ozs.service.service.BaseCameraManagementService;
 import com.ozs.service.service.BaseUserService;
 import com.ozs.service.service.CameraLogDetailService;
 import com.ozs.service.service.CameraUpdateLogService;
@@ -44,6 +46,8 @@ public class CameraUpdateLogController extends BaseController {
     private CameraUpdateLogService cameraUpdateLogService;
     @Autowired
     private CameraLogDetailService cameraLogDetailService;
+    @Resource
+    BaseCameraManagementService baseCameraManagementService;
     @Autowired
     private ISysDictDataService dictDataService;
     @Resource
@@ -88,6 +92,12 @@ public class CameraUpdateLogController extends BaseController {
     @PostMapping("/detail/{pageNum}/{pageSize}")
     public AjaxResult detail(@RequestBody CameraUpdateLogResVo cameraUpdateLogResVo,@PathVariable Integer pageNum,@PathVariable Integer pageSize) {
         List<CameraLogDetail> list = cameraLogDetailService.selectDetail((cameraUpdateLogResVo));
+        list.forEach(li -> {
+            LambdaQueryWrapper<BaseCameraManagement> wrapper = new LambdaQueryWrapper<BaseCameraManagement>();
+            wrapper.eq(!ObjectUtils.isEmpty(li.getCameraCode()),BaseCameraManagement::getCameraCode,li.getCameraCode());
+            BaseCameraManagement baseCameraManagement = baseCameraManagementService.getOne(wrapper);
+            li.setLastVersionNum(baseCameraManagement.getLastVersionNum());
+        });
         IPage<CameraLogDetail> page = cameraLogDetailService.listToPage(list, pageNum, pageSize);
         return AjaxResult.success(page);
     }
@@ -96,6 +106,12 @@ public class CameraUpdateLogController extends BaseController {
     @PostMapping("/export")
     public void export(HttpServletResponse response, @RequestBody CameraUpdateLogResVo cameraUpdateLogResVo) {
         List<CameraLogDetail> list = cameraLogDetailService.selectDetail(cameraUpdateLogResVo);
+        list.forEach(li -> {
+            LambdaQueryWrapper<BaseCameraManagement> wrapper = new LambdaQueryWrapper<BaseCameraManagement>();
+            wrapper.eq(!ObjectUtils.isEmpty(li.getCameraCode()),BaseCameraManagement::getCameraCode,li.getCameraCode());
+            BaseCameraManagement baseCameraManagement = baseCameraManagementService.getOne(wrapper);
+            li.setLastVersionNum(baseCameraManagement.getLastVersionNum());
+        });
         ExcelUtil<CameraLogDetail> util = new ExcelUtil<CameraLogDetail>(CameraLogDetail.class);
         util.exportExcel(response, list, "相机升级日志详情");
     }