From a20310f135ebf1c8ccff2b619f3eff3d704436a0 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期四, 08 十二月 2022 13:12:03 +0800
Subject: [PATCH] Merge branch 'xinghong-dev' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-community/src/main/java/com/java110/community/cmd/visit/ListVisitsCmd.java | 17 +++++++++++------
1 files changed, 11 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..dfabc31 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
@@ -28,13 +28,11 @@
@Autowired
private IVisitInnerServiceSMO visitInnerServiceSMOImpl;
-
//閿�
public static final String CAR_FREE_TIME = "CAR_FREE_TIME";
//閿�
public static final String VISIT_NUMBER = "VISIT_NUMBER";
-
@Override
public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
@@ -48,23 +46,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