bug修复

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<CountRtToolVo> countRtTool(@ApiIgnore @RequestParam HashMap<String, Object> paramMap) {
+    public Result<CountRtToolVo> countRtTool(@ApiIgnore @RequestBody HashMap<String, Object> paramMap) {
         return Result.success(rtToolService.countRtTool(paramMap));
     }
 

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<IPage<EntityMap>> queryPageList(@RequestBody Map<String, Object> map) {
+    public Result<IPage<AiAnalyseHardWareAlarmRecord>> queryPageList(@RequestBody Map<String, Object> map) {
-        Result<IPage<EntityMap>> result = new Result<>();
+        Result<IPage<AiAnalyseHardWareAlarmRecord>> result = new Result<>();
-        IPage<EntityMap> pageList = aiAnalyseHardWareAlarmRecordService.queryAiAnalyseHardWareAlarmPageList(map);
+        IPage<AiAnalyseHardWareAlarmRecord> pageList = aiAnalyseHardWareAlarmRecordService.queryAiAnalyseHardWareAlarmPageList(map);
         result.setSuccess(true);
         result.setResult(pageList);
         log.info("pageList" + pageList);

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<WorkerInfo> workerInfoList;
+    @TableField(exist = false)
+    private java.lang.String departmentName;
+    @TableField(exist = false)
+    private java.lang.String realName;
+
 }

src/main/java/com/zhgd/xmgl/modules/video/mapper/AiAnalyseHardWareAlarmRecordMapper.java

@@ -26,7 +26,7 @@ public interface AiAnalyseHardWareAlarmRecordMapper extends BaseMapper<AiAnalyse
     List<EntityMap> queryAiAnalyseHardWareAlarmPageList(Page<EntityMap> page, @Param("param") Map<String, Object> map);
 
 
-    List<EntityMap> queryAiAnalyseHardWareAlarmPageListTwo(Page<EntityMap> page, @Param("param") Map<String, Object> map);
+    List<AiAnalyseHardWareAlarmRecord> queryAiAnalyseHardWareAlarmPageListTwo(Page<AiAnalyseHardWareAlarmRecord> page, @Param("param") Map<String, Object> map);
 
     @MapKey("dayTitle")
     Map<String, Object> selectAiAnalyseHardWareAlarmTrendList(Map<String, Object> map);

src/main/java/com/zhgd/xmgl/modules/video/mapper/xml/AiAnalyseHardWareAlarmRecordMapper.xml

@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.zhgd.xmgl.modules.video.mapper.AiAnalyseHardWareAlarmRecordMapper">
-    <select id="queryAiAnalyseHardWareAlarmPageListTwo" resultType="com.zhgd.jeecg.common.mybatis.EntityMap">
+    <select id="queryAiAnalyseHardWareAlarmPageListTwo"
+            resultType="com.zhgd.xmgl.modules.video.entity.AiAnalyseHardWareAlarmRecord">
         SELECT a.*,
         '安全部' department_name,
         s.real_name

src/main/java/com/zhgd/xmgl/modules/video/service/IAiAnalyseHardWareAlarmRecordService.java

@@ -22,7 +22,7 @@ import java.util.Map;
  */
 public interface IAiAnalyseHardWareAlarmRecordService extends IService<AiAnalyseHardWareAlarmRecord> {
 
-    IPage<EntityMap> queryAiAnalyseHardWareAlarmPageList(Map<String, Object> map);
+    IPage<AiAnalyseHardWareAlarmRecord> queryAiAnalyseHardWareAlarmPageList(Map<String, Object> map);
 
     void saveAiAnalyseHardWareAlarmRecord(JSONObject body);
 

src/main/java/com/zhgd/xmgl/modules/video/service/impl/AiAnalyseHardWareAlarmRecordServiceImpl.java

@@ -89,11 +89,11 @@ public class AiAnalyseHardWareAlarmRecordServiceImpl extends ServiceImpl<AiAnaly
 
 
     @Override
-    public IPage<EntityMap> queryAiAnalyseHardWareAlarmPageList(Map<String, Object> map) {
+    public IPage<AiAnalyseHardWareAlarmRecord> queryAiAnalyseHardWareAlarmPageList(Map<String, Object> map) {
         int pageNo = Integer.parseInt(map.getOrDefault("pageNo", 1).toString());
         int pageSize = Integer.parseInt(map.getOrDefault("pageSize", 10).toString());
-        Page<EntityMap> page = new Page<>(pageNo, pageSize);
+        Page<AiAnalyseHardWareAlarmRecord> page = new Page<>(pageNo, pageSize);
-        List<EntityMap> list = aiAnalyseHardWareAlarmRecordMapper.queryAiAnalyseHardWareAlarmPageListTwo(page, map);
+        List<AiAnalyseHardWareAlarmRecord> list = aiAnalyseHardWareAlarmRecordMapper.queryAiAnalyseHardWareAlarmPageListTwo(page, map);
         return page.setRecords(list);
     }