map改成对象

src/main/java/com/zhgd/xmgl/modules/environment/controller/EnvironmentAlarmController.java

@@ -2,11 +2,11 @@ package com.zhgd.xmgl.modules.environment.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.zhgd.jeecg.common.api.vo.Result;
-import com.zhgd.jeecg.common.mybatis.EntityMap;
 import com.zhgd.xmgl.modules.environment.entity.ProjectTodayAlarmInfoDetailQO;
 import com.zhgd.xmgl.modules.environment.entity.ProjectTodayAlarmInfoDetailVo;
 import com.zhgd.xmgl.modules.environment.entity.ProjectTodayAlarmInfoVo;
 import com.zhgd.xmgl.modules.environment.entity.vo.EnvironmentAlarmCountTotalVo;
+import com.zhgd.xmgl.modules.environment.entity.vo.EnvironmentAlarmVo;
 import com.zhgd.xmgl.modules.environment.entity.vo.NewEnvironmentAlarmVo;
 import com.zhgd.xmgl.modules.environment.service.IEnvironmentAlarmService;
 import com.zhgd.xmgl.modules.project.entity.qo.QueryProjectTodayAlarmInfoQO;
@@ -58,9 +58,9 @@ public class EnvironmentAlarmController {
             @ApiImplicitParam(name = "pageSize", value = "每页显示条数", paramType = "body", required = true, dataType = "Integer"),
     })
     @PostMapping(value = "/list")
-	public Result<IPage<EntityMap>> queryPageList(@RequestBody Map<String,Object> map) {
+    public Result<IPage<EnvironmentAlarmVo>> queryPageList(@RequestBody Map<String, Object> map) {
-		Result<IPage<EntityMap>> result = new Result<IPage<EntityMap>>();
+        Result<IPage<EnvironmentAlarmVo>> result = new Result<IPage<EnvironmentAlarmVo>>();
-		IPage<EntityMap> pageList = environmentAlarmService.queryEnvironmentAlarmPageList(map);
+        IPage<EnvironmentAlarmVo> pageList = environmentAlarmService.queryEnvironmentAlarmPageList(map);
         result.setSuccess(true);
         result.setResult(pageList);
         return result;

src/main/java/com/zhgd/xmgl/modules/environment/entity/vo/EnvironmentAlarmVo.java

@@ -0,0 +1,12 @@
+package com.zhgd.xmgl.modules.environment.entity.vo;
+
+import com.zhgd.xmgl.modules.environment.entity.EnvironmentAlarm;
+import lombok.Data;
+
+@Data
+public class EnvironmentAlarmVo extends EnvironmentAlarm {
+    private Double exceedVal;
+    private String alarmTypeName;
+    private String tempAlarmTime;
+    private String deviceName;
+}

src/main/java/com/zhgd/xmgl/modules/environment/mapper/EnvironmentAlarmMapper.java

@@ -1,17 +1,17 @@
 package com.zhgd.xmgl.modules.environment.mapper;
 
-import java.util.List;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import java.util.Map;
-
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.zhgd.jeecg.common.mybatis.EntityMap;
 import com.zhgd.xmgl.modules.environment.entity.*;
 import com.zhgd.xmgl.modules.environment.entity.vo.EnvironmentAlarmCountTotalVo;
+import com.zhgd.xmgl.modules.environment.entity.vo.EnvironmentAlarmVo;
 import com.zhgd.xmgl.modules.environment.entity.vo.NewEnvironmentAlarmVo;
 import com.zhgd.xmgl.modules.project.entity.qo.QueryProjectTodayAlarmInfoQO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+import java.util.List;
+import java.util.Map;
 
 /**
  * @Description: 绿色设备报警预警数据
@@ -22,12 +22,11 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 @Mapper
 public interface EnvironmentAlarmMapper extends BaseMapper<EnvironmentAlarm> {
     /**
-     *
      * @param page
      * @param map
      * @return
      */
-    List<EntityMap> queryEnvironmentAlarmPageList(Page<EntityMap> page, @Param("param")Map<String, Object> map);
+    List<EnvironmentAlarmVo> queryEnvironmentAlarmPageList(Page<EnvironmentAlarmVo> page, @Param("param") Map<String, Object> map);
 
     /**
      *

src/main/java/com/zhgd/xmgl/modules/environment/mapper/xml/EnvironmentAlarmMapper.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.environment.mapper.EnvironmentAlarmMapper">
-    <select id="queryEnvironmentAlarmPageList" resultType="com.zhgd.jeecg.common.mybatis.EntityMap">
+    <select id="queryEnvironmentAlarmPageList"
+            resultType="com.zhgd.xmgl.modules.environment.entity.vo.EnvironmentAlarmVo">
         SELECT a.*,
         ifnull(a.avg_data - a.alarm_value, 0) exceed_val,
         b.alarm_type
@@ -23,10 +24,11 @@
             and a.alarm_type_id = #{param.alarmTypeId}
         </if>
         <if test="param.startTime != null and param.startTime != ''">
-            AND a.alarm_time &gt;= CONCAT(DATE_FORMAT(#{param.startTime}, '%Y-%m-%d'), ' 00:00:00')
+            AND a.alarm_time &gt;= #{param.startTime}
         </if>
         <if test="param.endTime != null and param.endTime != ''">
-            AND a.alarm_time &lt;= CONCAT(DATE_FORMAT(#{param.endTime}, '%Y-%m-%d'), ' 23:59:59')
+            AND a.alarm_time &lt;= if(LENGTH(#{param.endTime}) = 10, CONCAT(DATE_FORMAT(#{param.endTime}, '%Y-%m-%d'), '
+            23:59:59'), #{param.endTime})
         </if>
         order by a.alarm_time desc
     </select>

src/main/java/com/zhgd/xmgl/modules/environment/service/IEnvironmentAlarmService.java

@@ -2,10 +2,10 @@ package com.zhgd.xmgl.modules.environment.service;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.zhgd.jeecg.common.mybatis.EntityMap;
-import com.zhgd.xmgl.modules.environment.entity.*;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.zhgd.xmgl.modules.environment.entity.*;
 import com.zhgd.xmgl.modules.environment.entity.vo.EnvironmentAlarmCountTotalVo;
+import com.zhgd.xmgl.modules.environment.entity.vo.EnvironmentAlarmVo;
 import com.zhgd.xmgl.modules.environment.entity.vo.NewEnvironmentAlarmVo;
 import com.zhgd.xmgl.modules.project.entity.qo.QueryProjectTodayAlarmInfoQO;
 
@@ -20,7 +20,7 @@ import java.util.Map;
  */
 public interface IEnvironmentAlarmService extends IService<EnvironmentAlarm> {
 
-    IPage<EntityMap> queryEnvironmentAlarmPageList(Map<String, Object> map);
+    IPage<EnvironmentAlarmVo> queryEnvironmentAlarmPageList(Map<String, Object> map);
 
     void addEnvironmentAlarm(DustNoiseData dustNoiseData, EnvironmentDev environmentDev);
 

src/main/java/com/zhgd/xmgl/modules/environment/service/impl/EnvironmentAlarmServiceImpl.java

@@ -7,7 +7,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zhgd.jeecg.common.mybatis.EntityMap;
-import com.zhgd.redis.lock.RedisRepository;
 import com.zhgd.xmgl.async.AsyncEnvironment;
 import com.zhgd.xmgl.modules.basicdata.entity.Notice;
 import com.zhgd.xmgl.modules.basicdata.entity.SystemUser;
@@ -18,6 +17,7 @@ import com.zhgd.xmgl.modules.basicdata.service.UploadFileService;
 import com.zhgd.xmgl.modules.bigdevice.mapper.BigDeviceVideoMapper;
 import com.zhgd.xmgl.modules.environment.entity.*;
 import com.zhgd.xmgl.modules.environment.entity.vo.EnvironmentAlarmCountTotalVo;
+import com.zhgd.xmgl.modules.environment.entity.vo.EnvironmentAlarmVo;
 import com.zhgd.xmgl.modules.environment.entity.vo.NewEnvironmentAlarmVo;
 import com.zhgd.xmgl.modules.environment.mapper.EnvironmentAlarmMapper;
 import com.zhgd.xmgl.modules.environment.mapper.EnvironmentWarningMapper;
@@ -71,11 +71,11 @@ public class EnvironmentAlarmServiceImpl extends ServiceImpl<EnvironmentAlarmMap
     private ISprayRtDevService sprayRtDevService;
 
     @Override
-    public IPage<EntityMap> queryEnvironmentAlarmPageList(Map<String, Object> map) {
+    public IPage<EnvironmentAlarmVo> queryEnvironmentAlarmPageList(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<EnvironmentAlarmVo> page = new Page<>(pageNo, pageSize);
-        List<EntityMap> list = environmentAlarmMapper.queryEnvironmentAlarmPageList(page, map);
+        List<EnvironmentAlarmVo> list = environmentAlarmMapper.queryEnvironmentAlarmPageList(page, map);
         return page.setRecords(list);
     }