From d516e38fd44e186f393bbb05c4e7ca34b323b609 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 16 五月 2023 18:50:52 +0800
Subject: [PATCH] optimize report
---
service-job/src/main/java/com/java110/job/task/parkingSpace/ReleaseCarParkingSpaceTemplate.java | 99 ++++++++++++++++++++++++-------------------------
1 files changed, 49 insertions(+), 50 deletions(-)
diff --git a/service-job/src/main/java/com/java110/job/task/parkingSpace/ReleaseCarParkingSpaceTemplate.java b/service-job/src/main/java/com/java110/job/task/parkingSpace/ReleaseCarParkingSpaceTemplate.java
index 7fda022..173ecf7 100644
--- a/service-job/src/main/java/com/java110/job/task/parkingSpace/ReleaseCarParkingSpaceTemplate.java
+++ b/service-job/src/main/java/com/java110/job/task/parkingSpace/ReleaseCarParkingSpaceTemplate.java
@@ -1,20 +1,20 @@
package com.java110.job.task.parkingSpace;
+import com.alibaba.fastjson.JSONObject;
import com.java110.core.log.LoggerFactory;
import com.java110.dto.community.CommunityDto;
-import com.java110.dto.owner.OwnerCarDto;
-import com.java110.dto.ownerCarAttr.OwnerCarAttrDto;
+import com.java110.dto.machine.CarBlackWhiteDto;
+import com.java110.dto.parking.ParkingSpaceDto;
import com.java110.dto.task.TaskDto;
import com.java110.dto.visit.VisitDto;
import com.java110.intf.community.IParkingSpaceInnerServiceSMO;
import com.java110.intf.community.IVisitInnerServiceSMO;
-import com.java110.intf.user.IOwnerCarAttrInnerServiceSMO;
-import com.java110.intf.user.IOwnerCarAttrV1InnerServiceSMO;
-import com.java110.intf.user.IOwnerCarV1InnerServiceSMO;
+import com.java110.intf.user.ICarBlackWhiteV1InnerServiceSMO;
+import com.java110.job.adapt.hcIot.asyn.IIotSendAsyn;
import com.java110.job.quartz.TaskSystemQuartz;
-import com.java110.po.car.OwnerCarPo;
-import com.java110.po.ownerCarAttr.OwnerCarAttrPo;
+import com.java110.po.car.CarBlackWhitePo;
import com.java110.po.parking.ParkingSpacePo;
+import com.java110.utils.util.StringUtil;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -24,7 +24,7 @@
import java.util.List;
/**
- * 棰勭害杞﹀畾鏃堕噴鏀捐溅浣�
+ * 棰勭害杞﹀畾鏃堕噴鏀捐溅浣嶏紙渚濇嵁璁垮棰勭害缁撴潫鏃堕棿锛�
*
* @author fqz
* @date 2022-04-21
@@ -36,16 +36,13 @@
private IVisitInnerServiceSMO visitInnerServiceSMOImpl;
@Autowired
- private IOwnerCarAttrInnerServiceSMO ownerCarAttrInnerServiceSMOImpl;
-
- @Autowired
- private IOwnerCarAttrV1InnerServiceSMO ownerCarAttrV1InnerServiceSMOImpl;
-
- @Autowired
- private IOwnerCarV1InnerServiceSMO ownerCarV1InnerServiceSMOImpl;
-
- @Autowired
private IParkingSpaceInnerServiceSMO parkingSpaceInnerServiceSMOImpl;
+
+ @Autowired
+ private ICarBlackWhiteV1InnerServiceSMO carBlackWhiteV1InnerServiceSMOImpl;
+
+ @Autowired
+ private IIotSendAsyn hcCarBlackWhiteAsynImpl;
private static Logger logger = LoggerFactory.getLogger(ReleaseCarParkingSpaceTemplate.class);
@@ -71,53 +68,55 @@
SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
visitDto.setCommunityId(communityDto.getCommunityId());
visitDto.setDepartureEndTime(df.format(new Date()));
- visitDto.setState("1"); //瀹℃牳閫氳繃
- visitDto.setFlag("1");
+ visitDto.setCarNumNoEmpty("1"); //杞﹁締涓嶄负绌�
+ visitDto.setFlag("1"); //杞︿綅涓嶄负绌�
+// visitDto.setState(visitDto.STATE_C); //璁垮璁板綍瀹℃牳閫氳繃
List<VisitDto> visitDtos = visitInnerServiceSMOImpl.queryVisits(visitDto);
if (visitDtos == null || visitDtos.size() < 1) {
return;
}
for (VisitDto visit : visitDtos) {
- OwnerCarDto ownerCarDto = new OwnerCarDto();
- ownerCarDto.setCommunityId(communityDto.getCommunityId());
- ownerCarDto.setCarTypeCd(OwnerCarDto.CAR_TYPE_TEMP); //涓存椂杞�
- ownerCarDto.setCarNum(visit.getCarNum());
- List<OwnerCarDto> ownerCarDtos = ownerCarV1InnerServiceSMOImpl.queryOwnerCars(ownerCarDto);
- if (ownerCarDtos == null || ownerCarDtos.size() != 1) {
+ ParkingSpaceDto parkingSpaceDto = new ParkingSpaceDto();
+ parkingSpaceDto.setPsId(visit.getPsId());
+ List<ParkingSpaceDto> parkingSpaceDtos = parkingSpaceInnerServiceSMOImpl.queryParkingSpaces(parkingSpaceDto);
+ if (parkingSpaceDtos == null || parkingSpaceDtos.size() != 1) {
continue;
}
- OwnerCarAttrDto ownerCarAttrDto = new OwnerCarAttrDto();
- ownerCarAttrDto.setCarId(ownerCarDtos.get(0).getCarId());
- ownerCarAttrDto.setSpecCd("6443000036"); //鏄惁鏄绾﹁溅
- //鏌ヨ杞﹁締灞炴��
- List<OwnerCarAttrDto> ownerCarAttrDtos = ownerCarAttrInnerServiceSMOImpl.queryOwnerCarAttrs(ownerCarAttrDto);
- if (ownerCarAttrDtos == null || ownerCarAttrDtos.size() != 1) { //鍙湅鏄惁鏄绾﹁溅灞炴��
+ if (StringUtil.isEmpty(parkingSpaceDtos.get(0).getState()) || !parkingSpaceDtos.get(0).getState().equals("H")) { //鍑哄敭 S锛屽嚭绉� H 锛岀┖闂� F
continue;
}
- if (!ownerCarAttrDtos.get(0).getValue().equals("true")) { //涓嶆槸棰勭害杞︾殑涓嶈蛋瀹氭椂浠诲姟
- continue;
- }
- //閲婃斁杞︿綅骞跺垹闄よ繃鏈熺殑杞﹁締
- OwnerCarPo ownerCarPo = new OwnerCarPo();
- ownerCarPo.setCarId(ownerCarDtos.get(0).getCarId());
- ownerCarPo.setCommunityId(communityDto.getCommunityId());
- ownerCarPo.setCarTypeCd(OwnerCarDto.CAR_TYPE_TEMP);
- ownerCarPo.setState(OwnerCarDto.STATE_FINISH); //杞︿綅閲婃斁鐘舵��
- ownerCarPo.setStatusCd("1"); //涓嶅彲鐢ㄧ姸鎬�
- //淇敼杞﹁締鐘舵�侊紝鏀逛负杞﹁締閲婃斁鐘舵�佸苟鍒犻櫎
- ownerCarV1InnerServiceSMOImpl.updateOwnerCar(ownerCarPo);
- //淇敼杞﹁締灞炴�х姸鎬�
- OwnerCarAttrPo ownerCarAttrPo = new OwnerCarAttrPo();
- ownerCarAttrPo.setCarId(ownerCarDtos.get(0).getCarId());
- ownerCarAttrPo.setStatusCd("1");
- //鍒犻櫎杩囨湡杞﹁締灞炴��
- ownerCarAttrV1InnerServiceSMOImpl.updateOwnerCarAttr(ownerCarAttrPo);
//淇敼杞︿綅鐘舵��
ParkingSpacePo parkingSpacePo = new ParkingSpacePo();
- parkingSpacePo.setPsId(ownerCarDtos.get(0).getPsId());
+ parkingSpacePo.setPsId(visit.getPsId());
parkingSpacePo.setState("F");//杞︿綅鐘舵�� 鍑哄敭 S锛屽嚭绉� H 锛岀┖闂� F
//杞︿綅鐘舵�佹敼涓虹┖闂茬姸鎬�
parkingSpaceInnerServiceSMOImpl.updateParkingSpace(parkingSpacePo);
+ //鏌ョ湅榛戠櫧鍚嶅崟琛ㄩ噷鏄惁鏈夎杞﹁締淇℃伅
+ CarBlackWhiteDto carBlackWhiteDto = new CarBlackWhiteDto();
+ carBlackWhiteDto.setCarNum(visit.getCarNum());
+ carBlackWhiteDto.setCommunityId(visit.getCommunityId());
+ carBlackWhiteDto.setBlackWhite("2222"); //1111 榛戝悕鍗� 2222 鐧藉悕鍗�
+ carBlackWhiteDto.setStartTime(visit.getVisitTime());
+ carBlackWhiteDto.setEndTime(visit.getFreeTime());
+ List<CarBlackWhiteDto> carBlackWhiteDtos = carBlackWhiteV1InnerServiceSMOImpl.queryCarBlackWhites(carBlackWhiteDto);
+ if (carBlackWhiteDtos == null || carBlackWhiteDtos.size() != 1) {
+ continue;
+ }
+ CarBlackWhitePo carBlackWhitePo = new CarBlackWhitePo();
+ carBlackWhitePo.setBwId(carBlackWhiteDtos.get(0).getBwId());
+ carBlackWhitePo.setStatusCd("1");
+ //鍒犻櫎鐧藉悕鍗曡溅杈嗕俊鎭�
+ carBlackWhiteV1InnerServiceSMOImpl.deleteCarBlackWhite(carBlackWhitePo);
+ //鍚戠涓夋柟鐗╄仈缃戞帹閫佸垹闄ょ櫧鍚嶅崟淇℃伅
+ JSONObject postParameters = new JSONObject();
+ postParameters.put("extBwId", carBlackWhiteDtos.get(0).getBwId());
+ postParameters.put("carNum", carBlackWhiteDtos.get(0).getCarNum());
+ postParameters.put("extPaId", carBlackWhiteDtos.get(0).getPaId());
+ postParameters.put("extCommunityId", carBlackWhiteDtos.get(0).getCommunityId());
+ postParameters.put("startTime", carBlackWhiteDtos.get(0).getStartTime());
+ postParameters.put("endTime", carBlackWhiteDtos.get(0).getEndTime());
+ postParameters.put("blackWhite", carBlackWhiteDtos.get(0).getBlackWhite());
+ hcCarBlackWhiteAsynImpl.deleteCarBlackWhite(postParameters);
}
}
--
Gitblit v1.8.0