王公峰：扫描开关接口

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
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+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;
+
+}

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<Map<String,String>> get(){
-        Map<String,String> data = scanSwitchService.getOne();
-        return new Result<Map<String,String>>().ok(data);
+    public Result<ScanFlagDTO> get(){
+        ScanFlagDTO data = scanSwitchService.getOne();
+        return new Result<ScanFlagDTO>().ok(data);
     }
 }

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<ScanSwitchEntity> {
     /***
      * 前端获取开关
      * @param
-     * @return com.elink.esua.epdc.dto.ScanSwitchDTO
+     * @return com.elink.esua.epdc.dto.ScanFlagDTO
      * @author qushutong
      * @date 2019/10/10 12:01
      */
-    Map<String,String>  getOne();
+    ScanFlagDTO getOne();
 }

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<ScanSwitchDao, ScanSw
     }
 
     @Override
-    public Map<String,String> getOne() {
+    public ScanFlagDTO getOne() {
+        ScanFlagDTO scanFlagDTO = new ScanFlagDTO();
         QueryWrapper<ScanSwitchEntity> wrapper = new QueryWrapper<>();
         wrapper.orderByDesc("updated_time");
         ScanSwitchEntity scanSwitchEntity = baseDao.selectOne(wrapper);
-        Map<String,String> 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;
     }
 
 }