productDev/dmvisit.git

			@@ -15,26 +15,26 @@
			public class ProblemLogVo {

			@ApiModelProperty(value = "答题人姓名")
			@ExcelColumn(name="答题人姓名")
			@ExcelColumn(name="答题人",width = 16)
			private String name;

			@ApiModelProperty(value = "答题人手机后")
			@ExcelColumn(name="答题人手机后")
			@ExcelColumn(name="联系电话",width = 16)
			private String phone;

			@ApiModelProperty(value = "组织名称")
			@ExcelColumn(name="组织名称")
			@ExcelColumn(name="组织名称",width = 16)
			private String companyName;

			@ApiModelProperty(value = "类型 0劳务访客 1普通访客 2内部人员")
			@ExcelColumn(name="类型")
			@ExcelColumn(name="用户类型",width = 10)
			private String typeName;

			@ApiModelProperty(value = "答题分数")
			@ExcelColumn(name="答题分数")
			@ExcelColumn(name="得分",width = 10)
			private BigDecimal score;

			@ApiModelProperty(value = "创建时间")
			@ExcelColumn(name="答题时间",dateFormat="yyyy-MM-dd HH:mm")
			@ExcelColumn(name="答题时间",dateFormat="yyyy-MM-dd HH:mm",width = 16)
			private Date createDate;
			}

			@@ -44,4 +44,9 @@
			@ApiModelProperty(value = "月台状态：0=作业中；1=空闲中；2=作业超时;3=叫号中")
			private Integer status;

			@ApiModelProperty(value = "监控视频设备id")
			private String deviceId;

			@ApiModelProperty(value = "监控视频播放插件地址")
			private String videoPluginUrl;
			}

			@@ -91,6 +91,8 @@
			private PlatformGroupMapper platformGroupMapper;
			@Autowired
			private TmsService tmsService;
			@Autowired
			private PlatformDeviceMapper platformDeviceMapper;

			@Value("${debug_model}")
			private Boolean isDebug;
			@@ -1908,6 +1910,10 @@
			.orderByDesc(PlatformJob::getStatus )
			.orderByAsc(PlatformJob::getId )
			);
			List<PlatformDevice> platformDevices = platformDeviceMapper.selectList(new QueryWrapper<PlatformDevice>().lambda().eq(PlatformDevice::getType,Constants.ONE)
			.eq(PlatformDevice::getIsdeleted,Constants.ZERO).isNotNull(PlatformDevice::getDeviceId));

			String videoUrl = getVideoUrl();
			//月台状态：0=作业中；1=空闲中；2=作业超时;3=叫号
			for(Platform model : platformList){
			PlatformWorkDataVO platformDurationVO = new PlatformWorkDataVO();
			@@ -1915,6 +1921,13 @@
			platformDurationVO.setPlatformId(model.getId());
			platformDurationVO.setPlatformCode(model.getCode());
			platformDurationVO.setPlatformSort(model.getSortnum());
			if(CollectionUtils.isNotEmpty(platformDevices)){
			List<PlatformDevice> deviceList = platformDevices.stream().filter(i->Constants.equalsInteger(i.getPlatformId(),model.getId())).collect(Collectors.toList());
			if (CollectionUtils.isNotEmpty(deviceList)) {
			platformDurationVO.setDeviceId(deviceList.get(Constants.ZERO).getDeviceId());
			platformDurationVO.setVideoPluginUrl(videoUrl);
			}
			}
			PlatformJob job = getJobFromListById(model.getId(),jobList);
			if(job != null){
			if(Constants.equalsInteger(job.getType(),Constants.ONE) \|\| Constants.equalsInteger(job.getType(),Constants.THREE)){

	server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/vo/ProblemLogVo.java	12 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/PlatformWorkDataVO.java	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java	13 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史