diff --git a/src/main/java/com/zhgd/xmgl/modules/safetyhat/controller/SafetyHatDataController.java b/src/main/java/com/zhgd/xmgl/modules/safetyhat/controller/SafetyHatDataController.java index d919417da..3131af9ac 100644 --- a/src/main/java/com/zhgd/xmgl/modules/safetyhat/controller/SafetyHatDataController.java +++ b/src/main/java/com/zhgd/xmgl/modules/safetyhat/controller/SafetyHatDataController.java @@ -163,6 +163,23 @@ public class SafetyHatDataController { return Result.success(safetyHatDataService.getNewestList(paramMap)); } + /** + * 暂时没有使用 + * + * @param paramMap + * @return + */ + @OperLog(operModul = "智能安全帽实时数据管理", operType = "查询", operDesc = "获取每个设备最新一条实时数据信息") + @ApiOperation(value = "获取每个设备最新一条实时数据信息", notes = "获取每个设备最新一条实时数据信息", httpMethod = "POST") + @ApiImplicitParams({ + @ApiImplicitParam(name = "projectSn", value = "项目sn", paramType = "body", required = true, dataType = "String"), + @ApiImplicitParam(name = "devSns", value = "设备sns(不传查全部)", paramType = "query", required = false, dataType = "String"), + }) + @PostMapping(value = "/getNewestList1") + public Result> getNewestList1(@ApiIgnore @RequestBody HashMap paramMap) { + return Result.success(safetyHatDataService.getNewestList1(paramMap)); + } + @OperLog(operModul = "智能安全帽实时数据管理", operType = "查询", operDesc = "列表查询智能安全帽-实时数据信息") @ApiOperation(value = "列表查询智能安全帽-实时数据信息(查询今日会调接口查询)", notes = "列表查询智能安全帽-实时数据信息(查询今日会调接口查询)", httpMethod = "GET") diff --git a/src/main/java/com/zhgd/xmgl/modules/safetyhat/mapper/SafetyHatDataMapper.java b/src/main/java/com/zhgd/xmgl/modules/safetyhat/mapper/SafetyHatDataMapper.java index c27068aee..f1184b993 100644 --- a/src/main/java/com/zhgd/xmgl/modules/safetyhat/mapper/SafetyHatDataMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/safetyhat/mapper/SafetyHatDataMapper.java @@ -53,6 +53,8 @@ public interface SafetyHatDataMapper extends BaseMapper { */ List getNewestList(HashMap paramMap); + List getNewestList1(HashMap paramMap); + /** * 批量插入 * diff --git a/src/main/java/com/zhgd/xmgl/modules/safetyhat/mapper/xml/SafetyHatDataMapper.xml b/src/main/java/com/zhgd/xmgl/modules/safetyhat/mapper/xml/SafetyHatDataMapper.xml index 3a0ea7038..5e2baf598 100644 --- a/src/main/java/com/zhgd/xmgl/modules/safetyhat/mapper/xml/SafetyHatDataMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/safetyhat/mapper/xml/SafetyHatDataMapper.xml @@ -38,6 +38,26 @@ group by t.dev_sn + + insert into safety_hat_data diff --git a/src/main/java/com/zhgd/xmgl/modules/safetyhat/service/ISafetyHatDataService.java b/src/main/java/com/zhgd/xmgl/modules/safetyhat/service/ISafetyHatDataService.java index afb191bc5..e8df63386 100644 --- a/src/main/java/com/zhgd/xmgl/modules/safetyhat/service/ISafetyHatDataService.java +++ b/src/main/java/com/zhgd/xmgl/modules/safetyhat/service/ISafetyHatDataService.java @@ -62,6 +62,8 @@ public interface ISafetyHatDataService extends IService { */ List getNewestList(HashMap paramMap); + List getNewestList1(HashMap paramMap); + /** * 更新状态 * diff --git a/src/main/java/com/zhgd/xmgl/modules/safetyhat/service/impl/SafetyHatDataServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/safetyhat/service/impl/SafetyHatDataServiceImpl.java index 635efd871..f836d1354 100644 --- a/src/main/java/com/zhgd/xmgl/modules/safetyhat/service/impl/SafetyHatDataServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/safetyhat/service/impl/SafetyHatDataServiceImpl.java @@ -175,6 +175,12 @@ public class SafetyHatDataServiceImpl extends ServiceImpl getNewestList1(HashMap paramMap) { + return baseMapper.getNewestList1(paramMap); + } + + @Override public void updateStatus(SafetyHatDev safetyHatDev) { SafetyHatDev dev = safetyHatDevMapper.selectOne(new LambdaQueryWrapper()