From 290e44b21a384d1798aad927ef8f6016e7c18af5 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 13 六月 2025 11:11:27 +0800
Subject: [PATCH] 最新版本541200007
---
admin/src/views/platform/LogisticsRecord/waybill.vue | 2 +-
admin/src/views/statistics/platformRecord.vue | 2 +-
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceEventServiceImpl.java | 4 ++--
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java | 34 +++++++++++++++++++---------------
server/startsh/DBbackup.sh | 1 -
screen/src/views/LogisticsEfficiency.vue | 2 +-
admin/src/views/business/deviceEvent.vue | 12 ++++++------
7 files changed, 30 insertions(+), 27 deletions(-)
diff --git a/admin/src/views/business/deviceEvent.vue b/admin/src/views/business/deviceEvent.vue
index 4e743b0..d86b88f 100644
--- a/admin/src/views/business/deviceEvent.vue
+++ b/admin/src/views/business/deviceEvent.vue
@@ -28,6 +28,9 @@
<el-option label="浜鸿劯璁よ瘉閫氳繃" value="196893"></el-option>
</el-select>
</el-form-item>
+ <el-form-item label="闂ㄧ鐐�" prop="srcName">
+ <el-input v-model="searchForm.srcName" placeholder="璇疯緭鍏ラ棬绂佺偣" @keypress.enter.native="search"></el-input>
+ </el-form-item>
<el-form-item label="璧锋鏃堕棿" prop="eventType">
<!-- <el-date-picker @change="seleTime" v-model="time" type="datetimerange" format="yyyy-MM-dd HH:mm:ss"
value-format="yyyy-MM-dd HH:mm:ss" range-separator="鑷�" start-placeholder="寮�濮嬫椂闂�" end-placeholder="缁撴潫鏃堕棿">
@@ -52,9 +55,7 @@
<!-- 琛ㄦ牸鍜屽垎椤� -->
<template v-slot:table-wrap>
<ul class="toolbar" v-permissions="['business:deviceevent:exportExcel']">
- <!--
<li><el-button type="primary" :loading="isWorking.export" v-permissions="['business:deviceevent:exportExcel']" @click="exportExcel">瀵煎嚭</el-button></li>
--->
</ul>
<el-table :height="tableHeightNew" v-loading="isWorking.search" :data="tableData.list" stripe>
<!-- <el-table-column prop="userType" label="浜哄憳绫诲瀷" min-width="100px">
@@ -88,9 +89,7 @@
</el-table-column>
<el-table-column label="鎶撴媿鐓х墖" min-width="100px">
<template slot-scope="{row}">
- <el-image v-if="row.extEventPictureURL" style="width: 80px; height: 80px" :src="row.extEventPictureURL"
- :preview-src-list="[row.extEventPictureURL]">
- </el-image>
+ <el-image v-if="row.extEventPictureURL" style="width: 80px; height: 80px" :src="row.extEventPictureURL" :preview-src-list="[row.extEventPictureURL]"> </el-image>
</template>
</el-table-column>
</el-table>
@@ -119,7 +118,8 @@
eventType: '',
startTime: '',
endTime: '',
- radio: 0
+ radio: 0,
+ srcName: ''
},
time: []
}
diff --git a/admin/src/views/platform/LogisticsRecord/waybill.vue b/admin/src/views/platform/LogisticsRecord/waybill.vue
index ce40f99..300df08 100644
--- a/admin/src/views/platform/LogisticsRecord/waybill.vue
+++ b/admin/src/views/platform/LogisticsRecord/waybill.vue
@@ -20,7 +20,7 @@
<el-table :height="tableHeightNew" v-loading="loading" :data="list" @selection-change="handleSelectionChange" stripe>
<el-table-column type="selection" width="55"></el-table-column>
<el-table-column prop="billCode" label="杩愬崟鍙�" min-width="100" show-overflow-tooltip />
- <el-table-column prop="totalNum" label="鎬讳綔涓氶噺锛堜竾鍙級" min-width="130" show-overflow-tooltip />
+ <el-table-column prop="totalNum" label="鎬讳綔涓氶噺锛堜竾鏀級" min-width="130" show-overflow-tooltip />
<el-table-column prop="carCodeFront" label="杞︾墝鍓嶇収鍙�" min-width="100" show-overflow-tooltip />
<!-- <el-table-column prop="carCodeBack" label="杞︾墝鍚庣収鍙�" min-width="100" show-overflow-tooltip /> -->
<el-table-column prop="taskOrigin" label="浠诲姟鏉ユ簮" min-width="100" show-overflow-tooltip />
diff --git a/admin/src/views/statistics/platformRecord.vue b/admin/src/views/statistics/platformRecord.vue
index 6c36e50..3901acd 100644
--- a/admin/src/views/statistics/platformRecord.vue
+++ b/admin/src/views/statistics/platformRecord.vue
@@ -30,7 +30,7 @@
<span>{{ scope.row.billCode || scope.row.contractNum }}</span>
</template>
</el-table-column>
- <el-table-column prop="totalNum" label="鎬讳綔涓氶噺(涓囧彧)" min-width="100" show-overflow-tooltip />
+ <el-table-column prop="totalNum" label="鎬讳綔涓氶噺(涓囨敮)" min-width="100" show-overflow-tooltip />
</el-table>
<div class="mt20">
<Pagination @size-change="handleSizeChange" @current-change="getList" :pagination="pagination" />
diff --git a/screen/src/views/LogisticsEfficiency.vue b/screen/src/views/LogisticsEfficiency.vue
index 5a96827..44af195 100644
--- a/screen/src/views/LogisticsEfficiency.vue
+++ b/screen/src/views/LogisticsEfficiency.vue
@@ -17,7 +17,7 @@
<div class="com_header">
<div class="title">
<img src="@/assets/images/ic_title@2x.png" class="icon" alt="" />
- <div>绱鍑哄簱閲忕粺璁★紙涓囧彧锛�</div>
+ <div>绱鍑哄簱閲忕粺璁★紙涓囨敮锛�</div>
</div>
<div class="tabs">
<div class="tab" :class="{ active: activeTab1 == 0 }" @click="tabClick1(0)">鏈湀</div>
diff --git a/server/startsh/DBbackup.sh b/server/startsh/DBbackup.sh
index ad057d2..7c45ec9 100644
--- a/server/startsh/DBbackup.sh
+++ b/server/startsh/DBbackup.sh
@@ -1,6 +1,5 @@
#!/bin/bash
/usr/local/mysql/bin/mysqldump -h127.0.0.1 -uroot -pAtwl@2024 antaiwuliu > /usr/local/jars/dbbackup/antaiwuliu_$(date +%Y%m%d).sql
-
# 鍒犻櫎7澶╁墠鐨勫浠芥暟鎹�
find /usr/local/jars/dbbackup -name "antaiwuliu_*.sql" -type f -mtime +7 -exec rm {} \; > /dev/null 2>&1
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceEventServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceEventServiceImpl.java
index 5d8c2df..51f933b 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceEventServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceEventServiceImpl.java
@@ -378,11 +378,11 @@
Company::getType, Constants.ZERO)
.isNull( pageWrap.getModel().getQueryUserType()!=null&&Constants.equalsInteger(pageWrap.getModel().getQueryUserType(),Constants.ZERO),
Member::getId)
- .eq( pageWrap.getModel().getQueryUserType()!=null&&Constants.equalsInteger(pageWrap.getModel().getQueryUserType(),Constants.TWO),
- Company::getType, Constants.ONE)
+ .eq( pageWrap.getModel().getQueryUserType()!=null&&Constants.equalsInteger(pageWrap.getModel().getQueryUserType(),Constants.TWO),Company::getType, Constants.ONE)
// .eq(Member::getIsdeleted,Constants.ZERO)
.eq(Objects.nonNull(pageWrap.getModel().getEventType()), DeviceEvent::getEventType, pageWrap.getModel().getEventType())
.like(Objects.nonNull(pageWrap.getModel().getCompanyName()),Company::getName, pageWrap.getModel().getCompanyName())
+ .like(Objects.nonNull(pageWrap.getModel().getSrcName()),DeviceEvent::getSrcName, pageWrap.getModel().getSrcName())
.ge(Objects.nonNull(pageWrap.getModel().getStartTime()), DeviceEvent::getCreateDate, pageWrap.getModel().getStartTime())
.le(Objects.nonNull(pageWrap.getModel().getEndTime()), DeviceEvent::getCreateDate, pageWrap.getModel().getEndTime())
.orderByDesc(DeviceEvent::getCreateDate);
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 244d0e3..7233eb7 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
@@ -560,8 +560,11 @@
updateVistis.setOutInfo("璁垮姝ｅ父绛剧");
}
delRetentionLis.add(visits.getMemberId());
- }else{
- //濡傛灉浜哄憳淇℃伅瀛樺湪锛屽垏鏄瀹㈤�氳锛屽垯鍒犻櫎涔嬪墠鐨勬墍鏈夎繘鍦烘暟鎹紙鏃犺姝ゆ鎺ㄩ�佹槸杩涘巶杩樻槸鍑哄満鎺ㄩ�佷簨浠讹級
+ }else if(!(request.getData().getParamValues()!=null
+ && StringUtils.isNotBlank(request.getData().getParamValues().getPlateNos())
+ && StringUtils.isNotBlank(request.getData().getParamValues().getParkIndex()))){
+ //鍙鐞嗚瀹㈤棬绂侀�氳閫氳锛�
+ //濡傛灉浜哄憳淇℃伅瀛樺湪锛屽垯鍒犻櫎涔嬪墠鐨勬墍鏈夎繘鍦烘暟鎹紙鏃犺姝ゆ鎺ㄩ�佹槸杩涘巶杩樻槸鍑哄満鎺ㄩ�佷簨浠讹級
delRetentionLis.add(visits.getMemberId());
InoutRecord record = new InoutRecord();
record.setDeviceName((request.getData()!=null &&request.getData().getParamValues()!=null)?
@@ -603,23 +606,23 @@
}
if( request.getData().getParamValues()!=null
&& StringUtils.isNotBlank(request.getData().getParamValues().getPlateNos())
- && StringUtils.isNotBlank(request.getData().getParamValues().getParkIndex())){
+ && StringUtils.isNotBlank(request.getData().getParamValues().getParkIndex())) {
//濡傛灉鏄仠杞﹀満浜嬩欢锛岃褰曡溅杈嗙被鍨�
Category category = null;
record.setCarCode(request.getData().getParamValues().getPlateNos());
- if(StringUtils.isNotBlank(record.getCarCode())){
+ if (StringUtils.isNotBlank(record.getCarCode())) {
category = categoryMapper.selectJoinOne(Category.class, new MPJLambdaWrapper<Category>()
.selectAll(Category.class)
- .select("t4.name",Category::getParentName)
+ .select("t4.name", Category::getParentName)
.leftJoin("category t4 on t.parent_id=t4.id")
- .eq(Category::getIsdeleted,Constants.ZERO)
- .eq(Category::getBizType,Constants.RetentionCarType.fkCar)
+ .eq(Category::getIsdeleted, Constants.ZERO)
+ .eq(Category::getBizType, Constants.RetentionCarType.fkCar)
.last("limit 1"));
- if(category ==null){
+ if (category == null) {
category = new Category();
category.setName("璁垮杞﹁締");
}
- category.setParentName(StringUtils.defaultString(category.getParentName(),"璁垮杞﹁締"));
+ category.setParentName(StringUtils.defaultString(category.getParentName(), "璁垮杞﹁締"));
}
record.setCarBizType(Constants.RetentionCarType.fkCar);
record.setCategoryId(category.getId());
@@ -627,17 +630,17 @@
record.setCategoryName(category.getName());
record.setCategoryParentId(category.getParentId());
record.setCategoryParentName(category.getParentName());
- if(Constants.equalsInteger(record.getInOrOut(),Constants.ONE)){
+ if (Constants.equalsInteger(record.getInOrOut(), Constants.ONE)) {
record.setRemark("璁垮璺熼殢杞﹁締绂诲洯骞惰嚜鍔ㄧ绂�");
try {
//璁垮鐢宠鑷姩绛剧
visitsService.visitLevelForCarOut(visits);
- }catch (Exception e){
- log.error("璁垮璺熼殢杞﹁締鍑哄洯鑷姩绛剧澶辫触锛�==========="+e.getMessage());
+ } catch (Exception e) {
+ log.error("璁垮璺熼殢杞﹁締鍑哄洯鑷姩绛剧澶辫触锛�===========" + e.getMessage());
}
}
}
- inoutRecordList.add(record);
+ inoutRecordList.add(record);//杩涘嚭璁板綍
}
updateVistis.setEditDate(new Date());
//鏇存柊璁垮鏉ヨ鎴栬�呯绂绘椂闂翠俊鎭�
@@ -1126,7 +1129,7 @@
carrecord.setCategoryParentName(StringUtils.defaultString(category.getParentName(),"璁垮杞﹁締"));
carrecord.setCategoryParentId(category.getParentId());
for(Visits v :visitsList){
- if(v.getEndtime()!=null && v.getEndtime().getTime() < System.currentTimeMillis()){
+// if(v.getEndtime()!=null && v.getEndtime().getTime() < System.currentTimeMillis()){
Retention dm = new Retention();
dm.setMemberId(event.getMemberId());
dm.setPhone(carrecord.getMemberPhone());
@@ -1163,7 +1166,7 @@
inoutDayCount.setInVisitorNum(Constants.formatIntegerNum(inoutDayCount.getInVisitorNum())+1);
}
}
- }
+// }
}
}
if(isCarInOrOutEvent(request) && event.getCarType() !=null && !event.getCarType().equals(Constants.RetentionCarType.fkCar)){
@@ -1259,6 +1262,7 @@
.in(PlatformJob::getStatus,
Constants.PlatformJobStatus.IN_WAIT.getKey(),
Constants.PlatformJobStatus.CALLED.getKey(),
+ Constants.PlatformJobStatus.WAIT_CALL.getKey(),
Constants.PlatformJobStatus.WORKING.getKey(),
Constants.PlatformJobStatus.TRANSFERING.getKey(),
Constants.PlatformJobStatus.OVER_NUMBER.getKey(),
--
Gitblit v1.9.3