luyan
/
epmet-cloud-rizhao0920
forked from rongchao/epmet-cloud-rizhao
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'dev1.0-resiguide' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev1.0-resiguide 

# Conflicts:
#	epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java
#	epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java
#	epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java
#	epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java
#	epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml
#	epmet-module/resi-guide/resi-guide-server/pom.xml
dev
sunyuchao 6 years ago
parent
ef5c834105 622a4de1ff
commit
559618560f
35 changed files with 1356 additions and 3 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/feign/fallback/OperCrmFeignClientFallBack.java
  2. 2
      epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/feign/fallback/DemoFeignClientFallBack.java
  3. 2
      epmet-module/gov-org/gov-org-client/pom.xml
  4. 42
      epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/GovOrgFormDTO.java
  5. 33
      epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/CustomerGridForStangerResultDTO.java
  6. 5
      epmet-module/gov-org/gov-org-server/pom.xml
  7. 20
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/exception/ModuleErrorCode.java
  8. 32
      epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml
  9. 25
      epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/constant/OperCustomizeConstant.java
  10. 34
      epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/CustomerHomeFormDTO.java
  11. 64
      epmet-module/resi-guide/resi-guide-client/src/main/java/com/epmet/dto/CustomerGridListQueryDTO.java
  12. 47
      epmet-module/resi-guide/resi-guide-client/src/main/java/com/epmet/dto/form/StrangerFormDTO.java
  13. 26
      epmet-module/resi-guide/resi-guide-client/src/main/java/com/epmet/dto/result/CustomerGridListResultDTO.java
  14. 53
      epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/controller/StrangerAccessRecordController.java
  15. 54
      epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/controller/StrangerController.java
  16. 33
      epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/dao/StrangerAccessRecordDao.java
  17. 30
      epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/dao/StrangerDao.java
  18. 72
      epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/entity/StrangerAccessRecordEntity.java
  19. 33
      epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/entity/StrangerEntity.java
  20. 71
      epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/excel/StrangerAccessRecordExcel.java
  21. 28
      epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java
  22. 41
      epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java
  23. 27
      epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/feign/OperCustomizeFeignClient.java
  24. 24
      epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/feign/fallback/EpmetUserFeignClientFallBack.java
  25. 33
      epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/feign/fallback/GovOrgFeginFallBack.java
  26. 23
      epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/feign/fallback/OperCustomizeFeignClientFallBack.java
  27. 21
      epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/StrangerAccessRecordService.java
  28. 35
      epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/StrangerService.java
  29. 80
      epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/impl/StrangerAccessRecordServiceImpl.java
  30. 79
      epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/impl/StrangerServiceImpl.java
  31. 159
      epmet-module/resi-guide/resi-guide-server/src/main/resources/logback-spring.xml
  32. 27
      epmet-module/resi-guide/resi-guide-server/src/main/resources/mapper/StrangerAccessRecordDao.xml
  33. 52
      epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/VisitedFormDTO.java
  34. 27
      epmet-user/epmet-user-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java
  35. 23
      epmet-user/epmet-user-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java

2
epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/feign/impl/OperCrmFeignClientFallBack.java → epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/feign/fallback/OperCrmFeignClientFallBack.java
View File

@ -1,4 +1,4 @@
package com.epmet.feign.impl;
package com.epmet.feign.fallback;
import com.epmet.commons.tools.constant.ServiceConstant;
import com.epmet.commons.tools.utils.ModuleUtils;

2
epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/feign/impl/DemoFeignClientFallBack.java → epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/feign/fallback/DemoFeignClientFallBack.java
View File

@ -1,4 +1,4 @@
package com.epmet.feign.impl;
package com.epmet.feign.fallback;
import com.epmet.commons.tools.constant.ServiceConstant;
import com.epmet.commons.tools.utils.ModuleUtils;

2
epmet-module/gov-org/gov-org-client/pom.xml
View File

@ -10,7 +10,7 @@
</parent>
<artifactId>gov-org-client</artifactId>
<packaging>jar</packaging>
<dependencies>
<dependency>

42
epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/GovOrgFormDTO.java
View File

@ -0,0 +1,42 @@
/**
* Copyright 2018 人人开源 https://www.renren.io
* <p>
* 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.
* <p>
* 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.
* <p>
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.epmet.dto.form;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import java.io.Serializable;
/**
* 居民端-网格链接获取客户首页配置
* @author sun
*/
@Data
public class GovOrgFormDTO implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 网格Id
*/
@NotBlank(message = "网格ID不能为空")
private String gridId;
}

33
epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/CustomerGridForStangerResultDTO.java
View File

@ -0,0 +1,33 @@
package com.epmet.dto.result;/**
* Created by 11 on 2020/3/19.
*/
import lombok.Data;
import java.io.Serializable;
/**
* @Description 陌生人搜索网格返回结果
* @ClassName CustomerGridForStangerResultDTO
* @Author wangc
* @date 2020.03.19 00:38
*/
@Data
public class CustomerGridForStangerResultDTO implements Serializable {
private static final long serialVersionUID = -1L;
/**
* 网格ID
* */
private String gridId;
/**
* 客户ID
* */
private String customerId;
/**
* 网格名称
* */
private String gridName;
}

5
epmet-module/gov-org/gov-org-server/pom.xml
View File

@ -54,6 +54,11 @@
<artifactId>feign-httpclient</artifactId>
<version>10.3.0</version>
</dependency>
<dependency>
<groupId>com.github.pagehelper</groupId>
<artifactId>pagehelper</artifactId>
<version>5.0.1</version>
</dependency>
</dependencies>
<build>

20
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/exception/ModuleErrorCode.java
View File

@ -0,0 +1,20 @@
package com.epmet.exception;
import com.epmet.commons.tools.exception.ErrorCode;
/**
* 模块错误编码，由9位数字组成，前6位为模块编码，后3位为业务编码
* <p>
* 如：100001001（100001代表模块，001代表业务代码）
* </p>
*
* @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;
}

32
epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml
View File

@ -22,6 +22,15 @@
<result property="updatedTime" column="UPDATED_TIME"/>
</resultMap>
<!-- 根据区县地区码匹配到当前区县下所有网格 -->
<select id="selectGridByAreaCode" parameterType="java.lang.String" resultType="com.epmet.dto.result.CustomerGridForStangerResultDTO">
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>
<select id="getCustomerGridByGridId" parameterType="com.epmet.dto.form.GovOrgFormDTO"
resultType="com.epmet.dto.CustomerGridDTO">
SELECT
@ -45,4 +54,27 @@
<!-- 根据城市地区码前四位匹配到城市下所有网格 -->
<select id="selectGridByCityLike" parameterType="java.lang.String" resultType="com.epmet.dto.result.CustomerGridForStangerResultDTO">
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
</select>
<!-- 根据区县地区码匹配到所属城市下除该区县以外其余所有网格 -->
<select id="selectRestGridWithoutGivenAreaCode" parameterType="java.lang.String" resultType="com.epmet.dto.result.CustomerGridForStangerResultDTO">
SELECT id AS grid_id , customer_id , grid_name
FROM CUSTOMER_GRID
WHERE AREA_CODE LIKE CONCAT(#{cityCode},'%')
AND
<![CDATA[
AREA_CODE <> #{areaCode}
]]>
ORDER BY
customer_id,
CONVERT ( grid_name USING gbk ) ASC
</select>
</mapper>

25
epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/constant/OperCustomizeConstant.java
View File

@ -0,0 +1,25 @@
/**
* Copyright (c) 2018 人人开源 All rights reserved.
* <p>
* https://www.renren.io
* <p>
* 版权所有，侵权必究！
*/
package com.epmet.dto.constant;
/**
* 常量
* @author sun
* @since 1.0.0
*/
public interface OperCustomizeConstant {
/**
* 数据状态-已发布
*/
String STATUS = "0";
/**
* 数据状态-草稿
*/
String STATUS_ONE = "1";
}

34
epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/CustomerHomeFormDTO.java
View File

@ -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;
}

64
epmet-module/resi-guide/resi-guide-client/src/main/java/com/epmet/dto/CustomerGridListQueryDTO.java
View File

@ -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;
}

47
epmet-module/resi-guide/resi-guide-client/src/main/java/com/epmet/dto/form/StrangerFormDTO.java
View File

@ -0,0 +1,47 @@
/**
* Copyright 2018 人人开源 https://www.renren.io
* <p>
* 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.
* <p>
* 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.
* <p>
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.epmet.dto.form;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import java.io.Serializable;
/**
* 居民端-网格链接获取客户首页配置入参
* @author sun
*/
@Data
public class StrangerFormDTO implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 网格Id
*/
@NotBlank(message = "网格ID不能为空")
private String gridId;
/**
* 客户Id CUSTOMER.id
*/
@NotBlank(message = "客户ID不能为空")
private String customerId;
}

26
epmet-module/resi-guide/resi-guide-client/src/main/java/com/epmet/dto/result/CustomerGridListResultDTO.java
View File

@ -0,0 +1,26 @@
package com.epmet.dto.result;/**
* Created by 11 on 2020/3/17.
*/
import java.io.Serializable;
/**
* @Description
* @ClassName CustomerGridListResultDTO
* @Author wangc
* @date 2020.03.17 13:56
*/
public class CustomerGridListResultDTO implements Serializable {
private static final long serialVersionUID = 1L;
//网格Id epmet_gov_org.customer_gird.id
private String gridId;
//客户Id epmet_gov_org.customer_gird.customer_id
private String customerId;
//网格名称 epmet_gov_org.customer_gird.grid_name
private String gridName;
}

53
epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/controller/StrangerAccessRecordController.java
View File

@ -0,0 +1,53 @@
package com.epmet.controller;
import com.epmet.commons.tools.utils.Result;
import com.epmet.commons.tools.validator.ValidatorUtils;
import com.epmet.dto.CustomerGridListQueryDTO;
import com.epmet.dto.result.CustomerGridForStangerResultDTO;
import com.epmet.service.StrangerAccessRecordService;
import org.springframework.beans.factory.annotation.Autowired;
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;
import java.util.List;
/**
* @Description
* @ClassName StrangerAccessRecordController
* @Author wangc
* @date 2020.03.17 11:33
*/
@RestController
@RequestMapping("stranger")
public class StrangerAccessRecordController {
@Autowired
private StrangerAccessRecordService strangerAccessRecordService;
/**
* 陌生访客授权位置获取附近网格数据
*
* */
@PostMapping("getlocationcustomergridlist")
Result<List<CustomerGridForStangerResultDTO>> getLocationCustomerGridList(@RequestBody CustomerGridListQueryDTO customerGridListQueryDTO){
ValidatorUtils.validateEntity(customerGridListQueryDTO);
return new Result<List<CustomerGridForStangerResultDTO>>().ok(strangerAccessRecordService.ListCustomerGrid(customerGridListQueryDTO));
}
/**
* 陌生访客自动选定位置获取附近网格数据
*
* */
@PostMapping("getselectcdcustomergridlist")
Result<List<CustomerGridForStangerResultDTO>> getSelectcdCustomerGridList(@RequestBody CustomerGridListQueryDTO customerGridListQueryDTO){
ValidatorUtils.validateEntity(customerGridListQueryDTO);
return new Result<List<CustomerGridForStangerResultDTO>>().ok(strangerAccessRecordService.ListCustomerGrid(customerGridListQueryDTO));
}
}

54
epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/controller/StrangerController.java
View File

@ -0,0 +1,54 @@
/**
* Copyright 2018 人人开源 https://www.renren.io
* <p>
* 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.
* <p>
* 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.
* <p>
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.epmet.controller;
import com.epmet.commons.tools.utils.Result;
import com.epmet.dto.form.StrangerFormDTO;
import com.epmet.dto.result.HomeDesignByCustomerResultDTO;
import com.epmet.service.StrangerService;
import org.springframework.beans.factory.annotation.Autowired;
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;
/**
* 居民端-陌生人导览
* @author sun
* @since v1.0.0 2020-03-16
*/
@RestController
@RequestMapping("stranger")
public class StrangerController {
@Autowired
private StrangerService strangerService;
/**
* @param
* @Author sun
* @Description 居民端-陌生人导览-网格链接获取客户首页配置
* @Date 2020/3/16
**/
@PostMapping("getgridhome")
public Result<HomeDesignByCustomerResultDTO> getValidCustomerList(@RequestBody StrangerFormDTO formDTO) throws Exception {
return strangerService.getgridhome(formDTO);
}
}

33
epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/dao/StrangerAccessRecordDao.java
View File

@ -0,0 +1,33 @@
/**
* Copyright 2018 人人开源 https://www.renren.io
* <p>
* 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.
* <p>
* 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.
* <p>
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.epmet.dao;
import com.epmet.commons.mybatis.dao.BaseDao;
import com.epmet.entity.StrangerAccessRecordEntity;
import org.apache.ibatis.annotations.Mapper;
/**
* 陌生人访问记录表
*
* @author generator generator@elink-cn.com
* @since v1.0.0 2020-03-16
*/
@Mapper
public interface StrangerAccessRecordDao extends BaseDao<StrangerAccessRecordEntity> {
}

30
epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/dao/StrangerDao.java
View File

@ -0,0 +1,30 @@
/**
* Copyright 2018 人人开源 https://www.renren.io
* <p>
* 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.
* <p>
* 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.
* <p>
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.epmet.dao;
import com.epmet.commons.mybatis.dao.BaseDao;
import com.epmet.entity.StrangerEntity;
import org.apache.ibatis.annotations.Mapper;
/**
* @author sun
*/
@Mapper
public interface StrangerDao extends BaseDao<StrangerEntity> {
}

72
epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/entity/StrangerAccessRecordEntity.java
View File

@ -0,0 +1,72 @@
/**
* Copyright 2018 人人开源 https://www.renren.io
* <p>
* 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.
* <p>
* 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.
* <p>
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.epmet.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
import lombok.Data;
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("stranger_access_record")
public class StrangerAccessRecordEntity extends BaseEpmetEntity {
private static final long serialVersionUID = 1L;
/**
* 定位地区编码 (用户允许获取位置)
*/
private String locationAreaCode;
/**
* 选择地区编码 (用户选择地区位置
*/
private String selectedAreaCode;
/**
* 是否首次位置授权(0:是 1:否)
*/
private Integer isAuthorized;
/**
* 网格数 根据位置查询到的附近网格数
*/
private Integer gridNumber;
/**
* 访问时间 访问的当前时间
*/
private Date visitTime;
private String province;
private String city;
private String area;
}

33
epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/entity/StrangerEntity.java
View File

@ -0,0 +1,33 @@
/**
* Copyright 2018 人人开源 https://www.renren.io
* <p>
* 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.
* <p>
* 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.
* <p>
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.epmet.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
@Data
@EqualsAndHashCode(callSuper=false)
@TableName("stranger")
public class StrangerEntity extends BaseEpmetEntity {
private static final long serialVersionUID = 1L;
}

71
epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/excel/StrangerAccessRecordExcel.java
View File

@ -0,0 +1,71 @@
/**
* Copyright 2018 人人开源 https://www.renren.io
* <p>
* 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.
* <p>
* 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.
* <p>
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.epmet.excel;
import cn.afterturn.easypoi.excel.annotation.Excel;
import lombok.Data;
import java.util.Date;
/**
* 陌生人访问记录表
*
* @author generator generator@elink-cn.com
* @since v1.0.0 2020-03-16
*/
@Data
public class StrangerAccessRecordExcel {
@Excel(name = "唯一标识")
private String id;
@Excel(name = "定位地区编码 (用户允许获取位置)")
private String locationAreaCode;
@Excel(name = "选择地区编码 (用户选择地区位置")
private String lelectedAreaCode;
@Excel(name = "是否首次位置授权(0:是 1:否)")
private Integer isAuthorized;
@Excel(name = "网格数 根据位置查询到的附近网格数")
private Integer gridNumber;
@Excel(name = "访问时间 访问的当前时间")
private Date visitTime;
@Excel(name = "删除标识：0.未删除 1.已删除")
private Integer delFlag;
@Excel(name = "乐观锁")
private Integer revision;
@Excel(name = "创建人")
private String createdBy;
@Excel(name = "创建时间")
private Date createdTime;
@Excel(name = "更新人")
private String updatedBy;
@Excel(name = "更新时间")
private Date updatedTime;
}

28
epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java
View File

@ -0,0 +1,28 @@
package com.epmet.feign;
import com.epmet.commons.tools.constant.ServiceConstant;
import com.epmet.commons.tools.utils.Result;
import com.epmet.dto.form.VisitedFormDTO;
import com.epmet.feign.fallback.EpmetUserFeignClientFallBack;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
/**
* @Description 居民端陌生人导览 调用epmet-user服务
* @Author sun
*/
@FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallback = EpmetUserFeignClientFallBack.class)
public interface EpmetUserFeignClient {
/**
* 保存或更新网格访问记录表和最近访问网格表数据
* @param
* @Description
**/
@PostMapping("/epmetuser/gridvisited/savelatestandvisited")
Result saveLatestAndVisited(VisitedFormDTO formDTO);
}

41
epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java
View File

@ -0,0 +1,41 @@
package com.epmet.feign;
import com.epmet.commons.tools.constant.ServiceConstant;
import com.epmet.commons.tools.page.PageData;
import com.epmet.commons.tools.utils.Result;
import com.epmet.dto.CustomerGridListQueryDTO;
import com.epmet.dto.result.CustomerGridForStangerResultDTO;
import com.epmet.dto.result.CustomerGridListResultDTO;
import com.epmet.feign.impl.GovOrgFeginFallBack;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestParam;
import java.util.List;
/**
* Feign调用gov-org-server模块
* Created by 11 on 2020/3/17.
*/
@FeignClient(name = ServiceConstant.GOV_ORG_SERVER, fallback = GovOrgFeginFallBack.class, url="http://localhost:8092")
public interface GovOrgFeignClient {
/**
* 根据地区编码获取附近网格数据
* @Param areaCode 地区编码
* @Param pageNo 当前页
* @Param pageSize 每页数据量
* */
@GetMapping("/gov/org/customergrid/queryListForStrangerByOrder")
Result<List<CustomerGridForStangerResultDTO>> getPageForStrangerGuideInterface(@RequestParam("areaCode")String areaCode, @RequestParam("pageNo")Integer pageNo, @RequestParam("pageSize")Integer pageSize);
}

27
epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/feign/OperCustomizeFeignClient.java
View File

@ -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<HomeDesignByCustomerResultDTO> getHomeReleaseByCustomer(CustomerHomeFormDTO formDTO);
}

24
epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/feign/fallback/EpmetUserFeignClientFallBack.java
View File

@ -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);
}
}

33
epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/feign/fallback/GovOrgFeginFallBack.java
View File

@ -0,0 +1,33 @@
package com.epmet.feign.fallback;/**
* Created by 11 on 2020/3/17.
*/
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.CustomerGridForStangerResultDTO;
import com.epmet.feign.GovOrgFeignClient;
import org.springframework.stereotype.Component;
import java.util.List;
/**
* @Description
* @ClassName GovOrgFeginFallBack
* @Author wangc
* @date 2020.03.17 14:29
*/
@Component
public class GovOrgFeginFallBack implements GovOrgFeignClient {
/**
* 根据地区编码获取附近网格数据
* @Param areaCode 地区编码
* @Param pageNo 当前页
* @Param pageSize 每页数据量
* */
@Override
public Result<List<CustomerGridForStangerResultDTO>> getPageForStrangerGuideInterface(String areaCode, Integer pageNo, Integer pageSize) {
return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "queryListForStrangerByOrder",areaCode,pageNo,pageSize);
}
}

23
epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/feign/fallback/OperCustomizeFeignClientFallBack.java
View File

@ -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<HomeDesignByCustomerResultDTO> getHomeReleaseByCustomer(CustomerHomeFormDTO formDTO) {
return ModuleUtils.feignConError(ServiceConstant.OPER_CUSTOMIZE_SERVER, "getHomeReleaseByCustomer",formDTO);
}
}

21
epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/StrangerAccessRecordService.java
View File

@ -0,0 +1,21 @@
package com.epmet.service;
import com.epmet.commons.mybatis.service.BaseService;
import com.epmet.dto.CustomerGridListQueryDTO;
import com.epmet.dto.result.CustomerGridForStangerResultDTO;
import com.epmet.entity.StrangerAccessRecordEntity;
import java.util.List;
/**
* Created by 11 on 2020/3/17.
*/
public interface StrangerAccessRecordService extends BaseService<StrangerAccessRecordEntity> {
/**
*
* 陌生人根据位置码获取附近网格数据，并且插入陌生人访客记录
* */
List<CustomerGridForStangerResultDTO> ListCustomerGrid(CustomerGridListQueryDTO customerGridListQueryDTO);
}

35
epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/StrangerService.java
View File

@ -0,0 +1,35 @@
/**
* Copyright 2018 人人开源 https://www.renren.io
* <p>
* 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.
* <p>
* 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.
* <p>
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.epmet.service;
import com.epmet.commons.mybatis.service.BaseService;
import com.epmet.commons.tools.utils.Result;
import com.epmet.dto.form.StrangerFormDTO;
import com.epmet.dto.result.HomeDesignByCustomerResultDTO;
import com.epmet.entity.StrangerEntity;
public interface StrangerService extends BaseService<StrangerEntity> {
/**
* 居民端-网格链接获取客户首页配置
* @param
* @return void
* @author sun
*/
Result<HomeDesignByCustomerResultDTO> getgridhome(StrangerFormDTO formDTO);
}

80
epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/impl/StrangerAccessRecordServiceImpl.java
View File

@ -0,0 +1,80 @@
package com.epmet.service.impl;/**
* Created by 11 on 2020/3/17.
*/
import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
import com.epmet.commons.tools.utils.Result;
import com.epmet.dao.StrangerAccessRecordDao;
import com.epmet.dto.CustomerGridListQueryDTO;
import com.epmet.dto.result.CustomerGridForStangerResultDTO;
import com.epmet.entity.StrangerAccessRecordEntity;
import com.epmet.feign.GovOrgFeignClient;
import com.epmet.service.StrangerAccessRecordService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.Date;
import java.util.List;
/**
* @Description
* @ClassName ResiGuideServiceImpl
* @Author wangc
* @date 2020.03.17 13:01
*/
@Service
public class StrangerAccessRecordServiceImpl extends BaseServiceImpl<StrangerAccessRecordDao, StrangerAccessRecordEntity> implements StrangerAccessRecordService {
@Autowired
private GovOrgFeignClient govOrgFeignClient;
/**
*
* 陌生人根据位置码获取附近网格数据，并且插入陌生人访客记录
* */
@Override
public List<CustomerGridForStangerResultDTO> ListCustomerGrid(CustomerGridListQueryDTO customerGridListQueryDTO) {
Result<List<CustomerGridForStangerResultDTO>> queryResult =
govOrgFeignClient
.getPageForStrangerGuideInterface(customerGridListQueryDTO.getAreaCode(),customerGridListQueryDTO.getPageNo(),customerGridListQueryDTO.getPageSize());
if(0 == queryResult.getCode()) {
List<CustomerGridForStangerResultDTO> queryList = queryResult.getData();
if (null != queryResult && queryList.size() > 0) {
StrangerAccessRecordEntity strangerTrance = new StrangerAccessRecordEntity();
//未授权，手动选择 locationAreaCode
if (0 == customerGridListQueryDTO.getIsAuthorized()) {
strangerTrance.setLocationAreaCode(customerGridListQueryDTO.getSelectedAreaCode());
} else if (1 == customerGridListQueryDTO.getIsAuthorized()) {
//已授权，自动选择 selectedAreaCode
strangerTrance.setLocationAreaCode(customerGridListQueryDTO.getAreaCode());
}
strangerTrance.setIsAuthorized(customerGridListQueryDTO.getIsAuthorized());
strangerTrance.setGridNumber(queryList.size());
strangerTrance.setVisitTime(new Date());
strangerTrance.setDelFlag("1");
strangerTrance.setRevision(0);
strangerTrance.setCreatedBy("陌生人访客");
strangerTrance.setCreatedTime(new Date());
strangerTrance.setProvince(customerGridListQueryDTO.getProvince());
strangerTrance.setCity(customerGridListQueryDTO.getCity());
strangerTrance.setArea(customerGridListQueryDTO.getArea());
insert(strangerTrance);
return queryList;
} else {
return null;
}
}else{
return null;
}
}
}

79
epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/impl/StrangerServiceImpl.java
View File

@ -0,0 +1,79 @@
/**
* Copyright 2018 人人开源 https://www.renren.io
* <p>
* 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.
* <p>
* 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.
* <p>
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.epmet.service.impl;
import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
import com.epmet.commons.tools.utils.Result;
import com.epmet.dao.StrangerDao;
import com.epmet.dto.form.CustomerHomeFormDTO;
import com.epmet.dto.form.StrangerFormDTO;
import com.epmet.dto.form.VisitedFormDTO;
import com.epmet.dto.result.HomeDesignByCustomerResultDTO;
import com.epmet.entity.StrangerEntity;
import com.epmet.feign.EpmetUserFeignClient;
import com.epmet.feign.OperCustomizeFeignClient;
import com.epmet.service.StrangerService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
/**
* 居民端-陌生人导览
*
* @author sun
* @since v1.0.0 2020-03-11
*/
@Service
public class StrangerServiceImpl extends BaseServiceImpl<StrangerDao, StrangerEntity> implements StrangerService {
@Autowired
private EpmetUserFeignClient epmetUserFeignClient;
@Autowired
private OperCustomizeFeignClient operCustomizeFeignClient;
/**
* 居民端-网格链接获取客户首页配置
* @return void
* @author sun
*/
@Override
public Result<HomeDesignByCustomerResultDTO> getgridhome(StrangerFormDTO formDTO) {
//token里边有所属端 userId这些参数 前台传递customerID和gridId
//1:调用epmet-user服务查询数据 新建网格记录数据
VisitedFormDTO vi = new VisitedFormDTO();
vi.setGridId(formDTO.getGridId());
vi.setCustomerId(formDTO.getCustomerId());
//vi.setUserId(token获取);
epmetUserFeignClient.saveLatestAndVisited(vi);
//2:调用ope-customize服务 获取首页发布数据
Result<HomeDesignByCustomerResultDTO> res = getCustomerHomeData(formDTO.getCustomerId());
return res;
}
/**
* 调用oper-customize服务 获取首页发布数据
*/
public Result<HomeDesignByCustomerResultDTO> getCustomerHomeData(String customerId){
CustomerHomeFormDTO dto = new CustomerHomeFormDTO();
dto.setCustomerId(customerId);
//dto.setClientType(token中获取);//居民端
return operCustomizeFeignClient.getHomeReleaseByCustomer(dto);
}
}

159
epmet-module/resi-guide/resi-guide-server/src/main/resources/logback-spring.xml
View File

@ -0,0 +1,159 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
<include resource="org/springframework/boot/logging/logback/base.xml"/>
<property name="log.path" value="logs/resi-guide"/>
<!-- 彩色日志格式 -->
<property name="CONSOLE_LOG_PATTERN"
value="${CONSOLE_LOG_PATTERN:-%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>
<!--1. 输出到控制台-->
<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
<!--此日志appender是为开发使用，只配置最底级别，控制台输出的日志级别是大于或等于此级别的日志信息-->
<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
<level>debug</level>
</filter>
<encoder>
<Pattern>${CONSOLE_LOG_PATTERN}</Pattern>
<!-- 设置字符集 -->
<charset>UTF-8</charset>
</encoder>
</appender>
<!--2. 输出到文档-->
<!-- 2.1 level为 DEBUG 日志，时间滚动输出 -->
<appender name="DEBUG_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
<!-- 正在记录的日志文档的路径及文档名 -->
<file>${log.path}/debug.log</file>
<!--日志文档输出格式-->
<encoder>
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
<charset>UTF-8</charset> <!-- 设置字符集 -->
</encoder>
<!-- 日志记录器的滚动策略，按日期，按大小记录 -->
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<!-- 日志归档 -->
<fileNamePattern>${log.path}/debug-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
<timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
<maxFileSize>100MB</maxFileSize>
</timeBasedFileNamingAndTriggeringPolicy>
<!--日志文档保留天数-->
<maxHistory>15</maxHistory>
</rollingPolicy>
<!-- 此日志文档只记录debug级别的 -->
<filter class="ch.qos.logback.classic.filter.LevelFilter">
<level>debug</level>
<onMatch>ACCEPT</onMatch>
<onMismatch>DENY</onMismatch>
</filter>
</appender>
<!-- 2.2 level为 INFO 日志，时间滚动输出 -->
<appender name="INFO_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
<!-- 正在记录的日志文档的路径及文档名 -->
<file>${log.path}/info.log</file>
<!--日志文档输出格式-->
<encoder>
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
<charset>UTF-8</charset>
</encoder>
<!-- 日志记录器的滚动策略，按日期，按大小记录 -->
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<!-- 每天日志归档路径以及格式 -->
<fileNamePattern>${log.path}/info-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
<timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
<maxFileSize>100MB</maxFileSize>
</timeBasedFileNamingAndTriggeringPolicy>
<!--日志文档保留天数-->
<maxHistory>15</maxHistory>
</rollingPolicy>
<!-- 此日志文档只记录info级别的 -->
<filter class="ch.qos.logback.classic.filter.LevelFilter">
<level>info</level>
<onMatch>ACCEPT</onMatch>
<onMismatch>DENY</onMismatch>
</filter>
</appender>
<!-- 2.3 level为 WARN 日志，时间滚动输出 -->
<appender name="WARN_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
<!-- 正在记录的日志文档的路径及文档名 -->
<file>${log.path}/warn.log</file>
<!--日志文档输出格式-->
<encoder>
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
<charset>UTF-8</charset> <!-- 此处设置字符集 -->
</encoder>
<!-- 日志记录器的滚动策略，按日期，按大小记录 -->
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<fileNamePattern>${log.path}/warn-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
<timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
<maxFileSize>100MB</maxFileSize>
</timeBasedFileNamingAndTriggeringPolicy>
<!--日志文档保留天数-->
<maxHistory>15</maxHistory>
</rollingPolicy>
<!-- 此日志文档只记录warn级别的 -->
<filter class="ch.qos.logback.classic.filter.LevelFilter">
<level>warn</level>
<onMatch>ACCEPT</onMatch>
<onMismatch>DENY</onMismatch>
</filter>
</appender>
<!-- 2.4 level为 ERROR 日志，时间滚动输出 -->
<appender name="ERROR_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
<!-- 正在记录的日志文档的路径及文档名 -->
<file>${log.path}/error.log</file>
<!--日志文档输出格式-->
<encoder>
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
<charset>UTF-8</charset> <!-- 此处设置字符集 -->
</encoder>
<!-- 日志记录器的滚动策略，按日期，按大小记录 -->
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<fileNamePattern>${log.path}/error-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
<timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
<maxFileSize>100MB</maxFileSize>
</timeBasedFileNamingAndTriggeringPolicy>
<!--日志文档保留天数-->
<maxHistory>15</maxHistory>
</rollingPolicy>
<!-- 此日志文档只记录ERROR级别的 -->
<filter class="ch.qos.logback.classic.filter.LevelFilter">
<level>ERROR</level>
<onMatch>ACCEPT</onMatch>
<onMismatch>DENY</onMismatch>
</filter>
</appender>
<!-- 开发、测试环境 -->
<springProfile name="dev,test">
<logger name="org.springframework.web" level="INFO"/>
<logger name="org.springboot.sample" level="INFO"/>
<logger name="com.epmet.dao" level="INFO"/>
<logger name="com.epmet.dao" level="DEBUG"/>
<root level="INFO">
<appender-ref ref="DEBUG_FILE"/>
<appender-ref ref="INFO_FILE"/>
<appender-ref ref="WARN_FILE"/>
<appender-ref ref="ERROR_FILE"/>
</root>
</springProfile>
<!-- 生产环境 -->
<springProfile name="prod">
<logger name="org.springframework.web" level="INFO"/>
<logger name="org.springboot.sample" level="INFO"/>
<logger name="com.epmet.dao" level="INFO"/>
<root level="INFO">
<appender-ref ref="CONSOLE"/>
<appender-ref ref="DEBUG_FILE"/>
<appender-ref ref="INFO_FILE"/>
<appender-ref ref="WARN_FILE"/>
<appender-ref ref="ERROR_FILE"/>
</root>
</springProfile>
</configuration>

27
epmet-module/resi-guide/resi-guide-server/src/main/resources/mapper/StrangerAccessRecordDao.xml
View File

@ -0,0 +1,27 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.epmet.dao.StrangerAccessRecordDao">
<resultMap type="com.epmet.entity.StrangerAccessRecordEntity" id="strangerAccessRecordMap">
<result property="id" column="ID"/>
<result property="locationAreaCode" column="LOCATION_AREA_CODE"/>
<result property="selectedAreaCode" column="SELECTED_AREA_CODE"/>
<result property="isAuthorized" column="IS_AUTHORIZED"/>
<result property="gridNumber" column="GRID_NUMBER"/>
<result property="visitTime" column="VISIT_TIME"/>
<result property="delFlag" column="DEL_FLAG"/>
<result property="revision" column="REVISION"/>
<result property="createdBy" column="CREATED_BY"/>
<result property="createdTime" column="CREATED_TIME"/>
<result property="updatedBy" column="UPDATED_BY"/>
<result property="updatedTime" column="UPDATED_TIME"/>
<result property="province" column="PROVINCE" />
<result property="city" column="CITY" />
<result property="area" column="AREA" />
</resultMap>
</mapper>

52
epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/VisitedFormDTO.java
View File

@ -0,0 +1,52 @@
/**
* Copyright 2018 人人开源 https://www.renren.io
* <p>
* 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.
* <p>
* 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.
* <p>
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.epmet.dto.form;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import java.io.Serializable;
/**
* 居民端-网格链接获取客户首页配置
* @author sun
*/
@Data
public class VisitedFormDTO implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 网格Id
*/
@NotBlank(message = "网格ID不能为空")
private String gridId;
/**
* 客户Id CUSTOMER.id
*/
@NotBlank(message = "客户ID不能为空")
private String customerId;
/**
* 用户Id
*/
@NotBlank(message = "用户ID不能为空")
private String userId;
}

27
epmet-user/epmet-user-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java
View File

@ -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.GovOrgFormDTO;
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<CustomerGridDTO> getCustomerGridByGridId(GovOrgFormDTO formDTO);
}

23
epmet-user/epmet-user-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java
View File

@ -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.GovOrgFormDTO;
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<CustomerGridDTO> getCustomerGridByGridId(GovOrgFormDTO formDTO) {
return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getCustomerGridByGridId",formDTO);
}
}
Write Preview
Loading…
Cancel
Save