From 42c990fc28490dfbcad4704e56319295f1ce25fe Mon Sep 17 00:00:00 2001 From: guo Date: Wed, 27 Dec 2023 18:41:54 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../zhgd/xmgl/modules/rt/controller/RtToolController.java | 2 +- .../AiAnalyseHardWareAlarmRecordController.java | 8 +++----- .../video/entity/AiAnalyseHardWareAlarmRecord.java | 5 +++++ .../video/mapper/AiAnalyseHardWareAlarmRecordMapper.java | 2 +- .../mapper/xml/AiAnalyseHardWareAlarmRecordMapper.xml | 3 ++- .../service/IAiAnalyseHardWareAlarmRecordService.java | 2 +- .../impl/AiAnalyseHardWareAlarmRecordServiceImpl.java | 6 +++--- 7 files changed, 16 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/zhgd/xmgl/modules/rt/controller/RtToolController.java b/src/main/java/com/zhgd/xmgl/modules/rt/controller/RtToolController.java index e2419166c..e4998102d 100644 --- a/src/main/java/com/zhgd/xmgl/modules/rt/controller/RtToolController.java +++ b/src/main/java/com/zhgd/xmgl/modules/rt/controller/RtToolController.java @@ -149,7 +149,7 @@ public class RtToolController { @ApiImplicitParam(name = "projectSn", value = "项目sn", paramType = "body", required = true, dataType = "String"), }) @PostMapping(value = "/countRtTool") - public Result countRtTool(@ApiIgnore @RequestParam HashMap paramMap) { + public Result countRtTool(@ApiIgnore @RequestBody HashMap paramMap) { return Result.success(rtToolService.countRtTool(paramMap)); } diff --git a/src/main/java/com/zhgd/xmgl/modules/video/controller/AiAnalyseHardWareAlarmRecordController.java b/src/main/java/com/zhgd/xmgl/modules/video/controller/AiAnalyseHardWareAlarmRecordController.java index bf36540e9..2d40b3fe2 100644 --- a/src/main/java/com/zhgd/xmgl/modules/video/controller/AiAnalyseHardWareAlarmRecordController.java +++ b/src/main/java/com/zhgd/xmgl/modules/video/controller/AiAnalyseHardWareAlarmRecordController.java @@ -6,11 +6,9 @@ import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.zhgd.jeecg.common.api.vo.Result; -import com.zhgd.jeecg.common.mybatis.EntityMap; import com.zhgd.xmgl.base.entity.vo.SectorVo; import com.zhgd.xmgl.modules.basicdata.entity.SystemUser; import com.zhgd.xmgl.modules.basicdata.service.ISystemUserService; -import com.zhgd.xmgl.modules.taskprogress.entity.TaskProgressMaterialRel; import com.zhgd.xmgl.modules.video.entity.AiAnalyseHardWareAlarmRecord; import com.zhgd.xmgl.modules.video.entity.vo.AiAnalyseHardWareAlarmTotalVo; import com.zhgd.xmgl.modules.video.entity.vo.AiAnalyseHardWareAlarmTrendVo; @@ -72,9 +70,9 @@ public class AiAnalyseHardWareAlarmRecordController { @ApiImplicitParam(name = "pageSize", value = "每页显示条数", paramType = "query", required = true, dataType = "Integer"), }) @PostMapping(value = "/selectPageList") - public Result> queryPageList(@RequestBody Map map) { - Result> result = new Result<>(); - IPage pageList = aiAnalyseHardWareAlarmRecordService.queryAiAnalyseHardWareAlarmPageList(map); + public Result> queryPageList(@RequestBody Map map) { + Result> result = new Result<>(); + IPage pageList = aiAnalyseHardWareAlarmRecordService.queryAiAnalyseHardWareAlarmPageList(map); result.setSuccess(true); result.setResult(pageList); log.info("pageList" + pageList); diff --git a/src/main/java/com/zhgd/xmgl/modules/video/entity/AiAnalyseHardWareAlarmRecord.java b/src/main/java/com/zhgd/xmgl/modules/video/entity/AiAnalyseHardWareAlarmRecord.java index 0af13eecf..b21bd1ebe 100644 --- a/src/main/java/com/zhgd/xmgl/modules/video/entity/AiAnalyseHardWareAlarmRecord.java +++ b/src/main/java/com/zhgd/xmgl/modules/video/entity/AiAnalyseHardWareAlarmRecord.java @@ -138,4 +138,9 @@ public class AiAnalyseHardWareAlarmRecord implements Serializable { @TableField(exist = false) @ApiModelProperty(value = "违章人员（新增时候提交id）") private List workerInfoList; + @TableField(exist = false) + private java.lang.String departmentName; + @TableField(exist = false) + private java.lang.String realName; + } diff --git a/src/main/java/com/zhgd/xmgl/modules/video/mapper/AiAnalyseHardWareAlarmRecordMapper.java b/src/main/java/com/zhgd/xmgl/modules/video/mapper/AiAnalyseHardWareAlarmRecordMapper.java index 5149ec04f..fcda109f3 100644 --- a/src/main/java/com/zhgd/xmgl/modules/video/mapper/AiAnalyseHardWareAlarmRecordMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/video/mapper/AiAnalyseHardWareAlarmRecordMapper.java @@ -26,7 +26,7 @@ public interface AiAnalyseHardWareAlarmRecordMapper extends BaseMapper queryAiAnalyseHardWareAlarmPageList(Page page, @Param("param") Map map); - List queryAiAnalyseHardWareAlarmPageListTwo(Page page, @Param("param") Map map); + List queryAiAnalyseHardWareAlarmPageListTwo(Page page, @Param("param") Map map); @MapKey("dayTitle") Map selectAiAnalyseHardWareAlarmTrendList(Map map); diff --git a/src/main/java/com/zhgd/xmgl/modules/video/mapper/xml/AiAnalyseHardWareAlarmRecordMapper.xml b/src/main/java/com/zhgd/xmgl/modules/video/mapper/xml/AiAnalyseHardWareAlarmRecordMapper.xml index 90fb79551..c297ffb49 100644 --- a/src/main/java/com/zhgd/xmgl/modules/video/mapper/xml/AiAnalyseHardWareAlarmRecordMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/video/mapper/xml/AiAnalyseHardWareAlarmRecordMapper.xml @@ -1,7 +1,8 @@ - SELECT a.*, '安全部' department_name, s.real_name diff --git a/src/main/java/com/zhgd/xmgl/modules/video/service/IAiAnalyseHardWareAlarmRecordService.java b/src/main/java/com/zhgd/xmgl/modules/video/service/IAiAnalyseHardWareAlarmRecordService.java index f4541769f..3c4b6982c 100644 --- a/src/main/java/com/zhgd/xmgl/modules/video/service/IAiAnalyseHardWareAlarmRecordService.java +++ b/src/main/java/com/zhgd/xmgl/modules/video/service/IAiAnalyseHardWareAlarmRecordService.java @@ -22,7 +22,7 @@ import java.util.Map; */ public interface IAiAnalyseHardWareAlarmRecordService extends IService { - IPage queryAiAnalyseHardWareAlarmPageList(Map map); + IPage queryAiAnalyseHardWareAlarmPageList(Map map); void saveAiAnalyseHardWareAlarmRecord(JSONObject body); diff --git a/src/main/java/com/zhgd/xmgl/modules/video/service/impl/AiAnalyseHardWareAlarmRecordServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/video/service/impl/AiAnalyseHardWareAlarmRecordServiceImpl.java index 488b3d84b..3957f7342 100644 --- a/src/main/java/com/zhgd/xmgl/modules/video/service/impl/AiAnalyseHardWareAlarmRecordServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/video/service/impl/AiAnalyseHardWareAlarmRecordServiceImpl.java @@ -89,11 +89,11 @@ public class AiAnalyseHardWareAlarmRecordServiceImpl extends ServiceImpl queryAiAnalyseHardWareAlarmPageList(Map map) { + public IPage queryAiAnalyseHardWareAlarmPageList(Map map) { int pageNo = Integer.parseInt(map.getOrDefault("pageNo", 1).toString()); int pageSize = Integer.parseInt(map.getOrDefault("pageSize", 10).toString()); - Page page = new Page<>(pageNo, pageSize); - List list = aiAnalyseHardWareAlarmRecordMapper.queryAiAnalyseHardWareAlarmPageListTwo(page, map); + Page page = new Page<>(pageNo, pageSize); + List list = aiAnalyseHardWareAlarmRecordMapper.queryAiAnalyseHardWareAlarmPageListTwo(page, map); return page.setRecords(list); }