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

.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/CameraLogDetail.java

@@ -43,6 +43,13 @@ public class CameraLogDetail implements Serializable {
     @Excel(name = "相机编码", width = 30)
     private String cameraCode;
 
+    /**
+     * 序列号
+     */
+    @Excel(name = "序列号")
+    @TableField(exist = false)
+    private String cameraSn;
+
     /**
      * 升级状态
      */

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

@@ -0,0 +1,57 @@
+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
+ * @subject
+ * @creat 2023/5/29
+ */
+@Data
+public class CameraUpdateLogResVo implements Serializable {
+    private static final long serialVersionUID = 1L;
+    /**
+     * 版本号
+     */
+    private String versionNum;
+
+    /**
+     * 版本名称
+     */
+    private String versionName;
+
+    /**
+     * 升级类型
+     */
+    private String upgradeType;
+
+    /**
+     * 相机编码
+     */
+    private String cameraCode;
+
+    /**
+     * 升级状态
+     */
+    private Integer status;
+
+    /**
+     * 时间（年）
+     */
+    private Integer currentYear;
+
+    /**
+     * 关联升级日志id
+     */
+    private Long logId;
+
+    /**
+     * 复选框选中id
+     */
+    private List<Long> ids;
+}

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

@@ -2,6 +2,7 @@ package com.ozs.service.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ozs.service.entity.CameraLogDetail;
+import com.ozs.service.entity.vo.CameraUpdateLogResVo;
 import com.ozs.service.entity.vo.CameraUpdateLogResp;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -14,5 +15,5 @@ import java.util.List;
  */
 @Mapper
 public interface CameraLogDetailMapper extends BaseMapper<CameraLogDetail> {
-    List<CameraLogDetail> selectDetail(CameraUpdateLogResp cameraUpdateLogResp);
+    List<CameraLogDetail> selectDetail(CameraUpdateLogResVo cameraUpdateLogResVo);
 }

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

@@ -3,6 +3,7 @@ package com.ozs.service.service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ozs.service.entity.CameraLogDetail;
+import com.ozs.service.entity.vo.CameraUpdateLogResVo;
 import com.ozs.service.entity.vo.CameraUpdateLogResp;
 
 import java.util.List;
@@ -15,5 +16,5 @@ import java.util.List;
 public interface CameraLogDetailService extends IService<CameraLogDetail> {
     void updateAccessories(String deviceSn, Integer code,String remark);
     IPage listToPage(List list, int pageNum, int pageSize);
-    List<CameraLogDetail> selectDetail(CameraUpdateLogResp cameraUpdateLogResp);
+    List<CameraLogDetail> selectDetail(CameraUpdateLogResVo cameraUpdateLogResVo);
 }

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

@@ -14,6 +14,7 @@ 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;
+import com.ozs.service.entity.vo.BaseCameraVersionVo;
 import com.ozs.service.mapper.*;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ozs.service.service.BaseCameraManagementService;
@@ -27,6 +28,7 @@ import org.springframework.util.ObjectUtils;
 import javax.annotation.Resource;
 import javax.validation.Validator;
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -336,14 +338,26 @@ public class BaseCameraManagementServiceImpl extends ServiceImpl<BaseCameraManag
         if (!StringUtils.isEmptySunhh(baseCameraManagement) && !StringUtils.isEmptySunhh(baseCameraManagement.getCameraCode())) {
             wrapper.like(BaseCameraManagement::getCameraCode, baseCameraManagement.getCameraCode());
         }
+        if (!StringUtils.isEmptySunhh(baseCameraManagement) && !StringUtils.isEmptySunhh(baseCameraManagement.getDeptId())) {
+            wrapper.eq(BaseCameraManagement::getDeptId, baseCameraManagement.getDeptId());
+        }
+        if (!StringUtils.isEmptySunhh(baseCameraManagement) && !StringUtils.isEmptySunhh(baseCameraManagement.getRailwayCode())) {
+            wrapper.like(BaseCameraManagement::getRailwayCode, baseCameraManagement.getRailwayCode());
+        }
         if (!StringUtils.isEmptySunhh(baseCameraManagement) && !StringUtils.isEmptySunhh(baseCameraManagement.getVersionId())) {
 //            wrapper.ne(BaseCameraManagement::getVersionId, baseCameraManagement.getVersionId());
-            // 判断
             wrapper.and((wp) -> {
                 wp.isNull(BaseCameraManagement::getVersionId).or().ne(BaseCameraManagement::getVersionId, baseCameraManagement.getVersionId());
             });
         }
         List<BaseCameraManagement> baseCameraManagements = baseCameraManagementMapper.selectList(wrapper);
+        if (!StringUtils.isEmptySunhh(baseCameraManagements) && baseCameraManagements.size() > 0) {
+            for (BaseCameraManagement baseCameraManagement1 : baseCameraManagements) {
+                if (!StringUtils.isEmptySunhh(baseCameraManagement1) && !StringUtils.isEmptySunhh(baseCameraManagement1.getInstallMile())) {
+                    baseCameraManagement1.setInstallMiles(AppendUtils.stringAppend(baseCameraManagement1.getInstallMile()));
+                }
+            }
+        }
         return baseCameraManagements;
     }
 }

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

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 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.mapper.CameraLogDetailMapper;
 import com.ozs.service.mapper.CameraUpdateLogMapper;
@@ -28,8 +29,8 @@ public class CameraLogDetailServiceImpl extends ServiceImpl<CameraLogDetailMappe
     CameraLogDetailMapper cameraLogDetailMapper;
 
     @Override
-    public List<CameraLogDetail> selectDetail(CameraUpdateLogResp cameraUpdateLogResp) {
-        List<CameraLogDetail> list = cameraLogDetailMapper.selectDetail(cameraUpdateLogResp);
+    public List<CameraLogDetail> selectDetail(CameraUpdateLogResVo cameraUpdateLogResVo) {
+        List<CameraLogDetail> list = cameraLogDetailMapper.selectDetail(cameraUpdateLogResVo);
         return list;
     }
 

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

@@ -12,7 +12,7 @@
         <result column="currentVersionNum" property="currentVersionNum"/>
     </resultMap>
     <select id="selectDetail" resultMap="CameraDetailResult"
-            parameterType="com.ozs.service.entity.vo.CameraUpdateLogResp">
+            parameterType="com.ozs.service.entity.vo.CameraUpdateLogResVo">
         select
         a.id,
         a.camera_code,
@@ -21,10 +21,10 @@
         a.update_time,
         a.remark,
         b.version_num as currentVersionNum,
-        b.last_version_num as lastVersionNum
-        from camera_log_detail as a inner join
-        base_camera_management as b on a.camera_code=b.camera_code
-
+        b.last_version_num as lastVersionNum,
+        b.camera_sn as cameraSn
+        from camera_log_detail as a
+        inner join base_camera_management as b on a.camera_code=b.camera_code
         <where>
             <if test="logId != null and logId != 0">
                 and a.log_id =#{logId}
@@ -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,23 +8,24 @@ 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;
 import com.ozs.system.service.ISysDictDataService;
 import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.ObjectUtils;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
@@ -45,6 +46,8 @@ public class CameraUpdateLogController extends BaseController {
     private CameraUpdateLogService cameraUpdateLogService;
     @Autowired
     private CameraLogDetailService cameraLogDetailService;
+    @Resource
+    BaseCameraManagementService baseCameraManagementService;
     @Autowired
     private ISysDictDataService dictDataService;
     @Resource
@@ -86,19 +89,29 @@ public class CameraUpdateLogController extends BaseController {
     }
 
     @ApiOperation(value = "获取相机升级日志详细")
-    @PostMapping("/detail")
-    public AjaxResult detail(@RequestBody CameraUpdateLogResp cameraUpdateLogResp) {
-        Integer pageNum = cameraUpdateLogResp.getPageNum().intValue();
-        Integer pageSize = cameraUpdateLogResp.getPageSize().intValue();
-        List<CameraLogDetail> list = cameraLogDetailService.selectDetail((cameraUpdateLogResp));
+    @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);
     }
 
     @Log(title = "相机升级日志", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, @RequestBody CameraUpdateLogResp cameraUpdateLogResp) {
-        List<CameraLogDetail> list = cameraLogDetailService.selectDetail(cameraUpdateLogResp);
+    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, "相机升级日志详情");
     }