From 0b04f664887c73e90bf684a4e69c0fdbfe26349d Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 29 三月 2023 13:35:20 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-community/src/main/java/com/java110/community/smo/impl/VisitInnerServiceSMOImpl.java | 27 +++++++++++++++++++--------
1 files changed, 19 insertions(+), 8 deletions(-)
diff --git a/service-community/src/main/java/com/java110/community/smo/impl/VisitInnerServiceSMOImpl.java b/service-community/src/main/java/com/java110/community/smo/impl/VisitInnerServiceSMOImpl.java
old mode 100644
new mode 100755
index 8c1bdd7..db430c5
--- a/service-community/src/main/java/com/java110/community/smo/impl/VisitInnerServiceSMOImpl.java
+++ b/service-community/src/main/java/com/java110/community/smo/impl/VisitInnerServiceSMOImpl.java
@@ -1,15 +1,15 @@
package com.java110.community.smo.impl;
-
+import com.java110.po.owner.VisitPo;
import com.java110.utils.util.BeanConvertUtil;
import com.java110.community.dao.IVisitServiceDao;
import com.java110.core.base.smo.BaseServiceSMO;
-
-import com.java110.core.smo.user.IUserInnerServiceSMO;
-import com.java110.core.smo.community.IVisitInnerServiceSMO;
+import com.java110.intf.user.IUserInnerServiceSMO;
+import com.java110.intf.community.IVisitInnerServiceSMO;
import com.java110.dto.PageDto;
import com.java110.dto.user.UserDto;
import com.java110.dto.visit.VisitDto;
+import com.java110.utils.util.StringUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
@@ -35,7 +35,7 @@
private IUserInnerServiceSMO userInnerServiceSMOImpl;
@Override
- public List<VisitDto> queryVisits(@RequestBody VisitDto visitDto) {
+ public List<VisitDto> queryVisits(@RequestBody VisitDto visitDto) {
//鏍￠獙鏄惁浼犱簡 鍒嗛〉淇℃伅
@@ -69,7 +69,7 @@
*/
private void refreshVisit(VisitDto visit, List<UserDto> users) {
for (UserDto user : users) {
- if (visit.getUserId().equals(user.getUserId())) {
+ if (!StringUtil.isEmpty(visit.getCreateUserId()) && visit.getCreateUserId().equals(user.getUserId())) {
BeanConvertUtil.covertBean(user, visit);
}
}
@@ -84,7 +84,7 @@
private String[] getUserIds(List<VisitDto> visits) {
List<String> userIds = new ArrayList<String>();
for (VisitDto visit : visits) {
- userIds.add(visit.getUserId());
+ userIds.add(visit.getCreateUserId());
}
return userIds.toArray(new String[userIds.size()]);
@@ -92,7 +92,18 @@
@Override
public int queryVisitsCount(@RequestBody VisitDto visitDto) {
- return visitServiceDaoImpl.queryVisitsCount(BeanConvertUtil.beanCovertMap(visitDto)); }
+ return visitServiceDaoImpl.queryVisitsCount(BeanConvertUtil.beanCovertMap(visitDto));
+ }
+
+ @Override
+ public void saveVisit(@RequestBody VisitPo visitPo) {
+ visitServiceDaoImpl.saveBusinessVisitInfo(BeanConvertUtil.beanCovertMap(visitPo));
+ }
+
+ @Override
+ public void updateVisit(@RequestBody VisitPo visitPo) {
+ visitServiceDaoImpl.updateVisitInfoInstance(BeanConvertUtil.beanCovertMap(visitPo));
+ }
public IVisitServiceDao getVisitServiceDaoImpl() {
return visitServiceDaoImpl;
--
Gitblit v1.8.0