From 53e62f2fedb2506793620454df0e9b5bcdfeaf96 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期一, 23 一月 2023 18:47:22 +0800
Subject: [PATCH] 访客设置加入停车场功能
---
service-community/src/main/java/com/java110/community/cmd/visit/ListVisitsCmd.java | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 50 insertions(+), 6 deletions(-)
diff --git a/service-community/src/main/java/com/java110/community/cmd/visit/ListVisitsCmd.java b/service-community/src/main/java/com/java110/community/cmd/visit/ListVisitsCmd.java
index 3a5606f..4803b84 100644
--- a/service-community/src/main/java/com/java110/community/cmd/visit/ListVisitsCmd.java
+++ b/service-community/src/main/java/com/java110/community/cmd/visit/ListVisitsCmd.java
@@ -6,9 +6,11 @@
import com.java110.core.event.cmd.Cmd;
import com.java110.core.event.cmd.CmdEvent;
import com.java110.core.factory.CommunitySettingFactory;
+import com.java110.doc.annotation.*;
import com.java110.dto.visit.VisitDto;
import com.java110.intf.community.IVisitInnerServiceSMO;
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 com.java110.vo.api.visit.ApiVisitDataVo;
@@ -22,12 +24,45 @@
import java.util.List;
import java.util.Map;
+
+
+@Java110CmdDoc(title = "鏌ヨ璁垮",
+ description = "渚沺c绔煡璇㈣瀹汉鍛�",
+ httpMethod = "get",
+ url = "http://{ip}:{port}/app/visit.listVisits",
+ resource = "communityDoc",
+ author = "鍚村鏂�",
+ serviceCode = "visit.listVisits"
+)
+
+@Java110ParamsDoc(params = {
+ @Java110ParamDoc(name = "page",type = "int",length = 11, remark = "鍒嗛〉淇℃伅"),
+ @Java110ParamDoc(name = "row", type = "int",length = 11, remark = "琛屾暟"),
+ @Java110ParamDoc(name = "communityId", length = 30, remark = "灏忓尯ID"),
+})
+
+@Java110ResponseDoc(
+ params = {
+ @Java110ParamDoc(name = "code", type = "int", length = 11, defaultValue = "0", remark = "杩斿洖缂栧彿锛�0 鎴愬姛 鍏朵粬澶辫触"),
+ @Java110ParamDoc(name = "msg", type = "String", length = 250, defaultValue = "鎴愬姛", remark = "鎻忚堪"),
+ @Java110ParamDoc(name = "visits", type = "Array", remark = "鏈夋晥鏁版嵁"),
+ @Java110ParamDoc(parentNodeName = "visits",name = "vId", type = "String", remark = "璁垮ID"),
+ @Java110ParamDoc(parentNodeName = "visits",name = "vName", type = "String", remark = "璁垮鍚嶇О"),
+ @Java110ParamDoc(parentNodeName = "visits",name = "visitGender", type = "String", remark = "璁垮鎬у埆"),
+ @Java110ParamDoc(parentNodeName = "visits",name = "phoneNumber", type = "String", remark = "鎵嬫満鍙�"),
+ @Java110ParamDoc(parentNodeName = "visits",name = "visitTime", type = "String", remark = "璁块棶鏃堕棿"),
+ }
+)
+
+@Java110ExampleDoc(
+ reqBody="ttp://localhost:3000/app/visit.listVisits?page=1&row=10&communityId=2022121921870161",
+ resBody="{\"page\":0,\"records\":0,\"rows\":0,\"total\":0,\"visits\":[]}"
+)
@Java110Cmd(serviceCode = "visit.listVisits")
public class ListVisitsCmd extends Cmd {
@Autowired
private IVisitInnerServiceSMO visitInnerServiceSMOImpl;
-
//閿�
public static final String CAR_FREE_TIME = "CAR_FREE_TIME";
@@ -35,10 +70,12 @@
//閿�
public static final String VISIT_NUMBER = "VISIT_NUMBER";
-
@Override
public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
super.validatePageInfo(reqJson);
+
+ Assert.hasKeyAndValue(reqJson,"communityId","鏈寘鍚皬鍖�");
+
}
@Override
@@ -48,23 +85,30 @@
&& "initAddVisitParameter".equals(reqJson.getString("addVisitType"))) {
//棰勭害杞﹀厤璐规椂闀�
String freeTime = CommunitySettingFactory.getValue(reqJson.getString("communityId"), CAR_FREE_TIME);
- //棰勭害杞﹀厤璐规鏁�
- int number = Integer.parseInt(CommunitySettingFactory.getValue(reqJson.getString("communityId"), VISIT_NUMBER));
+ String numStr = CommunitySettingFactory.getValue(reqJson.getString("communityId"), VISIT_NUMBER);
+ int number = 999;
+ if(StringUtil.isInteger(numStr)){
+ number = Integer.parseInt(numStr);
+ }
Map initAddVisitParameter = new HashMap();
initAddVisitParameter.put("freeTime", freeTime);
initAddVisitParameter.put("freeTimes", number);
+ //涓氫富绔幏鍙栬瀹㈢櫥璁扮浉鍏抽厤缃弬鏁�
responseEntity = new ResponseEntity<String>(JSONObject.toJSONString(initAddVisitParameter), HttpStatus.OK);
} else {
VisitDto visitDto = BeanConvertUtil.covertBean(reqJson, VisitDto.class);
+ if (reqJson.containsKey("channel") && !StringUtil.isEmpty(reqJson.getString("channel"))
+ && "PC".equals(reqJson.getString("channel"))) {
+ visitDto.setUserId("");
+ }
int count = visitInnerServiceSMOImpl.queryVisitsCount(visitDto);
-
List<ApiVisitDataVo> visits = new ArrayList<>();
if (count > 0) {
List<VisitDto> visitDtos = visitInnerServiceSMOImpl.queryVisits(visitDto);
for (VisitDto visit : visitDtos) {
ApiVisitDataVo apiVisitDataVo = BeanConvertUtil.covertBean(visit, ApiVisitDataVo.class);
if (!StringUtil.isEmpty(visit.getFileSaveName())) {
- apiVisitDataVo.setUrl("/callComponent/download/getFile/file?fileId=" + visit.getFileSaveName() + "&communityId=-1");
+ apiVisitDataVo.setUrl(visit.getFileSaveName());
}
visits.add(apiVisitDataVo);
}
--
Gitblit v1.8.0