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/ScanVersionNumDTO.java → esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcAppScanVersionNumDTO.java

@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.elink.esua.epdc.dto;
+package com.elink.esua.epdc.dto.form;
 
 import lombok.Data;
 
@@ -30,7 +30,7 @@ import java.io.Serializable;
  * @since v1.0.0 2019-10-10
  */
 @Data
-public class ScanVersionNumDTO implements Serializable {
+public class EpdcAppScanVersionNumDTO implements Serializable {
 
     /**
      * 版本号

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

@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.elink.esua.epdc.dto;
+package com.elink.esua.epdc.dto.result;
 
 import lombok.Data;
 
@@ -30,7 +30,7 @@ import java.io.Serializable;
  * @since v1.0.0 2019-10-10
  */
 @Data
-public class ScanFlagDTO implements Serializable {
+public class EpdcAppScanFlagDTO implements Serializable {
 
     /**
      * 扫码开关 0关1开

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

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

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/entity/ScanSwitchEntity.java

@@ -56,4 +56,15 @@ public class ScanSwitchEntity extends BaseEpdcEntity {
 	 */
 	private String maintainInfo;
 
+	/**
+	 * 扫码开关名称
+	 */
+	private String scanFlagName;
+
+	/**
+	 * 维护状态名称
+	 */
+	private String maintainFlagName;
+
+
 }

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

@@ -19,9 +19,9 @@ 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.dto.ScanVersionNumDTO;
+import com.elink.esua.epdc.dto.form.EpdcAppScanVersionNumDTO;
+import com.elink.esua.epdc.dto.result.EpdcAppScanFlagDTO;
 import com.elink.esua.epdc.entity.ScanSwitchEntity;
 
 import java.util.List;
@@ -99,9 +99,9 @@ public interface ScanSwitchService extends BaseService<ScanSwitchEntity> {
     /***
      * 前端获取开关
      * @param
-     * @return com.elink.esua.epdc.dto.ScanFlagDTO
+     * @return com.elink.esua.epdc.dto.form.EpdcAppScanVersionNumDTO
      * @author qushutong
      * @date 2019/10/10 12:01
      */
-    ScanFlagDTO getOne(ScanVersionNumDTO scanVersionNumDTO);
+    EpdcAppScanFlagDTO getOne(EpdcAppScanVersionNumDTO scanVersionNumDTO);
 }

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

@@ -24,9 +24,9 @@ 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.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.dto.form.EpdcAppScanVersionNumDTO;
+import com.elink.esua.epdc.dto.result.EpdcAppScanFlagDTO;
 import com.elink.esua.epdc.entity.ScanSwitchEntity;
 import com.elink.esua.epdc.service.ScanSwitchService;
 import org.apache.commons.lang3.StringUtils;
@@ -55,6 +55,23 @@ public class ScanSwitchServiceImpl extends BaseServiceImpl<ScanSwitchDao, ScanSw
                 getPage(params, FieldConstant.CREATED_TIME, false),
                 getWrapper(params)
         );
+       /* List<ScanSwitchEntity> list = page.getRecords();
+        for(int i = 0 ; i < list.size() ; i++){
+            ScanSwitchEntity scanSwitchEntity = list.get(i);
+            int scanFlag = scanSwitchEntity.getScanFlag();
+            int maintainFlag = scanSwitchEntity.getMaintainFlag();
+            if(scanFlag == 0){
+                scanSwitchEntity.setScanFlagName("不需要扫码");
+            }else{
+                scanSwitchEntity.setScanFlagName("需要扫码");
+            }
+            if(maintainFlag == 0){
+                scanSwitchEntity.setMaintainFlagName("关闭维护");
+            }else{
+                scanSwitchEntity.setMaintainFlagName("开启维护");
+            }
+        }*/
+
         return getPageData(page, ScanSwitchDTO.class);
     }
 
@@ -102,7 +119,7 @@ public class ScanSwitchServiceImpl extends BaseServiceImpl<ScanSwitchDao, ScanSw
     }
 
     @Override
-    public ScanFlagDTO getOne(ScanVersionNumDTO scanVersionNumDTO) {
+    public EpdcAppScanFlagDTO getOne(EpdcAppScanVersionNumDTO scanVersionNumDTO) {
         ScanSwitchEntity scanSwitchEntityParam = new ScanSwitchEntity();
         String versionNum = scanVersionNumDTO.getVersionNum();
         scanSwitchEntityParam.setVersionNum(versionNum);
@@ -112,7 +129,7 @@ public class ScanSwitchServiceImpl extends BaseServiceImpl<ScanSwitchDao, ScanSw
         int scanFlag = scanSwitchEntity.getScanFlag();
         int maintainFlag = scanSwitchEntity.getMaintainFlag();
         String maintainInfo = scanSwitchEntity.getMaintainInfo();
-        ScanFlagDTO scanFlagDTO = new ScanFlagDTO();
+        EpdcAppScanFlagDTO scanFlagDTO = new EpdcAppScanFlagDTO();
         scanFlagDTO.setScanFlag(scanFlag);
         scanFlagDTO.setMaintainFlag(maintainFlag);
         scanFlagDTO.setMaintainInfo(maintainInfo);