renkang/xj-platform
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

0919新需求开发

Browse Source
This commit is contained in:
wanghao
2025-09-25 13:58:00 +08:00
parent 273d1377b9
commit ff6e83f1c8
22 changed files with 714 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
health-watch/health-watch-biz/src/main/java/com/renkang/watch/controller/WatchMonitorDataController.java
+2 -2
View File
@@ -75,14 +75,14 @@ public class WatchMonitorDataController extends JeecgController<WatchMonitorData
*/
@Operation(summary = "应急大屏-健康终端报警列表", description = "应急大屏-健康终端报警列表")
@GetMapping(value = "/getMonitorList")
public Result<IPage<WatchMonitorDataVo>> getMonitorList(@RequestParam(name = "orgCode",required = false) String orgCode,
public Result<Page<WatchMonitorDataVo>> getMonitorList(@RequestParam(name = "orgCode",required = false) String orgCode,
@RequestParam(name = "orgCodeList", required = false) String orgCodeList,
@RequestParam(name = "startDate", required = false) String startDate,
@RequestParam(name = "endDate", required = false) String endDate,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
Page<WatchMonitorData> page = new Page<WatchMonitorData>(pageNo, pageSize);
IPage<WatchMonitorDataVo> pageList = watchMonitorDataService.getMonitorList(page,orgCode,orgCodeList,startDate,endDate);
Page<WatchMonitorDataVo> pageList = watchMonitorDataService.getMonitorList(page,orgCode,orgCodeList,startDate,endDate);
return Result.OK(pageList);
}
health-watch/health-watch-biz/src/main/java/com/renkang/watch/service/IWatchMonitorDataService.java
+1 -1
View File
@@ -30,7 +30,7 @@ public interface IWatchMonitorDataService extends IService<WatchMonitorData> {
* @return
* @param page
*/
IPage<WatchMonitorDataVo> getMonitorList(Page<WatchMonitorData> page, String orgCode, String orgCodeList,String startDate,String endDate);
Page<WatchMonitorDataVo> getMonitorList(Page<WatchMonitorData> page, String orgCode, String orgCodeList,String startDate,String endDate);
/**
* 手表报警
health-watch/health-watch-biz/src/main/java/com/renkang/watch/service/impl/WatchMonitorDataServiceImpl.java
+3 -2
View File
@@ -625,7 +625,7 @@ public class WatchMonitorDataServiceImpl extends ServiceImpl<WatchMonitorDataMap
* @return
*/
@Override
public IPage<WatchMonitorDataVo> getMonitorList(Page<WatchMonitorData> page, String orgCode, String orgCodes, String startDate, String endDate) {
public Page<WatchMonitorDataVo> getMonitorList(Page<WatchMonitorData> page, String orgCode, String orgCodes, String startDate, String endDate) {
LambdaQueryWrapper<WatchMonitorData> queryWrapper = new LambdaQueryWrapper<>();
List<String> orgCodeList = new ArrayList<>();
@@ -701,6 +701,7 @@ public class WatchMonitorDataServiceImpl extends ServiceImpl<WatchMonitorDataMap
}
LoginUserNew userNew = userMap.get(watchMonitorData.getBindUserId());
if (ObjectUtil.isNotNull(userNew)) {
vo.setUserId(userNew.getId());
vo.setRealName(userNew.getRealname());
vo.setOrgCode(userNew.getOrgCode());
vo.setOrgName(userNew.getDepart() != null ? userNew.getDepart().getDepartName() : "");
@@ -726,7 +727,7 @@ public class WatchMonitorDataServiceImpl extends ServiceImpl<WatchMonitorDataMap
voList.add(vo);
});
}
IPage<WatchMonitorDataVo> pageVo = new Page<>();
Page<WatchMonitorDataVo> pageVo = new Page<>();
GlobalUtils.copyPageDataToTarget(pageList, pageVo);
pageVo.setRecords(voList);
return pageVo;