diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java index be74383365..46eba71b6f 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java @@ -91,4 +91,9 @@ public class CustomerGridController { ExcelUtils.exportExcelToTarget(response, null, list, CustomerGridExcel.class); } + @GetMapping("{areaCode}") + public Result queryListByOrder(@PathVariable("areaCode")String areaCode){ + + return new Result(); + } } \ No newline at end of file diff --git a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/controller/ResiGuideController.java b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/controller/ResiGuideController.java index 9dc4f5c5b2..a7ef911c89 100644 --- a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/controller/ResiGuideController.java +++ b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/controller/ResiGuideController.java @@ -27,13 +27,22 @@ public class ResiGuideController { private ResiGuideService resiGuideService; - @PostMapping() - Result> getlocationcustomergridlist(@RequestBody CustomerGridListQueryDTO queryParam){ - return null; + @PostMapping("getlocationcustomergridlist") + Result> getlocationcustomergridlist(@RequestBody CustomerGridListQueryDTO queryParam){ + Result> result = new Result<>(); + + //TODO..捕获异常 + + return result.ok(resiGuideService.ListCustomerGrid(queryParam)); + } - @PostMapping() + @PostMapping("getlelectcdcustomergridlist") Result> getlelectcdcustomergridlist(@RequestBody CustomerGridListQueryDTO queryParam){ - return null; + Result> result = new Result<>(); + + //TODO..捕获异常 + + return result.ok(resiGuideService.ListCustomerGrid(queryParam)); } } diff --git a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java new file mode 100644 index 0000000000..990e8fb5db --- /dev/null +++ b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java @@ -0,0 +1,22 @@ +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.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.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; + + +/** + * Created by 11 on 2020/3/17. + */ +@FeignClient(name = ServiceConstant.GOV_ORG_SERVER, fallback = GovOrgFeginFallBack.class) +public interface GovOrgFeignClient { + @PostMapping(value = "/gov/org/customergrid/{areaCode}", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE) + Result> getPageForStrangerGuideInterface(@PathVariable("areaCode")String areaCode); +} diff --git a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/feign/impl/GovOrgFeginFallBack.java b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/feign/impl/GovOrgFeginFallBack.java new file mode 100644 index 0000000000..286ce4e36c --- /dev/null +++ b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/feign/impl/GovOrgFeginFallBack.java @@ -0,0 +1,29 @@ +package com.epmet.feign.impl;/** + * Created by 11 on 2020/3/17. + */ + +import com.epmet.commons.tools.constant.ServiceConstant; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.ModuleUtils; +import com.epmet.commons.tools.utils.Result; +import com.epmet.dto.CustomerGridListQueryDTO; +import com.epmet.dto.result.CustomerGridListResultDTO; +import com.epmet.feign.GovOrgFeignClient; +import org.springframework.stereotype.Component; +import org.springframework.stereotype.Controller; + +/** + * @Description + * @ClassName GovOrgFeginFallBack + * @Author wangc + * @date 2020.03.17 14:29 + */ +@Component +public class GovOrgFeginFallBack implements GovOrgFeignClient { + + @Override + public Result> getPageForStrangerGuideInterface(String areaCode) { + + return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "queryListByAreaCodeOrderBy",areaCode); + } +} diff --git a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/ResiGuideService.java b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/ResiGuideService.java index 26dd0af259..84e11a07da 100644 --- a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/ResiGuideService.java +++ b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/ResiGuideService.java @@ -13,4 +13,6 @@ import com.epmet.entity.StrangerAccessRecordEntity; public interface ResiGuideService extends BaseService { PageData ListCustomerGrid(CustomerGridListQueryDTO customerGridListQueryDTO); + + void save(StrangerAccessRecordEntity strangerAccessRecordEntity); } diff --git a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/impl/ResiGuideServiceImpl.java b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/impl/ResiGuideServiceImpl.java index 5efc51dcb0..f7b1b32f59 100644 --- a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/impl/ResiGuideServiceImpl.java +++ b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/impl/ResiGuideServiceImpl.java @@ -4,12 +4,19 @@ package com.epmet.service.impl;/** 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.dao.StrangerAccessRecordDao; import com.epmet.dto.CustomerGridListQueryDTO; import com.epmet.dto.result.CustomerGridListResultDTO; import com.epmet.entity.StrangerAccessRecordEntity; +import com.epmet.feign.GovOrgFeignClient; import com.epmet.service.ResiGuideService; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Date; /** * @Description @@ -20,10 +27,44 @@ import org.springframework.stereotype.Service; @Service public class ResiGuideServiceImpl extends BaseServiceImpl implements ResiGuideService { + @Autowired + private GovOrgFeignClient govOrgFeignClient; @Override public PageData ListCustomerGrid(CustomerGridListQueryDTO customerGridListQueryDTO) { - return null; + PageData queryResult = + govOrgFeignClient.getPageForStrangerGuideInterface(customerGridListQueryDTO); + if(null != queryResult.getList() && queryResult.getList().size() > 0){ + for(CustomerGridListResultDTO obj : queryResult.getList()){ + StrangerAccessRecordEntity strangerTrance = new StrangerAccessRecordEntity(); + //未授权，手动选择 locationAreaCode + if(0 == customerGridListQueryDTO.getIsAuthorized()){ + strangerTrance.setLocationAreaCode(customerGridListQueryDTO.getLelectedAreaCode()); + }else if( 1 == customerGridListQueryDTO.getIsAuthorized()){ + //已授权，自动选择 lelectedAreaCode + strangerTrance.setLocationAreaCode(customerGridListQueryDTO.getAreaCode()); + } + strangerTrance.setIsAuthorized(customerGridListQueryDTO.getIsAuthorized()); + strangerTrance.setGridNumber(queryResult.getTotal()); + strangerTrance.setVisitTime(new Date()); + strangerTrance.setDelFlag("1"); + strangerTrance.setRevision(0); + strangerTrance.setCreatedBy("陌生人访客"); + strangerTrance.setCreatedTime(new Date()); + + insert(strangerTrance); + } + + } + + return queryResult; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void save(StrangerAccessRecordEntity strangerAccessRecordEntity) { + StrangerAccessRecordEntity entity = ConvertUtils.sourceToTarget(strangerAccessRecordEntity, StrangerAccessRecordEntity.class); + insert(entity); } }