Merge remote-tracking branch 'origin/dev_1118' into dev_1118

esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/ScanFlagDTO.java

@@ -19,6 +19,7 @@ package com.elink.esua.epdc.dto;
 
 import lombok.Data;
 
+import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 
 
@@ -34,11 +35,13 @@ public class ScanFlagDTO implements Serializable {
     /**
      * 扫码开关 0关1开
      */
+    @NotNull
 	private int scanFlag;
 
     /**
      * 维护状态：0-关闭维护，1-开启维护
      */
+    @NotNull
     private int maintainFlag;
 
     /**

esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/ScanVersionNumDTO.java

@@ -0,0 +1,41 @@
+/**
+ * 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 javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+
+/**
+ * 扫码开关
+ *
+ * @author wanggongfeng
+ * @since v1.0.0 2019-10-10
+ */
+@Data
+public class ScanVersionNumDTO implements Serializable {
+
+    /**
+     * 版本号
+     */
+    @NotBlank(message = "版本号不能为空")
+    private String versionNum;
+
+}

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiScanSwitchController.java

@@ -26,6 +26,7 @@ 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.dto.ScanVersionNumDTO;
 import com.elink.esua.epdc.service.ScanSwitchService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -85,13 +86,13 @@ public class ApiScanSwitchController {
 
     /***
      * 前端接口开关
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.ScanSwitchDTO>
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.ScanFlagDTO>
      * @author qushutong
      * @date 2019/10/10 11:58
      */
     @GetMapping("scanSwitch")
-    public Result<ScanFlagDTO> get(){
-        ScanFlagDTO data = scanSwitchService.getOne();
+    public Result<ScanFlagDTO> get(ScanVersionNumDTO scanVersionNumDTO){
+        ScanFlagDTO data = scanSwitchService.getOne(scanVersionNumDTO);
         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

@@ -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.dto.ScanFlagDTO;
 import com.elink.esua.epdc.dto.ScanSwitchDTO;
+import com.elink.esua.epdc.dto.ScanVersionNumDTO;
 import com.elink.esua.epdc.entity.ScanSwitchEntity;
 
 import java.util.List;
@@ -102,5 +103,5 @@ public interface ScanSwitchService extends BaseService<ScanSwitchEntity> {
      * @author qushutong
      * @date 2019/10/10 12:01
      */
-    ScanFlagDTO getOne();
+    ScanFlagDTO getOne(ScanVersionNumDTO scanVersionNumDTO);
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ScanSwitchServiceImpl.java

@@ -26,6 +26,7 @@ import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
 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.dto.ScanVersionNumDTO;
 import com.elink.esua.epdc.entity.ScanSwitchEntity;
 import com.elink.esua.epdc.service.ScanSwitchService;
 import org.apache.commons.lang3.StringUtils;
@@ -101,15 +102,17 @@ public class ScanSwitchServiceImpl extends BaseServiceImpl<ScanSwitchDao, ScanSw
     }
 
     @Override
-    public ScanFlagDTO getOne() {
-        ScanFlagDTO scanFlagDTO = new ScanFlagDTO();
-        QueryWrapper<ScanSwitchEntity> wrapper = new QueryWrapper<>();
+    public ScanFlagDTO getOne(ScanVersionNumDTO scanVersionNumDTO) {
+        ScanSwitchEntity scanSwitchEntityParam = new ScanSwitchEntity();
+        String versionNum = scanVersionNumDTO.getVersionNum();
+        scanSwitchEntityParam.setVersionNum(versionNum);
+        QueryWrapper<ScanSwitchEntity> wrapper = new QueryWrapper<ScanSwitchEntity>(scanSwitchEntityParam);
         wrapper.orderByDesc("updated_time");
         ScanSwitchEntity scanSwitchEntity = baseDao.selectOne(wrapper);
         int scanFlag = scanSwitchEntity.getScanFlag();
         int maintainFlag = scanSwitchEntity.getMaintainFlag();
         String maintainInfo = scanSwitchEntity.getMaintainInfo();
-
+        ScanFlagDTO scanFlagDTO = new ScanFlagDTO();
         scanFlagDTO.setScanFlag(scanFlag);
         scanFlagDTO.setMaintainFlag(maintainFlag);
         scanFlagDTO.setMaintainInfo(maintainInfo);