fix:修改获取传感器参数接口

fix:修改获取报警次数最多的十条记录接口

snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/core/alarm/mapper/mapping/SensorAlarmMapper.xml

@@ -8,21 +8,23 @@
     FROM
       (SELECT
         COUNT(*) AS totalWarnings,
-        device_id as deviceId,
-        device_name as deviceName,
-        sensor_code as sensorCode,
-        sensor_route as sensorRoute
-      FROM sensor_alarm
-      WHERE delete_flag = 'NOT_DELETE'
-      AND type in
+        s.device_id as deviceId,
+        r.name as device_name,
+        s.sensor_code as sensorCode,
+        s.sensor_route as sensorRoute
+      FROM sensor_alarm s
+      left join monitor_target_region r
+      on s.device_id = r.id
+      WHERE r.delete_flag = 'NOT_DELETE'
+      AND s.type in
       <foreach collection="types" item="type" open="(" separator="," close=")">
         #{type}
       </foreach>
       <if test="month != null">
-        AND alarm_time LIKE concat(#{month}, '%')
+        AND s.alarm_time LIKE concat(#{month}, '%')
       </if>
-      AND CREATE_ORG = #{orgId}
-      GROUP BY device_id , sensor_route) tmp
+      AND s.CREATE_ORG = #{orgId}
+      GROUP BY s.device_id , s.sensor_route) tmp
     ORDER BY tmp.totalWarnings DESC
     limit 10
   </select>

snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/core/alarm/service/messagepush/RedisSensorAlarmMessagePushService.java

@@ -55,6 +55,7 @@ public class RedisSensorAlarmMessagePushService {
             SensorAlarmUser user = users.get(openid);
             if (hasExceededPushLimit(openid, deviceID, alarm.getSensorRoute(), alarmType)) {
                 log.info("用户 {} 对设备 {} 的告警类型 {} \n在过去{}分钟内推送次数超过限制，跳过推送", openid, deviceID, alarmType, JfcloudColdChainConstants.MESS_PUSH_TIME_WINDOW / 60 / 1000);
+                delAlarmTime(deviceID, alarm.getSensorRoute(), alarmType);
                 continue;
             }
             // 只对当前人发送预警消息

snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/core/renke/RenKeService.java

@@ -2,6 +2,7 @@ package vip.xiaonuo.coldchain.core.renke;
 
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Component;
+import rk.netDevice.sdk.p2.ParamItem;
 import rk.netDevice.sdk.p2.RSServer;
 
 import java.util.List;
@@ -32,5 +33,8 @@ public class RenKeService {
         return rsServer.callParam(deviceId, paramIds);
     }
 
+    public boolean writeParams(Integer deviceId, List<ParamItem> parameters) {
+        return rsServer.writeParam(deviceId, parameters);
+    }
 
 }

snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/core/service/JfcloudSensorDataService.java

@@ -185,7 +185,7 @@ public class JfcloudSensorDataService extends JfcloudFluxDataService<SensorData>
     public long getLastMonthDataCount(String deviceId, String roads) {
         // 获取上个月的起始时间和结束时间
         String startDate = getFirstDayOfLastMonth();
-        String endDate = getLastDayOfLastMonth();
+        String endDate = getThisDayOfLastMonth();
         return getSensorDataCount(startDate, endDate, deviceId, roads);
     }
 
@@ -267,13 +267,19 @@ public class JfcloudSensorDataService extends JfcloudFluxDataService<SensorData>
         LocalDate lastDayOfLastMonth = LocalDate.now().minusMonths(1).withDayOfMonth(1).plusMonths(1).minusDays(1);
         return lastDayOfLastMonth.format(DateTimeFormatter.ISO_DATE) + "T23:59:59Z";
     }
+
+    private String getThisDayOfLastMonth() {
+        LocalDate thisDayOfLastMonth = LocalDate.now().minusMonths(1);
+        return thisDayOfLastMonth.format(DateTimeFormatter.ISO_DATE) + "T23:59:59Z";
+    }
+
     public long getAlarmCount(String sensorCode, String sensorRoute, SensorAlarmType alarmType, boolean isLastMonth) {
         // 获取上个月或本月的起始时间和结束时间
         String startDate;
         String endDate;
         if (isLastMonth) {
             startDate = getFirstDayOfLastMonth();
-            endDate = getLastDayOfLastMonth();
+            endDate = getThisDayOfLastMonth();
         } else {
             startDate = getFirstDayOfCurrentMonth();
             endDate = getLastDayOfCurrentMonth();

snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/modular/app/controller/AppController.java

@@ -24,6 +24,7 @@ import vip.xiaonuo.common.pojo.CommonResult;
 import java.io.IOException;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 
 @Tag(name = "APP移动端控制器")
 @RestController
@@ -40,8 +41,8 @@ public class AppController {
 
     @GetMapping("/device-status")
     @Operation(summary = "设备总缆")
-    public CommonResult<DeviceStatus> getDeviceStatus(String keyword,String roomId) {
-        DeviceStatus deviceStatus = appDeviceService.getDeviceStatus(keyword,roomId);
+    public CommonResult<DeviceStatus> getDeviceStatus(String keyword, String roomId) {
+        DeviceStatus deviceStatus = appDeviceService.getDeviceStatus(keyword, roomId);
         return CommonResult.data(deviceStatus);
     }
 
@@ -142,7 +143,7 @@ public class AppController {
     @Operation(summary = "导出传感器数据")
     @GetMapping("/device/export")
     public void export(HttpServletResponse response, AppTrendParam trendParam) {
-        appDeviceService.export(response,trendParam);
+        appDeviceService.export(response, trendParam);
     }
 
     /**
@@ -150,11 +151,7 @@ public class AppController {
      */
     @Operation(summary = "获取传感器设备参数")
     @GetMapping("/device/getParameters")
-    public CommonResult<List<ParamItem>> getParameters(String deviceId) {
-        CommonResult<List<ParamItem>> data = CommonResult.data(monitorDeviceService.getParameters(deviceId));
-        if (data.getData().isEmpty()) {
-            throw new CommonException("该设备没有配置参数");
-        }
-        return data;
+    public CommonResult<AppParametersParam> getParameters(String deviceCode, Integer sensorRoute) {
+        return CommonResult.data(monitorDeviceService.getParameters(deviceCode, sensorRoute));
     }
 }

snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/modular/app/param/AppParametersParam.java

@@ -0,0 +1,95 @@
+package vip.xiaonuo.coldchain.modular.app.param;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class AppParametersParam {
+
+    @Schema(description = "目标端口")
+    private String targetPort;
+
+    @Schema(description = "目标ip(域名)")
+    private String targetIp;
+
+    @Schema(description = "目标路由器SSID")
+    private String RouterIp;
+
+    @Schema(description = "目标路由器密码")
+    private String RouterPassword;
+
+    @Schema(description = "ip获取方式")
+    private String ipWay;
+
+    @Schema(description = "本地ip")
+    private String ip;
+
+    @Schema(description = "子网掩码")
+    private String mask;
+
+    @Schema(description = "网关")
+    private String gateWay;
+
+    @Schema(description = "mac地址")
+    private String mac;
+
+    @Schema(description = "终端地址")
+    private String deviceAddress;
+
+    @Schema(description = "登录帧间隔")
+    private Integer loginInterval;
+
+    @Schema(description = "心跳帧间隔")
+    private Integer heartbeatInterval;
+
+    @Schema(description = "主动上送帧间隔")
+    private Integer postInterval;
+
+    @Schema(description = "温度上限")
+    private Float temperatureMax;
+
+    @Schema(description = "温度下限")
+    private Float temperatureMin;
+
+    @Schema(description = "湿度上限")
+    private Float humidityMax;
+
+    @Schema(description = "湿度下限")
+    private Float humidityMin;
+
+    @Schema(description = "温度回差")
+    private Float temperatureReturn;
+
+    @Schema(description = "湿度回差")
+    private Float humidityReturn;
+
+    @Schema(description = "温度偏差")
+    private Float temperatureDeviation;
+
+    @Schema(description = "湿度偏差")
+    private Float humidityDeviation;
+
+    @Schema(description = "温度上限报警使能")
+    private Boolean temperatureMaxWarning;
+
+    @Schema(description = "温度下限报警使能")
+    private Boolean temperatureMinWarning;
+
+    @Schema(description = "湿度上限报警使能")
+    private Boolean humidityMaxWarning;
+
+    @Schema(description = "湿度下限报警使能")
+    private Boolean humidityMinWarning;
+
+    @Schema(description = "设备数据记录间隔")
+    private Integer dataRecordingInterval;
+
+    @Schema(description = "数据记录模式")
+    private String dataRecordingMode;
+
+    @Schema(description = "设备中储存的数据主动上传")
+    private Boolean dataActiveUpload;
+
+}

snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/modular/monitordevice/config/CopyOptionsConfig.java

@@ -0,0 +1,50 @@
+package vip.xiaonuo.coldchain.modular.monitordevice.config;
+
+import cn.hutool.core.bean.copier.CopyOptions;
+
+import java.util.HashMap;
+import java.util.Map;
+
+
+public class CopyOptionsConfig {
+
+    private static final Map<String, String> propNameMap = new HashMap<>();
+
+    static  {
+        propNameMap.put("paramId19", "dataPostInterval");
+        propNameMap.put("paramId20", "targetIp");
+        propNameMap.put("paramId38", "dataRecordingInterval");
+        propNameMap.put("paramId40", "dataRecordingMode");
+        propNameMap.put("paramId44", "dataActiveUpload");
+        propNameMap.put("paramId248", "temperatureMax");
+        propNameMap.put("paramId249", "temperatureMin");
+        propNameMap.put("paramId259", "humidityMax");
+        propNameMap.put("paramId260", "humidityMin");
+        propNameMap.put("paramId273", "temperatureMax");
+        propNameMap.put("paramId274", "temperatureMin");
+        propNameMap.put("paramId284", "humidityMax");
+        propNameMap.put("paramId285", "humidityMin");
+        propNameMap.put("paramId298", "temperatureMax");
+        propNameMap.put("paramId299", "temperatureMin");
+        propNameMap.put("paramId309", "humidityMax");
+        propNameMap.put("paramId310", "humidityMin");
+        propNameMap.put("paramId323", "temperatureMax");
+        propNameMap.put("paramId324", "temperatureMin");
+        propNameMap.put("paramId334", "humidityMax");
+        propNameMap.put("paramId335", "humidityMin");
+        propNameMap.put("paramId2", "targetIp");
+        propNameMap.put("paramId13", "ip");
+        propNameMap.put("paramId14", "mask");
+        propNameMap.put("paramId15", "gateWay");
+        propNameMap.put("paramId16", "ipWay");
+        propNameMap.put("paramId30", "loginInterval");
+        propNameMap.put("paramId31", "heartbeatInterval");
+        propNameMap.put("paramId32", "postInterval");
+        propNameMap.put("paramId250", "temperatureReturn");
+    }
+
+    public static CopyOptions appParametersParamCopyOptions() {
+        return CopyOptions.create().setFieldNameEditor(propNameMap::get);
+    }
+
+}

snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/modular/monitordevice/service/MonitorDeviceService.java

@@ -22,6 +22,7 @@ import rk.netDevice.sdk.p2.ParamData;
 import rk.netDevice.sdk.p2.ParamIdsData;
 import rk.netDevice.sdk.p2.ParamItem;
 import vip.xiaonuo.coldchain.core.bean.influxdb.SensorData;
+import vip.xiaonuo.coldchain.modular.app.param.AppParametersParam;
 import vip.xiaonuo.coldchain.modular.monitordevice.entity.MonitorDevice;
 import vip.xiaonuo.coldchain.modular.monitordevice.param.MonitorDeviceAddParam;
 import vip.xiaonuo.coldchain.modular.monitordevice.param.MonitorDeviceEditParam;
@@ -139,5 +140,5 @@ public interface MonitorDeviceService extends IService<MonitorDevice> {
      */
     List<MonitorDevice> getMonitorDeviceByPowerCode(String powerCode);
 
-    List<ParamItem> getParameters(String deviceId);
+    AppParametersParam getParameters(String deviceCode, Integer sensorRoute);
 }

snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/modular/monitordevice/service/impl/MonitorDeviceServiceImpl.java

@@ -15,6 +15,7 @@ package vip.xiaonuo.coldchain.modular.monitordevice.service.impl;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollStreamUtil;
 import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.ReUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.support.ExcelTypeEnum;
@@ -43,6 +44,9 @@ import vip.xiaonuo.coldchain.core.config.JfcloudColdChainConstants;
 import vip.xiaonuo.coldchain.core.config.JfcloudRedisCacheService;
 import vip.xiaonuo.coldchain.core.renke.RenKeService;
 import vip.xiaonuo.coldchain.core.service.JfcloudSensorDataService;
+import vip.xiaonuo.coldchain.modular.app.param.AppParametersParam;
+import vip.xiaonuo.coldchain.modular.app.param.MessagePageParam;
+import vip.xiaonuo.coldchain.modular.monitordevice.config.CopyOptionsConfig;
 import vip.xiaonuo.coldchain.modular.monitordevice.dto.MonitorDevicePageDto;
 import vip.xiaonuo.coldchain.modular.monitordevice.entity.MonitorDevice;
 import vip.xiaonuo.coldchain.modular.monitordevice.entity.MonitorDeviceTemplate;
@@ -74,6 +78,7 @@ import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
 import java.time.Instant;
 import java.util.*;
+import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
 /**
@@ -538,12 +543,27 @@ public class MonitorDeviceServiceImpl extends ServiceImpl<MonitorDeviceMapper, M
     }
 
     @Override
-    public List<ParamItem> getParameters(String deviceId) {
-        SaBaseLoginUser loginUser = StpLoginUserUtil.getLoginUser();
+    public AppParametersParam getParameters(String deviceCode, Integer sensorRoute) {
+        AppParametersParam appParametersParam = new AppParametersParam();
         LambdaQueryWrapper<MonitorDevice> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(MonitorDevice::getId, deviceId).eq(MonitorDevice::getCreateOrg, loginUser.getOrgId())
-                .eq(MonitorDevice::getDeleteFlag, CommonDeleteFlagEnum.NOT_DELETE);
-        return getOne(queryWrapper).getParameters();
+        queryWrapper.eq(MonitorDevice::getDeviceCode, deviceCode).eq(MonitorDevice::getDeleteFlag, CommonDeleteFlagEnum.NOT_DELETE);
+        List<ParamItem> parameterList = this.getOne(queryWrapper).getParameters();
+        MonitorTargetRegion monitorTargetRegion = monitorTargetRegionService.findOneByDeviceCodeAndSensorNo(deviceCode, sensorRoute);
+        Map<String, String> paramMap = new HashMap<>();
+        if (ReUtil.contains(Pattern.compile("RS-WS-WIFI-Y\\d"), monitorTargetRegion.getModelName())) {
+            for (ParamItem paramItem : parameterList) {
+                if (paramItem.getParamId() < 248 || paramItem.getDescription().startsWith("通道" + sensorRoute)) {
+                    paramMap.put("paramId" + paramItem.getParamId(), paramItem.getValue());
+                }
+            }
+            appParametersParam = BeanUtil.toBean(paramMap, AppParametersParam.class, CopyOptionsConfig.appParametersParamCopyOptions());
+        } else if (monitorTargetRegion.getModelName().equals("RS-WD-WIFI-6-5WL")) {
+            for (ParamItem paramItem : parameterList) {
+                paramMap.put("paramId" + paramItem.getParamId(), paramItem.getValue());
+            }
+            appParametersParam = BeanUtil.toBean(paramMap, AppParametersParam.class, CopyOptionsConfig.appParametersParamCopyOptions());
+        }
+        return appParametersParam;
     }
 
 }

snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/modular/monitornotice/service/impl/MonitorNoticeServiceImpl.java

@@ -63,9 +63,9 @@ public class MonitorNoticeServiceImpl extends ServiceImpl<MonitorNoticeMapper, M
         List<Integer> countList = new ArrayList<>();
         int timeFlag = 0;
         while (timeFlag != 24) {
-            String startTimeStr = getTimeStr(timeFlag);
-            timeFlag += STP;
-            String endTimeStr = getTimeStr(timeFlag);
+            String startTimeStr = getStartTimeStr(timeFlag);
+            timeFlag = timeFlag + STP - 1;
+            String endTimeStr = getEndTimeStr(timeFlag);
             timePeriodList.add(startTimeStr + "-" + endTimeStr);
             Integer toDay = monitorNoticeMapper.getToDay(startTimeStr, endTimeStr, orgId);
             countList.add(toDay);
@@ -84,9 +84,9 @@ public class MonitorNoticeServiceImpl extends ServiceImpl<MonitorNoticeMapper, M
         List<Integer> countList = new ArrayList<>();
         int timeFlag = 0;
         while (timeFlag != 24) {
-            String startTimeStr = getTimeStr(timeFlag);
-            timeFlag += STP;
-            String endTimeStr = getTimeStr(timeFlag);
+            String startTimeStr = getStartTimeStr(timeFlag);
+            timeFlag = timeFlag + STP;
+            String endTimeStr = getEndTimeStr(timeFlag);
             timePeriodList.add(startTimeStr + "-" + endTimeStr);
             Integer yesterday = monitorNoticeMapper.getYesterday(startTimeStr, endTimeStr, orgId);
             countList.add(yesterday);
@@ -105,9 +105,9 @@ public class MonitorNoticeServiceImpl extends ServiceImpl<MonitorNoticeMapper, M
         List<Integer> countList = new ArrayList<>();
         int timeFlag = 0;
         while (timeFlag != 24) {
-            String startTimeStr = getTimeStr(timeFlag);
-            timeFlag += STP;
-            String endTimeStr = getTimeStr(timeFlag);
+            String startTimeStr = getStartTimeStr(timeFlag);
+            timeFlag = timeFlag + STP;
+            String endTimeStr = getEndTimeStr(timeFlag);
             timePeriodList.add(startTimeStr + "-" + endTimeStr);
             Integer dayBeforeYesterday = monitorNoticeMapper.getDayBeforeYesterday(startTimeStr, endTimeStr, orgId);
             countList.add(dayBeforeYesterday);
@@ -130,7 +130,15 @@ public class MonitorNoticeServiceImpl extends ServiceImpl<MonitorNoticeMapper, M
         return countWithTimeList;
     }
 
-    private String getTimeStr(int timeFlag) {
+    private String getEndTimeStr(int timeFlag) {
+        String timeStr = timeFlag - 1 + ":59:59";
+        if (timeStr.length() < 8) {
+            timeStr = "0" + timeStr;
+        }
+        return timeStr;
+    }
+
+    private String getStartTimeStr(int timeFlag) {
         String timeStr = timeFlag + ":00:00";
         if (timeStr.length() < 8) {
             timeStr = "0" + timeStr;

snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/modular/monitorsearchhistory/entity/SearchHistoryController.java → snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/modular/monitorsearchhistory/controller/SearchHistoryController.java

@@ -1,4 +1,4 @@
-package vip.xiaonuo.coldchain.modular.monitorsearchhistory.entity;
+package vip.xiaonuo.coldchain.modular.monitorsearchhistory.controller;
 
 import com.alibaba.fastjson.JSONObject;
 import io.swagger.v3.oas.annotations.Operation;
@@ -10,7 +10,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import vip.xiaonuo.coldchain.core.alarm.enums.SensorAlarmType;
 import vip.xiaonuo.coldchain.core.alarm.service.SensorAlarmService;
-import vip.xiaonuo.coldchain.modular.monitorsearchhistory.controller.SearchHistory;
+import vip.xiaonuo.coldchain.modular.monitorsearchhistory.entity.SearchHistory;
 import vip.xiaonuo.coldchain.modular.monitorsearchhistory.param.SearchHistoryAddParam;
 import vip.xiaonuo.coldchain.modular.monitorsearchhistory.param.SearchHistoryIdParam;
 import vip.xiaonuo.coldchain.modular.monitorsearchhistory.service.SearchHistoryService;

snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/modular/monitorsearchhistory/controller/SearchHistory.java → snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/modular/monitorsearchhistory/entity/SearchHistory.java

@@ -1,4 +1,4 @@
-package vip.xiaonuo.coldchain.modular.monitorsearchhistory.controller;
+package vip.xiaonuo.coldchain.modular.monitorsearchhistory.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;

snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/modular/monitorsearchhistory/mapper/SearchHistoryMapper.java

@@ -13,7 +13,7 @@
 package vip.xiaonuo.coldchain.modular.monitorsearchhistory.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import vip.xiaonuo.coldchain.modular.monitorsearchhistory.controller.SearchHistory;
+import vip.xiaonuo.coldchain.modular.monitorsearchhistory.entity.SearchHistory;
 
 public interface SearchHistoryMapper extends BaseMapper<SearchHistory> {
 }

snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/modular/monitorsearchhistory/service/SearchHistoryService.java

@@ -1,7 +1,7 @@
 package vip.xiaonuo.coldchain.modular.monitorsearchhistory.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import vip.xiaonuo.coldchain.modular.monitorsearchhistory.controller.SearchHistory;
+import vip.xiaonuo.coldchain.modular.monitorsearchhistory.entity.SearchHistory;
 import vip.xiaonuo.coldchain.modular.monitorsearchhistory.param.SearchHistoryAddParam;
 import vip.xiaonuo.coldchain.modular.monitorsearchhistory.param.SearchHistoryIdParam;
 

snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/modular/monitorsearchhistory/service/impl/SearchHistoryServiceImpl.java

@@ -1,7 +1,6 @@
 package vip.xiaonuo.coldchain.modular.monitorsearchhistory.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.collection.CollStreamUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -9,8 +8,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import vip.xiaonuo.auth.core.pojo.SaBaseLoginUser;
 import vip.xiaonuo.auth.core.util.StpLoginUserUtil;
-import vip.xiaonuo.coldchain.modular.monitordevicetype.param.MonitorDeviceTypeIdParam;
-import vip.xiaonuo.coldchain.modular.monitorsearchhistory.controller.SearchHistory;
+import vip.xiaonuo.coldchain.modular.monitorsearchhistory.entity.SearchHistory;
 import vip.xiaonuo.coldchain.modular.monitorsearchhistory.mapper.SearchHistoryMapper;
 import vip.xiaonuo.coldchain.modular.monitorsearchhistory.param.SearchHistoryAddParam;
 import vip.xiaonuo.coldchain.modular.monitorsearchhistory.param.SearchHistoryIdParam;