|
|
@@ -17,10 +17,11 @@ import com.welampiot.vo.DevEnumVO;
|
|
|
import com.welampiot.vo.EventVO;
|
|
|
import com.welampiot.vo.InductionConfigVO;
|
|
|
import com.welampiot.vo.PanelConfigVO;
|
|
|
-import io.ipdata.client.Ipdata;
|
|
|
-import io.ipdata.client.error.IpdataException;
|
|
|
-import io.ipdata.client.model.IpdataModel;
|
|
|
-import io.ipdata.client.service.IpdataService;
|
|
|
+//import io.ipdata.client.Ipdata;
|
|
|
+//import io.ipdata.client.error.IpdataException;
|
|
|
+//import io.ipdata.client.model.IpdataModel;
|
|
|
+//import io.ipdata.client.service.IpdataService;
|
|
|
+//import io.ipdata.client.service.IpdataService;
|
|
|
import org.apache.commons.httpclient.HttpClient;
|
|
|
import org.apache.commons.httpclient.methods.PostMethod;
|
|
|
import org.eclipse.paho.client.mqttv3.MqttClient;
|
|
|
@@ -39,6 +40,7 @@ import org.springframework.web.context.request.RequestContextHolder;
|
|
|
import org.springframework.web.context.request.ServletRequestAttributes;
|
|
|
import org.springframework.web.multipart.MultipartFile;
|
|
|
|
|
|
+import javax.annotation.PostConstruct;
|
|
|
import javax.servlet.http.HttpServletRequest;
|
|
|
import java.io.*;
|
|
|
import java.lang.reflect.Field;
|
|
|
@@ -83,7 +85,8 @@ public class ToolUtils {
|
|
|
@Autowired
|
|
|
private GlobalLocationService globalLocationService;
|
|
|
@Autowired
|
|
|
- private MqttConfig mqttConfig;
|
|
|
+ private MqttConfig mqttConfig1;
|
|
|
+ private static MqttConfig mqttConfig;
|
|
|
@Autowired
|
|
|
private MqttHandler mqttHandler;
|
|
|
@Autowired
|
|
|
@@ -101,6 +104,10 @@ public class ToolUtils {
|
|
|
private GbPlayService gbPlayService;
|
|
|
@Autowired
|
|
|
private WifiMqttConfig wifiMqttConfig;
|
|
|
+ @PostConstruct
|
|
|
+ public void init(){
|
|
|
+ mqttConfig = this.mqttConfig1;
|
|
|
+ }
|
|
|
|
|
|
/**
|
|
|
* 获取用户所有路段 id
|
crazycat