diff --git a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/UpgradeController.java b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/UpgradeController.java index 9351b1d..7207718 100644 --- a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/UpgradeController.java +++ b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/UpgradeController.java @@ -28,8 +28,8 @@ public class UpgradeController extends BaseController { @GetMapping("listAll") @ApiOperation("查询全部列表") - public ResponseReult> listAll() { - List result = service.listAll(); + public ResponseReult> listAll(Integer type) { + List result = service.listAll(type); return ResponseReult.success(result); } @@ -41,7 +41,8 @@ public class UpgradeController extends BaseController { if (file == null) { throw new ApiException("缺少上传的文件"); } - if (StringUtils.isBlank(file.getOriginalFilename()) || !file.getOriginalFilename().endsWith(".apk")) { + if (StringUtils.isBlank(file.getOriginalFilename()) || + !file.getOriginalFilename().endsWith(".apk") && !file.getOriginalFilename().endsWith(".zip")) { throw new ApiException("文件格式不正确"); } MntnUpgrades record = new MntnUpgrades(); diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/UpgradeServiceImpl.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/UpgradeServiceImpl.java index 91b7bce..4d12346 100644 --- a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/UpgradeServiceImpl.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/UpgradeServiceImpl.java @@ -33,9 +33,12 @@ public class UpgradeServiceImpl implements UpgradeService { MntnUpgradesMapper mapper; @Override - public List listAll() { + public List listAll(Integer type) { MntnUpgradesExample example = new MntnUpgradesExample(); MntnUpgradesExample.Criteria criteria = example.createCriteria(); + if (type != null) { + criteria.andTypeEqualTo(type); + } example.setOrderByClause("id desc"); List list = mapper.selectByExample(example); for (MntnUpgrades item : list) { diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/service/UpgradeService.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/service/UpgradeService.java index 30c7f96..3a247d1 100644 --- a/xymanager_service/src/main/java/com/shxy/xymanager_service/service/UpgradeService.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/service/UpgradeService.java @@ -7,7 +7,7 @@ import java.util.List; public interface UpgradeService { - List listAll(); + List listAll(Integer type); boolean upload(MntnUpgrades item, MultipartFile file) throws Exception;