diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileRemoteController.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileRemoteController.java index 83102b847..226828f8f 100644 --- a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileRemoteController.java +++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileRemoteController.java @@ -1,19 +1,16 @@ package com.jsowell.web.controller.pile; import com.google.common.collect.ImmutableMap; -import com.jsowell.common.constant.Constants; import com.jsowell.common.core.domain.AjaxResult; -import com.jsowell.common.enums.ykc.OrderPayModeEnum; -import com.jsowell.common.enums.ykc.PayModeEnum; import com.jsowell.common.enums.ykc.ReturnCodeEnum; import com.jsowell.common.exception.BusinessException; +import com.jsowell.common.util.StringUtils; import com.jsowell.common.util.id.IdUtils; import com.jsowell.pile.dto.GenerateOrderDTO; -import com.jsowell.pile.dto.PayOrderDTO; import com.jsowell.pile.dto.QueryPileDTO; import com.jsowell.pile.dto.UpdateFirmwareDTO; -import com.jsowell.service.OrderService; import com.jsowell.pile.service.PileRemoteService; +import com.jsowell.service.OrderService; import org.apache.commons.collections4.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; @@ -131,6 +128,9 @@ public class PileRemoteController { if (CollectionUtils.isEmpty(dto.getPileSns())) { throw new BusinessException(ReturnCodeEnum.CODE_PARAM_NOT_NULL_ERROR); } + if (StringUtils.isBlank(dto.getFirmwareId())) { + throw new BusinessException(ReturnCodeEnum.CODE_PARAM_NOT_NULL_ERROR); + } pileRemoteService.updateFirmware(dto); result = AjaxResult.success(); } catch (BusinessException e) { diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/PileRemoteService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/PileRemoteService.java index 919670808..0b3fa3af7 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/PileRemoteService.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/PileRemoteService.java @@ -192,9 +192,6 @@ public class PileRemoteService { * 远程更新 */ public void updateFirmware(UpdateFirmwareDTO dto) { - if (StringUtils.isBlank(dto.getFirmwareId())) { - throw new BusinessException(ReturnCodeEnum.CODE_PARAM_NOT_NULL_ERROR); - } PileFirmwareInfo pileFirmwareInfo = pileFirmwareInfoService.selectPileFirmwareInfoById(Long.valueOf(dto.getFirmwareId())); if (pileFirmwareInfo == null) { throw new BusinessException(ReturnCodeEnum.CODE_FIRMWARE_NOT_FOUND_ERROR);