王公峰：空指针修改

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<EpdcAppScanFlagDTO> get(EpdcAppScanVersionNumDTO scanVersionNumDTO){
-        EpdcAppScanFlagDTO data = scanSwitchService.getOne(scanVersionNumDTO);
+        //效验数据
+        ValidatorUtils.validateEntity(scanVersionNumDTO);
+        EpdcAppScanFlagDTO data = scanSwitchService.getOneScanInfo(scanVersionNumDTO);
         return new Result<EpdcAppScanFlagDTO>().ok(data);
     }
 }

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<ScanSwitchEntity> {
+
+    /***
+     * 前端获取开关
+     * @param
+     * @return com.elink.esua.epdc.dto.form.EpdcAppScanVersionNumDTO
+     * @author qushutong
+     * @date 2019/10/10 12:01
+     */
+    EpdcAppScanFlagDTO selectOneOfScanInfo(EpdcAppScanVersionNumDTO scanVersionNumDTO);
 	
 }

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<ScanSwitchEntity> {
      * @author qushutong
      * @date 2019/10/10 12:01
      */
-    EpdcAppScanFlagDTO getOne(EpdcAppScanVersionNumDTO scanVersionNumDTO);
+    EpdcAppScanFlagDTO getOneScanInfo(EpdcAppScanVersionNumDTO scanVersionNumDTO);
 }

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<ScanSwitchDao, ScanSw
     }
 
     @Override
-    public EpdcAppScanFlagDTO getOne(EpdcAppScanVersionNumDTO scanVersionNumDTO) {
+    public EpdcAppScanFlagDTO getOneScanInfo(EpdcAppScanVersionNumDTO scanVersionNumDTO) {
-        ScanSwitchEntity scanSwitchEntityParam = new ScanSwitchEntity();
+        return baseDao.selectOneOfScanInfo(scanVersionNumDTO);
-        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();
-        EpdcAppScanFlagDTO scanFlagDTO = new EpdcAppScanFlagDTO();
-        scanFlagDTO.setScanFlag(scanFlag);
-        scanFlagDTO.setMaintainFlag(maintainFlag);
-        scanFlagDTO.setMaintainInfo(maintainInfo);
-        return scanFlagDTO;
     }
 
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/mapper/ScanSwitchDao.xml

@@ -16,5 +16,9 @@
         <result property="updateDate" column="update_time"/>
     </resultMap>
 
+    <select id="selectOneOfScanInfo" resultType="com.elink.esua.epdc.dto.result.EpdcAppScanFlagDTO">
+        SELECT scan_flag, maintain_flag, maintain_info FROM `epdc_scan_switch` WHERE del_flag = '0' AND version_num = #{versionNum} ORDER BY updated_time DESC LIMIT 1
+    </select>
+
 
 </mapper>