From 483c9c58c704c257247780849a63c5666a9ef3fc Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Sat, 7 Dec 2019 15:44:02 +0800 Subject: [PATCH] =?UTF-8?q?=E7=8E=8B=E5=85=AC=E5=B3=B0=EF=BC=9A=E6=89=AB?= =?UTF-8?q?=E6=8F=8F=E5=BC=80=E5=85=B3=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/elink/esua/epdc/dto/ScanFlagDTO.java | 49 +++++++++++++++++++ .../controller/ApiScanSwitchController.java | 11 +++-- .../esua/epdc/service/ScanSwitchService.java | 5 +- .../service/impl/ScanSwitchServiceImpl.java | 18 ++++--- 4 files changed, 70 insertions(+), 13 deletions(-) create mode 100644 esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/ScanFlagDTO.java diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/ScanFlagDTO.java b/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/ScanFlagDTO.java new file mode 100644 index 000000000..864c14a84 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/ScanFlagDTO.java @@ -0,0 +1,49 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * 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. + *

+ * 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. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.elink.esua.epdc.dto; + +import lombok.Data; + +import java.io.Serializable; + + +/** + * 扫码开关 + * + * @author wanggongfeng + * @since v1.0.0 2019-10-10 + */ +@Data +public class ScanFlagDTO implements Serializable { + + /** + * 扫码开关 0关1开 + */ + private int scanFlag; + + /** + * 维护状态：0-关闭维护，1-开启维护 + */ + private int maintainFlag; + + /** + * 维护信息 + */ + private String maintainInfo; + +} \ 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/controller/ApiScanSwitchController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiScanSwitchController.java index 343e73b6a..dd0bff3c7 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 @@ -18,17 +18,18 @@ package com.elink.esua.epdc.controller; import com.elink.esua.epdc.commons.tools.page.PageData; -import com.elink.esua.epdc.commons.tools.utils.ExcelUtils; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.commons.tools.validator.AssertUtils; import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; import com.elink.esua.epdc.commons.tools.validator.group.AddGroup; -import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup; 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.ScanFlagDTO; import com.elink.esua.epdc.dto.ScanSwitchDTO; import com.elink.esua.epdc.service.ScanSwitchService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; + import java.util.Map; @@ -89,8 +90,8 @@ public class ApiScanSwitchController { * @date 2019/10/10 11:58 */ @GetMapping("scanSwitch") - public Result> get(){ - Map data = scanSwitchService.getOne(); - return new Result>().ok(data); + public Result get(){ + ScanFlagDTO data = scanSwitchService.getOne(); + 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/service/ScanSwitchService.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/ScanSwitchService.java index 57c524118..49109ad83 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 @@ -19,6 +19,7 @@ package com.elink.esua.epdc.service; import com.elink.esua.epdc.commons.mybatis.service.BaseService; import com.elink.esua.epdc.commons.tools.page.PageData; +import com.elink.esua.epdc.dto.ScanFlagDTO; import com.elink.esua.epdc.dto.ScanSwitchDTO; import com.elink.esua.epdc.entity.ScanSwitchEntity; @@ -97,9 +98,9 @@ public interface ScanSwitchService extends BaseService { /*** * 前端获取开关 * @param - * @return com.elink.esua.epdc.dto.ScanSwitchDTO + * @return com.elink.esua.epdc.dto.ScanFlagDTO * @author qushutong * @date 2019/10/10 12:01 */ - Map getOne(); + ScanFlagDTO getOne(); } \ 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 ba34178b0..61da8fb5c 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 @@ -20,10 +20,11 @@ package com.elink.esua.epdc.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; +import com.elink.esua.epdc.commons.tools.constant.FieldConstant; 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.constant.FieldConstant; import com.elink.esua.epdc.dao.ScanSwitchDao; +import com.elink.esua.epdc.dto.ScanFlagDTO; import com.elink.esua.epdc.dto.ScanSwitchDTO; import com.elink.esua.epdc.entity.ScanSwitchEntity; import com.elink.esua.epdc.service.ScanSwitchService; @@ -33,7 +34,6 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.Arrays; -import java.util.HashMap; import java.util.List; import java.util.Map; @@ -101,13 +101,19 @@ public class ScanSwitchServiceImpl extends BaseServiceImpl getOne() { + public ScanFlagDTO getOne() { + ScanFlagDTO scanFlagDTO = new ScanFlagDTO(); QueryWrapper wrapper = new QueryWrapper<>(); wrapper.orderByDesc("updated_time"); ScanSwitchEntity scanSwitchEntity = baseDao.selectOne(wrapper); - Map map=new HashMap<>(); - map.put("switch",scanSwitchEntity.getScanFlag()+""); - return map; + int scanFlag = scanSwitchEntity.getScanFlag(); + int maintainFlag = scanSwitchEntity.getMaintainFlag(); + String maintainInfo = scanSwitchEntity.getMaintainInfo(); + + scanFlagDTO.setScanFlag(scanFlag); + scanFlagDTO.setMaintainFlag(maintainFlag); + scanFlagDTO.setMaintainInfo(maintainInfo); + return scanFlagDTO; } } \ No newline at end of file