From 6e13e0fa577df5511157a7841617106bd2f5c0b2 Mon Sep 17 00:00:00 2001
From: xiaogang <905166056@qq.com>
Date: 星期一, 20 三月 2023 16:03:05 +0800
Subject: [PATCH] 1、优化采购批次相关内容2、优化访客停车白名单下发3、新增权限组排序4、优化设备相关5、优化页面相关展示bug
---
service-community/src/main/java/com/java110/community/cmd/visit/DeleteVisitCmd.java | 49 +++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 45 insertions(+), 4 deletions(-)
diff --git a/service-community/src/main/java/com/java110/community/cmd/visit/DeleteVisitCmd.java b/service-community/src/main/java/com/java110/community/cmd/visit/DeleteVisitCmd.java
index 4cf6229..7404074 100644
--- a/service-community/src/main/java/com/java110/community/cmd/visit/DeleteVisitCmd.java
+++ b/service-community/src/main/java/com/java110/community/cmd/visit/DeleteVisitCmd.java
@@ -5,19 +5,34 @@
import com.java110.core.context.ICmdDataFlowContext;
import com.java110.core.event.cmd.Cmd;
import com.java110.core.event.cmd.CmdEvent;
+import com.java110.dto.machine.CarBlackWhiteDto;
+import com.java110.dto.parking.ParkingSpaceDto;
+import com.java110.dto.visit.VisitDto;
+import com.java110.intf.community.IParkingSpaceInnerServiceSMO;
import com.java110.intf.community.IVisitV1InnerServiceSMO;
+import com.java110.intf.user.ICarBlackWhiteV1InnerServiceSMO;
+import com.java110.po.car.CarBlackWhitePo;
import com.java110.po.owner.VisitPo;
+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.StringUtil;
import org.springframework.beans.factory.annotation.Autowired;
+import java.util.List;
@Java110Cmd(serviceCode = "visit.deleteVisit")
public class DeleteVisitCmd extends Cmd {
@Autowired
private IVisitV1InnerServiceSMO visitV1InnerServiceSMOImpl;
+
+ @Autowired
+ private IParkingSpaceInnerServiceSMO parkingSpaceInnerServiceSMOImpl;
+
+ @Autowired
+ private ICarBlackWhiteV1InnerServiceSMO carBlackWhiteV1InnerServiceSMOImpl;
@Override
public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
@@ -26,14 +41,40 @@
@Override
public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
-
+ VisitDto visitDto = new VisitDto();
+ visitDto.setvId(reqJson.getString("vId"));
+ List<VisitDto> visitDtos = visitV1InnerServiceSMOImpl.queryVisits(visitDto);
+ Assert.listOnlyOne(visitDtos, "鏌ヨ璁垮淇℃伅閿欒锛�");
VisitPo visitPo = BeanConvertUtil.covertBean(reqJson, VisitPo.class);
visitPo.setStatusCd("1");
-
int flag = visitV1InnerServiceSMOImpl.deleteVisit(visitPo);
-
- if(flag < 1){
+ if (flag < 1) {
throw new CmdException("鍒犻櫎寮傚父");
}
+ if (!StringUtil.isEmpty(visitDtos.get(0).getCarNum()) && !StringUtil.isEmpty(visitDtos.get(0).getPsId()) && !visitDtos.get(0).getPsId().equals("-1")) { //鏈夎溅杈嗭紝涓旀湁杞︿綅
+ ParkingSpaceDto parkingSpaceDto = new ParkingSpaceDto();
+ parkingSpaceDto.setPsId(visitDtos.get(0).getPsId());
+ List<ParkingSpaceDto> parkingSpaceDtos = parkingSpaceInnerServiceSMOImpl.queryParkingSpaces(parkingSpaceDto); //鏌ヨ杞︿綅淇℃伅
+ Assert.listOnlyOne(parkingSpaceDtos, "杞︿綅淇℃伅涓嶅瓨鍦ㄦ垨瀛樺湪澶氭潯锛�");
+ if (parkingSpaceDtos.get(0).getState().equals("H")) { //杞︿綅鐘舵�� 鍑哄敭 S锛屽嚭绉� H 锛岀┖闂� F
+ ParkingSpacePo parkingSpacePo = new ParkingSpacePo();
+ parkingSpacePo.setPsId(parkingSpaceDtos.get(0).getPsId());
+ parkingSpacePo.setState("F");
+ parkingSpaceInnerServiceSMOImpl.updateParkingSpace(parkingSpacePo); //閲婃斁杞︿綅
+ }
+ CarBlackWhiteDto carBlackWhiteDto = new CarBlackWhiteDto();
+ carBlackWhiteDto.setCarNum(visitDtos.get(0).getCarNum());
+ carBlackWhiteDto.setPaId(parkingSpaceDtos.get(0).getPaId());
+ List<CarBlackWhiteDto> carBlackWhiteDtos = carBlackWhiteV1InnerServiceSMOImpl.queryCarBlackWhites(carBlackWhiteDto);
+ if (carBlackWhiteDtos != null && carBlackWhiteDtos.size() == 1) {
+ CarBlackWhitePo carBlackWhitePo = new CarBlackWhitePo();
+ carBlackWhitePo.setBwId(carBlackWhiteDtos.get(0).getBwId());
+ carBlackWhiteV1InnerServiceSMOImpl.deleteCarBlackWhite(carBlackWhitePo); //鍒犻櫎鐧藉悕鍗�
+ } else if (carBlackWhiteDtos != null && carBlackWhiteDtos.size() > 1) {
+ throw new IllegalArgumentException("鏌ヨ鍑哄鏉＄櫧鍚嶅崟淇℃伅锛�");
+ } else {
+ throw new IllegalArgumentException("鏌ヨ涓嶅埌鐧藉悕鍗曚俊鎭紒");
+ }
+ }
}
}
--
Gitblit v1.8.0