From 3d571a3e5ef8e6cc76214b79ea386455afb1bd9d Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期五, 27 十二月 2024 11:02:05 +0800
Subject: [PATCH] 优化代码
---
service-user/src/main/java/com/java110/user/cmd/owner/SaveOwnerCarCmd.java | 95 ++++++++++++++++++++++++++++++++++++-----------
1 files changed, 73 insertions(+), 22 deletions(-)
diff --git a/service-user/src/main/java/com/java110/user/cmd/owner/SaveOwnerCarCmd.java b/service-user/src/main/java/com/java110/user/cmd/owner/SaveOwnerCarCmd.java
index edf4963..0522670 100644
--- a/service-user/src/main/java/com/java110/user/cmd/owner/SaveOwnerCarCmd.java
+++ b/service-user/src/main/java/com/java110/user/cmd/owner/SaveOwnerCarCmd.java
@@ -8,8 +8,10 @@
import com.java110.core.event.cmd.Cmd;
import com.java110.core.event.cmd.CmdEvent;
import com.java110.core.factory.GenerateCodeFactory;
+import com.java110.dto.machine.CarInoutDto;
import com.java110.dto.owner.OwnerCarDto;
import com.java110.dto.parking.ParkingSpaceDto;
+import com.java110.intf.common.ICarInoutInnerServiceSMO;
import com.java110.intf.community.IParkingSpaceInnerServiceSMO;
import com.java110.intf.community.IParkingSpaceV1InnerServiceSMO;
import com.java110.intf.fee.IFeeConfigInnerServiceSMO;
@@ -17,16 +19,14 @@
import com.java110.intf.user.IOwnerCarInnerServiceSMO;
import com.java110.intf.user.IOwnerCarV1InnerServiceSMO;
import com.java110.po.car.OwnerCarPo;
-import com.java110.po.ownerCarAttr.OwnerCarAttrPo;
+import com.java110.po.owner.OwnerCarAttrPo;
import com.java110.po.parking.ParkingSpacePo;
-import com.java110.utils.constant.ResponseConstant;
+import com.java110.utils.cache.MappingCache;
import com.java110.utils.exception.CmdException;
-import com.java110.utils.exception.ListenerExecuteException;
-import com.java110.utils.util.Assert;
-import com.java110.utils.util.BeanConvertUtil;
-import com.java110.utils.util.StringUtil;
+import com.java110.utils.util.*;
import org.springframework.beans.factory.annotation.Autowired;
+import java.util.Date;
import java.util.List;
@Java110Cmd(serviceCode = "owner.saveOwnerCar")
@@ -51,41 +51,90 @@
@Autowired
private IParkingSpaceV1InnerServiceSMO parkingSpaceV1InnerServiceSMOImpl;
+ @Autowired
+ private ICarInoutInnerServiceSMO carInoutInnerServiceSMOImpl;
+
@Override
public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
- Assert.jsonObjectHaveKey(reqJson, "communityId", "鏈寘鍚皬鍖篒D");
- Assert.jsonObjectHaveKey(reqJson, "ownerId", "璇锋眰鎶ユ枃涓湭鍖呭惈ownerId");
- Assert.jsonObjectHaveKey(reqJson, "carNum", "璇锋眰鎶ユ枃涓湭鍖呭惈carNum");
- Assert.jsonObjectHaveKey(reqJson, "carBrand", "璇锋眰鎶ユ枃涓湭鍖呭惈carBrand");
- Assert.jsonObjectHaveKey(reqJson, "carType", "璇锋眰鎶ユ枃涓湭鍖呭惈carType");
- Assert.jsonObjectHaveKey(reqJson, "carColor", "鏈寘鍚玞arColor");
- Assert.jsonObjectHaveKey(reqJson, "psId", "鏈寘鍚玴sId");
- Assert.jsonObjectHaveKey(reqJson, "storeId", "鏈寘鍚玸toreId");
- Assert.jsonObjectHaveKey(reqJson, "carNumType", "鏈寘鍚玞arNumType");
+ Assert.hasKeyAndValue(reqJson, "communityId", "鏈寘鍚皬鍖篒D");
+ Assert.hasKeyAndValue(reqJson, "ownerId", "璇锋眰鎶ユ枃涓湭鍖呭惈ownerId");
+ Assert.hasKeyAndValue(reqJson, "carNum", "璇锋眰鎶ユ枃涓湭鍖呭惈carNum");
+ Assert.hasKeyAndValue(reqJson, "carType", "璇锋眰鎶ユ枃涓湭鍖呭惈carType");
+ Assert.hasKeyAndValue(reqJson, "psId", "鏈寘鍚玴sId");
- Assert.hasLength(reqJson.getString("communityId"), "灏忓尯ID涓嶈兘涓虹┖");
- Assert.hasLength(reqJson.getString("ownerId"), "ownerId涓嶈兘涓虹┖");
- Assert.hasLength(reqJson.getString("psId"), "psId涓嶈兘涓虹┖");
+ if (OwnerCarDto.LEASE_TYPE_MONTH.equals(reqJson.getString("leaseType"))) {
+ Assert.hasKeyAndValue(reqJson, "startTime", "璇锋眰鎶ユ枃涓湭鍖呭惈寮�濮嬫椂闂�");
+ Assert.hasKeyAndValue(reqJson, "endTime", "璇锋眰鎶ユ枃涓湭鍖呭惈缁撴潫鏃堕棿");
+ Assert.isDate(reqJson.getString("startTime"),DateUtil.DATE_FORMATE_STRING_B,"寮�濮嬫椂闂存牸寮忛敊璇�");
+ Assert.isDate(reqJson.getString("endTime"),DateUtil.DATE_FORMATE_STRING_B,"缁撴潫鏃堕棿鏍煎紡閿欒");
+ }
- if (!"H".equals(reqJson.getString("carNumType"))
- && !"S".equals(reqJson.getString("carNumType"))) {
- throw new ListenerExecuteException(ResponseConstant.RESULT_CODE_ERROR, "璇锋眰鎶ユ枃涓璼ellOrFire鍊奸敊璇� 锛屽嚭鍞负S 鍑虹涓篐");
+ String startTime = reqJson.getString("startTime");
+ String endTime = reqJson.getString("endTime");
+ if(StringUtil.isEmpty(startTime)){
+ startTime = DateUtil.getFormatTimeString(new Date(), DateUtil.DATE_FORMATE_STRING_B);
+ reqJson.put("startTime",startTime);
+ }
+ if(StringUtil.isEmpty(endTime)){
+ endTime = "2050-01-01";
+ reqJson.put("endTime",endTime);
+ }
+
+ //妫�鏌ヨ溅浣嶆槸鍚︽槸绌洪棽鐘舵��
+ ParkingSpaceDto parkingSpaceDto = new ParkingSpaceDto();
+ parkingSpaceDto.setPsId(reqJson.getString("psId"));
+ List<ParkingSpaceDto> parkingSpaceDtos = parkingSpaceInnerServiceSMOImpl.queryParkingSpaces(parkingSpaceDto);
+ Assert.listOnlyOne(parkingSpaceDtos, "鏌ヨ杞︿綅閿欒锛�");
+ //鑾峰彇杞︿綅鐘舵��
+ String state = parkingSpaceDtos.get(0).getState();
+ if (StringUtil.isEmpty(state) || !ParkingSpaceDto.STATE_FREE.equals(state)) {
+ throw new IllegalArgumentException("璇ヨ溅浣嶄笉鏄┖闂茬姸鎬侊紒");
}
//鏍￠獙杞︾墝鍙锋槸鍚﹀瓨鍦�
OwnerCarDto ownerCarDto = new OwnerCarDto();
ownerCarDto.setCommunityId(reqJson.getString("communityId"));
ownerCarDto.setCarNum(reqJson.getString("carNum"));
+ ownerCarDto.setPaIds(new String[]{parkingSpaceDtos.get(0).getPaId()});
+ ownerCarDto.setCarTypeCds(new String[]{OwnerCarDto.CAR_TYPE_PRIMARY, OwnerCarDto.CAR_TYPE_MEMBER}); // 涓存椂杞﹂櫎澶�
int count = ownerCarInnerServiceSMOImpl.queryOwnerCarsCount(ownerCarDto);
if (count > 0) {
throw new IllegalArgumentException("杞﹁締宸插瓨鍦�");
+ }
+
+ //鍒ゆ柇涓存椂杞� 鏄惁鍦ㄥ満
+ String parkingIn = MappingCache.getValue("TEMP_CAR_IN_PARKING");
+
+ if (!"ON".equals(parkingIn)) {
+ return;
+ }
+
+ ownerCarDto = new OwnerCarDto();
+ ownerCarDto.setCommunityId(reqJson.getString("communityId"));
+ ownerCarDto.setCarNum(reqJson.getString("carNum"));
+ ownerCarDto.setCarTypeCds(new String[]{OwnerCarDto.CAR_TYPE_TEMP}); // 涓存椂杞﹂櫎澶�
+ count = ownerCarInnerServiceSMOImpl.queryOwnerCarsCount(ownerCarDto);
+ if (count < 1) {
+ return;
+ }
+
+ CarInoutDto carInoutDto = new CarInoutDto();
+ carInoutDto.setCarNum(reqJson.getString("carNum"));
+ carInoutDto.setStates(new String[]{CarInoutDto.STATE_PAY, CarInoutDto.STATE_IN, CarInoutDto.STATE_REPAY});
+ List<CarInoutDto> carInoutDtos = carInoutInnerServiceSMOImpl.queryCarInouts(carInoutDto);
+ if (!ListUtil.isNull(carInoutDtos)) {
+ throw new CmdException("杞﹁締鍦ㄥ満锛岃鍑哄満鍚庡啀鍔炵悊鏈堢杞�");
}
}
@Override
@Java110Transactional
public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
+ if (!reqJson.containsKey("leaseType")) {
+ reqJson.put("leaseType", OwnerCarDto.LEASE_TYPE_MONTH);
+ }
+
JSONObject businessOwnerCar = new JSONObject();
businessOwnerCar.putAll(reqJson);
businessOwnerCar.put("memberId", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_carId));
@@ -101,6 +150,8 @@
}
//娣诲姞杞﹁締灞炴��
dealOwnerCarAttr(reqJson, ownerCarPo);
+
+
int flag = ownerCarV1InnerServiceSMOImpl.saveOwnerCar(ownerCarPo);
if (flag < 1) {
throw new CmdException("淇濆瓨杞﹁締灞炴�уけ璐�");
@@ -121,8 +172,8 @@
JSONObject businessParkingSpace = new JSONObject();
businessParkingSpace.putAll(BeanConvertUtil.beanCovertMap(parkingSpaceDto));
- businessParkingSpace.put("state", reqJson.getString("carNumType"));
ParkingSpacePo parkingSpacePo = BeanConvertUtil.covertBean(businessParkingSpace, ParkingSpacePo.class);
+ parkingSpacePo.setState("H"); //S 鍑哄敭 H 鍑虹 F 绌洪棽
flag = parkingSpaceV1InnerServiceSMOImpl.updateParkingSpace(parkingSpacePo);
if (flag < 1) {
throw new CmdException("淇敼杞︿綅鐘舵�佸け璐�");
--
Gitblit v1.8.0