From ea0698e0384aa60d3e2bad7da5efd7ea4fb8cf71 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 08 五月 2025 15:39:42 +0800
Subject: [PATCH] 最新版本541200007
---
server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java | 10 +
server/system_service/src/main/java/com/doumee/core/utils/Constants.java | 49 -------
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java | 226 +++++++++++++++++++------------------
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java | 13 +-
server/visits/dmvisit_admin/pom.xml | 2
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncVisitServiceImpl.java | 3
6 files changed, 136 insertions(+), 167 deletions(-)
diff --git a/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java b/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java
index f1395de..1eb2bb7 100644
--- a/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java
+++ b/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java
@@ -1312,11 +1312,15 @@
*/
@Override
public void autoStart(){
- List<Rooms> roomList = roomsMapper.selectList(new QueryWrapper<Rooms>().lambda().eq(Rooms::getIsdeleted,Constants.ZERO).eq(Rooms::getStatus,Constants.ZERO));
+ List<Rooms> roomList = roomsMapper.selectList(new QueryWrapper<Rooms>()
+ .lambda().eq(Rooms::getIsdeleted,Constants.ZERO).eq(Rooms::getStatus,Constants.ZERO));
for (Rooms rooms:roomList) {
//鏌ヨ褰撳墠浼氳瀹ゆ槸鍚﹀瓨鍦ㄨ繘琛屼腑鐨勪細璁�
- if(bookingsMapper.selectCount(new QueryWrapper<Bookings>().lambda().eq(Bookings::getIsdeleted,Constants.ZERO)
- .eq(Bookings::getStatus,Constants.ZERO).isNotNull(Bookings::getStartTimeReal).apply(" DATE_FORMAT(NOW(), '%Y-%m-%d') = DATE_FORMAT(START_TIME, '%Y-%m-%d') ")
+ if(bookingsMapper.selectCount(new QueryWrapper<Bookings>().lambda()
+ .eq(Bookings::getIsdeleted,Constants.ZERO)
+ .eq(Bookings::getStatus,Constants.ZERO)
+ .isNotNull(Bookings::getStartTimeReal)
+ .apply(" DATE_FORMAT(NOW(), '%Y-%m-%d') = DATE_FORMAT(START_TIME, '%Y-%m-%d') ")
)<=Constants.ZERO){
//鏍规嵁浼氳瀹よ幏鍙栧彲浠ュ紑鍚殑浼氳璁板綍锛堢涓�鏉¤褰曪級
Bookings bookings = bookingsMapper.selectOne(new QueryWrapper<Bookings>().lambda()
diff --git a/server/system_service/src/main/java/com/doumee/core/utils/Constants.java b/server/system_service/src/main/java/com/doumee/core/utils/Constants.java
index b538ada..2bb838a 100644
--- a/server/system_service/src/main/java/com/doumee/core/utils/Constants.java
+++ b/server/system_service/src/main/java/com/doumee/core/utils/Constants.java
@@ -718,53 +718,8 @@
// System.out.println(Constants.getVehiclePlateNo("婀楤140D17").getDescription());
// System.out.println(Constants.getVehiclePlateNo("瀹緼P0637").getDescription());
- System.out.println("<script> SELECT \n" +
- "t1.REALNAME `REALNAME`,\n" +
- "MAX(t1.`01`) `januaryCount`,\n" +
- "MAX(t1.`02`) `februaryCount`,\n" +
- "MAX(t1.`03`) `marchCount`,\n" +
- "MAX(t1.`04`) `aprilCount`,\n" +
- "MAX(t1.`05`) `mayCount`,\n" +
- "MAX(t1.`06`) `juneCount`,\n" +
- "MAX(t1.`07`) `julyCount`,\n" +
- "MAX(t1.`08`) `augustCount`,\n" +
- "MAX(t1.`09`) `septemberCount`,\n" +
- "MAX(t1.`10`) `octoberCount`,\n" +
- "MAX(t1.`11`) `novemberCount`,\n" +
- "MAX(t1.`12`) `decemberCount`\n" +
- "FROM(\n" +
- "SELECT \n" +
- "t.id,\n" +
- "t.REALNAME,\n" +
- "CASE WHEN t.yue='01' THEN t.c ELSE 0 END AS `01`,\n" +
- "CASE WHEN t.yue='02' THEN t.c ELSE 0 END AS `02`,\n" +
- "CASE WHEN t.yue='03' THEN t.c ELSE 0 END AS `03`,\n" +
- "CASE WHEN t.yue='04' THEN t.c ELSE 0 END AS `04`,\n" +
- "CASE WHEN t.yue='05' THEN t.c ELSE 0 END AS `05`,\n" +
- "CASE WHEN t.yue='06' THEN t.c ELSE 0 END AS `06`,\n" +
- "CASE WHEN t.yue='07' THEN t.c ELSE 0 END AS `07`,\n" +
- "CASE WHEN t.yue='08' THEN t.c ELSE 0 END AS `08`,\n" +
- "CASE WHEN t.yue='09' THEN t.c ELSE 0 END AS `09`,\n" +
- "CASE WHEN t.yue='10' THEN t.c ELSE 0 END AS `10`,\n" +
- "CASE WHEN t.yue='11' THEN t.c ELSE 0 END AS `11`,\n" +
- "CASE WHEN t.yue='12' THEN t.c ELSE 0 END AS `12` \n" +
- "FROM \n" +
- "(SELECT \n" +
- "su.id,\n" +
- "su.REALNAME,\n" +
- "DATE_FORMAT(b.START_TIME,'%m') yue,\n" +
- "SUM(" +
- "CONVERT( (UNIX_TIMESTAMP(b.END_TIME) - UNIX_TIMESTAMP(b.START_TIME))/(60*60), DECIMAL(5,1))) c\n" +
- "FROM \n" +
- "meeting_user_rel ur\n" +
- "LEFT JOIN `SYSTEM_USER` su ON ur.USER_ID = su.id \n" +
- "LEFT JOIN meeting_book b ON ur.OBJ_ID = b.id \n" +
- "WHERE DATE_FORMAT(b.START_TIME,'%Y') = #{yearNum} AND b.STATUS in(0,2) and b.isdeleted=0" +
- "<if test='userId != null'>"+
- "and ur.USER_ID = #{userId}\n" +
- "</if>"+
- "GROUP BY su.id, DATE_FORMAT(b.START_TIME,'%m')) t) t1 GROUP BY t1.id" +
- "</script>");
+ System.out.println("{\"data\":{\"paramValues\":{\"accessType\":\"2\",\"certTypes\":\"111\",\"certificateNos\":\"340621198301259374\",\"defineEventType\":\"771760131\",\"eventId\":\"6eb4a18bf3744c4385adb37eecdc9d37_634958cfeb68a_3a38\",\"eventType\":\"541200060\",\"eventTypeName\":\"\",\"extEventCardNo\":\"\",\"extEventPictureURL\":\"/pic?9d9c568c1a2do-4el*41-852o9=4586*2l9=0408*0606476=6137*=t213**ps5=0*1b9=559838d9837397-b106of-5pi2dc3=88=20c\",\"extEventReaderID\":\"\",\"extEventReaderKind\":\"\",\"gateIndex\":\"fc92c663ffb9420994f2574469f35e2d\",\"gateName\":\"瀹夋嘲瑗块棬\",\"happenTime\":\"2025-05-08T09:13:00.000+08:00\",\"inOrOut\":\"0\",\"invoicesIds\":\"9857A54DAD5947EDB032575ECDD9EA4B447f2a7ce6c043c393d0d3c372c545d9\",\"parkIndex\":\"1c4cdb8b66ed4c23bacb385c3fb6c46b\",\"parkName\":\"鍋滆溅鍦篭",\"phones\":\"18756162028\",\"plateNos\":\"鐨朆3X003\",\"srcIndex\":\"6eb4a18bf3744c4385adb37eecdc9d37\",\"srcName\":\"\",\"srcParentIndex\":\"\",\"srcType\":\"roadway\",\"svrIndexCode\":\"eae18a71-1ffd-4e72-bcf6-998c5977630d\",\"userType\":\"\",\"visitorNames\":\"榄忕ぜ\"},\"targetPerson\":{\"certType\":\"111\",\"createTime\":\"2024-08-19T17:43:09.966+08:00\",\"jobNo\":\"13856591439\",\"mobile\":\"13856591439\",\"name\":\"闄堥缚椋瀄",\"orgId\":\"986364bf-7d4c-49a4-91c8-2818c65885f3\",\"orgPathName\":\"瀹夋嘲鐗╂祦鍥尯/瀹夋嘲鐗╂祦/淇℃伅宸ョ▼绉慭",\"personId\":\"a3b3381325834e55a18ede6f4eac9552\",\"personNumber\":\"13856591439\",\"pinyin\":\"chenhongfei\",\"sex\":\"1\",\"updateTime\":\"2025-04-03T15:18:21.721+08:00\",\"userName\":\"13856591439\"},\"visitorInformationList\":[{\"appointmentCode\":\"763586\",\"cardNo\":\"5856663501660\",\"certNo\":\"340621198301259374\",\"certType\":111,\"companionPerson\":\"0\",\"createTime\":\"2025-05-08T08:18:22.857+08:00\",\"faceUrl\":\"822f9386e3f0494fa17ff012dc8c5ed4\",\"phone\":\"18756162028\",\"plateNo\":\"鐨朆3X003\",\"sex\":1,\"unit\":\"涓Щ闆嗘垚\",\"updateTime\":\"2025-05-08T09:12:49.255+08:00\",\"visitNum\":\"0\",\"visitorId\":\"6531b8ce08db4975b47250d2f3da4bc2\",\"visitorName\":\"榄忕ぜ\"}],\"visitorInvoices\":{\"appointmentType\":\"3\",\"authIssueStatus\":\"1\",\"beginTime\":\"2025-05-08T07:00:00.000+08:00\",\"campusId\":\"root000000\",\"campusName\":\"榛樿鍥尯\",\"createTime\":\"2025-05-08T08:18:22.828+08:00\",\"extendJson\":\"\",\"finishTime\":\"2025-05-08T18:00:00.000+08:00\",\"ifInfoAbnormal\":\"0\",\"invoicesId\":\"9857A54DAD5947EDB032575ECDD9EA4B447f2a7ce6c043c393d0d3c372c545d9\",\"invoicesNo\":\"FK20250508080001\",\"invoicesStatus\":\"1\",\"isRepast\":\"0\",\"type\":\"0\",\"updateTime\":\"2025-05-08T09:12:42.215+08:00\",\"visitReason\":\"-1\",\"visitReasonName\":\"鍏朵粬\",\"visitTargetId\":\"a3b3381325834e55a18ede6f4eac9552\",\"workflowInitiatorId\":\"6531b8ce08db4975b47250d2f3da4bc2\",\"workflowInitiatorType\":\"0\",\"workflowInstanceId\":\"946d456ce7ce44d58cca440e1093a8c7\"}},\"eventId\":\"3d337efbb8844b7dbd8ee280ee9d6b52\",\"eventType\":541200060,\"happenTime\":\"2025-05-08T09:13:00+08:00\",\"srcIndex\":\"9857A54DAD5947EDB032575ECDD9EA4B447f2a7ce6c043c393d0d3c372c545d9\",\"srcType\":\"9857A54DAD5947EDB032575ECDD9EA4B447f2a7ce6c043c393d0d3c372c545d9\",\"status\":0,\"timeout\":0}");
+ System.out.println( "{\"data\":{\"paramValues\":{\"accessType\":\"1\",\"certTypes\":\"111\",\"certificateNos\":\"341122198804270428\",\"defineEventType\":\"196893\",\"eventId\":\"ec091e3c4bafd53b4f88563f28926ec1\",\"eventType\":\"541200060\",\"eventTypeName\":\"\",\"extEventCardNo\":\"5876663983160\",\"extEventInOut\":\"1\",\"extEventPictureURL\":\"/pic?0d9c111c1a7do-4el*61-821o9=6211*8l7=9180*7668406=6137*=t114**ps5=0*8b9=559838d9837373-b101of-5pi4dc3=68=25c\",\"extEventReaderID\":\"1\",\"extEventReaderKind\":\"0\",\"gateIndex\":\"\",\"gateName\":\"\",\"happenTime\":\"2025-05-08T09:33:24.000+08:00\",\"inOrOut\":\"0\",\"invoicesIds\":\"9857A54DAD5947EDB032575ECDD9EA4B833eb84a3b2b49cda6cc5b24837e747f\",\"parkIndex\":\"\",\"parkName\":\"\",\"phones\":\"15056231084\",\"plateNos\":\"鐨朅90LL0\",\"regionName\":\"瀹夋嘲鐗╂祦\",\"srcIndex\":\"ccba405a829d4814a3e050f9db0c6977\",\"srcName\":\"瑗块棬浜鸿鍏ュ彛_闂╛1\",\"srcParentIndex\":\"c5cda4e972c54711a89a2b557bb0e6bc\",\"srcType\":\"door\",\"svrIndexCode\":\"02591f1d-456e-4816-b988-72e7bed62129\",\"userType\":\"2\",\"visitorNames\":\"鏂芥棴杈塡"},\"targetPerson\":{\"certType\":\"111\",\"createTime\":\"2024-08-19T17:43:09.966+08:00\",\"jobNo\":\"13856591439\",\"mobile\":\"13856591439\",\"name\":\"闄堥缚椋瀄",\"orgId\":\"986364bf-7d4c-49a4-91c8-2818c65885f3\",\"orgPathName\":\"瀹夋嘲鐗╂祦鍥尯/瀹夋嘲鐗╂祦/淇℃伅宸ョ▼绉慭",\"personId\":\"a3b3381325834e55a18ede6f4eac9552\",\"personNumber\":\"13856591439\",\"pinyin\":\"chenhongfei\",\"sex\":\"1\",\"updateTime\":\"2025-04-03T15:18:21.721+08:00\",\"userName\":\"13856591439\"},\"visitorInformationList\":[{\"appointmentCode\":\"594451\",\"cardNo\":\"5876663983160\",\"certNo\":\"341122198804270428\",\"certType\":111,\"companionPerson\":\"0\",\"createTime\":\"2025-05-08T08:26:23.957+08:00\",\"faceUrl\":\"59f5ef5d9d374ef3896fdc1a551189c4\",\"phone\":\"15056231084\",\"plateNo\":\"鐨朅90LL0\",\"sex\":2,\"unit\":\"璞嗙背\",\"updateTime\":\"2025-05-08T09:33:17.148+08:00\",\"visitNum\":\"0\",\"visitorId\":\"5f3efa09d4114788ab46bc619a4950ee\",\"visitorName\":\"鏂芥棴杈塡"}],\"visitorInvoices\":{\"appointmentType\":\"3\",\"authIssueStatus\":\"1\",\"beginTime\":\"2025-05-08T08:24:50.000+08:00\",\"campusId\":\"root000000\",\"campusName\":\"榛樿鍥尯\",\"createTime\":\"2025-05-08T08:26:23.935+08:00\",\"extendJson\":\"\",\"finishTime\":\"2025-05-08T23:01:00.000+08:00\",\"ifInfoAbnormal\":\"0\",\"invoicesId\":\"9857A54DAD5947EDB032575ECDD9EA4B833eb84a3b2b49cda6cc5b24837e747f\",\"invoicesNo\":\"FK20250508080003\",\"invoicesStatus\":\"1\",\"isRepast\":\"0\",\"type\":\"0\",\"updateTime\":\"2025-05-08T09:33:12.509+08:00\",\"visitReason\":\"-1\",\"visitReasonName\":\"鍏朵粬\",\"visitTargetId\":\"a3b3381325834e55a18ede6f4eac9552\",\"workflowInitiatorId\":\"5f3efa09d4114788ab46bc619a4950ee\",\"workflowInitiatorType\":\"0\",\"workflowInstanceId\":\"a2397bfd491d440fabc24cedea8033f5\"}},\"eventId\":\"a3369228dc6b4e3ba212eeab6774e545\",\"eventType\":541200060,\"happenTime\":\"2025-05-08T09:33:27+08:00\",\"srcIndex\":\"9857A54DAD5947EDB032575ECDD9EA4B833eb84a3b2b49cda6cc5b24837e747f\",\"srcType\":\"9857A54DAD5947EDB032575ECDD9EA4B833eb84a3b2b49cda6cc5b24837e747f\",\"status\":0,\"timeout\":0}");
}
diff --git a/server/visits/dmvisit_admin/pom.xml b/server/visits/dmvisit_admin/pom.xml
index 56ff907..ed28378 100644
--- a/server/visits/dmvisit_admin/pom.xml
+++ b/server/visits/dmvisit_admin/pom.xml
@@ -8,9 +8,7 @@
<artifactId>visits</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>
-
<artifactId>dmvisit_admin</artifactId>
-
<properties>
<maven.compiler.source>8</maven.compiler.source>
<maven.compiler.target>8</maven.compiler.target>
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 b8f27dc..337f753 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
@@ -1,7 +1,6 @@
package com.doumee.service.business.impl.hksync;
import com.alibaba.fastjson.JSONObject;
-import com.alibaba.nacos.shaded.org.checkerframework.checker.units.qual.C;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.doumee.biz.system.SystemDictDataBiz;
@@ -25,7 +24,6 @@
import com.doumee.dao.business.model.*;
import com.doumee.dao.business.model.Member;
import com.doumee.dao.web.reqeust.SavePlatformWarnEventDTO;
-import com.doumee.service.business.CategoryService;
import com.doumee.service.business.VisitsService;
import com.doumee.service.business.impl.PlatformWarnEventServiceImpl;
import com.doumee.service.business.third.TmsService;
@@ -33,9 +31,7 @@
import com.doumee.service.business.third.model.response.TmsOrderInfoResponse;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.net.ftp.FTP;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -576,7 +572,6 @@
record.setMemberType(Constants.ZERO);
record.setIsdeleted(Constants.ZERO);
record.setMemberName(visits.getName());
- record.setCarCode(request.getData().getVisitorInformationList().get(0).getPlateNo());
record.setObjId(visits.getId());
record.setMemberId(visits.getMemberId());
record.setObjType(Constants.TWO);
@@ -585,21 +580,8 @@
record.setInOrOut(Constants.ZERO);
record.setHkEventId(request.getEventId());
record.setHkId(visits.getHkId());
- Category category = null;
- if(StringUtils.isNotBlank(record.getCarCode())){
- category = categoryMapper.selectJoinOne(Category.class, new MPJLambdaWrapper<Category>()
- .selectAll(Category.class)
- .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)
- .last("limit 1"));
- if(category ==null){
- category = new Category();
- category.setName("璁垮杞﹁締");
- }
- category.setParentName(StringUtils.defaultString(category.getParentName(),"璁垮杞﹁締"));
- }
+ record.setDeviceName((request.getData()!=null &&request.getData().getParamValues()!=null)?
+ request.getData().getParamValues().getSrcName():request.getSrcName());
//濡傛灉鏄瀹㈤�氳
if(request.getData()!=null&&request.getData().getParamValues()!=null &&
StringUtils.equals(request.getData().getParamValues().getInOrOut(),"0")){
@@ -613,22 +595,44 @@
inoutDayCount.setInVisitorNum(Constants.formatIntegerNum(inoutDayCount.getInVisitorNum())+1);
}
if(request.getData()!=null&&request.getData().getParamValues()!=null &&
- !StringUtils.equals(request.getData().getParamValues().getInOrOut(),"0")){
+ !StringUtils.equals(request.getData().getParamValues().getInOrOut(),"0")){
inoutDayCount.setOutVisitorNum(Constants.formatIntegerNum(inoutDayCount.getOutVisitorNum())+1);
record.setInOrOut(Constants.ONE);
}
- if(record.getCarCode()!=null){
+ if(StringUtils.isNotBlank(record.getCarCode())
+ &&request.getData().getParamValues()!=null
+ && StringUtils.isNotBlank(request.getData().getParamValues().getParkIndex())){
+ //濡傛灉鏄仠杞﹀満浜嬩欢锛岃褰曡溅杈嗙被鍨�
+ Category category = null;
+ if(StringUtils.isNotBlank(record.getCarCode())){
+ category = categoryMapper.selectJoinOne(Category.class, new MPJLambdaWrapper<Category>()
+ .selectAll(Category.class)
+ .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)
+ .last("limit 1"));
+ if(category ==null){
+ category = new Category();
+ category.setName("璁垮杞﹁締");
+ }
+ category.setParentName(StringUtils.defaultString(category.getParentName(),"璁垮杞﹁締"));
+ }
record.setCarBizType(Constants.RetentionCarType.fkCar);
record.setCategoryId(category.getId());
+ record.setCarCode(request.getData().getVisitorInformationList().get(0).getPlateNo());
+ record.setDeviceName(request.getData().getParamValues().getGateName());
record.setCategoryName(category.getName());
record.setCategoryParentId(category.getParentId());
record.setCategoryParentName(category.getParentName());
- record.setRemark("璁垮璺熼殢杞﹁締绂诲洯骞惰嚜鍔ㄧ绂�");
- try {
- //璁垮鐢宠鑷姩绛剧
- visitsService.visitLevelForCarOut(visits);
- }catch (Exception e){
- log.error("璁垮璺熼殢杞﹁締鍑哄洯鑷姩绛剧澶辫触锛�==========="+e.getMessage());
+ if(Constants.equalsInteger(record.getInOrOut(),Constants.ONE)){
+ record.setRemark("璁垮璺熼殢杞﹁締绂诲洯骞惰嚜鍔ㄧ绂�");
+ try {
+ //璁垮鐢宠鑷姩绛剧
+ visitsService.visitLevelForCarOut(visits);
+ }catch (Exception e){
+ log.error("璁垮璺熼殢杞﹁締鍑哄洯鑷姩绛剧澶辫触锛�==========="+e.getMessage());
+ }
}
}
inoutRecordList.add(record);
@@ -695,6 +699,10 @@
event.setSrcParentIndex(request.getSrcParentIndex());
event.setSrcName((request.getData()!=null &&request.getData().getParamValues()!=null)?
request.getData().getParamValues().getSrcName():request.getSrcName());
+ if(StringUtils.isBlank(event.getSrcName())){
+ event.setSrcName((request.getData()!=null &&request.getData().getParamValues()!=null)?
+ request.getData().getParamValues().getGateName()+ request.getData().getParamValues().getParkIndex():request.getSrcName());
+ }
event.setSrcIndex(request.getSrcIndex());
event.setSex(detail.getSex());
event.setPurpose(request.getData().getVisitorInvoices().getVisitReason());
@@ -920,11 +928,11 @@
if(StringUtils.isNotBlank(event.getPlateNos())){
//鏍囪杞﹁締杩涘嚭璁板綍
List<Category> categoryList = categoryMapper.selectJoinList(Category.class, new MPJLambdaWrapper<Category>()
- .selectAll(Category.class)
- .select("t4.name",Category::getParentName)
- .leftJoin("category t4 on t.parent_id=t4.id")
- .eq(Category::getIsdeleted,Constants.ZERO)
- .isNotNull(Category::getBizType));//鏌ヨ鎵�鏈夊甫鏈変笟鍔＄被鍨嬬殑杞﹁締鍒嗙被缂栫爜
+ .selectAll(Category.class)
+ .select("t4.name",Category::getParentName)
+ .leftJoin("category t4 on t.parent_id=t4.id")
+ .eq(Category::getIsdeleted,Constants.ZERO)
+ .isNotNull(Category::getBizType));//鏌ヨ鎵�鏈夊甫鏈変笟鍔＄被鍨嬬殑杞﹁締鍒嗙被缂栫爜
List<Visits> visitsList = null;
InoutRecord carrecord = new InoutRecord();
carrecord.setCreateDate(DateUtil.getISO8601DateByStr2(request.getHappenTime()));
@@ -936,27 +944,27 @@
carrecord.setHkEventId(request.getEventId());
carrecord.setCarCode(event.getPlateNos());
Cars carModel = carsMapper.selectJoinOne(Cars.class,new MPJLambdaWrapper<Cars>()
- .selectAll(Cars.class )
- .selectAs(Company::getType,Cars::getCompanyType)
- .selectAs(Member::getName,Cars::getMemberName)
- .selectAs(Member::getIdcardDecode,Cars::getIdcardDecode)
- .selectAs(Member::getCode,Cars::getMemberCode)
- .selectAs(Member::getFaceImg,Cars::getFaceImg)
- .selectAs(Member::getIdcardNo,Cars::getIdcardNo)
- .selectAs(Member::getName,Cars::getMemberName)
- .selectAs(Member::getPhone,Cars::getMemberPhone)
- .selectAs(Company::getCompanyNamePath,Cars::getCompanyName)
- .selectAs(Category::getBizType,Cars::getBizType)
- .selectAs(Category::getName,Cars::getCateName)
- .select("t4.id",Cars::getCatePId)
- .select("t4.name",Cars::getCatePName)
- .leftJoin(Company.class,Company::getId,Cars::getGroupId)
- .leftJoin(Member.class,Member::getId,Cars::getMemberId)
- .leftJoin(Category.class,Category::getId,Cars::getCateId)
- .leftJoin("category t4 on t3.parent_id=t4.id")
- .eq(Cars::getCode,event.getPlateNos())
- .eq(Cars::getIsdeleted,Constants.ZERO)
- .last(" limit 1"));
+ .selectAll(Cars.class )
+ .selectAs(Company::getType,Cars::getCompanyType)
+ .selectAs(Member::getName,Cars::getMemberName)
+ .selectAs(Member::getIdcardDecode,Cars::getIdcardDecode)
+ .selectAs(Member::getCode,Cars::getMemberCode)
+ .selectAs(Member::getFaceImg,Cars::getFaceImg)
+ .selectAs(Member::getIdcardNo,Cars::getIdcardNo)
+ .selectAs(Member::getName,Cars::getMemberName)
+ .selectAs(Member::getPhone,Cars::getMemberPhone)
+ .selectAs(Company::getCompanyNamePath,Cars::getCompanyName)
+ .selectAs(Category::getBizType,Cars::getBizType)
+ .selectAs(Category::getName,Cars::getCateName)
+ .select("t4.id",Cars::getCatePId)
+ .select("t4.name",Cars::getCatePName)
+ .leftJoin(Company.class,Company::getId,Cars::getGroupId)
+ .leftJoin(Member.class,Member::getId,Cars::getMemberId)
+ .leftJoin(Category.class,Category::getId,Cars::getCateId)
+ .leftJoin("category t4 on t3.parent_id=t4.id")
+ .eq(Cars::getCode,event.getPlateNos())
+ .eq(Cars::getIsdeleted,Constants.ZERO)
+ .last(" limit 1"));
if(carModel!=null){
//0瀹夋嘲鍏姟杞� 1瀹夋嘲鑷湁鐗╂祦杞� 2鍏跺畠
event.setMemberId(carModel.getMemberId());
@@ -1018,7 +1026,7 @@
carrecord.setCompanyId(carTypeJob.getCompanyId());
carrecord.setCompanyName(carTypeJob.getCompanyNamePath());
carrecord.setType(Constants.RetentionMemberType.car);
- if(carModel.getMemberPhone()!=null || StringUtils.isNotBlank(carModel.getMemberName())){
+ if(carTypeJob.getDriverName()!=null || StringUtils.isNotBlank(carTypeJob.getDrivierPhone())){
//璐ц繍鍙告満(濡傛灉鍙告満鎵嬫満鍙锋垨鑰呭鍚嶄笉涓虹┖锛�
carrecord.setMemberType(Constants.RetentionMemberType.driver);
}
@@ -1068,7 +1076,7 @@
carrecord.setInOrOut(Constants.ONE);
}
//杞﹁締杩涘叆璁板綍瀵瑰簲涓氬姟绫诲瀷
- if(1==2 && isCarInOrOutEvent(request) &&( event.getCarType() ==null || event.getCarType().equals(Constants.RetentionCarType.other))){
+ if( isCarInOrOutEvent(request) &&( event.getCarType() ==null || event.getCarType().equals(Constants.RetentionCarType.other))){
//濡傛灉鏈瘑鍒埌杞﹀瀷锛屼笉鏄浐瀹氳溅 涔熶笉鏄揣杩愯溅杈嗭紝鍒欐鏌ユ槸鍚︽槸璁垮杞�
visitsList = visitsMapper.selectList(new QueryWrapper<Visits>().lambda()
.eq(Visits::getCarNos,event.getPlateNos())
@@ -1084,41 +1092,43 @@
event.setCarType(Constants.RetentionCarType.fkCar);
int index =0;
carrecord.setCarBizType(Constants.RetentionCarType.fkCar);
- Category category =findCategoryByBizType(Constants.RetentionCarType.fkCar,"璁垮杞﹁締","璁垮杞﹁締",categoryList);
- carrecord.setCategoryId(category.getId());
- carrecord.setCategoryName(StringUtils.defaultString(category.getName(),"璁垮杞﹁締"));
- carrecord.setCategoryParentName(StringUtils.defaultString(category.getParentName(),"璁垮杞﹁締"));
- carrecord.setCategoryParentId(category.getParentId());
- for(Visits v :visitsList){
- delMemberRetentionList.add(event.getMemberId());
- InoutRecord copyObj = new InoutRecord();
- BeanUtils.copyProperties(carrecord,copyObj);
- copyObj.setMemberId(v.getMemberId());
- copyObj.setMemberName(v.getName());
- copyObj.setMemberPhone(v.getPhone());
- copyObj.setCompanyName(v.getCompanyName());
- copyObj.setType(Constants.ONE);
- copyObj.setRemark("璁垮璺熼殢杞﹁締銆�"+carrecord.getCarCode()+"銆戠鍥�");
- copyObj.setCarCode(index>0?null:carrecord.getCarCode());
- copyObj.setMemberType(Constants.RetentionMemberType.fk);
- inoutRecordList.add(copyObj);
- index++;
- if(Constants.equalsInteger(carrecord.getInOrOut(),Constants.ONE)){
- //濡傛灉鏄溅杈嗗嚭鍥尯 缁熻璁垮杩涘叆鏁�
- inoutDayCount.setOutVisitorNum(Constants.formatIntegerNum(inoutDayCount.getOutVisitorNum())+1);
- try {
- //璁垮鐢宠鑷姩绛剧
- visitsService.visitLevelForCarOut(v);
- //缁熻绛剧鏁�
- inoutDayCount.setLeaveVisitorNum(Constants.formatIntegerNum(inoutDayCount.getLeaveVisitorNum())+1);
- }catch (Exception e){
- log.error("璁垮璺熼殢杞﹁締鍑哄洯鑷姩绛剧澶辫触锛�==========="+e.getMessage());
+ if(1==2){
+ Category category =findCategoryByBizType(Constants.RetentionCarType.fkCar,"璁垮杞﹁締","璁垮杞﹁締",categoryList);
+ carrecord.setCategoryId(category.getId());
+ carrecord.setCategoryName(StringUtils.defaultString(category.getName(),"璁垮杞﹁締"));
+ carrecord.setCategoryParentName(StringUtils.defaultString(category.getParentName(),"璁垮杞﹁締"));
+ carrecord.setCategoryParentId(category.getParentId());
+ for(Visits v :visitsList){
+ delMemberRetentionList.add(event.getMemberId());
+ InoutRecord copyObj = new InoutRecord();
+ BeanUtils.copyProperties(carrecord,copyObj);
+ copyObj.setMemberId(v.getMemberId());
+ copyObj.setMemberName(v.getName());
+ copyObj.setMemberPhone(v.getPhone());
+ copyObj.setCompanyName(v.getCompanyName());
+ copyObj.setType(Constants.ONE);
+ copyObj.setRemark("璁垮璺熼殢杞﹁締銆�"+carrecord.getCarCode()+"銆戠鍥�");
+ copyObj.setCarCode(index>0?null:carrecord.getCarCode());
+ copyObj.setMemberType(Constants.RetentionMemberType.fk);
+ inoutRecordList.add(copyObj);
+ index++;
+ if(Constants.equalsInteger(carrecord.getInOrOut(),Constants.ONE)){
+ //濡傛灉鏄溅杈嗗嚭鍥尯 缁熻璁垮杩涘叆鏁�
+ inoutDayCount.setOutVisitorNum(Constants.formatIntegerNum(inoutDayCount.getOutVisitorNum())+1);
+ try {
+ //璁垮鐢宠鑷姩绛剧
+ visitsService.visitLevelForCarOut(v);
+ //缁熻绛剧鏁�
+ inoutDayCount.setLeaveVisitorNum(Constants.formatIntegerNum(inoutDayCount.getLeaveVisitorNum())+1);
+ }catch (Exception e){
+ log.error("璁垮璺熼殢杞﹁締鍑哄洯鑷姩绛剧澶辫触锛�==========="+e.getMessage());
+ }
+ }else{
+ //濡傛灉鏄繘鍏ュ洯鍖猴紝璁垮褰曞叆鍦ㄥ洯浜哄憳璁板綍
+ retentionList.add(getRetentionModelByRequest(copyObj,request));
+ //缁熻璁垮鍑鸿鏁�
+ inoutDayCount.setInVisitorNum(Constants.formatIntegerNum(inoutDayCount.getInVisitorNum())+1);
}
- }else{
- //濡傛灉鏄繘鍏ュ洯鍖猴紝璁垮褰曞叆鍦ㄥ洯浜哄憳璁板綍
- retentionList.add(getRetentionModelByRequest(copyObj,request));
- //缁熻璁垮鍑鸿鏁�
- inoutDayCount.setInVisitorNum(Constants.formatIntegerNum(inoutDayCount.getInVisitorNum())+1);
}
}
}
@@ -1317,9 +1327,9 @@
param.setContractNumber(detail.getContractNum());
TmsOrderInfoResponse response = tmsService.orderInfo(param);
if(response!=null &&( StringUtils.equals(response.getOrderStatus(),"3") )
- ||StringUtils.equals(response.getOrderStatus(),"4")
- ||StringUtils.equals(response.getOrderStatus(),"5")
- ||StringUtils.equals(response.getOrderStatus(),"6")){
+ ||StringUtils.equals(response.getOrderStatus(),"4")
+ ||StringUtils.equals(response.getOrderStatus(),"5")
+ ||StringUtils.equals(response.getOrderStatus(),"6")){
//濡傛灉鍚堝悓鍦ㄩ�旓紝鍒欒嚜鍔ㄧ鍒�
jobAutoSignBiz(platformJob);
}
@@ -1421,20 +1431,20 @@
continue;
}
Integer workStatus = 0;
- if( data.getHPWorkingStatus() ==null || data.getHPWorkingStatus().size() ==0){
- continue;//濡備綍鎺ㄩ�佺姸鎬侀泦鍚堜负绌猴紝涓嶅鐞嗚烦杩�
- }
- PlatformDevice model = platformDeviceMapper.selectOne(new QueryWrapper<PlatformDevice>().lambda()
- .eq(PlatformDevice::getDeviceId,request.getSrcIndex())
- .eq(PlatformDevice::getIsdeleted,Constants.ZERO)
- .last("limit 1"));
- if(model ==null){
- continue;//鐩戞帶鐐规湭鍚屾锛岃烦杩囧鐞�
- }
- //鍚勮溅閬撹溅杈嗙姸鎬�
- for(EventPlatformStatusInfoRequest status : data.getHPWorkingStatus()){
+ if( data.getHPWorkingStatus() ==null || data.getHPWorkingStatus().size() ==0){
+ continue;//濡備綍鎺ㄩ�佺姸鎬侀泦鍚堜负绌猴紝涓嶅鐞嗚烦杩�
+ }
+ PlatformDevice model = platformDeviceMapper.selectOne(new QueryWrapper<PlatformDevice>().lambda()
+ .eq(PlatformDevice::getDeviceId,request.getSrcIndex())
+ .eq(PlatformDevice::getIsdeleted,Constants.ZERO)
+ .last("limit 1"));
+ if(model ==null){
+ continue;//鐩戞帶鐐规湭鍚屾锛岃烦杩囧鐞�
+ }
+ //鍚勮溅閬撹溅杈嗙姸鎬�
+ for(EventPlatformStatusInfoRequest status : data.getHPWorkingStatus()){
- }
+ }
}
result = "鎴愬姛";
log.info("銆愭捣搴锋湀鍙板伐浣滅姸鎬佷簨浠舵帹閫併��========鎴愬姛=======");
@@ -1551,7 +1561,7 @@
platformJobMapper.updateById(update);
}
dealPlatformContentForLeave(job);
- }
+ }
}
}else if(StringUtils.equals(status.getMotionStatus(),"enter")){
//濡傛灉鏄溅杈嗚繘鍏�
@@ -1576,7 +1586,7 @@
}else{
continue;//鍏朵粬鐘舵�佷笉澶勭悊锛岃烦杩�
}
- //鏆傛椂涓嶅仛鐩稿叧鑷姩瀹屾垚浣滀笟涓氬姟澶勭悊
+ //鏆傛椂涓嶅仛鐩稿叧鑷姩瀹屾垚浣滀笟涓氬姟澶勭悊
// dealPlatformJobLogBiz(update,status);//璁板綍浣滀笟鏃ュ織
}
if(eventList.size()>0){
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncVisitServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncVisitServiceImpl.java
index ea87f4c..bd6cf76 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncVisitServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncVisitServiceImpl.java
@@ -678,7 +678,7 @@
}
info.setPhoneNo(c.getPhone());
info.setPlateNo(c.getCarNos());
- info.setGender(c.getSex()+"");
+ info.setGender(c.getSex()==null?"1":c.getSex()+"");
if(Constants.equalsInteger(c.getIdcardType(),Constants.ZERO)){
info.setCertificateType(HKConstants.CertificateType.SHENFENZHENG.getKey()+"");
info.setCertificateNo(DESUtil.decrypt(Constants.EDS_PWD, c.getIdcardNo()));
@@ -727,6 +727,7 @@
info.setPhoneNo(c.getPhone());
info.setPlateNo(c.getCarNos());
info.setGender(c.getSex()+"");
+ info.setGender(c.getSex()==null?"1":c.getSex()+"");
if(Constants.equalsInteger(c.getIdcardType(),Constants.ZERO)){
info.setCertificateType(HKConstants.CertificateType.SHENFENZHENG.getKey()+"");
info.setCertificateNo(DESUtil.decrypt(Constants.EDS_PWD, c.getIdcardNo()));
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java
index 4f92786..126b630 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java
@@ -2784,17 +2784,18 @@
t =new WholeProvinceMapVO();
t.setMonthNum( Constants.formatBigdecimal0Float(model.getMonthOutboundQuantity()));
t.setYearNum( Constants.formatBigdecimal0Float(model.getYearOutboundQuantity()));
-
- if(Constants.UNIT_TYPE == 1) {
- //澶勭悊鍗曚綅鎴愨�滅鈥濓紝涓�绠�=5涓囨敮
- t.setMonthNum(Constants.formatBigdecimal(t.getMonthNum()).divide(new BigDecimal(5), 2, BigDecimal.ROUND_HALF_UP));
- t.setYearNum(Constants.formatBigdecimal(t.getYearNum()).divide(new BigDecimal(5), 2, BigDecimal.ROUND_HALF_UP));
- }
t.setProvinceCode(model.getToProvinceCode());
t.setProvinceName(model.getToProvinceName());
result.add(t);
}
}
+ if(Constants.UNIT_TYPE == 1) {
+ for(WholeProvinceMapVO t : result){
+ //澶勭悊鍗曚綅鎴愨�滅鈥濓紝涓�绠�=5涓囨敮
+ t.setMonthNum(Constants.formatBigdecimal(t.getMonthNum()).divide(new BigDecimal(5), 2, BigDecimal.ROUND_HALF_UP));
+ t.setYearNum(Constants.formatBigdecimal(t.getYearNum()).divide(new BigDecimal(5), 2, BigDecimal.ROUND_HALF_UP));
+ }
+ }
}
return result;
}
--
Gitblit v1.9.3