Browse Source

陌生人导览接口初始提交v1

master
sunyuchao 6 years ago
parent
commit
8efa3ffe6b
  1. 2
      epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/feign/OperCrmFeignClient.java
  2. 2
      epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/feign/DemoFeignClient.java
  3. 10
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java
  4. 2
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java
  5. 12
      epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/HomeController.java
  6. 8
      epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/HomeServiceImpl.java
  7. 8
      epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java
  8. 2
      epmet-module/resi-guide/resi-guide-server/src/main/resources/bootstrap.yml
  9. 2
      epmet-user/epmet-user-server/src/main/java/com/epmet/UserApplication.java
  10. 10
      epmet-user/epmet-user-server/src/main/java/com/epmet/controller/GridVisitedController.java
  11. 2
      epmet-user/epmet-user-server/src/main/java/com/epmet/dao/GridVisitedDao.java
  12. 9
      epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/GridLatestServiceImpl.java
  13. 36
      epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/GridVisitedServiceImpl.java
  14. 6
      epmet-user/epmet-user-server/src/main/resources/mapper/GridVisitedDao.xml

2
epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/feign/OperCrmFeignClient.java

@ -4,7 +4,7 @@ import com.epmet.commons.tools.constant.ServiceConstant;
import com.epmet.commons.tools.utils.Result;
import com.epmet.dto.CustomerDTO;
import com.epmet.dto.result.ValidCustomerResultDTO;
import com.epmet.feign.impl.OperCrmFeignClientFallBack;
import com.epmet.feign.fallback.OperCrmFeignClientFallBack;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.*;

2
epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/feign/DemoFeignClient.java

@ -2,7 +2,7 @@ package com.epmet.feign;
import com.epmet.commons.tools.constant.ServiceConstant;
import com.epmet.commons.tools.utils.Result;
import com.epmet.feign.impl.DemoFeignClientFallBack;
import com.epmet.feign.fallback.DemoFeignClientFallBack;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.GetMapping;

10
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java

@ -92,9 +92,15 @@ public class CustomerGridController {
ExcelUtils.exportExcelToTarget(response, null, list, CustomerGridExcel.class);
}
/**
* 供epmet-user服务调用 查询客户网格表数据
* @author sun
* @param formDTO
* @return
* @throws Exception
*/
@PostMapping("getcustomergridbygridid")
public Result<CustomerGridDTO> getCustomerGridByGridId(@RequestBody GovOrgFormDTO formDTO) throws Exception {
System.out.println("2222222222");
public Result<CustomerGridDTO> getCustomerGridByGridId(@RequestBody GovOrgFormDTO formDTO){
return customerGridService.getCustomerGridByGridId(formDTO);
}

2
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java

@ -96,7 +96,7 @@ public interface CustomerGridService extends BaseService<CustomerGridEntity> {
void delete(String[] ids);
/**
* 根据客户Id查询用户数据
* 根据网格Id查询用户数据
* @param formDTO
* @return
* @date 2020-03-17

12
epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/HomeController.java

@ -2,6 +2,7 @@ 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;
@ -10,7 +11,10 @@ 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 客户定制化服务-首页相关接口
@ -79,6 +83,7 @@ public class HomeController {
}
/**
* 供resi-guide服务调用 获取客户首页配置
* @param formDTO
* @return com.epmet.commons.tools.utils.Result<com.epmet.dto.result.CustomerHomeFormDTO>
* @Author sun
@ -86,9 +91,8 @@ public class HomeController {
**/
@PostMapping("gethomereleasebycustomer")
public Result<HomeDesignByCustomerResultDTO> getHomeReleaseByCustomer(@RequestBody CustomerHomeFormDTO formDTO) {
System.out.println("33333");
formDTO.setStatus("0");
formDTO.setClientType("1");
formDTO.setStatus(OperCustomizeConstant.STATUS);//已发布数据
formDTO.setClientType("0");//居民端(token中获取)
ValidatorUtils.validateEntity(formDTO);
return homeService.getHomeReleaseByCustomer(formDTO);
}

8
epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/HomeServiceImpl.java

@ -114,13 +114,13 @@ public class HomeServiceImpl implements HomeService {
for(CommonComponentDesignResultDTO c:list){
usedComponent.add(c.getComponentId());
//所属区域:0.标题区、1.置顶区、2.功能区、3.悬浮区
if("0".equals(c.getRegion())){
if("titleList".equals(c.getRegion())){
resultDTO.setTitleList(c);
}else if("1".equals(c.getRegion())){
}else if("topList".equals(c.getRegion())){
resultDTO.setTopList(c);
}else if("2".equals(c.getRegion())){
}else if("functionList".equals(c.getRegion())){
flist.add(c);
}else if("3".equals(c.getRegion())){
}else if("floatingList".equals(c.getRegion())){
resultDTO.setFloatingList(c);
}
}

8
epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java

@ -2,17 +2,11 @@ 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 com.epmet.feign.fallback.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;

2
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

2
epmet-user/epmet-user-server/src/main/java/com/epmet/UserApplication.java

@ -21,6 +21,8 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
*/
@SpringBootApplication
@EnableDiscoveryClient
@EnableFeignClients
public class UserApplication {
public static void main(String[] args) {

10
epmet-user/epmet-user-server/src/main/java/com/epmet/controller/GridVisitedController.java

@ -23,9 +23,8 @@ 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.dto.GridLatestDTO;
import com.epmet.commons.tools.validator.group.UpdateGroup;
import com.epmet.dto.GridVisitedDTO;
import com.epmet.dto.form.VisitedFormDTO;
import com.epmet.excel.GridVisitedExcel;
@ -96,16 +95,11 @@ public class GridVisitedController {
/**
* 网格访问记录表最近访问网格表新增数据
* 网格访问记录表新增数据(一天一条)
* 最近访问表更新时间字段
* 最近访问表更新访问时间字段
* @param formDTO
*/
@PostMapping("savelatestandvisited")
public void saveLatestAndVisited(@RequestBody VisitedFormDTO formDTO) throws Exception {
System.out.println("1111111");
gridVisitedService.saveLatestAndVisited(formDTO);
}
@GetMapping("getgridhome")
public void getValidCustomerList(VisitedFormDTO formDTO) throws Exception {
gridVisitedService.saveLatestAndVisited(formDTO);
}

2
epmet-user/epmet-user-server/src/main/java/com/epmet/dao/GridVisitedDao.java

@ -33,5 +33,5 @@ import org.apache.ibatis.annotations.Mapper;
@Mapper
public interface GridVisitedDao extends BaseDao<GridVisitedEntity> {
GridVisitedEntity getGridVisitedByIds(GridVisitedDTO formDTO);
GridVisitedDTO getGridVisitedByIds(GridVisitedDTO formDTO);
}

9
epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/GridLatestServiceImpl.java

@ -111,18 +111,21 @@ public class GridLatestServiceImpl extends BaseServiceImpl<GridLatestDao, GridLa
GridLatestDTO la = new GridLatestDTO();
la.setCustomerId(cu.getCustomerId());
la.setGridId(cu.getId());
la.setCustomerUserId(formDTO.getUserId());
//la.setCustomerUserId(formDTO.getUserId());//token传递的值
la.setCustomerUserId("1111111111");//token传递的值
la.setAreaCode(cu.getAreaCode());
la.setPid(cu.getPid());
la.setLatestTime(date);
la.setUpdatedTime(date);
//查询是否存在历史数据(一个用户对一个网格的访问只记录一条数据)
GridLatestEntity dto = baseDao.getGridLatestByIds(la);
GridLatestEntity entity = ConvertUtils.sourceToTarget(formDTO, GridLatestEntity.class);
GridLatestEntity entity = null;
if(dto==null||dto.getId()==null){
entity = ConvertUtils.sourceToTarget(la, GridLatestEntity.class);
insert(entity);
}else{
entity.setLatestTime(date);
entity = ConvertUtils.sourceToTarget(dto, GridLatestEntity.class);
entity.setLatestTime(date);//最近访问时间
entity.setUpdatedTime(date);
updateById(entity);
}

36
epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/GridVisitedServiceImpl.java

@ -31,7 +31,6 @@ import com.epmet.dto.form.GovOrgFormDTO;
import com.epmet.dto.form.VisitedFormDTO;
import com.epmet.entity.GridVisitedEntity;
import com.epmet.feign.GovOrgFeignClient;
import com.epmet.redis.GridVisitedRedis;
import com.epmet.service.GridLatestService;
import com.epmet.service.GridVisitedService;
import org.apache.commons.lang3.StringUtils;
@ -53,8 +52,6 @@ import java.util.Map;
@Service
public class GridVisitedServiceImpl extends BaseServiceImpl<GridVisitedDao, GridVisitedEntity> implements GridVisitedService {
@Autowired
private GridVisitedRedis gridVisitedRedis;
@Autowired
private GovOrgFeignClient govOrgFeignClient;
@Autowired
@ -112,6 +109,12 @@ public class GridVisitedServiceImpl extends BaseServiceImpl<GridVisitedDao, Grid
baseDao.deleteBatchIds(Arrays.asList(ids));
}
/**
* 网格记录表新增数据
* @author sun
* @param formDTO
* @throws Exception
*/
@Override
@Transactional(rollbackFor = Exception.class)
public void saveLatestAndVisited(VisitedFormDTO formDTO) throws Exception {
@ -132,24 +135,41 @@ public class GridVisitedServiceImpl extends BaseServiceImpl<GridVisitedDao, Grid
}
/**
* 网格记录表和最近访问网格表新增数据
* @param formDTO
* @param cu
*/
public void saveGridVisited(VisitedFormDTO formDTO,CustomerGridDTO cu) {
Date date = new Date();
GridVisitedDTO vi = new GridVisitedDTO();
vi.setIsRegister(0);//token中获取是否注册
vi.setIsRegister(getRegister("0"));//token中获取是否注册
vi.setCustomerId(cu.getCustomerId());
vi.setGridId(cu.getId());
vi.setCustomerUserId(formDTO.getUserId());
// vi.setCustomerUserId(formDTO.getUserId());//token传递的值
vi.setCustomerUserId("1111111111");//token传递的值
vi.setVisitTime(date);
vi.setUpdatedTime(date);
//查询是否存在历史数据(一个用户一天对一个网格只存在一条访问记录)
GridVisitedEntity dto = baseDao.getGridVisitedByIds(vi);
GridVisitedEntity entity = ConvertUtils.sourceToTarget(dto, GridVisitedEntity.class);
//查询是否存在历史数据( 一个用户一天对一个网格只存在一条访问记录)
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;
}
}

6
epmet-user/epmet-user-server/src/main/resources/mapper/GridVisitedDao.xml

@ -19,7 +19,7 @@
</resultMap>
<select id="getGridVisitedByIds" parameterType="com.epmet.dto.GridVisitedDTO"
resultType="com.epmet.entity.GridVisitedEntity">
resultType="com.epmet.dto.GridVisitedDTO">
SELECT
vi.id,
vi.is_register,
@ -45,8 +45,8 @@
<if test='customerUserId != "" and customerUserId != null'>
AND vi.customer_user_id = #{customerUserId}
</if>
<if test='visitTime != "" and visitTime != null'>
AND to_days(vi.VISIT_TIME) = to_days(visitTime)
<if test='visitTime != null'>
AND to_days(vi.visit_time) = to_days(#{visitTime})
</if>
</select>

Loading…
Cancel
Save