diff --git a/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/controller/HwMonitorPlatformController.java b/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/controller/HwMonitorPlatformController.java index 569ad52..a078277 100644 --- a/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/controller/HwMonitorPlatformController.java +++ b/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/controller/HwMonitorPlatformController.java @@ -17,14 +17,7 @@ import com.ruoyi.common.security.utils.SecurityUtils; import com.ruoyi.system.api.domain.SysUser; import com.ruoyi.system.api.model.LoginUser; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import com.ruoyi.common.log.annotation.Log; import com.ruoyi.common.log.enums.BusinessType; import com.ruoyi.common.security.annotation.RequiresPermissions; @@ -57,7 +50,7 @@ public class HwMonitorPlatformController extends BaseController { * @return list * @throws * */ - @PostMapping("/treeList") + @GetMapping("/treeList") public TableDataInfo treeList(List hwMonitorUnits){ List list = hwMonitorUnitService.selectTreeList(hwMonitorUnits); return getDataTable(list); @@ -91,9 +84,11 @@ public class HwMonitorPlatformController extends BaseController { @PostMapping("/selectDeviceByDeviceModeByMonitorUnitId") public Map> selectDeviceByDeviceModeByMonitorUnitId(Long monitorUnitId){ startPage(); + Map> maps = hwDeviceService.selectDeviceByDeviceModeByMonitorUnitId(monitorUnitId); return maps; } + /** * 获取直采变量的设备 * @param monitorUnitId 监控单元id @@ -101,6 +96,7 @@ public class HwMonitorPlatformController extends BaseController { @PostMapping("/selectDeviceModeFunctionByFunctionType") public Map> selectDeviceModeFunctionByFunctionType(Long monitorUnitId){ startPage(); + Map> maps = hwDeviceService.selectDeviceModeFunctionByFunctionType(monitorUnitId); return maps; } diff --git a/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/service/impl/HwDeviceModeServiceImpl.java b/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/service/impl/HwDeviceModeServiceImpl.java index 284462b..c77642c 100644 --- a/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/service/impl/HwDeviceModeServiceImpl.java +++ b/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/service/impl/HwDeviceModeServiceImpl.java @@ -5,6 +5,7 @@ import com.ruoyi.business.domain.HwDeviceMode; import com.ruoyi.business.domain.HwDeviceModeFunction; import com.ruoyi.business.domain.HwDeviceModeParameter; import com.ruoyi.business.mapper.HwDeviceMapper; +import com.ruoyi.business.mapper.HwDeviceModeFunctionMapper; import com.ruoyi.business.mapper.HwDeviceModeMapper; import com.ruoyi.business.service.IHwDeviceModeService; import com.ruoyi.common.core.constant.HwDictConstants; diff --git a/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/service/impl/HwDeviceServiceImpl.java b/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/service/impl/HwDeviceServiceImpl.java index d92516c..deed73f 100644 --- a/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/service/impl/HwDeviceServiceImpl.java +++ b/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/service/impl/HwDeviceServiceImpl.java @@ -77,6 +77,9 @@ public class HwDeviceServiceImpl implements IHwDeviceService Integer value = 0; if (list.size() > 10) { for (int i = 9; i < list.size(); i++) { + if (list.get(i).sum==null){ + list.get(i).sum = 0; + } value = value + list.get(i).sum; } } @@ -85,6 +88,9 @@ public class HwDeviceServiceImpl implements IHwDeviceService hwMonitorUnitTypeVo.setSum(value); Integer sums = 0; for (int i = 0; i < list.size();i++){ + if (list.get(i).sum==null){ + list.get(i).sum = 0; + } sums = sums+list.get(i).sum; } for (int i=0;i5){ for (int i = 4; i < list.size(); i++){ + if (list.get(i).sum==null){ + list.get(i).sum = 0; + } value = value+list.get(i).sum; } } for (int i = 0; i < list.size();i++){ + if (list.get(i).sum==null){ + list.get(i).sum = 0; + } sums = sums+list.get(i).sum; } for (int i=0;i selectSenceAllNums() {