解决合并冲突问题

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/DemoController.java

 package com.yeejoin.amos.boot.module.jxiop.biz.controller;
 
 
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.jxiop.api.dto.IndexDto;
+import com.yeejoin.amos.boot.module.jxiop.api.entity.MonitorFanIndicator;
 import com.yeejoin.amos.boot.module.jxiop.api.entity.StationBasic;
+import com.yeejoin.amos.boot.module.jxiop.api.mapper.MonitorFanIndicatorMapper;
 import com.yeejoin.amos.boot.module.jxiop.api.mapper.StationBasicMapper;
 import com.yeejoin.amos.boot.module.jxiop.biz.entity.Test;
 import com.yeejoin.amos.boot.module.jxiop.biz.service.impl.MonitorFanIndicatorImpl;
@@ -15,12 +19,9 @@ import com.yeejoin.amos.boot.module.jxiop.biz.utils.InfluxDButils;
 import com.yeejoin.amos.component.influxdb.InfluxDbConnection;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import io.swagger.models.auth.In;
-import net.logstash.logback.encoder.org.apache.commons.lang3.StringUtils;
-import org.influxdb.dto.QueryResult;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.BeanWrapperImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.typroject.tyboot.component.emq.EmqKeeper;
@@ -31,10 +32,12 @@ import java.util.*;
 import java.util.concurrent.TimeUnit;
 import java.util.*;
 
+
 @RestController
 @Api(tags = "Demo-test")
 @RequestMapping(value = "/demo")
 public class DemoController extends BaseController {
+    Logger logger = LoggerFactory.getLogger(DemoController.class);
 
     @Autowired
     StationBasicServiceImpl stationBasicServiceimpl;