zgyw.git - Gitblit

			@@ -80,7 +80,7 @@
			log.info("开始获取OSD");
			// YSApi.getOsd("51.95.66.42",YSUserName,YSPassword);

			DHApi.getOsd("51.95.67.189",DHUserName,DHPassword);
			// DHApi.getOsd("51.95.67.189",DHUserName,DHPassword);
			//批量修改海康品牌集合
			List<String> hkList = new ArrayList<>();
			//批量修改大华品牌集合
			@@ -96,7 +96,6 @@
			if(!CollectionUtils.isEmpty(serialNumbers)) {
			List<TMonitor> monitors = monitorMapper.selectByNumbers(serialNumbers);
			monitors = monitors.stream().filter(monitor -> !StringUtils.isEmpty(monitor.getIp()) && !"127.0.0.1".equals(monitor.getIp())).collect(Collectors.toList());
			// monitors = monitors.stream().filter(monitor -> monitor.getId() < 7000).collect(Collectors.toList());
			log.info("处理数据大小{}", monitors.size());
			for (TMonitor monitor : monitors) {
			executorService.submit(() -> {
			@@ -117,6 +116,7 @@
			} else if (DeviceType.YS.getType().equals(monitor.getDeviceType())) {
			//TODO：宇视api
			}
			log.info("//未知品牌或者api调用失败，挨个执行所有api");
			//未知品牌或者api调用失败，挨个执行所有api
			OSDResult osd = tryAllApi(monitor, hkList, dhList, ysList);
			if (osd != null) {

			@@ -240,7 +240,7 @@
			SELECT wo.id,wo.work_order_no,wo.unit_id,woet.error_name as errorType,woet.distribute_time,woar.create_time as auditTime
			FROM t_work_order wo
			LEFT JOIN t_work_order_error_type woet ON woet.work_order_no = wo.work_order_no
			LEFT JOIN t_work_order_auditing_record woar ON woar.work_order_id = wo.id
			LEFT JOIN t_work_order_auditing_record woar ON woar.work_order_no = wo.work_order_no
			WHERE wo.deleted = 0 AND wo.status = #{status} AND woar.result = #{auditStatus}
			AND wo.deduct = 0 AND woar.create_time between #{startTime} and #{endTime}
			</select>

	ycl-server/src/main/java/com/ycl/task/OsdTask.java	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史