@@ -108,7 +108,7 @@
elink@833066
0
- 122.152.200.70
+ 10.10.10.79
6379
123456
diff --git a/epmet-module/oper-crm/oper-crm-server/pom.xml b/epmet-module/oper-crm/oper-crm-server/pom.xml
index 39feec80f4..a7d55f5520 100644
--- a/epmet-module/oper-crm/oper-crm-server/pom.xml
+++ b/epmet-module/oper-crm/oper-crm-server/pom.xml
@@ -107,7 +107,7 @@
elink@833066
0
- 122.152.200.70
+ 10.10.10.79
6379
123456
diff --git a/epmet-module/oper-customize/oper-customize-server/pom.xml b/epmet-module/oper-customize/oper-customize-server/pom.xml
index 96ef6bb929..acd7a063cb 100644
--- a/epmet-module/oper-customize/oper-customize-server/pom.xml
+++ b/epmet-module/oper-customize/oper-customize-server/pom.xml
@@ -101,7 +101,7 @@
elink@833066
0
- 122.152.200.70
+ 10.10.10.79
6379
123456
diff --git a/epmet-module/pom.xml b/epmet-module/pom.xml
index a35e85adb9..4ace2972f1 100644
--- a/epmet-module/pom.xml
+++ b/epmet-module/pom.xml
@@ -24,6 +24,7 @@
resi-guide
gov-org
oper-access
+ resi-mine
diff --git a/epmet-module/resi-guide/resi-guide-server/pom.xml b/epmet-module/resi-guide/resi-guide-server/pom.xml
index f5959bc1c1..4cf1999e78 100644
--- a/epmet-module/resi-guide/resi-guide-server/pom.xml
+++ b/epmet-module/resi-guide/resi-guide-server/pom.xml
@@ -119,7 +119,7 @@
elink@833066
0
- 122.152.200.70
+ 10.10.10.79
6379
123456
diff --git a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/constant/StrangerResiGuideConstant.java b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/constant/StrangerResiGuideConstant.java
new file mode 100644
index 0000000000..6d84665655
--- /dev/null
+++ b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/constant/StrangerResiGuideConstant.java
@@ -0,0 +1,25 @@
+/**
+ * Copyright (c) 2018 人人开源 All rights reserved.
+ *
+ * https://www.renren.io
+ *
+ * 版权所有，侵权必究！
+ */
+
+package com.epmet.constant;
+
+/**
+ * 常量
+ * @author sun
+ * @since 1.0.0
+ */
+public interface StrangerResiGuideConstant {
+ /**
+ * 参数异常
+ */
+ String PARAMETER_EXCEPTION = "参数异常，app端不是指定的居民端，请检查token信息！";
+ /**
+ * 服务调用异常
+ */
+ String EPMET_USER_EXCEPTION = "调用epmet-user服务保存网格记录表数据失败！";
+}
diff --git a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/controller/StrangerResiGuideController.java b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/controller/StrangerResiGuideController.java
index 5f97343835..7c3b78194f 100644
--- a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/controller/StrangerResiGuideController.java
+++ b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/controller/StrangerResiGuideController.java
@@ -54,8 +54,8 @@ public class StrangerResiGuideController {
* @Date 2020/3/16
**/
@PostMapping("getgridhome")
- public Result getValidCustomerList( @LoginUser TokenDto tokenDTO, @RequestBody StrangerFormDTO formDTO) throws Exception {
- return strangerAccessRecordService.getgridhome(tokenDTO, formDTO);
+ public Result getGridHome( @LoginUser TokenDto tokenDTO, @RequestBody StrangerFormDTO strangerFormDTO) throws Exception {
+ return strangerAccessRecordService.getGridHome(tokenDTO, strangerFormDTO);
}
diff --git a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java
index 0268ea99ec..31582eecd3 100644
--- a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java
+++ b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java
@@ -19,8 +19,8 @@ public interface EpmetUserFeignClient {
* @param
* @Description
**/
- @PostMapping("/epmetuser/gridvisited/savelatestandvisited")
- Result saveLatestAndVisited(VisitedFormDTO formDTO);
+ @PostMapping("/epmetuser/gridvisited/savevisitedrecord")
+ Result saveVisitedRecord(VisitedFormDTO formDTO);
diff --git a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java
index c6721d4c14..41f1a26efe 100644
--- a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java
+++ b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java
@@ -20,7 +20,7 @@ import java.util.List;
* @Author wangc
* @date 2020.03.17 14:29
*/
-@FeignClient(name = ServiceConstant.GOV_ORG_SERVER, fallback = GovOrgFeignFallBack.class)
+@FeignClient(name = ServiceConstant.GOV_ORG_SERVER, fallback = GovOrgFeignFallBack.class )
public interface GovOrgFeignClient {
/**
@@ -29,8 +29,8 @@ public interface GovOrgFeignClient {
* @Param pageNo 当前页
* @Param pageSize 每页数据量
* */
- @PostMapping("/gov/org/customergrid/queryListForStrangerByOrder")
- Result> getPageForStrangerGuideInterface(@RequestBody ListCustomerGridFormDTO listCustomerGridFormDTO);
+ @PostMapping("/gov/org/customergrid/querygridlistbyareacode")
+ Result> queryGridListByAreaCode(@RequestBody ListCustomerGridFormDTO listCustomerGridFormDTO);
diff --git a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/feign/fallback/EpmetUserFeignClientFallBack.java b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/feign/fallback/EpmetUserFeignClientFallBack.java
index 60688ad717..06b6ed803a 100644
--- a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/feign/fallback/EpmetUserFeignClientFallBack.java
+++ b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/feign/fallback/EpmetUserFeignClientFallBack.java
@@ -16,8 +16,8 @@ import org.springframework.stereotype.Component;
public class EpmetUserFeignClientFallBack implements EpmetUserFeignClient {
@Override
- public Result saveLatestAndVisited(VisitedFormDTO formDTO) {
- return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "saveLatestAndVisited",formDTO);
+ public Result saveVisitedRecord(VisitedFormDTO formDTO) {
+ return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "savevisitedrecord",formDTO);
}
diff --git a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignFallBack.java b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignFallBack.java
index 0554f8be50..f616ede85c 100644
--- a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignFallBack.java
+++ b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignFallBack.java
@@ -26,7 +26,7 @@ public class GovOrgFeignFallBack implements GovOrgFeignClient {
* @return Result>
* */
@Override
- public Result> getPageForStrangerGuideInterface(ListCustomerGridFormDTO listCustomerGridFormDTO) {
- return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "queryListForStrangerByOrder",listCustomerGridFormDTO);
+ public Result> queryGridListByAreaCode(ListCustomerGridFormDTO listCustomerGridFormDTO) {
+ return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "queryGridListByAreaCode",listCustomerGridFormDTO);
}
}
diff --git a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/StrangerAccessRecordService.java b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/StrangerAccessRecordService.java
index 88c1d1d37d..b2d42505b3 100644
--- a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/StrangerAccessRecordService.java
+++ b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/StrangerAccessRecordService.java
@@ -25,6 +25,7 @@ public interface StrangerAccessRecordService extends BaseService
* @author yangshaoping
@@ -41,6 +42,7 @@ public interface StrangerAccessRecordService extends BaseService page(Map params);
+
/**
* 默认查询
*
@@ -92,9 +94,9 @@ public interface StrangerAccessRecordService extends BaseService>
* @Description 陌生人根据地区编码查询附近网格数据接口定义
* @Param CustomerGridListFormDTO
- * @return Result>
* @Author wangc
* @Date 2020.03.19 14:28
**/
@@ -102,9 +104,10 @@ public interface StrangerAccessRecordService extends BaseService getgridhome(TokenDto tokenDTO, StrangerFormDTO formDTO) throws Exception;
+ Result getGridHome(TokenDto tokenDTO, StrangerFormDTO formDTO);
}
diff --git a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/impl/StrangerAccessRecordServiceImpl.java b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/impl/StrangerAccessRecordServiceImpl.java
index 06975cc16d..148394dad2 100644
--- a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/impl/StrangerAccessRecordServiceImpl.java
+++ b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/impl/StrangerAccessRecordServiceImpl.java
@@ -1,13 +1,17 @@
package com.epmet.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
import com.epmet.commons.tools.constant.AppClientConstant;
import com.epmet.commons.tools.constant.FieldConstant;
import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.page.PageData;
import com.epmet.commons.tools.security.dto.TokenDto;
import com.epmet.commons.tools.utils.ConvertUtils;
import com.epmet.commons.tools.utils.Result;
+import com.epmet.constant.StrangerResiGuideConstant;
import com.epmet.dao.StrangerAccessRecordDao;
import com.epmet.dto.StrangerAccessRecordDTO;
import com.epmet.dto.form.*;
@@ -18,17 +22,16 @@ import com.epmet.feign.EpmetUserFeignClient;
import com.epmet.feign.GovOrgFeignClient;
import com.epmet.feign.OperCustomizeFeignClient;
import com.epmet.service.StrangerAccessRecordService;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import com.epmet.utils.ModuleConstant;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import java.util.*;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.epmet.commons.tools.page.PageData;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.transaction.annotation.Transactional;
-
/**
* @Description 陌生人记录访问表
* @ClassName ResiGuideServiceImpl
@@ -37,6 +40,8 @@ import org.springframework.transaction.annotation.Transactional;
*/
@Service
public class StrangerAccessRecordServiceImpl extends BaseServiceImpl implements StrangerAccessRecordService {
+
+ private static final Logger log = LoggerFactory.getLogger(StrangerAccessRecordServiceImpl.class);
@Autowired
private StrangerAccessRecordDao strangerAccessRecordDao;
@Autowired
@@ -45,8 +50,10 @@ public class StrangerAccessRecordServiceImpl extends BaseServiceImpl
* @author yangshaoping
@@ -55,13 +62,15 @@ public class StrangerAccessRecordServiceImpl extends BaseServiceImpl getStrangerAccessRecordPage(Map params) {
+ //当前陌生人访客记录查询只能查询最近三天，无法查询三天以外的数据，需要完善功能
IPage page = baseDao.selectPage(
- getPage(params, "VISIT_TIME",false),
+ getPage(params, "VISIT_TIME", false),
getWrapper(params)
);
- return getPageData(page,StrangerAccessRecordDTO.class);
+ return getPageData(page, StrangerAccessRecordDTO.class);
}
+
@Override
public PageData page(Map params) {
IPage page = baseDao.selectPage(
@@ -86,15 +95,15 @@ public class StrangerAccessRecordServiceImpl extends BaseServiceImpl getWrapper(Map params){
- String id = (String)params.get(FieldConstant.ID_HUMP);
+ private QueryWrapper getWrapper(Map params) {
+ String id = (String) params.get(FieldConstant.ID_HUMP);
QueryWrapper wrapper = new QueryWrapper<>();
wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
Calendar before3daysDate = Calendar.getInstance();
before3daysDate.setTime(new Date());
- before3daysDate.add(Calendar.DATE,-3);
- wrapper.between("VISIT_TIME", before3daysDate.getTime(),new Date());
+ before3daysDate.add(Calendar.DATE, -3);
+ wrapper.between("VISIT_TIME", before3daysDate.getTime(), new Date());
return wrapper;
}
@@ -139,32 +148,30 @@ public class StrangerAccessRecordServiceImpl extends BaseServiceImpl> queryResult =
govOrgFeignClient
- .getPageForStrangerGuideInterface(listCustomerGridFormDTO);
+ .queryGridListByAreaCode(listCustomerGridFormDTO);
//Feign调用成功
- if(queryResult.success()) {
+ if (queryResult.success()) {
List queryList = queryResult.getData();
if (null != queryResult && queryList.size() > 0) {
StrangerAccessRecordEntity strangerTrance = new StrangerAccessRecordEntity();
//未授权，手动选择
- if (0 == customerGridListFormDTO.getIsAuthorized()) {
+ if (ModuleConstant.NOT_POSITION_AUTHORIZED == customerGridListFormDTO.getIsAuthorized()) {
strangerTrance.setSelectedAreaCode(customerGridListFormDTO.getSelectedAreaCode());
- strangerTrance.setLocationAreaCode("");
- } else if (1 == customerGridListFormDTO.getIsAuthorized()) {
+ } else if (ModuleConstant.POSITION_AUTHORIZED == customerGridListFormDTO.getIsAuthorized()) {
//已授权，自动选择
strangerTrance.setLocationAreaCode(customerGridListFormDTO.getAreaCode());
- strangerTrance.setSelectedAreaCode("");
}
strangerTrance.setIsAuthorized(customerGridListFormDTO.getIsAuthorized());
strangerTrance.setGridNumber(queryList.size());
@@ -179,9 +186,9 @@ public class StrangerAccessRecordServiceImpl extends BaseServiceImpl>().ok(new ArrayList<>());
}
- }else{
+ } else {
//Feign调用失败
- return new Result>().error(queryResult.getCode(),queryResult.getMsg());
+ return new Result>().error(queryResult.getCode(), queryResult.getMsg());
}
@@ -189,42 +196,44 @@ public class StrangerAccessRecordServiceImpl extends BaseServiceImpl getgridhome(TokenDto tokenDTO, StrangerFormDTO formDTO) throws Exception {
+ public Result getGridHome(TokenDto tokenDTO, StrangerFormDTO strangerFormDTO) {
+ //1.先判断参数
+ //居民端 所以参数必须是居民端的参数 否则就是参数错误s
+ if (!AppClientConstant.APP_RESI.equals(tokenDTO.getApp())) {
+ return new Result().error(StrangerResiGuideConstant.PARAMETER_EXCEPTION);
+ }
//token里边有所属端 userId这些参数 前台传递customerID和gridId
- //1:调用epmet-user服务查询数据 新建网格记录数据
- VisitedFormDTO vi = new VisitedFormDTO();
- vi.setGridId(formDTO.getGridId());
- vi.setCustomerId(formDTO.getCustomerId());
- vi.setUserId(tokenDTO.getUserId());//token中获取userId
- epmetUserFeignClient.saveLatestAndVisited(vi);
-
- //2:调用ope-customize服务 获取首页发布数据
- Result res = getCustomerHomeData(formDTO.getCustomerId(),tokenDTO.getApp());
- return res;
-
+ //2:调用epmet-user服务查询数据 新建网格记录数据
+ VisitedFormDTO visitedFormDTO = new VisitedFormDTO();
+ visitedFormDTO.setGridId(strangerFormDTO.getGridId());
+ visitedFormDTO.setCustomerId(strangerFormDTO.getCustomerId());
+ visitedFormDTO.setUserId(tokenDTO.getUserId());//token中获取userId
+ Result re = epmetUserFeignClient.saveVisitedRecord(visitedFormDTO);
+ if (!re.success()) {
+ log.warn(StrangerResiGuideConstant.EPMET_USER_EXCEPTION);
+ }
+ //3:调用ope-customize服务 获取首页发布数据
+ Result result = getCustomerHomeData(strangerFormDTO.getCustomerId());
+ return result;
}
/**
* 调用oper-customize服务 获取首页发布数据
- * @param customerId 客户Id
- * @param clientType 所属端
+ *
+ * @param customerId 客户Id
* @return
* @author sun
*/
- public Result getCustomerHomeData(String customerId,String clientType) throws Exception {
- CustomerHomeFormDTO dto = new CustomerHomeFormDTO();
- dto.setCustomerId(customerId);
- //居民端 所以参数必须是居民端的参数 否则就是参数错误s
- if (AppClientConstant.APP_RESI.equals(clientType)){//居民端
- dto.setClientType(NumConstant.ZERO_STR);
- }else {
- throw new Exception("参数异常，app端不是指定的居民端，请检查token信息！");
- }
- return operCustomizeFeignClient.getHomeReleaseByCustomer(dto);
+ public Result getCustomerHomeData(String customerId) {
+ CustomerHomeFormDTO customerHomeFormDTO = new CustomerHomeFormDTO();
+ customerHomeFormDTO.setCustomerId(customerId);
+ customerHomeFormDTO.setClientType(NumConstant.ZERO_STR);
+ return operCustomizeFeignClient.getHomeReleaseByCustomer(customerHomeFormDTO);
}
diff --git a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/utils/ModuleConstant.java b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/utils/ModuleConstant.java
index d9f96aa25d..3c83277662 100644
--- a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/utils/ModuleConstant.java
+++ b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/utils/ModuleConstant.java
@@ -18,4 +18,12 @@ import com.epmet.commons.tools.constant.Constant;
*/
public interface ModuleConstant extends Constant {
+ //位置未授权
+ int NOT_POSITION_AUTHORIZED = 0;
+
+ //位置授权
+ int POSITION_AUTHORIZED = 1;
+
+ //当前页最小值
+ int MIN_CURRENT_PAGE_NO = 1;
}
diff --git a/epmet-module/resi-mine/pom.xml b/epmet-module/resi-mine/pom.xml
new file mode 100644
index 0000000000..ad431995d0
--- /dev/null
+++ b/epmet-module/resi-mine/pom.xml
@@ -0,0 +1,21 @@
+
+
+ 4.0.0
+
+
+ com.epmet
+ epmet-module
+ 2.0.0
+
+
+ com.epmet
+ resi-mine
+ pom
+
+
+ resi-mine-client
+ resi-mine-server
+
+
+
diff --git a/epmet-module/resi-mine/resi-mine-client/pom.xml b/epmet-module/resi-mine/resi-mine-client/pom.xml
new file mode 100644
index 0000000000..3841644651
--- /dev/null
+++ b/epmet-module/resi-mine/resi-mine-client/pom.xml
@@ -0,0 +1,35 @@
+
+
+ 4.0.0
+
+
+ com.epmet
+ resi-mine
+ 2.0.0
+
+
+ resi-mine-client
+ jar
+
+
+
+ com.epmet
+ epmet-commons-tools
+ 2.0.0
+
+
+ io.springfox
+ springfox-swagger2
+
+
+ io.springfox
+ springfox-swagger-ui
+
+
+
+
+ ${project.artifactId}
+
+
+
diff --git a/epmet-module/resi-mine/resi-mine-client/src/main/java/com/epmet/resi/mine/dto/form/.gitkeep b/epmet-module/resi-mine/resi-mine-client/src/main/java/com/epmet/resi/mine/dto/form/.gitkeep
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/epmet-module/resi-mine/resi-mine-client/src/main/java/com/epmet/resi/mine/dto/result/.gitkeep b/epmet-module/resi-mine/resi-mine-client/src/main/java/com/epmet/resi/mine/dto/result/.gitkeep
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/epmet-module/resi-mine/resi-mine-server/pom.xml b/epmet-module/resi-mine/resi-mine-server/pom.xml
new file mode 100644
index 0000000000..6e973e581e
--- /dev/null
+++ b/epmet-module/resi-mine/resi-mine-server/pom.xml
@@ -0,0 +1,154 @@
+
+
+ 4.0.0
+
+
+ com.epmet
+ resi-mine
+ 2.0.0
+
+ resi-mine-server
+ jar
+
+
+
+ com.epmet
+ resi-mine-client
+ 2.0.0
+
+
+ com.epmet
+ epmet-commons-tools
+ 2.0.0
+
+
+ com.epmet
+ epmet-commons-mybatis
+ 2.0.0
+
+
+ org.springframework.boot
+ spring-boot-starter-web
+
+
+ org.springframework
+ spring-context-support
+
+
+ org.springframework.boot
+ spring-boot-starter-actuator
+
+
+ de.codecentric
+ spring-boot-admin-starter-client
+ ${spring.boot.admin.version}
+
+
+ com.alibaba.cloud
+ spring-cloud-starter-alibaba-nacos-discovery
+
+
+ com.alibaba.cloud
+ spring-cloud-starter-alibaba-nacos-config
+
+
+
+ io.github.openfeign
+ feign-httpclient
+ 10.3.0
+
+
+ com.epmet
+ epmet-user-client
+ 2.0.0
+ compile
+
+
+
+
+ ${project.artifactId}
+
+
+ org.springframework.boot
+ spring-boot-maven-plugin
+
+
+ org.apache.maven.plugins
+ maven-surefire-plugin
+
+ true
+
+
+
+ ${project.basedir}/src/main/java
+
+
+ true
+ ${basedir}/src/main/resources
+
+
+
+
+
+ dev
+
+ true
+
+
+ 8094
+ dev
+
+
+
+
+
+ epmet
+ elink@833066
+
+ 0
+ 122.152.200.70
+ 6379
+ 123456
+
+ false
+ 122.152.200.70:8848
+ fcd6fc8f-ca3a-4b01-8026-2b05cdc5976b
+
+
+ false
+
+
+
+
+ test
+
+
+ 8094
+ test
+
+
+
+
+
+ epmet
+ elink@833066
+
+ 0
+ 122.152.200.70
+ 6379
+ 123456
+
+ true
+ 122.152.200.70:8848
+ fcd6fc8f-ca3a-4b01-8026-2b05cdc5976b
+
+
+ false
+
+
+
+
+
diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/ResiMineApplication.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/ResiMineApplication.java
new file mode 100644
index 0000000000..a8e461d66a
--- /dev/null
+++ b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/ResiMineApplication.java
@@ -0,0 +1,31 @@
+/**
+ * Copyright (c) 2018 人人开源 All rights reserved.
+ *
+ * https://www.renren.io
+ *
+ * 版权所有，侵权必究！
+ */
+
+package com.epmet;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
+import org.springframework.cloud.openfeign.EnableFeignClients;
+
+/**
+ * 模块
+ *
+ * @author Mark sunlightcs@gmail.com
+ * @since 1.0.0
+ */
+@SpringBootApplication
+@EnableDiscoveryClient
+@EnableFeignClients
+public class ResiMineApplication {
+
+ public static void main(String[] args) {
+ SpringApplication.run(ResiMineApplication.class, args);
+ }
+
+}
diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/config/ModuleConfigImpl.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/config/ModuleConfigImpl.java
new file mode 100644
index 0000000000..91a66e87be
--- /dev/null
+++ b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/config/ModuleConfigImpl.java
@@ -0,0 +1,26 @@
+/**
+ * Copyright (c) 2018 人人开源 All rights reserved.
+ *
+ * https://www.renren.io
+ *
+ * 版权所有，侵权必究！
+ */
+
+package com.epmet.config;
+
+import com.epmet.commons.tools.config.ModuleConfig;
+import org.springframework.stereotype.Service;
+
+/**
+ * 模块配置信息
+ *
+ * @author Mark sunlightcs@gmail.com
+ * @since 1.0.0
+ */
+@Service
+public class ModuleConfigImpl implements ModuleConfig {
+ @Override
+ public String getName() {
+ return "resimine";
+ }
+}
diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/config/SwaggerConfig.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/config/SwaggerConfig.java
new file mode 100644
index 0000000000..262f1bc07b
--- /dev/null
+++ b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/config/SwaggerConfig.java
@@ -0,0 +1,68 @@
+/**
+ * Copyright (c) 2018 人人开源 All rights reserved.
+ *
+ * https://www.renren.io
+ *
+ * 版权所有，侵权必究！
+ */
+
+package com.epmet.config;
+
+import com.epmet.commons.tools.constant.Constant;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+import springfox.documentation.builders.ApiInfoBuilder;
+import springfox.documentation.builders.PathSelectors;
+import springfox.documentation.builders.RequestHandlerSelectors;
+import springfox.documentation.service.ApiInfo;
+import springfox.documentation.service.ApiKey;
+import springfox.documentation.spi.DocumentationType;
+import springfox.documentation.spring.web.plugins.Docket;
+import springfox.documentation.swagger2.annotations.EnableSwagger2;
+
+import java.util.List;
+
+import static com.google.common.collect.Lists.newArrayList;
+
+/**
+ * Swagger配置
+ *
+ * @author Mark sunlightcs@gmail.com
+ * @since 1.0.0
+ */
+@Configuration
+@EnableSwagger2
+public class SwaggerConfig implements WebMvcConfigurer {
+
+ @Bean
+ public Docket createRestApi() {
+ return new Docket(DocumentationType.SWAGGER_2)
+ .apiInfo(apiInfo())
+ .select()
+ //加了ApiOperation注解的类，才生成接口文档
+ .apis(RequestHandlerSelectors.withMethodAnnotation(ApiOperation.class))
+ .paths(PathSelectors.any())
+ .build()
+ .directModelSubstitute(java.util.Date.class, String.class)
+ .securitySchemes(security());
+
+ }
+
+ private ApiInfo apiInfo() {
+ return new ApiInfoBuilder()
+ .title("人人开源")
+ .description("模块接口文档")
+ .termsOfServiceUrl("https://www.renren.io")
+ .version("1.1.0")
+ .build();
+ }
+
+ private List security() {
+ return newArrayList(
+ new ApiKey(Constant.TOKEN_HEADER, Constant.TOKEN_HEADER, "header")
+ );
+ }
+
+}
diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/controller/ResiMineGridController.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/controller/ResiMineGridController.java
new file mode 100644
index 0000000000..7348057d21
--- /dev/null
+++ b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/controller/ResiMineGridController.java
@@ -0,0 +1,35 @@
+package com.epmet.controller;
+
+import com.epmet.commons.tools.annotation.LoginUser;
+import com.epmet.commons.tools.security.dto.TokenDto;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.result.LatestGridInfoResultDTO;
+import com.epmet.service.ResiMineGridService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @Description 居民端用户网格信息相关接口入口
+ * @Author yinzuomei
+ * @Date 2020/3/24 11:02
+ */
+@RestController
+@RequestMapping("minegrid")
+public class ResiMineGridController {
+ @Autowired
+ private ResiMineGridService resiMineGridService;
+
+ /**
+ * @return com.epmet.resi.mine.dto.result.LatestGridInfoResultDTO
+ * @param tokenDto
+ * @Author yinzuomei
+ * @Description 获取用户最近访问网格
+ * @Date 2020/3/24 11:10
+ **/
+ @GetMapping("getlatestgridinfo")
+ public Result getLatestGridInfo(@LoginUser TokenDto tokenDto){
+ return resiMineGridService.getLatestGridInfo(tokenDto);
+ }
+}
diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/dao/.gitkeep b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/dao/.gitkeep
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/entity/.gitkeep b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/entity/.gitkeep
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/excel/.gitkeep b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/excel/.gitkeep
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/exception/ModuleErrorCode.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/exception/ModuleErrorCode.java
new file mode 100644
index 0000000000..1206c71b9a
--- /dev/null
+++ b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/exception/ModuleErrorCode.java
@@ -0,0 +1,25 @@
+/**
+ * Copyright (c) 2018 人人开源 All rights reserved.
+ *
+ * https://www.renren.io
+ *
+ * 版权所有，侵权必究！
+ */
+
+package com.epmet.exception;
+
+
+import com.epmet.commons.tools.exception.ErrorCode;
+
+/**
+ * 模块错误编码，由9位数字组成，前6位为模块编码，后3位为业务编码
+ *
+ * 如：100001001（100001代表模块，001代表业务代码）
+ *
+ *
+ * @author Mark sunlightcs@gmail.com
+ * @since 1.0.0
+ */
+public interface ModuleErrorCode extends ErrorCode {
+
+}
diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java
new file mode 100644
index 0000000000..0143c55acd
--- /dev/null
+++ b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java
@@ -0,0 +1,27 @@
+package com.epmet.feign;
+
+import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.result.LatestGridInfoResultDTO;
+import com.epmet.feign.fallback.EpmetUserFeignClientFallBack;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+
+/**
+ * @Description 居民端陌生人导览 调用epmet-user服务
+ * @Author sun
+ */
+@FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallback = EpmetUserFeignClientFallBack.class)
+public interface EpmetUserFeignClient {
+
+ /**
+ * @param userId
+ * @return com.epmet.resi.mine.dto.result.LatestGridInfoResultDTO
+ * @Author yinzuomei
+ * @Description 根据居民id查询最后一次访问的网格信息
+ * @Date 2020/3/24 13:05
+ **/
+ @GetMapping(value = "epmetuser/gridlatest/getLatestGridInfoByUserId/{userId}")
+ Result getLatestGridInfoByUserId(@PathVariable("userId") String userId);
+}
diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/feign/fallback/EpmetUserFeignClientFallBack.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/feign/fallback/EpmetUserFeignClientFallBack.java
new file mode 100644
index 0000000000..6e912e7417
--- /dev/null
+++ b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/feign/fallback/EpmetUserFeignClientFallBack.java
@@ -0,0 +1,29 @@
+package com.epmet.feign.fallback;
+
+import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.commons.tools.utils.ModuleUtils;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.result.LatestGridInfoResultDTO;
+import com.epmet.feign.EpmetUserFeignClient;
+import org.springframework.stereotype.Component;
+
+/**
+ * @Description 居民端-陌生人导览 调用epmet-user服务
+ * @Author sun
+ * @Date 2020/3/16
+ */
+@Component
+public class EpmetUserFeignClientFallBack implements EpmetUserFeignClient {
+
+ /**
+ * @param userId
+ * @return com.epmet.resi.mine.dto.result.LatestGridInfoResultDTO
+ * @Author yinzuomei
+ * @Description 根据居民id查询最后一次访问的网格信息
+ * @Date 2020/3/24 13:05
+ **/
+ @Override
+ public Result getLatestGridInfoByUserId(String userId) {
+ return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getLatestGridInfoByUserId", userId);
+ }
+}
diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/service/ResiMineGridService.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/service/ResiMineGridService.java
new file mode 100644
index 0000000000..33c5f4d73d
--- /dev/null
+++ b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/service/ResiMineGridService.java
@@ -0,0 +1,21 @@
+package com.epmet.service;
+
+import com.epmet.commons.tools.security.dto.TokenDto;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.result.LatestGridInfoResultDTO;
+
+/**
+ * @Description 居民端用户网格信息service
+ * @Author yinzuomei
+ * @Date 2020/3/24 11:04
+ */
+public interface ResiMineGridService {
+ /**
+ * 获取用户最近访问网格
+ *
+ * @Author yinzuomei
+ * @param tokenDto
+ * @return com.epmet.commons.tools.utils.Result
+ */
+ Result getLatestGridInfo(TokenDto tokenDto);
+}
diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/service/impl/ResiMineGridServiceImpl.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/service/impl/ResiMineGridServiceImpl.java
new file mode 100644
index 0000000000..891d41bf51
--- /dev/null
+++ b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/service/impl/ResiMineGridServiceImpl.java
@@ -0,0 +1,42 @@
+package com.epmet.service.impl;
+
+import com.epmet.commons.tools.constant.AppClientConstant;
+import com.epmet.commons.tools.security.dto.TokenDto;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.result.LatestGridInfoResultDTO;
+import com.epmet.feign.EpmetUserFeignClient;
+import com.epmet.service.ResiMineGridService;
+import com.epmet.utils.ModuleConstant;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * @Description 居民端用户网格信息service
+ * @Author yinzuomei
+ * @Date 2020/3/24 11:04
+ */
+@Service
+public class ResiMineGridServiceImpl implements ResiMineGridService {
+
+ @Autowired
+ private EpmetUserFeignClient epmetUserFeignClient;
+
+ /**
+ * @param tokenDto
+ * @return com.epmet.commons.tools.utils.Result
+ * @Author yinzuomei
+ * @Description 获取用户最近访问网格
+ * @Date 2020/3/24 11:11
+ **/
+ @Override
+ public Result getLatestGridInfo(TokenDto tokenDto) {
+ if (null == tokenDto || StringUtils.isBlank(tokenDto.getUserId())) {
+ return new Result().error(ModuleConstant.USER_NOT_NULL);
+ }
+ if(!AppClientConstant.APP_RESI.equals(tokenDto.getApp())){
+ return new Result().error(ModuleConstant.FOR_RESI_CALL);
+ }
+ return epmetUserFeignClient.getLatestGridInfoByUserId(tokenDto.getUserId());
+ }
+}
diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/utils/ModuleConstant.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/utils/ModuleConstant.java
new file mode 100644
index 0000000000..eb482b07f3
--- /dev/null
+++ b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/utils/ModuleConstant.java
@@ -0,0 +1,30 @@
+/**
+ * Copyright (c) 2018 人人开源 All rights reserved.
+ *
+ * https://www.renren.io
+ *
+ * 版权所有，侵权必究！
+ */
+
+package com.epmet.utils;
+
+import com.epmet.commons.tools.constant.Constant;
+
+/**
+ * 模块常量
+ *
+ * @author Mark sunlightcs@gmail.com
+ * @since 1.1.0
+ */
+public interface ModuleConstant extends Constant {
+
+ /**
+ * tokenDto不能为null userId不能为空
+ */
+ String USER_NOT_NULL="用户信息不能为空";
+
+ /**
+ * 接口只限居民端调用
+ */
+ String FOR_RESI_CALL="当前接口只限居民端调用";
+}
diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/resources/bootstrap.yml b/epmet-module/resi-mine/resi-mine-server/src/main/resources/bootstrap.yml
new file mode 100644
index 0000000000..f602718744
--- /dev/null
+++ b/epmet-module/resi-mine/resi-mine-server/src/main/resources/bootstrap.yml
@@ -0,0 +1,106 @@
+server:
+ port: @server.port@
+ servlet:
+ context-path: /resi/mine
+
+spring:
+ main:
+ allow-bean-definition-overriding: true
+ application:
+ name: resi-mine-server
+ #环境 dev|test|prod
+ profiles:
+ active: dev
+ messages:
+ encoding: UTF-8
+ basename: i18n/messages,i18n/messages_common
+ jackson:
+ time-zone: GMT+8
+ date-format: yyyy-MM-dd HH:mm:ss
+ redis:
+ database: @spring.redis.index@
+ host: @spring.redis.host@
+ port: @spring.redis.port@
+ password: @spring.redis.password@
+ timeout: 30s
+ datasource:
+ druid:
+ #MySQL
+ driver-class-name: com.mysql.cj.jdbc.Driver
+ url: @spring.datasource.druid.url@
+ username: @spring.datasource.druid.username@
+ password: @spring.datasource.druid.password@
+ cloud:
+ nacos:
+ discovery:
+ server-addr: @nacos.server-addr@
+ #nacos的命名空间ID，默认是public
+ namespace: @nacos.discovery.namespace@
+ #不把自己注册到注册中心的地址
+ register-enabled: @nacos.register-enabled@
+ ip: @nacos.ip@
+ config:
+ enabled: @nacos.config-enabled@
+ server-addr: @nacos.server-addr@
+ namespace: @nacos.config.namespace@
+ group: @nacos.config.group@
+ file-extension: yaml
+ #指定共享配置，且支持动态刷新
+# ext-config:
+# - data-id: datasource.yaml
+# group: ${spring.cloud.nacos.config.group}
+# refresh: true
+# - data-id: common.yaml
+# group: ${spring.cloud.nacos.config.group}
+# refresh: true
+management:
+ endpoints:
+ web:
+ exposure:
+ include: "*"
+ endpoint:
+ health:
+ show-details: ALWAYS
+
+mybatis-plus:
+ mapper-locations: classpath:/mapper/**/*.xml
+ #实体扫描，多个package用逗号或者分号分隔
+ typeAliasesPackage: com.epmet.resi.mine.entity
+ global-config:
+ #数据库相关配置
+ db-config:
+ #主键类型 AUTO:"数据库ID自增", INPUT:"用户输入ID", ID_WORKER:"全局唯一ID (数字类型唯一ID)", UUID:"全局唯一ID UUID";
+ id-type: ID_WORKER
+ #字段策略 IGNORED:"忽略判断",NOT_NULL:"非 NULL 判断"),NOT_EMPTY:"非空判断"
+ field-strategy: NOT_NULL
+ #驼峰下划线转换
+ column-underline: true
+ banner: false
+ #原生配置
+ configuration:
+ map-underscore-to-camel-case: true
+ cache-enabled: false
+ call-setters-on-nulls: true
+ jdbc-type-for-null: 'null'
+
+feign:
+ hystrix:
+ enabled: true
+ client:
+ config:
+ default:
+ loggerLevel: BASIC
+ httpclient:
+ enabled: true
+
+hystrix:
+ command:
+ default:
+ execution:
+ isolation:
+ thread:
+ timeoutInMilliseconds: 60000 #缺省为1000
+
+ribbon:
+ ReadTimeout: 300000
+ ConnectTimeout: 300000
diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/resources/i18n/messages.properties b/epmet-module/resi-mine/resi-mine-server/src/main/resources/i18n/messages.properties
new file mode 100644
index 0000000000..a7091dbb43
--- /dev/null
+++ b/epmet-module/resi-mine/resi-mine-server/src/main/resources/i18n/messages.properties
@@ -0,0 +1 @@
+#Default
diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/resources/i18n/messages_en_US.properties b/epmet-module/resi-mine/resi-mine-server/src/main/resources/i18n/messages_en_US.properties
new file mode 100644
index 0000000000..9e895e4281
--- /dev/null
+++ b/epmet-module/resi-mine/resi-mine-server/src/main/resources/i18n/messages_en_US.properties
@@ -0,0 +1 @@
+#English
diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/resources/i18n/messages_zh_CN.properties b/epmet-module/resi-mine/resi-mine-server/src/main/resources/i18n/messages_zh_CN.properties
new file mode 100644
index 0000000000..b21fd22eca
--- /dev/null
+++ b/epmet-module/resi-mine/resi-mine-server/src/main/resources/i18n/messages_zh_CN.properties
@@ -0,0 +1 @@
+#\u7B80\u4F53\u4E2D\u6587
diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/resources/i18n/messages_zh_TW.properties b/epmet-module/resi-mine/resi-mine-server/src/main/resources/i18n/messages_zh_TW.properties
new file mode 100644
index 0000000000..4433dba45a
--- /dev/null
+++ b/epmet-module/resi-mine/resi-mine-server/src/main/resources/i18n/messages_zh_TW.properties
@@ -0,0 +1 @@
+#\u7E41\u4F53\u4E2D\u6587
diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/resources/i18n/validation.properties b/epmet-module/resi-mine/resi-mine-server/src/main/resources/i18n/validation.properties
new file mode 100644
index 0000000000..56ca909c46
--- /dev/null
+++ b/epmet-module/resi-mine/resi-mine-server/src/main/resources/i18n/validation.properties
@@ -0,0 +1 @@
+#Default
\ No newline at end of file
diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/resources/i18n/validation_en_US.properties b/epmet-module/resi-mine/resi-mine-server/src/main/resources/i18n/validation_en_US.properties
new file mode 100644
index 0000000000..9e895e4281
--- /dev/null
+++ b/epmet-module/resi-mine/resi-mine-server/src/main/resources/i18n/validation_en_US.properties
@@ -0,0 +1 @@
+#English
diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/resources/i18n/validation_zh_CN.properties b/epmet-module/resi-mine/resi-mine-server/src/main/resources/i18n/validation_zh_CN.properties
new file mode 100644
index 0000000000..b21fd22eca
--- /dev/null
+++ b/epmet-module/resi-mine/resi-mine-server/src/main/resources/i18n/validation_zh_CN.properties
@@ -0,0 +1 @@
+#\u7B80\u4F53\u4E2D\u6587
diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/resources/i18n/validation_zh_TW.properties b/epmet-module/resi-mine/resi-mine-server/src/main/resources/i18n/validation_zh_TW.properties
new file mode 100644
index 0000000000..4433dba45a
--- /dev/null
+++ b/epmet-module/resi-mine/resi-mine-server/src/main/resources/i18n/validation_zh_TW.properties
@@ -0,0 +1 @@
+#\u7E41\u4F53\u4E2D\u6587
diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/resources/logback-spring.xml b/epmet-module/resi-mine/resi-mine-server/src/main/resources/logback-spring.xml
new file mode 100644
index 0000000000..a038b82fe7
--- /dev/null
+++ b/epmet-module/resi-mine/resi-mine-server/src/main/resources/logback-spring.xml
@@ -0,0 +1,159 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+ debug
+
+
+ ${CONSOLE_LOG_PATTERN}
+
+ UTF-8
+
+
+
+
+
+
+
+ ${log.path}/debug.log
+
+
+ %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n
+ UTF-8
+
+
+
+
+ ${log.path}/debug-%d{yyyy-MM-dd}.%i.log
+
+ 100MB
+
+
+ 15
+
+
+
+ debug
+ ACCEPT
+ DENY
+
+
+
+
+
+
+ ${log.path}/info.log
+
+
+ %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n
+ UTF-8
+
+
+
+
+ ${log.path}/info-%d{yyyy-MM-dd}.%i.log
+
+ 100MB
+
+
+ 15
+
+
+
+ info
+ ACCEPT
+ DENY
+
+
+
+
+
+
+ ${log.path}/warn.log
+
+
+ %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n
+ UTF-8
+
+
+
+ ${log.path}/warn-%d{yyyy-MM-dd}.%i.log
+
+ 100MB
+
+
+ 15
+
+
+
+ warn
+ ACCEPT
+ DENY
+
+
+
+
+
+
+ ${log.path}/error.log
+
+
+ %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n
+ UTF-8
+
+
+
+ ${log.path}/error-%d{yyyy-MM-dd}.%i.log
+
+ 100MB
+
+
+ 15
+
+
+
+ ERROR
+ ACCEPT
+ DENY
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/LatestGridInfoResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/LatestGridInfoResultDTO.java
new file mode 100644
index 0000000000..829a1cd2d5
--- /dev/null
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/LatestGridInfoResultDTO.java
@@ -0,0 +1,25 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description 获取用户最近访问网格返参DTO
+ * @Author yinzuomei
+ * @Date 2020/3/24 11:09
+ */
+@Data
+public class LatestGridInfoResultDTO implements Serializable {
+ private static final long serialVersionUID = 8548569698676898706L;
+
+ /**
+ * 用户最后一次访问的网格对应的客户id
+ */
+ private String customerId;
+
+ /**
+ * 用户最后一次访问的网格
+ */
+ private String gridId;
+}
diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml
index fbca8c6fdb..f1f3a8cda1 100644
--- a/epmet-user/epmet-user-server/pom.xml
+++ b/epmet-user/epmet-user-server/pom.xml
@@ -115,7 +115,7 @@
elink@833066
0
- 122.152.200.70
+ 10.10.10.79
6379
123456
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/constant/GridVisitedConstant.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/constant/GridVisitedConstant.java
new file mode 100644
index 0000000000..cfd7228e97
--- /dev/null
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/constant/GridVisitedConstant.java
@@ -0,0 +1,37 @@
+/**
+ * Copyright (c) 2018 人人开源 All rights reserved.
+ *
+ * https://www.renren.io
+ *
+ * 版权所有，侵权必究！
+ */
+
+package com.epmet.constant;
+
+/**
+ * 常量
+ * @author sun
+ * @since 1.0.0
+ */
+public interface GridVisitedConstant {
+
+ /**
+ * 查询异常
+ */
+ String QUERY_EXCEPTION = "查询客户网格表数据失败！";
+
+ /**
+ * 网格访问记录表新增数据失败
+ */
+ String SAVE_VISITED = "网格访问记录表新增数据失败！";
+
+ /**
+ * 最近访问网格表新增数据失败
+ */
+ String SAVE_LATEST = "最近访问网格表新增数据失败！";
+
+ /**
+ * tokenDto中的userId不能为空
+ */
+ String USER_ID_NOTNULL="用户id不能为空";
+}
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/GridLatestController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/GridLatestController.java
index a6c1500b02..6ef6cdab25 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/GridLatestController.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/GridLatestController.java
@@ -26,6 +26,7 @@ import com.epmet.commons.tools.validator.group.AddGroup;
import com.epmet.commons.tools.validator.group.UpdateGroup;
import com.epmet.commons.tools.validator.group.DefaultGroup;
import com.epmet.dto.GridLatestDTO;
+import com.epmet.dto.result.LatestGridInfoResultDTO;
import com.epmet.excel.GridLatestExcel;
import com.epmet.service.GridLatestService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -45,7 +46,7 @@ import java.util.Map;
@RestController
@RequestMapping("gridlatest")
public class GridLatestController {
-
+
@Autowired
private GridLatestService gridLatestService;
@@ -91,4 +92,15 @@ public class GridLatestController {
ExcelUtils.exportExcelToTarget(response, null, list, GridLatestExcel.class);
}
-}
\ No newline at end of file
+ /**
+ * @return com.epmet.commons.tools.utils.Result
+ * @param userId
+ * @Author yinzuomei
+ * @Description 根据居民id查询最后一次访问的网格信息
+ * @Date 2020/3/24 13:09
+ **/
+ @GetMapping("getLatestGridInfoByUserId/{userId}")
+ public Result getLatestGridInfoByUserId(@PathVariable("userId") String userId){
+ return gridLatestService.getLatestGridInfoByUserId(userId);
+ }
+}
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/GridVisitedController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/GridVisitedController.java
index 1f3d09d73c..140f673d74 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/GridVisitedController.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/GridVisitedController.java
@@ -46,24 +46,24 @@ import java.util.Map;
@RestController
@RequestMapping("gridvisited")
public class GridVisitedController {
-
+
@Autowired
private GridVisitedService gridVisitedService;
@GetMapping("page")
- public Result> page(@RequestParam Map params){
+ public Result> page(@RequestParam Map params) {
PageData page = gridVisitedService.page(params);
return new Result>().ok(page);
}
@GetMapping("{id}")
- public Result get(@PathVariable("id") String id){
+ public Result get(@PathVariable("id") String id) {
GridVisitedDTO data = gridVisitedService.get(id);
return new Result().ok(data);
}
@PostMapping
- public Result save(@RequestBody GridVisitedDTO dto){
+ public Result save(@RequestBody GridVisitedDTO dto) {
//效验数据
ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
gridVisitedService.save(dto);
@@ -71,7 +71,7 @@ public class GridVisitedController {
}
@PutMapping
- public Result update(@RequestBody GridVisitedDTO dto){
+ public Result update(@RequestBody GridVisitedDTO dto) {
//效验数据
ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
gridVisitedService.update(dto);
@@ -79,7 +79,7 @@ public class GridVisitedController {
}
@DeleteMapping
- public Result delete(@RequestBody String[] ids){
+ public Result delete(@RequestBody String[] ids) {
//效验数据
AssertUtils.isArrayEmpty(ids, "id");
gridVisitedService.delete(ids);
@@ -96,11 +96,12 @@ public class GridVisitedController {
* 网格访问记录表、最近访问网格表新增数据
* 网格访问记录表新增数据(一天一条)
* 最近访问表更新访问时间字段
- * @param formDTO
+ *
+ * @param visitedFormDTO
*/
- @PostMapping("savelatestandvisited")
- public void saveLatestAndVisited(@RequestBody VisitedFormDTO formDTO) throws Exception {
- gridVisitedService.saveLatestAndVisited(formDTO);
+ @PostMapping("savevisitedrecord")
+ public Result saveVisitedRecord(@RequestBody VisitedFormDTO visitedFormDTO) {
+ return gridVisitedService.saveVisitedRecord(visitedFormDTO);
}
}
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/GridLatestDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/GridLatestDao.java
index 52af37226a..86437e3d25 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/GridLatestDao.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/GridLatestDao.java
@@ -19,6 +19,7 @@ package com.epmet.dao;
import com.epmet.commons.mybatis.dao.BaseDao;
import com.epmet.dto.GridLatestDTO;
+import com.epmet.dto.result.LatestGridInfoResultDTO;
import com.epmet.entity.GridLatestEntity;
import org.apache.ibatis.annotations.Mapper;
@@ -31,5 +32,18 @@ import org.apache.ibatis.annotations.Mapper;
@Mapper
public interface GridLatestDao extends BaseDao {
+ GridLatestDTO selectGridLatestByGridAndUserId(GridLatestDTO formDTO);
+
+ int updateByLatestId(GridLatestDTO dto);
+
GridLatestEntity getGridLatestByIds(GridLatestDTO formDTO);
-}
\ No newline at end of file
+
+ /**
+ * @return com.epmet.dto.result.LatestGridInfoResultDTO
+ * @param userId
+ * @Author yinzuomei
+ * @Description 根据居民id查询最后一次访问的网格信息
+ * @Date 2020/3/24 13:17
+ **/
+ LatestGridInfoResultDTO selectLatestGridInfoByUserId(String userId);
+}
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/GridVisitedDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/GridVisitedDao.java
index b246bdabd5..efa4fb8189 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/GridVisitedDao.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/GridVisitedDao.java
@@ -33,5 +33,6 @@ import org.apache.ibatis.annotations.Mapper;
@Mapper
public interface GridVisitedDao extends BaseDao {
- GridVisitedDTO getGridVisitedByIds(GridVisitedDTO formDTO);
+ GridVisitedDTO selectGridVisitedByGridIdAndUserId(GridVisitedDTO formDTO);
+ int updateByVisitedId(GridVisitedDTO dto);
}
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java
index 5625a3ee76..acbb5833f7 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java
@@ -16,12 +16,12 @@ import org.springframework.web.bind.annotation.PostMapping;
@FeignClient(name = ServiceConstant.GOV_ORG_SERVER, fallback = GovOrgFeignClientFallBack.class)
public interface GovOrgFeignClient {
- /**
- * @param
- * @Description 根据客户Id查询客户用户表数据
- * @Date 2020/3/17
- **/
- @PostMapping("/gov/org/customergrid/getcustomergridbygridid")
- Result getCustomerGridByGridId(CustomerGridFormDTO formDTO);
+ /**
+ * @param
+ * @Description 根据客户Id查询客户用户表数据
+ * @Date 2020/3/17
+ **/
+ @PostMapping("/gov/org/customergrid/getcustomergridbygridid")
+ Result getCustomerGridByGridId(CustomerGridFormDTO formDTO);
}
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/feign/OperRoleUserFeignClient.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/feign/OperRoleUserFeignClient.java
index a81e182f73..6cb0e54197 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/feign/OperRoleUserFeignClient.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/feign/OperRoleUserFeignClient.java
@@ -13,7 +13,7 @@ import java.util.List;
* @dscription
* @date 2020/3/20 17:19
*/
-@FeignClient(name = ServiceConstant.OPER_ACCESS_SERVER, fallback = OperRoleUserFeignClientFallBack.class)
+@FeignClient(name = ServiceConstant.OPER_ACCESS_SERVER, fallback = OperRoleUserFeignClientFallBack.class )
public interface OperRoleUserFeignClient {
/**
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java
index c5e04129bf..8b4d87717f 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java
@@ -16,8 +16,8 @@ import org.springframework.stereotype.Component;
@Component
public class GovOrgFeignClientFallBack implements GovOrgFeignClient {
- @Override
- public Result getCustomerGridByGridId(CustomerGridFormDTO formDTO) {
- return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getCustomerGridByGridId",formDTO);
- }
+ @Override
+ public Result getCustomerGridByGridId(CustomerGridFormDTO formDTO) {
+ return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getCustomerGridByGridId", formDTO);
+ }
}
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/GridLatestService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/GridLatestService.java
index 138f4c9483..fc41f0c32d 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/GridLatestService.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/GridLatestService.java
@@ -19,9 +19,11 @@ package com.epmet.service;
import com.epmet.commons.mybatis.service.BaseService;
import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.utils.Result;
import com.epmet.dto.CustomerGridDTO;
import com.epmet.dto.GridLatestDTO;
import com.epmet.dto.form.VisitedFormDTO;
+import com.epmet.dto.result.LatestGridInfoResultDTO;
import com.epmet.entity.GridLatestEntity;
import java.util.List;
@@ -99,5 +101,15 @@ public interface GridLatestService extends BaseService {
* 最近访问网格表新增数据
* @param formDTO
*/
- void saveGridLatest(VisitedFormDTO formDTO, CustomerGridDTO cu);
-}
\ No newline at end of file
+ boolean saveGridLatest(VisitedFormDTO formDTO, CustomerGridDTO cu);
+
+ /**
+ * @param userId
+ * @return com.epmet.commons.tools.utils.Result
+ * @Author yinzuomei
+ * @Description 根据居民id查询最后一次访问的网格信息
+ * @Date 2020/3/24 13:10
+ **/
+ Result getLatestGridInfoByUserId(String userId);
+
+}
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/GridVisitedService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/GridVisitedService.java
index b324356f94..717edcb011 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/GridVisitedService.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/GridVisitedService.java
@@ -19,6 +19,7 @@ package com.epmet.service;
import com.epmet.commons.mybatis.service.BaseService;
import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.utils.Result;
import com.epmet.dto.GridLatestDTO;
import com.epmet.dto.GridVisitedDTO;
import com.epmet.dto.form.VisitedFormDTO;
@@ -95,23 +96,8 @@ public interface GridVisitedService extends BaseService {
*/
void delete(String[] ids);
-
-
-
-
-
- /**
- * 网格访问记录表新增数据
- * @param formDTO
- */
- //void saveGridVisited(GridVisitedDTO formDTO);
-
-
-
-
-
/**
* @param formDTO
*/
- void saveLatestAndVisited(VisitedFormDTO formDTO) throws Exception;
+ Result saveVisitedRecord(VisitedFormDTO formDTO);
}
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/GridLatestServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/GridLatestServiceImpl.java
index ba4dcea6a1..b427ea8e2d 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/GridLatestServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/GridLatestServiceImpl.java
@@ -23,10 +23,13 @@ import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
import com.epmet.commons.tools.page.PageData;
import com.epmet.commons.tools.utils.ConvertUtils;
import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.constant.GridVisitedConstant;
import com.epmet.dao.GridLatestDao;
import com.epmet.dto.CustomerGridDTO;
import com.epmet.dto.GridLatestDTO;
import com.epmet.dto.form.VisitedFormDTO;
+import com.epmet.dto.result.LatestGridInfoResultDTO;
import com.epmet.entity.GridLatestEntity;
import com.epmet.redis.GridLatestRedis;
import com.epmet.service.GridLatestService;
@@ -51,6 +54,8 @@ public class GridLatestServiceImpl extends BaseServiceImpl page(Map params) {
@@ -68,8 +73,8 @@ public class GridLatestServiceImpl extends BaseServiceImpl getWrapper(Map params){
- String id = (String)params.get(FieldConstant.ID_HUMP);
+ private QueryWrapper getWrapper(Map params) {
+ String id = (String) params.get(FieldConstant.ID_HUMP);
QueryWrapper wrapper = new QueryWrapper<>();
wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
@@ -106,31 +111,42 @@ public class GridLatestServiceImpl extends BaseServiceImpl
+ * @Author yinzuomei
+ * @Description 根据居民id查询最后一次访问的网格信息
+ * @Date 2020/3/24 13:10
+ **/
+ @Override
+ public Result getLatestGridInfoByUserId(String userId) {
+ if(StringUtils.isBlank(userId)){
+ return new Result().error(GridVisitedConstant.USER_ID_NOTNULL);
+ }
+ return new Result().ok(baseDao.selectLatestGridInfoByUserId(userId));
+ }
+}
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/GridVisitedServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/GridVisitedServiceImpl.java
index a3810e7268..58aeea85cf 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/GridVisitedServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/GridVisitedServiceImpl.java
@@ -24,6 +24,7 @@ import com.epmet.commons.tools.constant.FieldConstant;
import com.epmet.commons.tools.page.PageData;
import com.epmet.commons.tools.utils.ConvertUtils;
import com.epmet.commons.tools.utils.Result;
+import com.epmet.constant.GridVisitedConstant;
import com.epmet.dao.GridVisitedDao;
import com.epmet.dto.CustomerGridDTO;
import com.epmet.dto.GridVisitedDTO;
@@ -34,6 +35,8 @@ import com.epmet.feign.GovOrgFeignClient;
import com.epmet.service.GridLatestService;
import com.epmet.service.GridVisitedService;
import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -52,10 +55,13 @@ import java.util.Map;
@Service
public class GridVisitedServiceImpl extends BaseServiceImpl implements GridVisitedService {
+ private static final Logger log = LoggerFactory.getLogger(GridVisitedServiceImpl.class);
@Autowired
private GovOrgFeignClient govOrgFeignClient;
@Autowired
private GridLatestService gridLatestService;
+ @Autowired
+ private GridVisitedDao gridVisitedDao;
@Override
public PageData page(Map params) {
@@ -73,8 +79,8 @@ public class GridVisitedServiceImpl extends BaseServiceImpl getWrapper(Map params){
- String id = (String)params.get(FieldConstant.ID_HUMP);
+ private QueryWrapper getWrapper(Map params) {
+ String id = (String) params.get(FieldConstant.ID_HUMP);
QueryWrapper wrapper = new QueryWrapper<>();
wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
@@ -111,63 +117,73 @@ public class GridVisitedServiceImpl extends BaseServiceImpl result = govOrgFeignClient.getCustomerGridByGridId(dto);
- if(!result.success()){
- throw new Exception("查询客户网格表数据失败！");
+ dto.setGridId(visitedFormDTO.getGridId());
+ Result gridDTO = govOrgFeignClient.getCustomerGridByGridId(dto);
+ if (!gridDTO.success()) {
+ log.warn(GridVisitedConstant.QUERY_EXCEPTION);
+ result.error(GridVisitedConstant.QUERY_EXCEPTION);
}
- CustomerGridDTO cu = result.getData();
-
+ CustomerGridDTO customerGridDTO = gridDTO.getData();
//2:网格访问记录表新增数据
- saveGridVisited(formDTO,cu);
-
+ if (!saveGridVisited(visitedFormDTO, customerGridDTO)) {
+ log.warn(GridVisitedConstant.SAVE_VISITED);
+ result.error(GridVisitedConstant.SAVE_VISITED);
+ }
//3：最近访问网格表新增数据
- gridLatestService.saveGridLatest(formDTO,cu);
-
+ if (!gridLatestService.saveGridLatest(visitedFormDTO, customerGridDTO)) {
+ log.warn(GridVisitedConstant.SAVE_LATEST);
+ result.error(GridVisitedConstant.SAVE_LATEST);
+ }
+ return result;
}
/**
* 网格记录表和最近访问网格表新增数据
- * @param formDTO
- * @param cu
+ *
+ * @param visitedFormDTO
+ * @param customerGridDTO
*/
- public void saveGridVisited(VisitedFormDTO formDTO,CustomerGridDTO cu) {
+ private boolean saveGridVisited(VisitedFormDTO visitedFormDTO, CustomerGridDTO customerGridDTO) {
Date date = new Date();
- GridVisitedDTO vi = new GridVisitedDTO();
- vi.setIsRegister(getRegister("0"));//后续再其他服务中获取这个状态值
- vi.setCustomerId(cu.getCustomerId());
- vi.setGridId(cu.getId());
- vi.setCustomerUserId(formDTO.getUserId());
- vi.setVisitTime(date);
- vi.setUpdatedTime(date);
+ GridVisitedDTO gridVisitedDTO = new GridVisitedDTO();
+ //TODO:预留方法 根据userId查询用户是否认证（注册）
+ gridVisitedDTO.setIsRegister(getRegisterByUserId(visitedFormDTO.getUserId()));
+ gridVisitedDTO.setCustomerId(customerGridDTO.getCustomerId());
+ gridVisitedDTO.setGridId(customerGridDTO.getId());
+ gridVisitedDTO.setCustomerUserId(visitedFormDTO.getUserId());
+ gridVisitedDTO.setVisitTime(date);
+ gridVisitedDTO.setUpdatedTime(date);
//查询是否存在历史数据( 一个用户一天对一个网格只存在一条访问记录)
- GridVisitedDTO dto = baseDao.getGridVisitedByIds(vi);
+ GridVisitedDTO dto = baseDao.selectGridVisitedByGridIdAndUserId(gridVisitedDTO);
GridVisitedEntity entity = null;
- if(dto==null||dto.getId()==null){
- entity = ConvertUtils.sourceToTarget(vi, GridVisitedEntity.class);
- insert(entity);
- }else{
- entity = ConvertUtils.sourceToTarget(dto, GridVisitedEntity.class);
- entity.setUpdatedTime(date);
- updateById(entity);
+ if (dto == null || dto.getId() == null) {
+ entity = ConvertUtils.sourceToTarget(gridVisitedDTO, GridVisitedEntity.class);
+ return insert(entity);
+ } else {
+ dto.setUpdatedBy(visitedFormDTO.getUserId());
+ dto.setUpdatedTime(date);
+ return BaseServiceImpl.retBool(gridVisitedDao.updateByVisitedId(dto));
}
}
/**
- * (预留方法)查询是否注册状态值
- * @param str
+ * (预留方法)查询是否注册的状态值
+ *
+ * @param userId
* @return
*/
- public Integer getRegister(String str){
+ public Integer getRegisterByUserId(String userId) {
return 0;
}
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/GridLatestDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/GridLatestDao.xml
index ed9eaa6398..893ae7819b 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/GridLatestDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/GridLatestDao.xml
@@ -19,8 +19,8 @@
-