getcustomergrid(@PathVariable("id") String id){
CustomerGridDTO data = customerGridService.get(id);
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/PdmanDbVersionController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/PdmanDbVersionController.java
deleted file mode 100644
index 00851cdb80..0000000000
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/PdmanDbVersionController.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/**
- * Copyright 2018 人人开源 https://www.renren.io
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see > page(@RequestParam Map params){
- PageData page = pdmanDbVersionService.page(params);
- return new Result>().ok(page);
- }
-
- @GetMapping("{id}")
- public Result get(@PathVariable("id") String id){
- PdmanDbVersionDTO data = pdmanDbVersionService.get(id);
- return new Result().ok(data);
- }
-
- @PostMapping
- public Result save(@RequestBody PdmanDbVersionDTO dto){
- //效验数据
- ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
- pdmanDbVersionService.save(dto);
- return new Result();
- }
-
- @PutMapping
- public Result update(@RequestBody PdmanDbVersionDTO dto){
- //效验数据
- ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
- pdmanDbVersionService.update(dto);
- return new Result();
- }
-
- @DeleteMapping
- public Result delete(@RequestBody String[] ids){
- //效验数据
- AssertUtils.isArrayEmpty(ids, "id");
- pdmanDbVersionService.delete(ids);
- return new Result();
- }
-
- @GetMapping("export")
- public void export(@RequestParam Map params, HttpServletResponse response) throws Exception {
- List list = pdmanDbVersionService.list(params);
- ExcelUtils.exportExcelToTarget(response, null, list, PdmanDbVersionExcel.class);
- }
-
-}
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java
index f13389578a..41951995ff 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java
@@ -18,8 +18,16 @@
package com.epmet.dao;
import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.form.ListCustomerGridFormDTO;
+import com.epmet.dto.result.CustomerGridForStrangerResultDTO;
+import com.epmet.dto.CustomerGridDTO;
+import com.epmet.dto.form.CustomerGridFormDTO;
import com.epmet.entity.CustomerGridEntity;
import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
/**
* 客户网格表
@@ -29,5 +37,36 @@ import org.apache.ibatis.annotations.Mapper;
*/
@Mapper
public interface CustomerGridDao extends BaseDao {
-
+
+
+ /**
+ * @Description 查特定区的网格
+ * @Param areaCode
+ * @return CustomerGridForStrangerResultDTO
+ * @Author wangc
+ * @Date 2020.03.19 15:53
+ **/
+ List selectGridByAreaCode(@Param("areaCode")String areaCode);
+
+ /**
+ * @Description 查整个城市的网格
+ * @Param areaCode
+ * @return CustomerGridForStrangerResultDTO
+ * @Author wangc
+ * @Date 2020.03.19 15:53
+ **/
+ List selectGridByCityLike(ListCustomerGridFormDTO listCustomerGridFormDTO);
+
+
+ /**
+ * @Description 指定区时查询当前城市下除该区之外其余的网格
+ * @Param areaCode
+ * @Param cityCode
+ * @return CustomerGridForStrangerResultDTO
+ * @Author wangc
+ * @Date 2020.03.19 15:53
+ **/
+ List selectRestGridWithoutGivenAreaCode(Map paramsMap);
+
+ CustomerGridDTO getCustomerGridByGridId(CustomerGridFormDTO formDTO);
}
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/exception/ModuleErrorCode.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/exception/ModuleErrorCode.java
new file mode 100644
index 0000000000..dc2e3e93cc
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/exception/ModuleErrorCode.java
@@ -0,0 +1,20 @@
+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 {
+
+ int ARGS_NOT_ALLOW_NULL_ERROR = 100019001;
+
+ int NOT_STANDARD_AREA_CODE_ERROR = 100019002;
+
+}
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java
index cdc050da2c..ceb317d455 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java
@@ -19,7 +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.form.CustomerGridFormDTO;
+import com.epmet.dto.form.ListCustomerGridFormDTO;
+import com.epmet.dto.result.CustomerGridForStrangerResultDTO;
import com.epmet.entity.CustomerGridEntity;
import java.util.List;
@@ -92,4 +96,21 @@ public interface CustomerGridService extends BaseService {
* @date 2020-03-16
*/
void delete(String[] ids);
+
+ /**
+ * 陌生人查询附近网格数据
+ * 不管传递的areaCode是市级还是县级，都查询整个城市的网格信息，需要特定的排序
+ * @param
+ * @return Result>
+ * @author wangc
+ * @date 2020-03-16
+ * */
+ Result> listGridForStrangerByOrder(ListCustomerGridFormDTO listCustomerGridFormDTO);
+
+ /** 根据网格Id查询用户数据
+ * @param formDTO
+ * @return
+ * @date 2020-03-17
+ */
+ Result getCustomerGridByGridId(CustomerGridFormDTO formDTO);
}
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/PdmanDbVersionService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/PdmanDbVersionService.java
deleted file mode 100644
index 2b869d27c9..0000000000
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/PdmanDbVersionService.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/**
- * Copyright 2018 人人开源 https://www.renren.io
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see {
-
- /**
- * 默认分页
- *
- * @param params
- * @return PageData
- * @author generator
- * @date 2020-03-16
- */
- PageData page(Map params);
-
- /**
- * 默认查询
- *
- * @param params
- * @return java.util.List
- * @author generator
- * @date 2020-03-16
- */
- List list(Map params);
-
- /**
- * 单条查询
- *
- * @param id
- * @return PdmanDbVersionDTO
- * @author generator
- * @date 2020-03-16
- */
- PdmanDbVersionDTO get(String id);
-
- /**
- * 默认保存
- *
- * @param dto
- * @return void
- * @author generator
- * @date 2020-03-16
- */
- void save(PdmanDbVersionDTO dto);
-
- /**
- * 默认更新
- *
- * @param dto
- * @return void
- * @author generator
- * @date 2020-03-16
- */
- void update(PdmanDbVersionDTO dto);
-
- /**
- * 批量删除
- *
- * @param ids
- * @return void
- * @author generator
- * @date 2020-03-16
- */
- void delete(String[] ids);
-}
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java
index 2058bf4d79..d94eb029cf 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java
@@ -23,9 +23,14 @@ 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.dao.CustomerGridDao;
import com.epmet.dto.CustomerGridDTO;
+import com.epmet.dto.form.CustomerGridFormDTO;
+import com.epmet.dto.form.ListCustomerGridFormDTO;
+import com.epmet.dto.result.CustomerGridForStrangerResultDTO;
import com.epmet.entity.CustomerGridEntity;
+
import com.epmet.redis.CustomerGridRedis;
import com.epmet.service.CustomerGridService;
import org.apache.commons.lang3.StringUtils;
@@ -34,11 +39,12 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.Arrays;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
- * 客户网格表
+ * 客户网格表
*
* @author generator generator@elink-cn.com
* @since v1.0.0 2020-03-16
@@ -101,4 +107,48 @@ public class CustomerGridServiceImpl extends BaseServiceImpl> listGridForStrangerByOrder(ListCustomerGridFormDTO listCustomerGridFormDTO) {
+
+ Result> result = new Result<>();
+
+
+ String areaCode = listCustomerGridFormDTO.getAreaCode();
+ listCustomerGridFormDTO.setPageNo((listCustomerGridFormDTO.getPageNo() - 1) * listCustomerGridFormDTO.getPageSize());
+
+ if(areaCode.endsWith("00")){
+ //城市 - 查全部
+ listCustomerGridFormDTO.setAreaCode(areaCode.substring(0,areaCode.length()-2));
+ List gridList
+ = baseDao.selectGridByCityLike(listCustomerGridFormDTO);
+
+ result.setData(gridList);
+ result.setCode(0);
+ return result;
+ }else{
+ //行政区
+
+ Map map = new HashMap<>();
+
+ map.put("areaCode",areaCode);
+ map.put("cityCode",areaCode.substring(0,areaCode.length()-2));
+ map.put("pageSize",listCustomerGridFormDTO.getPageSize());
+ map.put("pageNo",listCustomerGridFormDTO.getPageNo());
+
+ List gridListArea
+ = baseDao.selectRestGridWithoutGivenAreaCode(map);
+
+ result.setData(gridListArea);
+
+ return result;
+
+ }
+
+ }
+
+ @Override
+ public Result getCustomerGridByGridId(CustomerGridFormDTO formDTO) {
+ return new Result().ok(baseDao.getCustomerGridByGridId(formDTO));
+ }
+
+}
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/PdmanDbVersionServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/PdmanDbVersionServiceImpl.java
deleted file mode 100644
index 59143774d9..0000000000
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/PdmanDbVersionServiceImpl.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/**
- * Copyright 2018 人人开源 https://www.renren.io
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see implements PdmanDbVersionService {
-
- @Autowired
- private PdmanDbVersionRedis pdmanDbVersionRedis;
-
- @Override
- public PageData page(Map params) {
- IPage page = baseDao.selectPage(
- getPage(params, FieldConstant.CREATED_TIME, false),
- getWrapper(params)
- );
- return getPageData(page, PdmanDbVersionDTO.class);
- }
-
- @Override
- public List list(Map params) {
- List entityList = baseDao.selectList(getWrapper(params));
-
- return ConvertUtils.sourceToTarget(entityList, PdmanDbVersionDTO.class);
- }
-
- 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);
-
- return wrapper;
- }
-
- @Override
- public PdmanDbVersionDTO get(String id) {
- PdmanDbVersionEntity entity = baseDao.selectById(id);
- return ConvertUtils.sourceToTarget(entity, PdmanDbVersionDTO.class);
- }
-
- @Override
- @Transactional(rollbackFor = Exception.class)
- public void save(PdmanDbVersionDTO dto) {
- PdmanDbVersionEntity entity = ConvertUtils.sourceToTarget(dto, PdmanDbVersionEntity.class);
- insert(entity);
- }
-
- @Override
- @Transactional(rollbackFor = Exception.class)
- public void update(PdmanDbVersionDTO dto) {
- PdmanDbVersionEntity entity = ConvertUtils.sourceToTarget(dto, PdmanDbVersionEntity.class);
- updateById(entity);
- }
-
- @Override
- @Transactional(rollbackFor = Exception.class)
- public void delete(String[] ids) {
- // 逻辑删除（@TableLogic 注解）
- baseDao.deleteBatchIds(Arrays.asList(ids));
- }
-
-}
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml
index 5765fffd44..c18e744373 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml
@@ -22,5 +22,107 @@
+ SELECT
+ id AS grid_id,
+ customer_id,
+ grid_name
+ FROM
+ CUSTOMER_GRID
+ WHERE
+ AREA_CODE = #{areaCode}
+ ORDER BY
+ customer_id,
+ CONVERT ( grid_name USING gbk ) ASC
+
+
+ SELECT
+ gr.id,
+ gr.customer_id,
+ gr.grid_name,
+ gr.grid_code,
+ gr.pid,
+ gr.pids,
+ gr.sort,
+ gr.longitude,
+ gr.latitude,
+ gr.area_code
+ FROM customer_grid gr
+ WHERE
+ gr.del_flag = '0'
+
+ AND gr.id = #{gridId}
+
+
+
+
+
+
+
+ SELECT
+ id AS grid_id,
+ customer_id,
+ grid_name
+ FROM
+ CUSTOMER_GRID
+ WHERE
+ AREA_CODE LIKE CONCAT(#{areaCode},'%')
+
+ ORDER BY
+ customer_id,
+ CONVERT ( grid_name USING gbk ) ASC
+
+ LIMIT #{pageNo}, #{pageSize}
+
+
+
+
+
+
+ SELECT c.*
+
+
+ FROM
+ (
+
+ (
+ SELECT
+ a.id AS grid_id,
+ a.customer_id,
+ a.grid_name
+ FROM
+ CUSTOMER_GRID a
+ WHERE
+ a.area_code = #{areaCode}
+
+ ORDER BY
+ CONVERT ( a.grid_name USING gbk ) ASC
+ LIMIT 99999
+ )
+
+ UNION
+
+ (
+ SELECT
+ b.id AS grid_id,
+ b.customer_id,
+ b.grid_name
+ FROM
+ CUSTOMER_GRID b
+ WHERE
+ b.area_code LIKE CONCAT(#{cityCode},'%')
+
+ AND #{areaCode}
+ ]]>
+ ORDER BY
+ CONVERT ( b.grid_name USING gbk ) ASC
+ LIMIT 999999
+ )
+ ) AS c
+ LIMIT #{pageNo}, #{pageSize}
+
+
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/PdmanDbVersionDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/PdmanDbVersionDao.xml
deleted file mode 100644
index f265a47684..0000000000
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/PdmanDbVersionDao.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/constant/OperCustomizeConstant.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/constant/OperCustomizeConstant.java
new file mode 100644
index 0000000000..dfddc87a50
--- /dev/null
+++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/constant/OperCustomizeConstant.java
@@ -0,0 +1,25 @@
+/**
+ * Copyright (c) 2018 人人开源 All rights reserved.
+ *
+ * https://www.renren.io
+ *
+ * 版权所有，侵权必究！
+ */
+
+package com.epmet.dto.constant;
+
+/**
+ * 常量
+ * @author sun
+ * @since 1.0.0
+ */
+public interface OperCustomizeConstant {
+ /**
+ * 数据状态-已发布
+ */
+ String STATUS = "0";
+ /**
+ * 数据状态-草稿
+ */
+ String STATUS_ONE = "1";
+}
diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/CustomerHomeFormDTO.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/CustomerHomeFormDTO.java
new file mode 100644
index 0000000000..1cba7b47ab
--- /dev/null
+++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/CustomerHomeFormDTO.java
@@ -0,0 +1,34 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Description 陌生人导览-点击网格链接获取客户首页配置入参DTO
+ * @Author sun
+ * @Date 2020/3/16 11:27
+ */
+@Data
+public class CustomerHomeFormDTO implements Serializable {
+ private static final long serialVersionUID = 5272251336837515372L;
+ /**
+ * 客户ID
+ */
+ @NotBlank(message = "客户ID不能为空")
+ private String customerId;
+
+ /**
+ * 所属端类型0.居民端，1.政府端
+ */
+ @NotBlank(message = "所属端类型不能为空（0居民端1政府端）")
+ private String clientType;
+
+ /**
+ * 状态：0.已发布 1.草稿
+ */
+ @NotBlank(message = "状态（0已发布1草稿）")
+ private String status;
+
+}
diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/HomeController.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/HomeController.java
index 2ee5686c71..e528ed9b83 100644
--- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/HomeController.java
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/HomeController.java
@@ -2,14 +2,19 @@ package com.epmet.controller;
import com.epmet.commons.tools.utils.Result;
import com.epmet.commons.tools.validator.ValidatorUtils;
+import com.epmet.dto.constant.OperCustomizeConstant;
import com.epmet.dto.form.ComponentListByCustomerFormDTO;
+import com.epmet.dto.form.CustomerHomeFormDTO;
import com.epmet.dto.form.HomeDesignByCustomerFormDTO;
import com.epmet.dto.form.HomeDesignFormDTO;
import com.epmet.dto.result.ComponentListByCustomerResultDTO;
import com.epmet.dto.result.HomeDesignByCustomerResultDTO;
import com.epmet.service.HomeService;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
/**
* @Description 客户定制化服务-首页相关接口
@@ -76,4 +81,18 @@ public class HomeController {
homeService.distributeHomeDesign(formDTO);
return new Result();
}
+
+ /**
+ * 供resi-guide服务调用 获取客户首页配置
+ * @param formDTO
+ * @return com.epmet.commons.tools.utils.Result
+ * @Author sun
+ * @Description 获取客户首页发布数据
+ **/
+ @PostMapping("gethomereleasebycustomer")
+ public Result getHomeReleaseByCustomer(@RequestBody CustomerHomeFormDTO formDTO) {
+ formDTO.setStatus(OperCustomizeConstant.STATUS);//已发布数据
+ ValidatorUtils.validateEntity(formDTO);
+ return homeService.getHomeReleaseByCustomer(formDTO);
+ }
}
diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/CustomerHomeDetailDao.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/CustomerHomeDetailDao.java
index 838b83083d..2ad445ea6f 100644
--- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/CustomerHomeDetailDao.java
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/CustomerHomeDetailDao.java
@@ -18,6 +18,7 @@
package com.epmet.dao;
import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.form.CustomerHomeFormDTO;
import com.epmet.dto.form.HomeDesignByCustomerFormDTO;
import com.epmet.dto.result.CommonComponentDesignResultDTO;
import com.epmet.entity.CustomerHomeDetailEntity;
@@ -49,4 +50,6 @@ public interface CustomerHomeDetailDao extends BaseDao
* @date 2020/3/1714:02
*/
List getCustomerHomeDetailComponent(HomeDesignByCustomerFormDTO form);
+
+ List getHomeReleaseByCustomer(CustomerHomeFormDTO form);
}
\ No newline at end of file
diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/HomeService.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/HomeService.java
index cb43d8c0c3..375d092f81 100644
--- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/HomeService.java
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/HomeService.java
@@ -2,6 +2,7 @@ package com.epmet.service;
import com.epmet.commons.tools.utils.Result;
import com.epmet.dto.form.ComponentListByCustomerFormDTO;
+import com.epmet.dto.form.CustomerHomeFormDTO;
import com.epmet.dto.form.HomeDesignByCustomerFormDTO;
import com.epmet.dto.form.HomeDesignFormDTO;
import com.epmet.dto.result.ComponentListByCustomerResultDTO;
@@ -48,4 +49,12 @@ public interface HomeService {
* @date: 2020/03/16 13:49:41
*/
void distributeHomeDesign(HomeDesignFormDTO formDTO);
+
+ /**
+ * @param formDTO
+ * @return com.epmet.commons.tools.utils.Result
+ * @Author sun
+ * @Description 获取客户首页发布数据
+ **/
+ Result getHomeReleaseByCustomer(CustomerHomeFormDTO formDTO);
}
diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/HomeServiceImpl.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/HomeServiceImpl.java
index 9d936c031e..68d3faff90 100644
--- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/HomeServiceImpl.java
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/HomeServiceImpl.java
@@ -5,10 +5,7 @@ import com.epmet.constant.ReginConstant;
import com.epmet.dao.CustomerHomeDao;
import com.epmet.dao.CustomerHomeDetailDao;
import com.epmet.dao.HomeComponentDao;
-import com.epmet.dto.form.ComponentListByCustomerFormDTO;
-import com.epmet.dto.form.HomeComponentFormDTO;
-import com.epmet.dto.form.HomeDesignByCustomerFormDTO;
-import com.epmet.dto.form.HomeDesignFormDTO;
+import com.epmet.dto.form.*;
import com.epmet.dto.result.CommonComponentDesignResultDTO;
import com.epmet.dto.result.ComponentListByCustomerResultDTO;
import com.epmet.dto.result.HomeDesignByCustomerResultDTO;
@@ -115,4 +112,35 @@ public class HomeServiceImpl implements HomeService {
}
}
+
+ @Override
+ public Result getHomeReleaseByCustomer(CustomerHomeFormDTO formDTO) {
+ HomeDesignByCustomerResultDTO resultDTO = new HomeDesignByCustomerResultDTO();
+ //根据客户id,所属端获取客户首页配置的设计稿
+ List list = customerHomeDetailDao.getHomeReleaseByCustomer(formDTO);
+ List titlelist=new ArrayList();
+ List toplist=new ArrayList();
+ List functionlist=new ArrayList();
+ List floatlist=new ArrayList();
+ //List usedComponent=new ArrayList<>();//使用过的组件集合
+ for(CommonComponentDesignResultDTO c:list){
+ //usedComponent.add(c.getComponentId());
+ //所属区域：0.标题区、1.置顶区、2.功能区、3.悬浮区
+ if(ReginConstant.titleList.equals(c.getRegion())){
+ titlelist.add(c);
+ }else if(ReginConstant.topList.equals(c.getRegion())){
+ toplist.add(c);
+ }else if(ReginConstant.functionList.equals(c.getRegion())){
+ functionlist.add(c);
+ }else if(ReginConstant.floatingList.equals(c.getRegion())){
+ floatlist.add(c);
+ }
+ }
+ resultDTO.setTitleList(titlelist);
+ resultDTO.setTopList(toplist);
+ resultDTO.setFloatingList(floatlist);
+ resultDTO.setFunctionList(functionlist);
+ //resultDTO.setUsedComponentIdList(usedComponent);
+ return new Result().ok(resultDTO);
+ }
}
diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/CustomerHomeDetailDao.xml b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/CustomerHomeDetailDao.xml
index c1005d7e66..b5aac36854 100644
--- a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/CustomerHomeDetailDao.xml
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/CustomerHomeDetailDao.xml
@@ -57,4 +57,29 @@
WHERE
b.DEL_FLAG = 0 and c.DEL_FLAG=0
+
+
+
+ SELECT
+ b.COMPONENT_ID,
+ c.COMPONENT_NAME,
+ b.REGION,
+ b.CONFIGURATION,
+ b.DEMO_DATA,
+ b.DISPLAY_ORDER
+ FROM
+ (
+ SELECT
+ id
+ FROM
+ customer_home
+ WHERE DEL_FLAG = '0'
+ AND CUSTOMER_ID = #{customerId}
+ AND CLIENT_TYPE = #{clientType}
+ AND `STATUS` = #{status}
+ ) a
+ INNER JOIN customer_home_detail b ON a.id = b.HOME_ID AND b.DEL_FLAG = '0'
+ LEFT JOIN home_component c ON b.COMPONENT_ID = c.id AND c.DEL_FLAG = '0'
+
\ No newline at end of file
diff --git a/epmet-module/resi-guide/resi-guide-client/src/main/java/com/epmet/dto/CustomerGridListQueryDTO.java b/epmet-module/resi-guide/resi-guide-client/src/main/java/com/epmet/dto/CustomerGridListQueryDTO.java
new file mode 100644
index 0000000000..b51dd9e7bc
--- /dev/null
+++ b/epmet-module/resi-guide/resi-guide-client/src/main/java/com/epmet/dto/CustomerGridListQueryDTO.java
@@ -0,0 +1,64 @@
+package com.epmet.dto;/**
+ * Created by 11 on 2020/3/17.
+ */
+
+import lombok.Data;
+
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Description
+ * @ClassName CustomerGridListQueryDTO
+ * @Author wangc
+ * @date 2020.03.17 13:45
+ */
+@Data
+public class CustomerGridListQueryDTO implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 当前页
+ * */
+ @Min(value = 1)
+ private Integer pageNo;
+
+ /**
+ * 每页数量
+ * */
+ private Integer pageSize = 20;
+
+ /**
+ * 地区码
+ * */
+ private String areaCode;
+
+ /**
+ * 选定地区编码
+ * */
+ private String selectedAreaCode;
+
+ /**
+ * 是否首次位置授权(0:是 1:否)
+ */
+ private Integer isAuthorized;
+
+ /**
+ * 前端传递的省份
+ * */
+ @NotBlank(message = "省份信息不能为空")
+ private String province;
+
+ /**
+ * 前端传递的城市
+ * */
+ @NotBlank(message = "城市信息不能为空")
+ private String city;
+
+ /**
+ * 前端传递的地区
+ * */
+ private String area;
+}
diff --git a/epmet-module/resi-guide/resi-guide-client/src/main/java/com/epmet/dto/StrangerAccessRecordDTO.java b/epmet-module/resi-guide/resi-guide-client/src/main/java/com/epmet/dto/StrangerAccessRecordDTO.java
new file mode 100644
index 0000000000..183bc5fb2f
--- /dev/null
+++ b/epmet-module/resi-guide/resi-guide-client/src/main/java/com/epmet/dto/StrangerAccessRecordDTO.java
@@ -0,0 +1,111 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see feign-httpclient
10.3.0
+
+ com.epmet
+ epmet-user-client
+ 2.0.0
+ compile
+
+
+ com.epmet
+ gov-org-client
+ 2.0.0
+ compile
+
+
+ com.epmet
+ oper-customize-client
+ 2.0.0
+ compile
+
diff --git a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/controller/StrangerAccessRecordController.java b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/controller/StrangerAccessRecordController.java
new file mode 100644
index 0000000000..e2a164c48f
--- /dev/null
+++ b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/controller/StrangerAccessRecordController.java
@@ -0,0 +1,89 @@
+package com.epmet.controller;
+
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.utils.ExcelUtils;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.validator.AssertUtils;
+import com.epmet.commons.tools.validator.ValidatorUtils;
+import com.epmet.dto.StrangerAccessRecordDTO;
+import com.epmet.dto.form.CustomerGridListFormDTO;
+import com.epmet.dto.result.CustomerGridForStrangerResultDTO;
+import com.epmet.commons.tools.validator.group.AddGroup;
+import com.epmet.commons.tools.validator.group.DefaultGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
+import com.epmet.excel.StrangerAccessRecordExcel;
+import com.epmet.service.StrangerAccessRecordService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Description 陌生人导览模块
+ * @ClassName StrangerAccessRecordController
+ * @Author wangc
+ * @date 2020.03.17 11:33
+ */
+@RestController
+@RequestMapping("strangerAccessRecord")
+public class StrangerAccessRecordController {
+
+ @Autowired
+ private StrangerAccessRecordService strangerAccessRecordService;
+
+
+
+ /**
+ * 查询陌生人访问记录
+ * @Author yangshaoping
+ * @date 2020.03.1811:33
+ * */
+ @GetMapping("getStrangerAccessRecordPage")
+ public Result> getStrangerAccessRecordPage(@RequestParam Map params){
+ PageData page = strangerAccessRecordService.getStrangerAccessRecordPage(params);
+ return new Result>().ok(page);
+ }
+ @GetMapping("page")
+ public Result> page(@RequestParam Map params){
+ PageData page = strangerAccessRecordService.page(params);
+ return new Result>().ok(page);
+ }
+
+ @GetMapping("{id}")
+ public Result get(@PathVariable("id") String id){
+ StrangerAccessRecordDTO data = strangerAccessRecordService.get(id);
+ return new Result().ok(data);
+ }
+
+ @PostMapping
+ public Result save(@RequestBody StrangerAccessRecordDTO dto){
+ //效验数据
+ ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+ strangerAccessRecordService.save(dto);
+ return new Result();
+ }
+
+ @PutMapping
+ public Result update(@RequestBody StrangerAccessRecordDTO dto){
+ //效验数据
+ ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+ strangerAccessRecordService.update(dto);
+ return new Result();
+ }
+
+ @DeleteMapping
+ public Result delete(@RequestBody String[] ids){
+ //效验数据
+ AssertUtils.isArrayEmpty(ids, "id");
+ strangerAccessRecordService.delete(ids);
+ return new Result();
+ }
+
+ @GetMapping("export")
+ public void export(@RequestParam Map params, HttpServletResponse response) throws Exception {
+ List list = strangerAccessRecordService.list(params);
+ ExcelUtils.exportExcelToTarget(response, null, list, StrangerAccessRecordExcel.class);
+ }
+}
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
new file mode 100644
index 0000000000..5f97343835
--- /dev/null
+++ b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/controller/StrangerResiGuideController.java
@@ -0,0 +1,94 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see getValidCustomerList( @LoginUser TokenDto tokenDTO, @RequestBody StrangerFormDTO formDTO) throws Exception {
+ return strangerAccessRecordService.getgridhome(tokenDTO, formDTO);
+ }
+
+
+
+ /**
+ * @Description 陌生访客根据自动定位获取附近网格数据
+ * @Param CustomerGridListFormDTO
+ * @return Result>
+ * @Author wangc
+ * @Date 2020.03.19 14:13
+ **/
+ @PostMapping("getlocationcustomergridlist")
+ Result> getLocationCustomerGridList(@RequestBody CustomerGridListFormDTO customerGridListFormDTO){
+
+ ValidatorUtils.validateEntity(customerGridListFormDTO);
+
+ return strangerAccessRecordService.listCustomerGrid(customerGridListFormDTO);
+
+ }
+
+ /**
+ * @Description 陌生访客手动选定位置获取附近网格数据
+ * @Param CustomerGridListFormDTO
+ * @return Result>
+ * @Author wangc
+ * @Date 2020.03.19 14:13
+ **/
+ @PostMapping("getselectcdcustomergridlist")
+ Result> getSelectcdCustomerGridList(@RequestBody CustomerGridListFormDTO customerGridListFormDTO){
+
+ ValidatorUtils.validateEntity(customerGridListFormDTO);
+
+ return strangerAccessRecordService.listCustomerGrid(customerGridListFormDTO);
+ }
+
+}
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/PdmanDbVersionDao.java b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/dao/StrangerAccessRecordDao.java
similarity index 65%
rename from epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/PdmanDbVersionDao.java
rename to epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/dao/StrangerAccessRecordDao.java
index 44b4dc43da..625e30b399 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/PdmanDbVersionDao.java
+++ b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/dao/StrangerAccessRecordDao.java
@@ -17,17 +17,27 @@
package com.epmet.dao;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.epmet.commons.mybatis.dao.BaseDao;
-import com.epmet.entity.PdmanDbVersionEntity;
+import com.epmet.entity.StrangerAccessRecordEntity;
import org.apache.ibatis.annotations.Mapper;
+import java.util.List;
+import java.util.Map;
+
/**
- *
+ * 陌生人访问记录
*
* @author generator generator@elink-cn.com
* @since v1.0.0 2020-03-16
*/
@Mapper
-public interface PdmanDbVersionDao extends BaseDao {
-
+public interface StrangerAccessRecordDao extends BaseDao {
+ /**
+ * 查询陌生人访问记录
+ * @param params
+ * @author yangshaoping
+ * @date 2020-03-19
+ */
+ List getStrangerAccessRecordPage(Map params);
}
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/PdmanDbVersionEntity.java b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/entity/StrangerAccessRecordEntity.java
similarity index 61%
rename from epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/PdmanDbVersionEntity.java
rename to epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/entity/StrangerAccessRecordEntity.java
index 9a9e181918..f9788d9b36 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/PdmanDbVersionEntity.java
+++ b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/entity/StrangerAccessRecordEntity.java
@@ -26,26 +26,56 @@ import lombok.EqualsAndHashCode;
import java.util.Date;
/**
- *
+ * 陌生人访问记录表
*
* @author generator generator@elink-cn.com
* @since v1.0.0 2020-03-16
*/
@Data
@EqualsAndHashCode(callSuper=false)
-@TableName("pdman_db_version")
-public class PdmanDbVersionEntity extends BaseEpmetEntity {
+@TableName("stranger_access_record")
+public class StrangerAccessRecordEntity extends BaseEpmetEntity {
private static final long serialVersionUID = 1L;
/**
- *
+ * 定位地区编码 (用户允许获取位置)
*/
- private String dbVersion;
+ private String locationAreaCode;
/**
- *
+ * 选择地区编码 (用户选择地区位置
*/
- private String versionDesc;
+ private String selectedAreaCode;
+
+ /**
+ * 是否首次位置授权(0:是 1:否)
+ */
+ private Integer isAuthorized;
+
+ /**
+ * 网格数 根据位置查询到的附近网格数
+ */
+ private Integer gridNumber;
+
+ /**
+ * 访问时间 访问的当前时间
+ */
+ private Date visitTime;
+
+ /**
+ * 省份
+ * */
+ private String province;
+
+ /**
+ * 城市
+ * */
+ private String city;
+
+ /**
+ * 地区
+ * */
+ private String area;
}
diff --git a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/excel/StrangerAccessRecordExcel.java b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/excel/StrangerAccessRecordExcel.java
new file mode 100644
index 0000000000..977f253ef3
--- /dev/null
+++ b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/excel/StrangerAccessRecordExcel.java
@@ -0,0 +1,71 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see > getPageForStrangerGuideInterface(@RequestBody ListCustomerGridFormDTO listCustomerGridFormDTO);
+
+
+
+
+
+}
diff --git a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/feign/OperCustomizeFeignClient.java b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/feign/OperCustomizeFeignClient.java
new file mode 100644
index 0000000000..0a3eb35a01
--- /dev/null
+++ b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/feign/OperCustomizeFeignClient.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.form.CustomerHomeFormDTO;
+import com.epmet.dto.result.HomeDesignByCustomerResultDTO;
+import com.epmet.feign.fallback.OperCustomizeFeignClientFallBack;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+
+/**
+ * @Description 居民端陌生人导览 调用oper_customize服务
+ * @Author sun
+ * @Date 2020/3/16
+ */
+@FeignClient(name = ServiceConstant.OPER_CUSTOMIZE_SERVER, fallback = OperCustomizeFeignClientFallBack.class)
+public interface OperCustomizeFeignClient {
+
+ /**
+ * @param
+ * @Description 根据客户Id查询客户用户表数据
+ * @Date 2020/3/17
+ **/
+ @PostMapping("/oper/customize/home/gethomereleasebycustomer")
+ Result getHomeReleaseByCustomer(CustomerHomeFormDTO formDTO);
+
+}
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
new file mode 100644
index 0000000000..60688ad717
--- /dev/null
+++ b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/feign/fallback/EpmetUserFeignClientFallBack.java
@@ -0,0 +1,24 @@
+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.form.VisitedFormDTO;
+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 {
+
+ @Override
+ public Result saveLatestAndVisited(VisitedFormDTO formDTO) {
+ return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "saveLatestAndVisited",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
new file mode 100644
index 0000000000..0554f8be50
--- /dev/null
+++ b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignFallBack.java
@@ -0,0 +1,32 @@
+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.form.ListCustomerGridFormDTO;
+import com.epmet.dto.result.CustomerGridForStrangerResultDTO;
+import com.epmet.feign.GovOrgFeignClient;
+import org.springframework.stereotype.Component;
+
+
+import java.util.List;
+
+/**
+ * @Description Feign
+ * @ClassName GovOrgFeginFallBack
+ * @Author wangc
+ * @date 2020.03.17 14:29
+ */
+@Component
+public class GovOrgFeignFallBack implements GovOrgFeignClient {
+
+ /**
+ * 根据地区编码获取附近网格数据
+ * @Param ListCustomerGridFormDTO 包含：地区编码、页码、每页数据量
+ * @return Result>
+ * */
+ @Override
+ public Result> getPageForStrangerGuideInterface(ListCustomerGridFormDTO listCustomerGridFormDTO) {
+ return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "queryListForStrangerByOrder",listCustomerGridFormDTO);
+ }
+}
diff --git a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/feign/fallback/OperCustomizeFeignClientFallBack.java b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/feign/fallback/OperCustomizeFeignClientFallBack.java
new file mode 100644
index 0000000000..95853e7da3
--- /dev/null
+++ b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/feign/fallback/OperCustomizeFeignClientFallBack.java
@@ -0,0 +1,23 @@
+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.form.CustomerHomeFormDTO;
+import com.epmet.dto.result.HomeDesignByCustomerResultDTO;
+import com.epmet.feign.OperCustomizeFeignClient;
+import org.springframework.stereotype.Component;
+
+/**
+ * @Description 居民端-陌生人导览 调用oper-customize服务
+ * @Author sun
+ * @Date 2020/3/16
+ */
+@Component
+public class OperCustomizeFeignClientFallBack implements OperCustomizeFeignClient {
+
+ @Override
+ public Result getHomeReleaseByCustomer(CustomerHomeFormDTO formDTO) {
+ return ModuleUtils.feignConError(ServiceConstant.OPER_CUSTOMIZE_SERVER, "getHomeReleaseByCustomer",formDTO);
+ }
+}
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
new file mode 100644
index 0000000000..c0c0824075
--- /dev/null
+++ b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/StrangerAccessRecordService.java
@@ -0,0 +1,110 @@
+package com.epmet.service;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.security.dto.TokenDto;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.StrangerAccessRecordDTO;
+import com.epmet.dto.form.CustomerGridListFormDTO;
+import com.epmet.dto.form.StrangerFormDTO;
+import com.epmet.dto.result.CustomerGridForStrangerResultDTO;
+import com.epmet.dto.result.HomeDesignByCustomerResultDTO;
+import com.epmet.entity.StrangerAccessRecordEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Description 陌生人记录访问表
+ * @InterfaceName ResiGuideServiceImpl
+ * @Author wangc
+ * @date 2020.03.17 13:01
+ */
+
+public interface StrangerAccessRecordService extends BaseService {
+
+ /**
+ * 查询陌生人访问记录
+ * @param params
+ * @return PageData
+ * @author yangshaoping
+ * @date 2020-03-19
+ */
+ PageData getStrangerAccessRecordPage(Map params);
+
+ /**
+ * 默认分页
+ *
+ * @param params
+ * @return PageData
+ * @author generator
+ * @date 2020-03-19
+ */
+ PageData page(Map params);
+ /**
+ * 默认查询
+ *
+ * @param params
+ * @return java.util.List
+ * @author generator
+ * @date 2020-03-19
+ */
+ List list(Map params);
+
+ /**
+ * 单条查询
+ *
+ * @param id
+ * @return StrangerAccessRecordDTO
+ * @author generator
+ * @date 2020-03-19
+ */
+ StrangerAccessRecordDTO get(String id);
+
+ /**
+ * 默认保存
+ *
+ * @param dto
+ * @return void
+ * @author generator
+ * @date 2020-03-19
+ */
+ void save(StrangerAccessRecordDTO dto);
+
+ /**
+ * 默认更新
+ *
+ * @param dto
+ * @return void
+ * @author generator
+ * @date 2020-03-19
+ */
+ void update(StrangerAccessRecordDTO dto);
+
+ /**
+ * 批量删除
+ *
+ * @param ids
+ * @return void
+ * @author generator
+ * @date 2020-03-19
+ */
+ void delete(String[] ids);
+
+ /**
+ * @Description 陌生人根据地区编码查询附近网格数据接口定义
+ * @Param CustomerGridListFormDTO
+ * @return Result>
+ * @Author wangc
+ * @Date 2020.03.19 14:28
+ **/
+ Result> listCustomerGrid(CustomerGridListFormDTO customerGridListFormDTO);
+
+ /**
+ * 居民端-网格链接获取客户首页配置
+ * @param
+ * @return void
+ * @author sun
+ */
+ 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
new file mode 100644
index 0000000000..5858a5b795
--- /dev/null
+++ b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/impl/StrangerAccessRecordServiceImpl.java
@@ -0,0 +1,211 @@
+package com.epmet.service.impl;
+
+
+import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
+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.dao.StrangerAccessRecordDao;
+import com.epmet.dto.StrangerAccessRecordDTO;
+import com.epmet.dto.form.*;
+import com.epmet.dto.result.CustomerGridForStrangerResultDTO;
+import com.epmet.dto.result.HomeDesignByCustomerResultDTO;
+import com.epmet.entity.StrangerAccessRecordEntity;
+import com.epmet.feign.EpmetUserFeignClient;
+import com.epmet.feign.GovOrgFeignClient;
+import com.epmet.feign.OperCustomizeFeignClient;
+import com.epmet.service.StrangerAccessRecordService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
+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;
+
+import java.util.Map;
+/**
+ * @Description 陌生人记录访问表
+ * @ClassName ResiGuideServiceImpl
+ * @Author wangc
+ * @date 2020.03.17 13:01
+ */
+@Service
+public class StrangerAccessRecordServiceImpl extends BaseServiceImpl implements StrangerAccessRecordService {
+ @Autowired
+ private StrangerAccessRecordDao strangerAccessRecordDao;
+ @Autowired
+ private GovOrgFeignClient govOrgFeignClient;
+ @Autowired
+ private EpmetUserFeignClient epmetUserFeignClient;
+ @Autowired
+ private OperCustomizeFeignClient operCustomizeFeignClient;
+ /**
+ * 查询陌生人访问记录
+ * @param params
+ * @return PageData
+ * @author yangshaoping
+ * @date 2020-03-19
+ */
+ @Override
+ public PageData getStrangerAccessRecordPage(Map params) {
+ List list = strangerAccessRecordDao.getStrangerAccessRecordPage(params);
+ return getPageData(list,list.size(), StrangerAccessRecordDTO.class);
+ }
+ @Override
+ public PageData page(Map params) {
+ IPage page = baseDao.selectPage(
+ getPage(params, FieldConstant.CREATED_TIME, false),
+ getWrapper(params)
+ );
+ return getPageData(page, StrangerAccessRecordDTO.class);
+ }
+
+ @Override
+ public List list(Map params) {
+ List entityList = baseDao.selectList(getWrapper(params));
+
+ return ConvertUtils.sourceToTarget(entityList, StrangerAccessRecordDTO.class);
+ }
+
+ 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);
+
+ return wrapper;
+ }
+
+ @Override
+ public StrangerAccessRecordDTO get(String id) {
+ StrangerAccessRecordEntity entity = baseDao.selectById(id);
+ return ConvertUtils.sourceToTarget(entity, StrangerAccessRecordDTO.class);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void save(StrangerAccessRecordDTO dto) {
+ StrangerAccessRecordEntity entity = ConvertUtils.sourceToTarget(dto, StrangerAccessRecordEntity.class);
+ insert(entity);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void update(StrangerAccessRecordDTO dto) {
+ StrangerAccessRecordEntity entity = ConvertUtils.sourceToTarget(dto, StrangerAccessRecordEntity.class);
+ updateById(entity);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void delete(String[] ids) {
+ // 逻辑删除（@TableLogic 注解）
+ baseDao.deleteBatchIds(Arrays.asList(ids));
+ }
+
+
+ /**
+ * @Description 陌生人根据地区编码查询附近网格数据具体实现
+ * @Param CustomerGridListFormDTO
+ * @return Result>
+ * @Author wangc
+ * @Date 2020.03.19 14:28
+ **/
+
+ @Override
+ public Result> listCustomerGrid(CustomerGridListFormDTO customerGridListFormDTO) {
+
+
+ ListCustomerGridFormDTO listCustomerGridFormDTO = new ListCustomerGridFormDTO();
+ listCustomerGridFormDTO.setAreaCode(0 == customerGridListFormDTO.getIsAuthorized() ?
+ customerGridListFormDTO.getSelectedAreaCode() : customerGridListFormDTO.getAreaCode());
+
+ listCustomerGridFormDTO.setPageNo(null == customerGridListFormDTO.getPageNo() ? 1 : customerGridListFormDTO.getPageNo());
+
+ listCustomerGridFormDTO.setPageSize(customerGridListFormDTO.getPageSize());
+
+
+ Result> queryResult =
+ govOrgFeignClient
+ .getPageForStrangerGuideInterface(listCustomerGridFormDTO);
+
+ //Feign调用成功
+ if(queryResult.success()) {
+
+ List queryList = queryResult.getData();
+ if (null != queryResult && queryList.size() > 0) {
+ StrangerAccessRecordEntity strangerTrance = new StrangerAccessRecordEntity();
+ //未授权，手动选择
+ if (0 == customerGridListFormDTO.getIsAuthorized()) {
+ strangerTrance.setSelectedAreaCode(customerGridListFormDTO.getSelectedAreaCode());
+ strangerTrance.setLocationAreaCode("");
+ } else if (1 == customerGridListFormDTO.getIsAuthorized()) {
+ //已授权，自动选择
+ strangerTrance.setLocationAreaCode(customerGridListFormDTO.getAreaCode());
+ strangerTrance.setSelectedAreaCode("");
+ }
+ strangerTrance.setIsAuthorized(customerGridListFormDTO.getIsAuthorized());
+ strangerTrance.setGridNumber(queryList.size());
+ strangerTrance.setVisitTime(new Date());
+ strangerTrance.setProvince(customerGridListFormDTO.getProvince());
+ strangerTrance.setCity(customerGridListFormDTO.getCity());
+ strangerTrance.setArea(customerGridListFormDTO.getArea());
+ insert(strangerTrance);
+
+ return new Result>().ok(queryList);
+ } else {
+ //没有查询出结果
+ return new Result>().ok(new ArrayList<>());
+ }
+ }else{
+ //Feign调用失败
+ return new Result>().error(queryResult.getCode(),queryResult.getMsg());
+ }
+
+
+ }
+
+ /**
+ * 居民端-网格链接获取客户首页配置
+ * @return void
+ * @author sun
+ */
+ @Override
+ public Result getgridhome(TokenDto tokenDTO, StrangerFormDTO formDTO) {
+ //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.getClient());
+ return res;
+
+ }
+
+ /**
+ * 调用oper-customize服务 获取首页发布数据
+ * @param customerId 客户Id
+ * @param clientType 所属端
+ * @return
+ * @author sun
+ */
+ public Result getCustomerHomeData(String customerId,String clientType){
+ CustomerHomeFormDTO dto = new CustomerHomeFormDTO();
+ dto.setCustomerId(customerId);
+ dto.setClientType(clientType);//居民端
+ return operCustomizeFeignClient.getHomeReleaseByCustomer(dto);
+ }
+
+
+}
diff --git a/epmet-module/resi-guide/resi-guide-server/src/main/resources/bootstrap.yml b/epmet-module/resi-guide/resi-guide-server/src/main/resources/bootstrap.yml
index ebcd8b5647..2ff1d86886 100644
--- a/epmet-module/resi-guide/resi-guide-server/src/main/resources/bootstrap.yml
+++ b/epmet-module/resi-guide/resi-guide-server/src/main/resources/bootstrap.yml
@@ -4,6 +4,8 @@ server:
context-path: /resi/guide
spring:
+ main:
+ allow-bean-definition-overriding: true
application:
name: resi-guide-server
#环境 dev|test|prod
diff --git a/epmet-module/resi-guide/resi-guide-server/src/main/resources/logback-spring.xml b/epmet-module/resi-guide/resi-guide-server/src/main/resources/logback-spring.xml
new file mode 100644
index 0000000000..6f0e508a90
--- /dev/null
+++ b/epmet-module/resi-guide/resi-guide-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-module/resi-guide/resi-guide-server/src/main/resources/mapper/StrangerAccessRecordDao.xml b/epmet-module/resi-guide/resi-guide-server/src/main/resources/mapper/StrangerAccessRecordDao.xml
new file mode 100644
index 0000000000..ee340ac3e7
--- /dev/null
+++ b/epmet-module/resi-guide/resi-guide-server/src/main/resources/mapper/StrangerAccessRecordDao.xml
@@ -0,0 +1,43 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ SELECT
+ a.LOCATION_AREA_CODE,
+ a.PROVINCE,
+ a.CITY,
+ a.AREA,
+ a.IS_AUTHORIZED,
+ a.VISIT_TIME
+ FROM
+ stranger_access_record AS a
+ where a.DEL_FLAG=0 and date_sub(curdate(), interval 3 day) <= a.VISIT_TIME
+ ORDER BY a.VISIT_TIME desc
+
+
+
\ No newline at end of file
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/GridVisitedDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/GridVisitedDTO.java
index cf2c85a332..72eea402f8 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/GridVisitedDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/GridVisitedDTO.java
@@ -58,11 +58,6 @@ public class GridVisitedDTO implements Serializable {
*/
private String customerUserId;
- /**
- * 是否首次位置授权(0:否 1:是)
- */
- private Integer isAuthorized;
-
/**
* 访问时间 一个用户一天访问一个网格只有一条记录
*/
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/redis/PdmanDbVersionRedis.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/VisitedFormDTO.java
similarity index 53%
rename from epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/redis/PdmanDbVersionRedis.java
rename to epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/VisitedFormDTO.java
index df050721f3..c8bacca5f9 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/redis/PdmanDbVersionRedis.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/VisitedFormDTO.java
@@ -15,33 +15,38 @@
* along with this program. If not, see io.github.openfeign
feign-httpclient
+
+ com.epmet
+ gov-org-client
+ 2.0.0
+ compile
+
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/UserApplication.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/UserApplication.java
index 31ded63d9e..8f8e583add 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/UserApplication.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/UserApplication.java
@@ -19,6 +19,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
* @author Mark sunlightcs@gmail.com
* @since 1.0.0
*/
+
@SpringBootApplication
@EnableDiscoveryClient
@EnableFeignClients
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 a960c39e20..1f3d09d73c 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
@@ -23,9 +23,10 @@ import com.epmet.commons.tools.utils.Result;
import com.epmet.commons.tools.validator.AssertUtils;
import com.epmet.commons.tools.validator.ValidatorUtils;
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.commons.tools.validator.group.UpdateGroup;
import com.epmet.dto.GridVisitedDTO;
+import com.epmet.dto.form.VisitedFormDTO;
import com.epmet.excel.GridVisitedExcel;
import com.epmet.service.GridVisitedService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -91,4 +92,15 @@ public class GridVisitedController {
ExcelUtils.exportExcelToTarget(response, null, list, GridVisitedExcel.class);
}
+ /**
+ * 网格访问记录表、最近访问网格表新增数据
+ * 网格访问记录表新增数据(一天一条)
+ * 最近访问表更新访问时间字段
+ * @param formDTO
+ */
+ @PostMapping("savelatestandvisited")
+ public void saveLatestAndVisited(@RequestBody VisitedFormDTO formDTO) throws Exception {
+ gridVisitedService.saveLatestAndVisited(formDTO);
+ }
+
}
\ 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 2b31a4b1a8..52af37226a 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
@@ -18,6 +18,7 @@
package com.epmet.dao;
import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.GridLatestDTO;
import com.epmet.entity.GridLatestEntity;
import org.apache.ibatis.annotations.Mapper;
@@ -29,5 +30,6 @@ import org.apache.ibatis.annotations.Mapper;
*/
@Mapper
public interface GridLatestDao extends BaseDao {
-
+
+ GridLatestEntity getGridLatestByIds(GridLatestDTO formDTO);
}
\ No newline at end of file
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 e51d88956d..b246bdabd5 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
@@ -18,6 +18,9 @@
package com.epmet.dao;
import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.GridLatestDTO;
+import com.epmet.dto.GridVisitedDTO;
+import com.epmet.entity.GridLatestEntity;
import com.epmet.entity.GridVisitedEntity;
import org.apache.ibatis.annotations.Mapper;
@@ -29,5 +32,6 @@ import org.apache.ibatis.annotations.Mapper;
*/
@Mapper
public interface GridVisitedDao extends BaseDao {
-
+
+ GridVisitedDTO getGridVisitedByIds(GridVisitedDTO formDTO);
}
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/GridVisitedEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/GridVisitedEntity.java
index 9fb79ca7af..a6cb62c704 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/GridVisitedEntity.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/GridVisitedEntity.java
@@ -58,11 +58,6 @@ public class GridVisitedEntity extends BaseEpmetEntity {
*/
private String customerUserId;
- /**
- * 是否首次位置授权(0:否 1:是)
- */
- private Integer isAuthorized;
-
/**
* 访问时间 一个用户一天访问一个网格只有一条记录
*/
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/GridVisitedExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/GridVisitedExcel.java
index 13c5fefc26..9e3e61b72b 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/GridVisitedExcel.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/GridVisitedExcel.java
@@ -46,9 +46,6 @@ public class GridVisitedExcel {
@Excel(name = "用户Id")
private String customerUserId;
- @Excel(name = "是否首次位置授权(0:否 1:是)")
- private Integer isAuthorized;
-
@Excel(name = "访问时间 一个用户一天访问一个网格只有一条记录")
private Date visitTime;
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
new file mode 100644
index 0000000000..5625a3ee76
--- /dev/null
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/feign/GovOrgFeignClient.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.CustomerGridDTO;
+import com.epmet.dto.form.CustomerGridFormDTO;
+import com.epmet.feign.fallback.GovOrgFeignClientFallBack;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+
+/**
+ * @Description 居民端陌生人导览 调用gov-org服务
+ * @Author sun
+ * @Date 2020/3/16
+ */
+@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);
+
+}
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
new file mode 100644
index 0000000000..c5e04129bf
--- /dev/null
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java
@@ -0,0 +1,23 @@
+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.CustomerGridDTO;
+import com.epmet.dto.form.CustomerGridFormDTO;
+import com.epmet.feign.GovOrgFeignClient;
+import org.springframework.stereotype.Component;
+
+/**
+ * @Description 居民端-陌生人导览 调用gov-org服务
+ * @Author sun
+ * @Date 2020/3/16
+ */
+@Component
+public class GovOrgFeignClientFallBack implements GovOrgFeignClient {
+
+ @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 1ddbb716a8..138f4c9483 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,7 +19,9 @@ package com.epmet.service;
import com.epmet.commons.mybatis.service.BaseService;
import com.epmet.commons.tools.page.PageData;
+import com.epmet.dto.CustomerGridDTO;
import com.epmet.dto.GridLatestDTO;
+import com.epmet.dto.form.VisitedFormDTO;
import com.epmet.entity.GridLatestEntity;
import java.util.List;
@@ -92,4 +94,10 @@ public interface GridLatestService extends BaseService {
* @date 2020-03-16
*/
void delete(String[] ids);
+
+ /**
+ * 最近访问网格表新增数据
+ * @param formDTO
+ */
+ void saveGridLatest(VisitedFormDTO formDTO, CustomerGridDTO cu);
}
\ No newline at end of file
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 d081fab310..b324356f94 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,7 +19,9 @@ package com.epmet.service;
import com.epmet.commons.mybatis.service.BaseService;
import com.epmet.commons.tools.page.PageData;
+import com.epmet.dto.GridLatestDTO;
import com.epmet.dto.GridVisitedDTO;
+import com.epmet.dto.form.VisitedFormDTO;
import com.epmet.entity.GridVisitedEntity;
import java.util.List;
@@ -92,4 +94,24 @@ public interface GridVisitedService extends BaseService {
* @date 2020-03-16
*/
void delete(String[] ids);
+
+
+
+
+
+
+ /**
+ * 网格访问记录表新增数据
+ * @param formDTO
+ */
+ //void saveGridVisited(GridVisitedDTO formDTO);
+
+
+
+
+
+ /**
+ * @param formDTO
+ */
+ void saveLatestAndVisited(VisitedFormDTO formDTO) throws Exception;
}
\ 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 1ab4bac35f..ba4dcea6a1 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
@@ -24,7 +24,9 @@ import com.epmet.commons.tools.page.PageData;
import com.epmet.commons.tools.utils.ConvertUtils;
import com.epmet.commons.tools.constant.FieldConstant;
import com.epmet.dao.GridLatestDao;
+import com.epmet.dto.CustomerGridDTO;
import com.epmet.dto.GridLatestDTO;
+import com.epmet.dto.form.VisitedFormDTO;
import com.epmet.entity.GridLatestEntity;
import com.epmet.redis.GridLatestRedis;
import com.epmet.service.GridLatestService;
@@ -34,6 +36,7 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.Arrays;
+import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -101,4 +104,33 @@ public class GridLatestServiceImpl extends BaseServiceImpl implements GridVisitedService {
@Autowired
- private GridVisitedRedis gridVisitedRedis;
+ private GovOrgFeignClient govOrgFeignClient;
+ @Autowired
+ private GridLatestService gridLatestService;
@Override
public PageData page(Map params) {
@@ -101,4 +109,66 @@ public class GridVisitedServiceImpl extends BaseServiceImpl result = govOrgFeignClient.getCustomerGridByGridId(dto);
+ if(!result.success()){
+ throw new Exception("查询客户网格表数据失败！");
+ }
+ CustomerGridDTO cu = result.getData();
+
+ //2:网格访问记录表新增数据
+ saveGridVisited(formDTO,cu);
+
+ //3：最近访问网格表新增数据
+ gridLatestService.saveGridLatest(formDTO,cu);
+
+ }
+
+ /**
+ * 网格记录表和最近访问网格表新增数据
+ * @param formDTO
+ * @param cu
+ */
+ public void saveGridVisited(VisitedFormDTO formDTO,CustomerGridDTO cu) {
+ 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 dto = baseDao.getGridVisitedByIds(vi);
+ 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);
+ }
+ }
+
+ /**
+ * (预留方法)查询是否注册状态值
+ * @param str
+ * @return
+ */
+ public Integer getRegister(String str){
+ return 0;
+ }
+
}
\ No newline at end of file
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 c05db815e8..ed9eaa6398 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,5 +19,34 @@
+ SELECT
+ la.id,
+ la.customer_id,
+ la.grid_id,
+ la.customer_user_id,
+ la.area_code,
+ la.pid,
+ la.latest_time,
+ la.del_flag,
+ la.revision,
+ la.created_by,
+ la.created_time,
+ la.updated_by,
+ la.updated_time
+ FROM grid_latest la
+ WHERE
+ la.del_flag = '0'
+
+ AND la.customer_id = #{customerId}
+
+
+ AND la.grid_id = #{gridId}
+
+
+ AND la.customer_user_id = #{customerUserId}
+
+
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/GridVisitedDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/GridVisitedDao.xml
index 2ea9a363db..12c9ebcfeb 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/GridVisitedDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/GridVisitedDao.xml
@@ -9,7 +9,6 @@
+ SELECT
+ vi.id,
+ vi.is_register,
+ vi.customer_id,
+ vi.grid_id,
+ vi.customer_user_id,
+ vi.visit_time,
+ vi.del_flag,
+ vi.revision,
+ vi.created_by,
+ vi.created_time,
+ vi.updated_by,
+ vi.updated_time
+ FROM grid_visited vi
+ WHERE
+ vi.del_flag = '0'
+
+ AND vi.customer_id = #{customerId}
+
+
+ AND vi.grid_id = #{gridId}
+
+
+ AND vi.customer_user_id = #{customerUserId}
+
+
+ AND to_days(vi.visit_time) = to_days(#{visitTime})
+
+
\ No newline at end of file