告警记录列表查询补充查询字段

src/main/java/com/yunfeiyun/agmp/iotm/web/controller/IotWarnlogController.java

@@ -10,6 +10,7 @@ import com.yunfeiyun.agmp.common.utils.SecurityUtils;
 import com.yunfeiyun.agmp.common.utils.poi.ExcelUtil;
 import com.yunfeiyun.agmp.iot.common.domain.IotWarnlog;
 import com.yunfeiyun.agmp.iotm.web.domain.reqvo.IotWarnlogDealReqVo;
+import com.yunfeiyun.agmp.iotm.web.domain.reqvo.IotWarnlogReqVo;
 import com.yunfeiyun.agmp.iotm.web.domain.resvo.IotWarnlogResVo;
 import com.yunfeiyun.agmp.iotm.web.service.IIotWarnlogService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -37,7 +38,7 @@ public class IotWarnlogController extends BaseController{
      */
     @PreAuthorize("@ss.hasPermi('iot:warn:record:list')")
     @GetMapping("/list")
-    public TableDataInfo list(IotWarnlog iotWarnlog){
+    public TableDataInfo list(IotWarnlogReqVo iotWarnlog){
         iotWarnlog.setTid(SecurityUtils.getTid());
         startPage();
         List<IotWarnlogResVo> list = iotWarnlogService.selectIotWarnlogResVoList(iotWarnlog);

src/main/java/com/yunfeiyun/agmp/iotm/web/domain/reqvo/IotWarnlogReqVo.java

@@ -0,0 +1,12 @@
+package com.yunfeiyun.agmp.iotm.web.domain.reqvo;
+
+import com.yunfeiyun.agmp.iot.common.domain.IotWarnlog;
+import lombok.Data;
+
+@Data
+public class IotWarnlogReqVo extends IotWarnlog {
+
+    private String startDate;
+    private String endDate;
+    private String userMobile;
+}

src/main/java/com/yunfeiyun/agmp/iotm/web/mapper/IotWarnlogMapper.java

@@ -1,6 +1,7 @@
 package com.yunfeiyun.agmp.iotm.web.mapper;
 
 import com.yunfeiyun.agmp.iot.common.domain.IotWarnlog;
+import com.yunfeiyun.agmp.iotm.web.domain.reqvo.IotWarnlogReqVo;
 import com.yunfeiyun.agmp.iotm.web.domain.resvo.IotWarnlogResVo;
 import org.apache.ibatis.annotations.Param;
 
@@ -61,5 +62,5 @@ public interface IotWarnlogMapper {
      */
     public int deleteIotWarnlogByWlBids(@Param("array") String[] wlBids, @Param("tid") String tid);
 
-    List<IotWarnlogResVo> selectIotWarnlogResVoList(IotWarnlog iotWarnlog);
+    List<IotWarnlogResVo> selectIotWarnlogResVoList(IotWarnlogReqVo iotWarnlogReqVo);
 }

src/main/java/com/yunfeiyun/agmp/iotm/web/service/IIotWarnlogService.java

@@ -1,6 +1,7 @@
 package com.yunfeiyun.agmp.iotm.web.service;
 
 import com.yunfeiyun.agmp.iot.common.domain.IotWarnlog;
+import com.yunfeiyun.agmp.iotm.web.domain.reqvo.IotWarnlogReqVo;
 import com.yunfeiyun.agmp.iotm.web.domain.resvo.IotWarnlogResVo;
 
 import java.util.List;
@@ -24,11 +25,11 @@ public interface IIotWarnlogService {
 
     /**
      * 查询告警记录列表
-     * 
-     * @param iotWarnlog 告警记录
+     *
+     * @param iotWarnlogReqVo 告警记录
      * @return 告警记录集合
      */
-    public List<IotWarnlogResVo> selectIotWarnlogResVoList(IotWarnlog iotWarnlog);
+    public List<IotWarnlogResVo> selectIotWarnlogResVoList(IotWarnlogReqVo iotWarnlogReqVo);
 
     /**
      * 新增告警记录

src/main/java/com/yunfeiyun/agmp/iotm/web/service/impl/IotWarnindicatorServiceImpl.java

@@ -132,6 +132,9 @@ public class IotWarnindicatorServiceImpl implements IIotWarnindicatorService {
             iotDeviceBaseFunReqVo.setMethodName("warnDataLatest");
             iotDeviceBaseFunReqVo.setParam(iotDeviceDataListReqVo);
             IotDevicelasteddata iotDevicelasteddata = iotDeviceCommonService.func(iotDeviceBaseFunReqVo);
+            if(null == iotDevicelasteddata){
+                return result;
+            }
             JSONArray jsonArray = JSONArray.parseArray(iotDevicelasteddata.getDevldContent());
             if (!jsonArray.isEmpty() && !warndataitemMap.isEmpty()) {
                 // 如果设备存在预设要素。则需要过滤非预设要素

src/main/java/com/yunfeiyun/agmp/iotm/web/service/impl/IotWarnlogServiceImpl.java

@@ -6,6 +6,7 @@ import com.yunfeiyun.agmp.iot.common.domain.IotWarnlog;
 import com.yunfeiyun.agmp.iot.common.domain.TosDevicetype;
 import com.yunfeiyun.agmp.iot.common.enums.warn.IotWarnTouchTypeEnum;
 import com.yunfeiyun.agmp.iot.common.enums.warn.IotWarnlevelEnum;
+import com.yunfeiyun.agmp.iotm.web.domain.reqvo.IotWarnlogReqVo;
 import com.yunfeiyun.agmp.iotm.web.domain.resvo.IotWarnlogResVo;
 import com.yunfeiyun.agmp.iotm.web.mapper.IotDeviceMapper;
 import com.yunfeiyun.agmp.iotm.web.mapper.IotWarnlogMapper;
@@ -60,12 +61,12 @@ public class IotWarnlogServiceImpl implements IIotWarnlogService {
     /**
      * 查询告警记录列表
      *
-     * @param iotWarnlog 告警记录
+     * @param iotWarnlogReqVo 告警记录
      * @return 告警记录
      */
     @Override
-    public List<IotWarnlogResVo> selectIotWarnlogResVoList(IotWarnlog iotWarnlog){
-        List<IotWarnlogResVo> iotWarnLogResVoList = iotWarnlogMapper.selectIotWarnlogResVoList(iotWarnlog);
+    public List<IotWarnlogResVo> selectIotWarnlogResVoList(IotWarnlogReqVo iotWarnlogReqVo){
+        List<IotWarnlogResVo> iotWarnLogResVoList = iotWarnlogMapper.selectIotWarnlogResVoList(iotWarnlogReqVo);
         List<String> devBids = new ArrayList<>();
         List<String> devTypeBids = new ArrayList<>();
         for(IotWarnlogResVo iotWarnlogResVo : iotWarnLogResVoList){

src/main/resources/mapper/IotWarnlogMapper.xml

@@ -138,10 +138,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="wlDealuserid != null  and wlDealuserid != ''"> and wlDealuserid = #{wlDealuserid}</if>
             <if test="wlDealresult != null  and wlDealresult != ''"> and wlDealresult = #{wlDealresult}</if>
             <if test="wlDealtime != null  and wlDealtime != ''"> and wlDealtime = #{wlDealtime}</if>
-
             <if test="wlCreateddate != null  and wlCreateddate != ''"> and wlCreateddate = #{wlCreateddate}</if>
             <if test="wlData != null  and wlData != ''"> and wlData = #{wlData}</if>
             <if test="tid != null  and tid != ''"> and tid = #{tid}</if>
+            <if test="startDate != null  and startDate != ''">
+                and wlCreateddate >=  #{startDate}
+            </if>
+            <if test="endDate != null  and endDate != ''">
+                and wlCreateddate <![CDATA[ <= ]]>  #{endDate}
+            </if>
         </where>
     </select>
 </mapper>