src/main/java/com/whyc/controller/Fbs9100StateController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/service/Fbs9100StateService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/whyc/controller/Fbs9100StateController.java
@@ -1,16 +1,14 @@ package com.whyc.controller; import com.whyc.dto.Response; import com.whyc.dto.paramter.FbsStatePar; import com.whyc.pojo.UserInf; import com.whyc.service.Fbs9100StateService; import com.whyc.util.ActionUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.*; @RestController @Api(tags= "在线监测-实时监控") @@ -50,4 +48,10 @@ public Response update_dev_alarmstate(@RequestParam int num,@RequestParam int devId){ return service.update_dev_alarmstate(num,devId); } @ApiOperation(value = "设备工作状态") @PostMapping("getFbsState") public Response getFbsState(@RequestBody FbsStatePar fbsStatePar){ return service.getFbsState(fbsStatePar); } } src/main/java/com/whyc/service/Fbs9100StateService.java
@@ -6,6 +6,7 @@ import com.github.pagehelper.PageInfo; import com.whyc.constant.DeviceConstant; import com.whyc.dto.Response; import com.whyc.dto.paramter.FbsStatePar; import com.whyc.dto.result.DischargeState; import com.whyc.mapper.BattInfMapper; import com.whyc.mapper.BattRtstateMapper; @@ -35,6 +36,12 @@ @Autowired(required = false) private BattRtstateMapper rtstateMapper; @Autowired(required = false) private Fbs9600StateService fbs9600StateService; @Autowired(required = false) private Ld9StateService ld9StateService; //开关状态 @Transactional @@ -251,4 +258,18 @@ int jcdisNum = mapper.getJcAnalysis(userId); return jcdisNum; } public Response getFbsState(FbsStatePar fbsStatePar) { Map<String, Response> res=new HashMap<>(); //查询fbs9100信息 Response f9100stateRes = searchByCondition(fbsStatePar.getPageNum(),fbsStatePar.getPageSize(),fbsStatePar.getDevErrcommcount(),fbsStatePar.getUserId()); res.put("f9100state",f9100stateRes); Response f9600StateRes = fbs9600StateService.searchByCondition(fbsStatePar.getPageNum(),fbsStatePar.getPageSize(),fbsStatePar.getDevErrcommcount(),fbsStatePar.getUserId()); res.put("f9600state",f9600StateRes); Response ld9stateRes = ld9StateService.searchByCondition(fbsStatePar.getPageNum(),fbsStatePar.getPageSize(),fbsStatePar.getDevErrcommcount(),fbsStatePar.getUserId()); res.put("ld9state",ld9stateRes); return new Response().set(1, res); } }