admin/src/views/business/platformEvent.vue
@@ -46,24 +46,24 @@ :data="tableData.list" stripe > <el-table-column prop="platformName" label="月台名称" min-width="180px"></el-table-column> <el-table-column prop="channelName" label="监控点名称" min-width="180px"></el-table-column> <el-table-column prop="plateNo" label="车牌号" min-width="180px"></el-table-column> <el-table-column label="车辆进出类型" min-width="180px"> <el-table-column prop="platformName" label="月台名称" min-width="150px"></el-table-column> <el-table-column prop="channelName" label="监控点名称" min-width="150px"></el-table-column> <el-table-column prop="plateNo" label="车牌号" min-width="100px"></el-table-column> <el-table-column label="进出类型" min-width="90px"> <template slot-scope="{row}"> <span v-if="row.motionStatus == 'enter'">进入span> <span v-if="row.motionStatus == 'enter'">进入</span> <span v-if="row.motionStatus == 'leave'">离开</span> <span v-if="row.motionStatus != 'leave' && row.motionStatus != 'enter'">{{ row.motionStatus }}</span> </template> </el-table-column> <el-table-column label="前后标识" min-width="180px"> <el-table-column label="前后标识" min-width="90px"> <template slot-scope="{row}"> <span v-if="row.stockStatus == 'rear'">车尾</span> <span v-if="row.stockStatus == 'front'">车头</span> <span v-if="row.stockStatus != 'rear' && row.stockStatus != 'front'">{{ row.stockStatus }}</span> </template> </el-table-column> <el-table-column prop="stockStatus" label="车门状态" min-width="180px"></el-table-column> <el-table-column prop="stockStatus" label="车门状态" min-width="90px"></el-table-column> <el-table-column label="车门状态" min-width="100px"> <template slot-scope="{row}"> <span v-if="row.vehicleDoorStatus == 'open'">开门</span> @@ -71,9 +71,9 @@ <span v-if="row.vehicleDoorStatus != 'open' && row.vehicleDoorStatus != 'close'">{{ row.vehicleDoorStatus }}</span> </template> </el-table-column> <el-table-column prop="deviceId" label="设备编码" min-width="150px"></el-table-column> <el-table-column prop="srcIndex" label="设备编码" min-width="180px"></el-table-column> <el-table-column prop="ipAddress" label="IP地址" min-width="100px"></el-table-column> <el-table-column prop="portNo" label="端口" min-width="100px"></el-table-column> <el-table-column prop="portNo" label="端口" min-width="80px"></el-table-column> <el-table-column fixed="right" label="抓拍图" min-width="100px"> <template slot-scope="{row}"> <el-image v-if="row.backgroundImageDown" style="width: 60px; height: 60px" :src="row.backgroundImageDown" @@ -81,7 +81,7 @@ </el-image> </template> </el-table-column> <el-table-column prop="createDate" label="创建时间" min-width="100px"></el-table-column> <el-table-column prop="createDate" label="创建时间" min-width="160px"></el-table-column> </el-table> <pagination @size-change="handleSizeChange" server/system_service/src/main/java/com/doumee/core/utils/HttpsUtil.java
@@ -101,15 +101,12 @@ if(contentType != null){ connection.setRequestProperty("Content-Type", contentType); } connection.connect(); if(data != null){ OutputStream outputStream = connection.getOutputStream(); outputStream.write(data.getBytes("utf-8")); outputStream.close(); } int responseCode = connection.getResponseCode(); if (responseCode == HttpsURLConnection.HTTP_OK) { return connection.getInputStream(); server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java
@@ -234,8 +234,6 @@ Map<String, String> path = getPath(HKConstants.InterfacePath.facePicture[0]); //参数根据接口实际情况设置 log.error("-------------------------ArtemisConfig.host***********************************"+ ArtemisConfig.host); log.error("-------------------------ArtemisConfig.key********************************"+ArtemisConfig.appKey); HttpResponse resp = ArtemisHttpUtil.doPostStringImgArtemis( path, body, null, null,"application/json",null); if (200==resp.getStatusLine().getStatusCode()) { HttpEntity entity = resp.getEntity(); server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformEvent.java
@@ -32,7 +32,6 @@ @ApiModelProperty(value = "创建时间") @ExcelColumn(name="创建时间") @JsonFormat(pattern = "yyyy-MM-dd") private Date createDate; @ApiModelProperty(value = "更新人编码", example = "1") @@ -41,7 +40,6 @@ @ApiModelProperty(value = "更新时间") @ExcelColumn(name="更新时间") @JsonFormat(pattern = "yyyy-MM-dd") private Date editDate; @ApiModelProperty(value = "是否删除0否 1是", example = "1") server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformEventServiceImpl.java
@@ -221,10 +221,10 @@ PageData<PlatformEvent> result = PageData.from(platformEventMapper.selectJoinPage(page, PlatformEvent.class,queryWrapper)); if(result!=null && result.getRecords()!=null){ String prefixUrl = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode() + systemDictDataBiz.queryByCode(Constants.FTP,Constants.MEMBER_IMG).getCode(); systemDictDataBiz.queryByCode(Constants.FTP,Constants.PLATFORM_EVENT_IMG).getCode(); for(PlatformEvent model : result.getRecords()){ if(StringUtils.isNotBlank(model.getBackgroundImageContent())){ model.setBackgroundImageDown(prefixUrl + model.getBackgroundImageContent()); if(StringUtils.isNotBlank(model.getBackgroundImageDown())){ model.setBackgroundImageDown(prefixUrl + model.getBackgroundImageDown()); } } } server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncImgServiceImpl.java
@@ -288,10 +288,13 @@ is = HKService.getFaceInputStream(param); }else if(StringUtils.equals(folder_code,Constants.PLATFORM_EVENT_IMG)){ //月台事件图片 log.info("月台图片下载开始：=========================="+img1); try { is = new URL(img1).openStream(); // is = HttpsUtil.connectionInputsteam(img1,"GET",null,null); }catch (Exception e){ log.error("月台图片下载失败：=========================="+img1); e.printStackTrace(); log.error("月台图片下载失败：=========================="+img1+"\n"+e.getMessage()); } } if(is ==null){ server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java
@@ -1082,8 +1082,7 @@ platformBroadcastLogMapper.insert(logList); } } private PlatformBroadcastLog dealBroadcastBiz(PlatformJob model, List<String> broadcastList,String bNames) { public static PlatformBroadcastLog dealBroadcastBiz(PlatformJob model, List<String> broadcastList,String bNames) { PlatformBroadcastLog log = new PlatformBroadcastLog(); String content1 =Constants.PlatformBroadcastContent.WRONG_IN.getInfo(); content1 = content1.replace("${param}",model.getCarCodeFront());
