| admin/src/views/business/deviceEvent.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| admin/src/views/platform/LogisticsRecord/waybill.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| admin/src/views/statistics/platformRecord.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| screen/src/views/LogisticsEfficiency.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| server/startsh/DBbackup.sh | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceEventServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
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: [] } 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 /> 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" /> 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> 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
@@ -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); 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(),
