From 4e625005adb6e91dee57a23c98e6357b997e4e0c Mon Sep 17 00:00:00 2001 From: Jackwang Date: Sat, 21 Aug 2021 14:37:22 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9B=BE=E7=89=87=E4=B8=8A=E4=BC=A0=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/PersonTestingController.java | 9 +++++---- .../modules/epidemic/dao/PersonTestingDao.java | 4 ++-- .../epidemic/service/PersonTestingService.java | 3 ++- .../service/impl/PersonTestingServiceImpl.java | 9 +++++---- .../src/main/resources/application.yml | 14 ++++++++++++++ .../resources/mapper/epidemic/PersonTestingDao.xml | 2 +- 6 files changed, 29 insertions(+), 12 deletions(-) diff --git a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/controller/PersonTestingController.java b/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/controller/PersonTestingController.java index a5e3869..6ebffa1 100644 --- a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/controller/PersonTestingController.java +++ b/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/controller/PersonTestingController.java @@ -26,6 +26,7 @@ import com.elink.esua.epdc.commons.tools.validator.group.AddGroup; import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup; import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup; import com.elink.esua.epdc.dto.PersonTestingDTO; +import com.elink.esua.epdc.dto.PersonTestingPageDTO; import com.elink.esua.epdc.modules.epidemic.dao.PersonTestingDao; import com.elink.esua.epdc.modules.epidemic.excel.PersonTestingExcel; import com.elink.esua.epdc.modules.epidemic.service.PersonTestingService; @@ -55,9 +56,9 @@ public class PersonTestingController { private PersonTestingDao personTestingDao; @GetMapping("page") - public Result> page(@RequestParam Map params){ - PageData page = personTestingService.page(params); - return new Result>().ok(page); + public Result> page(@RequestParam Map params){ + PageData page = personTestingService.page(params); + return new Result>().ok(page); } @GetMapping("{id}") @@ -92,7 +93,7 @@ public class PersonTestingController { @GetMapping("export") public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { - List list = personTestingDao.getTestingPage(params); + List list = personTestingDao.getTestingPage(params); ExcelUtils.exportExcelToTarget(response, null, list, PersonTestingExcel.class); } diff --git a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/dao/PersonTestingDao.java b/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/dao/PersonTestingDao.java index ba5fa04..801ab9c 100644 --- a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/dao/PersonTestingDao.java +++ b/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/dao/PersonTestingDao.java @@ -18,7 +18,7 @@ package com.elink.esua.epdc.modules.epidemic.dao; import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; -import com.elink.esua.epdc.dto.PersonTestingDTO; +import com.elink.esua.epdc.dto.PersonTestingPageDTO; import com.elink.esua.epdc.modules.epidemic.entity.PersonTestingEntity; import org.apache.ibatis.annotations.Mapper; @@ -34,5 +34,5 @@ import java.util.Map; @Mapper public interface PersonTestingDao extends BaseDao { - List getTestingPage(Map params); + List getTestingPage(Map params); } \ No newline at end of file diff --git a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/service/PersonTestingService.java b/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/service/PersonTestingService.java index af8d294..88dd1d7 100644 --- a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/service/PersonTestingService.java +++ b/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/service/PersonTestingService.java @@ -21,6 +21,7 @@ import com.elink.esua.epdc.commons.mybatis.service.BaseService; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.PersonTestingDTO; +import com.elink.esua.epdc.dto.PersonTestingPageDTO; import com.elink.esua.epdc.modules.epidemic.entity.PersonTestingEntity; import java.text.ParseException; @@ -43,7 +44,7 @@ public interface PersonTestingService extends BaseService { * @author generator * @date 2021-08-20 */ - PageData page(Map params); + PageData page(Map params); /** * 默认查询 diff --git a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/service/impl/PersonTestingServiceImpl.java b/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/service/impl/PersonTestingServiceImpl.java index fd2ed33..af7e288 100644 --- a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/service/impl/PersonTestingServiceImpl.java +++ b/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/service/impl/PersonTestingServiceImpl.java @@ -25,6 +25,7 @@ import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.PersonTestingDTO; +import com.elink.esua.epdc.dto.PersonTestingPageDTO; import com.elink.esua.epdc.dto.UploadFormDTO; import com.elink.esua.epdc.modules.epidemic.dao.PersonTestingDao; import com.elink.esua.epdc.modules.epidemic.entity.PersonTestingEntity; @@ -59,14 +60,14 @@ public class PersonTestingServiceImpl extends BaseServiceImpl page(Map params) { + public PageData page(Map params) { // IPage page = baseDao.selectPage( // getPage(params, FieldConstant.CREATED_TIME, false), // getWrapper(params) // ); // return getPageData(page, PersonTestingDTO.class); - IPage page = getPage(params); - List list = baseDao.getTestingPage(params); + IPage page = getPage(params); + List list = baseDao.getTestingPage(params); return new PageData<>(list, page.getTotal()); } @@ -153,7 +154,7 @@ public class PersonTestingServiceImpl extends BaseServiceImpl uploadResult = ossFeignClient.uploadBase64(form); if(!uploadResult.success()){ diff --git a/epdc-cloud-custom/src/main/resources/application.yml b/epdc-cloud-custom/src/main/resources/application.yml index e3be781..0417e6a 100644 --- a/epdc-cloud-custom/src/main/resources/application.yml +++ b/epdc-cloud-custom/src/main/resources/application.yml @@ -98,3 +98,17 @@ rocketmq: name-server: @rocketmq.name.server@ consumer: group: @rocketmq.consumer.group@ +#hystrix的超时时间 +hystrix: + command: + default: + execution: + timeout: + enabled: true + isolation: + thread: + timeoutInMilliseconds: 30000 +#ribbon的超时时间 +ribbon: + ReadTimeout: 30000 + ConnectTimeout: 30000 diff --git a/epdc-cloud-custom/src/main/resources/mapper/epidemic/PersonTestingDao.xml b/epdc-cloud-custom/src/main/resources/mapper/epidemic/PersonTestingDao.xml index e10a1e0..19c2b83 100644 --- a/epdc-cloud-custom/src/main/resources/mapper/epidemic/PersonTestingDao.xml +++ b/epdc-cloud-custom/src/main/resources/mapper/epidemic/PersonTestingDao.xml @@ -23,7 +23,7 @@ - select * from epdc_person_testing where del_flag='0'