From 82770eba6763cf3acee9e67533859606e1d6db1a Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期一, 24 十月 2022 14:09:15 +0800
Subject: [PATCH] 优化 抢单 报错问题
---
service-community/src/main/java/com/java110/community/cmd/visit/SaveVisitCmd.java | 47 +++++++++++++++++++++--------------------------
1 files changed, 21 insertions(+), 26 deletions(-)
diff --git a/service-community/src/main/java/com/java110/community/cmd/visit/SaveVisitCmd.java b/service-community/src/main/java/com/java110/community/cmd/visit/SaveVisitCmd.java
index e4a403d..f6ab41e 100644
--- a/service-community/src/main/java/com/java110/community/cmd/visit/SaveVisitCmd.java
+++ b/service-community/src/main/java/com/java110/community/cmd/visit/SaveVisitCmd.java
@@ -2,7 +2,6 @@
import com.alibaba.fastjson.JSONObject;
import com.java110.core.annotation.Java110Cmd;
-import com.java110.core.context.DataFlowContext;
import com.java110.core.context.ICmdDataFlowContext;
import com.java110.core.event.cmd.Cmd;
import com.java110.core.event.cmd.CmdEvent;
@@ -25,7 +24,6 @@
import com.java110.po.owner.VisitPo;
import com.java110.po.ownerCarAttr.OwnerCarAttrPo;
import com.java110.po.parking.ParkingSpacePo;
-import com.java110.utils.constant.BusinessTypeConstant;
import com.java110.utils.exception.CmdException;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
@@ -36,7 +34,6 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
-import java.text.SimpleDateFormat;
import java.util.Calendar;
import java.util.Date;
import java.util.List;
@@ -52,9 +49,6 @@
private IVisitV1InnerServiceSMO visitV1InnerServiceSMOImpl;
@Autowired
- private IFileInnerServiceSMO fileInnerServiceSMOImpl;
-
- @Autowired
private IFileRelInnerServiceSMO fileRelInnerServiceSMOImpl;
@Autowired
@@ -68,6 +62,9 @@
@Autowired
private IOwnerCarInnerServiceSMO ownerCarInnerServiceSMOImpl;
+
+ @Autowired
+ private IFileInnerServiceSMO fileInnerServiceSMOImpl;
//閿�
public static final String IS_NEED_REVIEW = "IS_NEED_REVIEW";
@@ -87,14 +84,11 @@
Assert.hasKeyAndValue(reqJson, "visitGender", "蹇呭～锛岃濉啓璁垮濮撳悕");
Assert.hasKeyAndValue(reqJson, "phoneNumber", "蹇呭～锛岃濉啓璁垮鑱旂郴鏂瑰紡");
Assert.hasKeyAndValue(reqJson, "visitTime", "蹇呭～锛岃濉啓璁垮鎷滆鏃堕棿");
-
}
@Override
public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
-
String userId = context.getReqHeaders().get("user-id");
-
reqJson.put("vId", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_vId));
//鏄惁闇�瑕佸鏍�
String isNeedReviewFlag = CommunitySettingFactory.getValue(reqJson.getString("communityId"), IS_NEED_REVIEW);
@@ -126,7 +120,7 @@
newTime.setTime(time);
newTime.add(Calendar.MINUTE, Integer.parseInt(freeTime));//鏃ユ湡鍔犱笂鍒嗛挓
Date newDate = newTime.getTime();
- String finishFreeTime = DateUtil.getFormatTimeString(newDate,DateUtil.DATE_FORMATE_STRING_A);
+ String finishFreeTime = DateUtil.getFormatTimeString(newDate, DateUtil.DATE_FORMATE_STRING_A);
reqJson.put("freeTime", finishFreeTime);
if (!StringUtils.isEmpty(isNeedReviewFlag) && isNeedReviewFlag.equals("false")) { //涓嶉渶瑕佸鏍稿氨闅忔満鑷姩鍒嗛厤杞︿綅
//鑾峰彇灏忓尯閰嶇疆閲岄厤缃殑鍋滆溅鍦篿d
@@ -202,7 +196,6 @@
reqJson.put("psId", "-1");
}
}
-
String result = "";
if (existCar) {
result = "璁垮淇℃伅鐧昏鎴愬姛,杞﹁締宸茬粡瀛樺湪棰勭害锛岃鎮ㄥ湪棰勭害鍒版湡鍚庯紝鍐嶆杩涜杞﹁締棰勭害锛岃阿璋紒";
@@ -216,23 +209,24 @@
reqJson.put("stateRemark", result);
addVisit(reqJson);
if (reqJson.containsKey("photo") && !StringUtils.isEmpty(reqJson.getString("photo"))) {
- FileDto fileDto = new FileDto();
- fileDto.setFileId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_file_id));
- fileDto.setFileName(fileDto.getFileId());
- fileDto.setContext(reqJson.getString("photo"));
- fileDto.setSuffix("jpeg");
- fileDto.setCommunityId(reqJson.getString("communityId"));
- String fileName = fileInnerServiceSMOImpl.saveFile(fileDto);
- reqJson.put("photoId", fileDto.getFileId());
- reqJson.put("fileSaveName", fileName);
+ if(reqJson.getString("photo").length()>512){ //璇存槑鏄浘鐗�
+ FileDto fileDto = new FileDto();
+ fileDto.setFileId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_file_id));
+ fileDto.setFileName(fileDto.getFileId());
+ fileDto.setContext(reqJson.getString("photo"));
+ fileDto.setSuffix("jpeg");
+ fileDto.setCommunityId(reqJson.getString("communityId"));
+ String fileName = fileInnerServiceSMOImpl.saveFile(fileDto);
+ reqJson.put("photo", fileName);
+ }
JSONObject businessUnit = new JSONObject();
- businessUnit.put("fileRelId", "-1");
+ businessUnit.put("fileRelId", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_fileRelId));
businessUnit.put("relTypeCd", "11000");
businessUnit.put("saveWay", "table");
businessUnit.put("objId", reqJson.getString("vId"));
- businessUnit.put("fileRealName", fileDto.getFileId());
- businessUnit.put("fileSaveName", fileName);
+ businessUnit.put("fileRealName", reqJson.getString("photo"));
+ businessUnit.put("fileSaveName", reqJson.getString("photo"));
FileRelPo fileRelPo = BeanConvertUtil.covertBean(businessUnit, FileRelPo.class);
fileRelInnerServiceSMOImpl.saveFileRel(fileRelPo);
}
@@ -262,6 +256,7 @@
ownerCarPo.setState(OwnerCarDto.STATE_NORMAL); //1001 姝ｅ父鐘舵�侊紝2002 杞︿綅閲婃斁娆犺垂鐘舵�� 3003 杞︿綅閲婃斁
ownerCarPo.setCarTypeCd(OwnerCarDto.CAR_TYPE_TEMP); //1001 涓氫富杞﹁締 1002 鎴愬憳杞﹁締 1003 涓存椂杞�
ownerCarPo.setMemberId(reqJson.getString("ownerId"));
+ ownerCarPo.setLeaseType(OwnerCarDto.LEASE_TYPE_RESERVE); //H 鏈堢杞� S 鍑哄敭杞� I 鍐呴儴杞� NM 鍏嶈垂杞� R 棰勭害杞�
ownerCarV1InnerServiceSMOImpl.saveOwnerCar(ownerCarPo);
//娣诲姞杞﹁締灞炴��
OwnerCarAttrPo ownerCarAttrPo = new OwnerCarAttrPo();
@@ -298,7 +293,7 @@
/**
* 娣诲姞灏忓尯淇℃伅
*
- * @param paramInJson 鎺ュ彛璋冪敤鏀句紶鍏ュ叆鍙�
+ * @param paramInJson 鎺ュ彛璋冪敤鏀句紶鍏ュ叆鍙�
* @return 璁㈠崟鏈嶅姟鑳藉鎺ュ彈鐨勬姤鏂�
*/
public void addVisit(JSONObject paramInJson) {
@@ -307,8 +302,8 @@
businessVisit.putAll(paramInJson);
VisitPo visitPo = BeanConvertUtil.covertBean(businessVisit, VisitPo.class);
- int flag =visitV1InnerServiceSMOImpl.saveVisit(visitPo);
- if(flag <1){
+ int flag = visitV1InnerServiceSMOImpl.saveVisit(visitPo);
+ if (flag < 1) {
throw new CmdException("淇濆瓨璁垮澶辫触");
}
}
--
Gitblit v1.8.0