From cca504b84583f8f8289b34e794939b8590a16446 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 23 五月 2023 14:34:22 +0800
Subject: [PATCH] optimzie exit room
---
service-community/src/main/java/com/java110/community/cmd/visit/UpdateVisitCmd.java | 65 +++-----------------------------
1 files changed, 6 insertions(+), 59 deletions(-)
diff --git a/service-community/src/main/java/com/java110/community/cmd/visit/UpdateVisitCmd.java b/service-community/src/main/java/com/java110/community/cmd/visit/UpdateVisitCmd.java
index ae4f97a..50ff6c3 100644
--- a/service-community/src/main/java/com/java110/community/cmd/visit/UpdateVisitCmd.java
+++ b/service-community/src/main/java/com/java110/community/cmd/visit/UpdateVisitCmd.java
@@ -6,59 +6,33 @@
import com.java110.core.context.ICmdDataFlowContext;
import com.java110.core.event.cmd.Cmd;
import com.java110.core.event.cmd.CmdEvent;
-import com.java110.core.factory.CommunitySettingFactory;
import com.java110.core.factory.GenerateCodeFactory;
import com.java110.core.smo.IPhotoSMO;
import com.java110.dto.RoomDto;
import com.java110.dto.accessControlWhite.AccessControlWhiteDto;
import com.java110.dto.machine.CarBlackWhiteDto;
import com.java110.dto.machine.MachineDto;
-import com.java110.dto.oaWorkflow.OaWorkflowDto;
-import com.java110.dto.owner.OwnerCarDto;
-import com.java110.dto.parking.ParkingSpaceDto;
import com.java110.dto.visit.VisitDto;
import com.java110.dto.visitSetting.VisitSettingDto;
import com.java110.intf.common.IAccessControlWhiteV1InnerServiceSMO;
import com.java110.intf.common.IMachineInnerServiceSMO;
-import com.java110.intf.community.IParkingSpaceInnerServiceSMO;
import com.java110.intf.community.IRoomInnerServiceSMO;
import com.java110.intf.community.IVisitSettingV1InnerServiceSMO;
import com.java110.intf.community.IVisitV1InnerServiceSMO;
import com.java110.intf.user.ICarBlackWhiteV1InnerServiceSMO;
-import com.java110.intf.user.IOwnerCarAttrInnerServiceSMO;
-import com.java110.intf.user.IOwnerCarInnerServiceSMO;
-import com.java110.intf.user.IOwnerCarV1InnerServiceSMO;
import com.java110.po.accessControlWhite.AccessControlWhitePo;
import com.java110.po.car.CarBlackWhitePo;
-import com.java110.po.car.OwnerCarPo;
import com.java110.po.owner.VisitPo;
-import com.java110.po.ownerCarAttr.OwnerCarAttrPo;
-import com.java110.po.parking.ParkingSpacePo;
import com.java110.utils.exception.CmdException;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
-import com.java110.utils.util.DateUtil;
import com.java110.utils.util.StringUtil;
-import com.java110.vo.ResultVo;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.ResponseEntity;
import java.util.*;
@Java110Cmd(serviceCode = "visit.updateVisit")
public class UpdateVisitCmd extends Cmd {
-
- @Autowired
- private IParkingSpaceInnerServiceSMO parkingSpaceInnerServiceSMOImpl;
-
- @Autowired
- private IOwnerCarV1InnerServiceSMO ownerCarV1InnerServiceSMOImpl;
-
- @Autowired
- private IOwnerCarAttrInnerServiceSMO ownerCarAttrInnerServiceSMOImpl;
-
- @Autowired
- private IOwnerCarInnerServiceSMO ownerCarInnerServiceSMOImpl;
@Autowired
private IVisitV1InnerServiceSMO visitV1InnerServiceSMOImpl;
@@ -74,7 +48,6 @@
@Autowired
private IAccessControlWhiteV1InnerServiceSMO accessControlWhiteV1InnerServiceSMOImpl;
-
@Autowired
private IRoomInnerServiceSMO roomInnerServiceSMOImpl;
@@ -100,14 +73,11 @@
@Override
@Java110Transactional
public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
- String userId = context.getReqHeaders().get("user-id");
- String storeId = context.getReqHeaders().get("store-id");
VisitDto visitDto = new VisitDto();
visitDto.setvId(reqJson.getString("vId"));
visitDto.setCommunityId(reqJson.getString("communityId"));
List<VisitDto> visitDtos = visitV1InnerServiceSMOImpl.queryVisits(visitDto);
Assert.listOnlyOne(visitDtos, "璁垮涓嶅瓨鍦�");
-
VisitPo visitPo = BeanConvertUtil.covertBean(reqJson, VisitPo.class);
visitPo.setState(visitDtos.get(0).getState());
int flag = visitV1InnerServiceSMOImpl.updateVisit(visitPo);
@@ -115,45 +85,37 @@
throw new CmdException("淇濆瓨璁垮澶辫触");
}
photoSMOImpl.savePhoto(reqJson, reqJson.getString("vId"), reqJson.getString("communityId"));
-
- if(!VisitDto.STATE_C.equals(visitDtos.get(0).getState())){
- return ;
+ if (!VisitDto.STATE_C.equals(visitDtos.get(0).getState())) {
+ return;
}
String faceWay = "Y";
String carNumWay = "N";
-
// 鏌ヨ璁垮璁剧疆
VisitSettingDto visitSettingDto = new VisitSettingDto();
visitSettingDto.setCommunityId(reqJson.getString("communityId"));
List<VisitSettingDto> visitSettingDtos = visitSettingV1InnerServiceSMOImpl.queryVisitSettings(visitSettingDto);
-
if (visitSettingDtos != null && visitSettingDtos.size() > 0) {
faceWay = visitSettingDtos.get(0).getFaceWay();
carNumWay = visitSettingDtos.get(0).getCarNumWay();
// 鍚屾杞︾墝 杩欓噷闇�瑕佸仠杞﹀満锛屾墍浠ユ病鏈夐厤缃瀹㈣缃紝涓嶅悓姝�
synchronizedVisitCarNum(visitPo, carNumWay, visitSettingDtos.get(0));
}
-
// 鍚屾璁垮浜鸿劯
synchronousVisitFace(visitPo, faceWay, reqJson.getString("photo"));
-
}
private void synchronousVisitFace(VisitPo visitPo, String faceWay, String photo) {
if (VisitSettingDto.FACE_WAY_NO.equals(faceWay) || StringUtil.isEmpty(photo)) {
return;
}
-
- if(StringUtil.isEmpty(visitPo.getOwnerId())){
+ if (StringUtil.isEmpty(visitPo.getOwnerId())) {
return;
}
-
// 鏌ヨ 璁块棶涓氫富鍙互璁块棶鐨勯棬绂佽澶�
RoomDto roomDto = new RoomDto();
roomDto.setOwnerId(visitPo.getOwnerId());
//杩欑鎯呭喌璇存槑 涓氫富宸茬粡鍒犳帀浜� 闇�瑕佹煡璇㈢姸鎬佷负 1 鐨勬暟鎹�
List<RoomDto> rooms = roomInnerServiceSMOImpl.queryRoomsByOwner(roomDto);
-
//鎷垮埌灏忓尯ID
String communityId = visitPo.getCommunityId();
//鏍规嵁灏忓尯ID鏌ヨ鐜版湁璁惧
@@ -167,13 +129,11 @@
locationObjIds.add(tRoomDto.getRoomId());
locationObjIds.add(tRoomDto.getFloorId());
}
-
machineDto.setLocationObjIds(locationObjIds.toArray(new String[locationObjIds.size()]));
List<MachineDto> machineDtos = machineInnerServiceSMOImpl.queryMachines(machineDto);
if (machineDtos == null || machineDtos.size() < 1) {
return;
}
-
// 鍚屾鍒� 闂ㄧ鐧藉悕鍗曚腑
for (MachineDto tmpMachineDto : machineDtos) {
if (!"9999".equals(tmpMachineDto.getMachineTypeCd())) {
@@ -209,7 +169,6 @@
throw new CmdException("淇濆瓨鏁版嵁澶辫触");
}
}
-
photoSMOImpl.savePhoto(photo, accessControlWhitePo.getAcwId(), accessControlWhitePo.getCommunityId());
}
@@ -227,11 +186,9 @@
if (VisitSettingDto.CAR_NUM_WAY_NO.equals(carNumWay)) {
return;
}
-
- if(StringUtil.isEmpty(visitPo.getCarNum())){
+ if (StringUtil.isEmpty(visitPo.getCarNum())) {
return;
}
-
CarBlackWhiteDto carBlackWhiteDto = new CarBlackWhiteDto();
carBlackWhiteDto.setBlackWhite(CarBlackWhiteDto.BLACK_WHITE_WHITE);
carBlackWhiteDto.setCarNum(visitPo.getCarNum());
@@ -245,10 +202,10 @@
carBlackWhitePo.setStartTime(visitPo.getVisitTime());
carBlackWhitePo.setEndTime(visitPo.getDepartureTime());
int flag = 0;
- if(carBlackWhiteDtos == null || carBlackWhiteDtos.size() < 1){
+ if (carBlackWhiteDtos == null || carBlackWhiteDtos.size() < 1) {
carBlackWhitePo.setBwId(GenerateCodeFactory.getGeneratorId("11"));
flag = carBlackWhiteV1InnerServiceSMOImpl.saveCarBlackWhite(carBlackWhitePo);
- }else {
+ } else {
carBlackWhitePo.setBwId(carBlackWhiteDtos.get(0).getBwId());
flag = carBlackWhiteV1InnerServiceSMOImpl.updateCarBlackWhite(carBlackWhitePo);
}
@@ -256,8 +213,6 @@
if (flag < 1) {
throw new CmdException("棰勭害杞﹁締娣诲姞鐧藉悕鍗曞け璐�");
}
-
-
}
/**
@@ -267,24 +222,16 @@
* @param reqJson
*/
private boolean hasAuditVisit(VisitPo visitPo, JSONObject reqJson, String storeId, String userId) {
-
-
VisitSettingDto visitSettingDto = new VisitSettingDto();
visitSettingDto.setCommunityId(reqJson.getString("communityId"));
List<VisitSettingDto> visitSettingDtos = visitSettingV1InnerServiceSMOImpl.queryVisitSettings(visitSettingDto);
-
if (visitSettingDtos == null || visitSettingDtos.size() < 1) {
return false;
}
-
// 闇�瑕佸鏍�
if (!VisitSettingDto.AUDIT_WAY_YES.equals(visitSettingDtos.get(0).getAuditWay())) {
return false;
}
-
return true;
-
}
-
-
}
--
Gitblit v1.8.0