From c4f0e69cc0eb1d66ae3519ce3023563b6031d25a Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Sat, 7 Dec 2019 19:43:28 +0800 Subject: [PATCH] =?UTF-8?q?=E7=8E=8B=E5=85=AC=E5=B3=B0=EF=BC=9A=E7=A9=BA?= =?UTF-8?q?=E6=8C=87=E9=92=88=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ApiScanSwitchController.java | 4 +++- .../com/elink/esua/epdc/dao/ScanSwitchDao.java | 11 +++++++++++ .../esua/epdc/service/ScanSwitchService.java | 2 +- .../service/impl/ScanSwitchServiceImpl.java | 17 ++--------------- .../src/main/resources/mapper/ScanSwitchDao.xml | 4 ++++ 5 files changed, 21 insertions(+), 17 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiScanSwitchController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiScanSwitchController.java index 3b38e1175..137b8ffb6 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiScanSwitchController.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiScanSwitchController.java @@ -92,7 +92,9 @@ public class ApiScanSwitchController { */ @GetMapping("scanSwitch") public Result get(EpdcAppScanVersionNumDTO scanVersionNumDTO){ - EpdcAppScanFlagDTO data = scanSwitchService.getOne(scanVersionNumDTO); + //效验数据 + ValidatorUtils.validateEntity(scanVersionNumDTO); + EpdcAppScanFlagDTO data = scanSwitchService.getOneScanInfo(scanVersionNumDTO); return new Result().ok(data); } } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/dao/ScanSwitchDao.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/dao/ScanSwitchDao.java index 5cc8adbfa..c73d1dbf3 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/dao/ScanSwitchDao.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/dao/ScanSwitchDao.java @@ -18,6 +18,8 @@ package com.elink.esua.epdc.dao; import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; +import com.elink.esua.epdc.dto.form.EpdcAppScanVersionNumDTO; +import com.elink.esua.epdc.dto.result.EpdcAppScanFlagDTO; import com.elink.esua.epdc.entity.ScanSwitchEntity; import org.apache.ibatis.annotations.Mapper; @@ -29,5 +31,14 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface ScanSwitchDao extends BaseDao { + + /*** + * 前端获取开关 + * @param + * @return com.elink.esua.epdc.dto.form.EpdcAppScanVersionNumDTO + * @author qushutong + * @date 2019/10/10 12:01 + */ + EpdcAppScanFlagDTO selectOneOfScanInfo(EpdcAppScanVersionNumDTO scanVersionNumDTO); } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/ScanSwitchService.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/ScanSwitchService.java index 2e37d27af..327a31b87 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/ScanSwitchService.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/ScanSwitchService.java @@ -103,5 +103,5 @@ public interface ScanSwitchService extends BaseService { * @author qushutong * @date 2019/10/10 12:01 */ - EpdcAppScanFlagDTO getOne(EpdcAppScanVersionNumDTO scanVersionNumDTO); + EpdcAppScanFlagDTO getOneScanInfo(EpdcAppScanVersionNumDTO scanVersionNumDTO); } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ScanSwitchServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ScanSwitchServiceImpl.java index 43f8b477a..b7787f550 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ScanSwitchServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ScanSwitchServiceImpl.java @@ -102,21 +102,8 @@ public class ScanSwitchServiceImpl extends BaseServiceImpl wrapper = new QueryWrapper(scanSwitchEntityParam); - wrapper.orderByDesc("updated_time"); - ScanSwitchEntity scanSwitchEntity = baseDao.selectOne(wrapper); - int scanFlag = scanSwitchEntity.getScanFlag(); - int maintainFlag = scanSwitchEntity.getMaintainFlag(); - String maintainInfo = scanSwitchEntity.getMaintainInfo(); - EpdcAppScanFlagDTO scanFlagDTO = new EpdcAppScanFlagDTO(); - scanFlagDTO.setScanFlag(scanFlag); - scanFlagDTO.setMaintainFlag(maintainFlag); - scanFlagDTO.setMaintainInfo(maintainInfo); - return scanFlagDTO; + public EpdcAppScanFlagDTO getOneScanInfo(EpdcAppScanVersionNumDTO scanVersionNumDTO) { + return baseDao.selectOneOfScanInfo(scanVersionNumDTO); } } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/mapper/ScanSwitchDao.xml b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/mapper/ScanSwitchDao.xml index c4bf73a64..9acb3bcfc 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/mapper/ScanSwitchDao.xml +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/mapper/ScanSwitchDao.xml @@ -16,5 +16,9 @@ + + \ No newline at end of file