diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/controller/DevInfoController.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/controller/DevInfoController.java index c95aa90..ef00f80 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/controller/DevInfoController.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/controller/DevInfoController.java @@ -200,8 +200,8 @@ public class DevInfoController extends BaseController { */ @ApiOperation(value = "装备状态统计") @GetMapping("/sumType") - public AjaxResult sumType() { - return success(devInfoService.sumType()); + public AjaxResult sumType(@RequestParam(value = "brand", required = false) String brand, @RequestParam(value = "modelName", required = false) String modelName) { + return success(devInfoService.sumType(brand, modelName)); } /** diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/DevInfoService.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/DevInfoService.java index 5d6205f..0915316 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/DevInfoService.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/DevInfoService.java @@ -88,7 +88,7 @@ public interface DevInfoService { */ AjaxResult insertDevInfo(DevInfo devInfo); - Map sumType(); + Map sumType(String brand, String modelName); Map sumProfession(); diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/impl/DevInfoServiceImpl.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/impl/DevInfoServiceImpl.java index a404555..cf54943 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/impl/DevInfoServiceImpl.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/impl/DevInfoServiceImpl.java @@ -682,8 +682,10 @@ public class DevInfoServiceImpl implements DevInfoService { * 装备状态统计 */ @Override - public Map sumType() { + public Map sumType(String brand, String modelName) { DevInfoVo devInfoVo = new DevInfoVo(); + devInfoVo.setBrand(brand); + devInfoVo.setModelName(modelName); Map sumTypeMap = new IdentityHashMap<>(); //获取所有的装备信息 List devInfoList = devInfoMapper.selectDevInfoList(devInfoVo);