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

.idea/compiler.xml

@@ -7,10 +7,10 @@
         <sourceOutputDir name="target/generated-sources/annotations" />
         <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
         <outputRelativeToContentRoot value="true" />
+        <module name="base-admin" />
+        <module name="hazard-admin" />
         <module name="hazard-sdk" />
         <module name="business-service" />
-        <module name="hazard-admin" />
-        <module name="base-admin" />
       </profile>
     </annotationProcessing>
     <bytecodeTargetLevel>

.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/misc.xml

@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
+  <component name="JavaScriptSettings">
+    <option name="languageLevel" value="ES6" />
+  </component>
   <component name="MavenProjectsManager">
     <option name="originalFiles">
       <list>

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

@@ -2,6 +2,7 @@ package com.ozs.service.entity.vo;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ozs.common.annotation.Excel;
 import com.ozs.common.vo.PageVo;
 import io.swagger.annotations.ApiModelProperty;
@@ -70,6 +71,7 @@ public class BaseCameraVersionVo {
     /**
      * 修改时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date updateTime;
 
     /**

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

@@ -2,11 +2,17 @@ package com.ozs.service.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ozs.service.entity.CameraLogDetail;
+import com.ozs.service.entity.vo.CameraUpdateLogResp;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
 
 /**
  * @author wyy
  * @subject
  * @creat 2023/4/25
  */
+@Mapper
 public interface CameraLogDetailMapper extends BaseMapper<CameraLogDetail> {
+    List<CameraLogDetail> selectDetail(CameraUpdateLogResp cameraUpdateLogResp);
 }

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

@@ -1,7 +1,11 @@
 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.CameraUpdateLogResp;
+
+import java.util.List;
 
 /**
  * @author wyy
@@ -10,4 +14,6 @@ import com.ozs.service.entity.CameraLogDetail;
  */
 public interface CameraLogDetailService extends IService<CameraLogDetail> {
     void updateAccessories(String deviceSn, Integer code);
+    IPage listToPage(List list, int pageNum, int pageSize);
+    List<CameraLogDetail> selectDetail(CameraUpdateLogResp cameraUpdateLogResp);
 }

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

@@ -9,10 +9,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.CameraLogDetail;
 import com.ozs.service.entity.CameraUpdateLog;
 import com.ozs.service.entity.vo.BaseCameraVersionVo;
 import com.ozs.service.mapper.BaseCameraManagementMapper;
 import com.ozs.service.mapper.BaseCameraVersionMapper;
+import com.ozs.service.mapper.CameraLogDetailMapper;
 import com.ozs.service.mapper.CameraUpdateLogMapper;
 import com.ozs.service.service.BaseCameraVersionService;
 import com.ozs.service.utils.PublishClient;
@@ -38,6 +40,8 @@ public class BaseCameraVersionServiceImpl extends ServiceImpl<BaseCameraVersionM
     private BaseCameraVersionMapper baseCameraVersionMapper;
     @Autowired
     private CameraUpdateLogMapper cameraUpdateLogMapper;
+    @Autowired
+    private CameraLogDetailMapper cameraLogDetailMapper;
     @Resource
     private BaseCameraManagementMapper baseCameraManagementMapper;
 
@@ -98,7 +102,7 @@ public class BaseCameraVersionServiceImpl extends ServiceImpl<BaseCameraVersionM
         cameraUpdateLog.setUpgradeType(baseCameraVersion.getUpgradeType());
         cameraUpdateLog.setCreateBy(userId);
         cameraUpdateLog.setCreateTime(new Date());
-//        int id = cameraUpdateLogMapper.insertCameraUpdateLog(cameraUpdateLog);
+        int id = cameraUpdateLogMapper.insert(cameraUpdateLog);
         for (String cameraCode : baseCameraVersionVo.getCameraCodeList()) {
             LambdaQueryWrapper<BaseCameraManagement> wrapper = new LambdaQueryWrapper<>();
             if (!StringUtils.isEmptySunhh(cameraCode)) {
@@ -108,13 +112,19 @@ public class BaseCameraVersionServiceImpl extends ServiceImpl<BaseCameraVersionM
             if (StringUtils.isEmptySunhh(baseCameraManagement)) {
                 return AjaxResult.error("相机编码：" + cameraCode + "不存在！");
             }
-            String lastVersionNum = baseCameraManagement.getLastVersionNum();
+            String lastVersionNum = baseCameraManagement.getVersionNum();
             baseCameraManagement.setVersionId(baseCameraVersion.getId());
             baseCameraManagement.setVersionNum(baseCameraVersion.getVersionNum());
             baseCameraManagement.setVersionName(baseCameraVersion.getVersionName());
             baseCameraManagement.setLastVersionNum(lastVersionNum);
             baseCameraManagementMapper.updateById(baseCameraManagement);
 
+            CameraLogDetail cameraLogDetail = new CameraLogDetail();
+            cameraLogDetail.setLogId(cameraUpdateLog.getId());
+            cameraLogDetail.setCameraCode(cameraCode);
+            cameraLogDetail.setStatus(2);
+            cameraLogDetail.setUpdateTime(new Date());
+            int insert = cameraLogDetailMapper.insert(cameraLogDetail);
         }
         PublishClient.updateDeviceSn(baseCameraVersionVo);
         new SubscribeClient("update", "update").start();

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

@@ -1,15 +1,19 @@
 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.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.CameraUpdateLogResp;
 import com.ozs.service.mapper.CameraLogDetailMapper;
 import com.ozs.service.mapper.CameraUpdateLogMapper;
 import com.ozs.service.service.CameraLogDetailService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -22,6 +26,25 @@ public class CameraLogDetailServiceImpl extends ServiceImpl<CameraLogDetailMappe
     
     @Autowired
     CameraLogDetailMapper cameraLogDetailMapper;
+
+    @Override
+    public List<CameraLogDetail> selectDetail(CameraUpdateLogResp cameraUpdateLogResp) {
+        List<CameraLogDetail> list = cameraLogDetailMapper.selectDetail(cameraUpdateLogResp);
+        return list;
+    }
+
+    @Override
+    public IPage listToPage(List list, int pageNum, int pageSize) {
+        List pageList = new ArrayList<>();
+        int curIdx = pageNum > 1 ? (pageNum - 1) * pageSize : 0;
+        for (int i = 0; i < pageSize && curIdx + i < list.size(); i++) {
+            pageList.add(list.get(curIdx + i));
+        }
+        IPage page = new Page<>(pageNum, pageSize);
+        page.setRecords(pageList);
+        page.setTotal(list.size());
+        return page;
+    }
     
     @Override
     public  void updateAccessories(String deviceSn, Integer code){

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

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.ozs.service.mapper.CameraLogDetailMapper">
-
-</mapper>

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

@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.ozs.service.mapper.CameraLogDetailMapper">
+    <resultMap id="CameraDetailResult" type="com.ozs.service.entity.CameraLogDetail">
+        <id column="id" property="id"/>
+        <result column="camera_code" property="cameraCode"/>
+        <result column="status" property="status"/>
+        <result column="log_id" property="logId"/>
+        <result column="update_time" property="updateTime"/>
+        <result column="lastVersionNum" property="lastVersionNum"/>
+        <result column="currentVersionNum" property="currentVersionNum"/>
+    </resultMap>
+    <select id="selectDetail" resultMap="CameraDetailResult"
+            parameterType="com.ozs.service.entity.vo.CameraUpdateLogResp">
+        select
+        a.id,
+        a.camera_code,
+        a.status,
+        a.log_id,
+        a.update_time,
+        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
+
+        <where>
+            <if test="logId != null and logId != 0">
+                and a.log_id =#{logId}
+            </if>
+            <if test="cameraCode != null and cameraCode != ''">
+                and UPPER(a.camera_code) like UPPER(CONCAT('%',#{cameraCode},'%'))
+            </if>
+            <if test="currentYear != null and currentYear != 0">
+                and YEAR(a.update_time) like UPPER(CONCAT('%',#{currentYear},'%'))
+            </if>
+            <if test="currentYear == null or currentYear == ''">
+                and YEAR(a.update_time) = YEAR(SYSDATE())
+            </if>
+            <if test="status != null and status != ''">
+                and UPPER(a.status) like UPPER(CONCAT('%',#{status},'%'))
+            </if>
+        </where>
+        order by a.update_time desc
+    </select>
+</mapper>

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

@@ -46,4 +46,54 @@
             </if>
         </where>
     </select>
+
+    <insert id="insertCameraUpdateLog" parameterType="com.ozs.service.entity.CameraUpdateLog">
+        insert into camera_update_log
+        <trim prefix="(" suffix=")" suffixOverrides="," >
+            <if test="id != null" >
+                id,
+            </if>
+            <if test="versionId != null" >
+                version_id,
+            </if>
+            <if test="versionNum != null" >
+                version_num,
+            </if>
+            <if test="versionName != null" >
+                version_name,
+            </if>
+            <if test="upgradeType != null" >
+                upgrade_type,
+            </if>
+            <if test="createBy != null" >
+                create_by,
+            </if>
+            <if test="createTime != null" >
+                create_time,
+            </if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides="," >
+            <if test="id != null" >
+                #{id},
+            </if>
+            <if test="versionId != null" >
+                #{versionId},
+            </if>
+            <if test="versionNum != null" >
+                #{versionNum},
+            </if>
+            <if test="versionName != null" >
+                #{versionName},
+            </if>
+            <if test="upgradeType != null" >
+                #{upgradeType},
+            </if>
+            <if test="createBy != null" >
+                #{createBy},
+            </if>
+            <if test="createTime != null" >
+                #{createTime},
+            </if>
+        </trim>
+    </insert>
 </mapper>

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

@@ -8,8 +8,10 @@ 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.CameraLogDetail;
 import com.ozs.service.entity.CameraUpdateLog;
 import com.ozs.service.entity.vo.CameraUpdateLogResp;
+import com.ozs.service.service.CameraLogDetailService;
 import com.ozs.service.service.CameraUpdateLogService;
 import com.ozs.system.service.ISysDictDataService;
 import io.swagger.annotations.ApiOperation;
@@ -39,6 +41,8 @@ public class CameraUpdateLogController extends BaseController {
     @Autowired
     private CameraUpdateLogService cameraUpdateLogService;
     @Autowired
+    private CameraLogDetailService cameraLogDetailService;
+    @Autowired
     private ISysDictDataService dictDataService;
 
     /**
@@ -79,16 +83,16 @@ public class CameraUpdateLogController extends BaseController {
     public AjaxResult detail(@RequestBody CameraUpdateLogResp cameraUpdateLogResp) {
         Integer pageNum = cameraUpdateLogResp.getPageNum().intValue();
         Integer pageSize = cameraUpdateLogResp.getPageSize().intValue();
-        List<CameraUpdateLog> list = cameraUpdateLogService.selectDetail(cameraUpdateLogResp);
-        IPage<CameraUpdateLog> page = cameraUpdateLogService.listToPage(list, pageNum, pageSize);
+        List<CameraLogDetail> list = cameraLogDetailService.selectDetail((cameraUpdateLogResp));
+        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<CameraUpdateLog> list = cameraUpdateLogService.selectDetail(cameraUpdateLogResp);
-        ExcelUtil<CameraUpdateLog> util = new ExcelUtil<CameraUpdateLog>(CameraUpdateLog.class);
-        util.exportExcel(response, list, "相机升级日志");
+        List<CameraLogDetail> list = cameraLogDetailService.selectDetail(cameraUpdateLogResp);
+        ExcelUtil<CameraLogDetail> util = new ExcelUtil<CameraLogDetail>(CameraLogDetail.class);
+        util.exportExcel(response, list, "相机升级日志详情");
     }
 }