定时获取录像完整性结果bug修改

src/main/java/com/zhgd/xmgl/modules/video/controller/ProjectVideoHkVqdController.java

@@ -1,16 +1,27 @@
 package com.zhgd.xmgl.modules.video.controller;
 
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.zhgd.jeecg.common.system.query.QueryGenerator;
+import com.zhgd.jeecg.common.util.oConvertUtils;
 import com.zhgd.xmgl.modules.video.entity.ProjectVideoHkVqd;
 import com.zhgd.xmgl.modules.video.entity.vo.CountQualityVo;
 import com.zhgd.xmgl.modules.video.service.IProjectVideoHkVqdService;
+import com.zhgd.xmgl.modules.xz.entity.XzTaskProgressAlarm;
 import com.zhgd.xmgl.modules.xz.entity.vo.CountStatusVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiImplicitParams;
 
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
 import java.util.HashMap;
 
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+import org.springframework.web.servlet.ModelAndView;
 import springfox.documentation.annotations.ApiIgnore;
 
 import java.util.List;
@@ -26,6 +37,9 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
 
 /**
  * @Title: Controller
@@ -137,4 +151,37 @@ public class ProjectVideoHkVqdController {
 		return Result.success(projectVideoHkVqdService.countQuality(param));
 	}
 
+	/**
+	 * 导出excel
+	 *
+	 * @param request
+	 * @param response
+	 */
+	@ApiOperation(value = "导出excel海康视频质量诊断结果信息", notes = "导出excel海康视频质量诊断结果信息", httpMethod = "POST")
+	@RequestMapping(value = "/exportXls")
+	public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
+		// Step.1 组装查询条件
+		QueryWrapper<ProjectVideoHkVqd> queryWrapper = null;
+		try {
+			String paramsStr = request.getParameter("paramsStr");
+			if (oConvertUtils.isNotEmpty(paramsStr)) {
+				String deString = URLDecoder.decode(paramsStr, "UTF-8");
+				ProjectVideoHkVqd taskProgressAlarm = JSON.parseObject(deString, ProjectVideoHkVqd.class);
+				queryWrapper = QueryGenerator.initQueryWrapper(taskProgressAlarm, request.getParameterMap());
+			}
+		} catch (UnsupportedEncodingException e) {
+			log.error("error：", e);
+		}
+
+		//Step.2 AutoPoi 导出Excel
+		ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
+		List<ProjectVideoHkVqd> pageList = projectVideoHkVqdService.list(queryWrapper);
+		//导出文件名称
+		mv.addObject(NormalExcelConstants.FILE_NAME, "导出列表");
+		mv.addObject(NormalExcelConstants.CLASS, ProjectVideoHkVqd.class);
+		mv.addObject(NormalExcelConstants.PARAMS, new ExportParams());
+		mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
+		return mv;
+	}
+
 }

src/main/java/com/zhgd/xmgl/task/VideoItemTask.java

@@ -106,17 +106,20 @@ public class VideoItemTask {
                 JSONArray listJa = dataJo.getJSONArray("list");
                 for (int i = 0; i < listJa.size(); i++) {
                     JSONObject oneJo = listJa.getJSONObject(i);
+                    String indexCode = oneJo.getString("indexCode");
+                    Integer result = oneJo.getInteger("result");
+                    String date = oneJo.getString("date");
+                    JSONArray videoClipstimeSegmentJa = oneJo.getJSONArray("videoClipstimeSegment");
+                    for (int j = 0; j < videoClipstimeSegmentJa.size(); j++) {
                         XzHikvisionVideoFull entity = new XzHikvisionVideoFull();
                         entity.setProjectSn(project.getProjectSn());
-                    String indexCode = oneJo.getString("indexCode");
                         entity.setSerialNumber(indexCode);
-                    Integer result = oneJo.getInteger("result");
                         entity.setType(result);
-                    String date = oneJo.getString("date");
                         entity.setDate(date);
-                    Integer from = oneJo.getInteger("from");
+                        JSONObject jo1 = videoClipstimeSegmentJa.getJSONObject(j);
+                        Integer from = jo1.getInteger("from");
                         entity.setFrom(from);
-                    Integer to = oneJo.getInteger("to");
+                        Integer to = jo1.getInteger("to");
                         entity.setTo(to);
                         Integer count = xzHikvisionVideoFullMapper.selectCount(new LambdaQueryWrapper<XzHikvisionVideoFull>()
                                 .eq(XzHikvisionVideoFull::getSerialNumber, entity.getSerialNumber())
@@ -131,6 +134,7 @@ public class VideoItemTask {
                 }
             }
         }
+    }
 
     /**
      * 定时获取视频质量诊断结果