From ad5af00b7ae7af3c5e6375ccff237df8254d3c3f Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 09 十月 2024 19:03:52 +0800
Subject: [PATCH] 最新版本
---
server/system_service/src/main/java/com/doumee/core/utils/HttpsUtil.java | 3 ---
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformEvent.java | 2 --
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java | 3 +--
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformEventServiceImpl.java | 6 +++---
admin/src/views/business/platformEvent.vue | 20 ++++++++++----------
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncImgServiceImpl.java | 5 ++++-
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java | 2 --
7 files changed, 18 insertions(+), 23 deletions(-)
diff --git a/admin/src/views/business/platformEvent.vue b/admin/src/views/business/platformEvent.vue
index 2d61009..568b04d 100644
--- a/admin/src/views/business/platformEvent.vue
+++ b/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"
diff --git a/server/system_service/src/main/java/com/doumee/core/utils/HttpsUtil.java b/server/system_service/src/main/java/com/doumee/core/utils/HttpsUtil.java
index d0025db..0f11b14 100644
--- a/server/system_service/src/main/java/com/doumee/core/utils/HttpsUtil.java
+++ b/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();
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java
index d14b20a..0e94f0b 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java
+++ b/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();
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformEvent.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformEvent.java
index ade66f6..0f9cf4e 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformEvent.java
+++ b/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")
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformEventServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformEventServiceImpl.java
index 1b631ea..0a6bbca 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformEventServiceImpl.java
+++ b/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());
}
}
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncImgServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncImgServiceImpl.java
index f0a2b4e..8aeaa4b 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncImgServiceImpl.java
+++ b/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){
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java
index 6800469..fe0be93 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java
+++ b/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());
--
Gitblit v1.9.3