|
@@ -18,6 +18,7 @@ import com.jjt.common.utils.poi.ExcelUtil;
|
|
|
import com.jjt.common.utils.sign.Base64;
|
|
|
import com.jjt.common.utils.spring.SpringUtils;
|
|
|
import com.jjt.framework.config.ServerConfig;
|
|
|
+import com.jjt.framework.websocket.WebSocketUsers;
|
|
|
import org.apache.coyote.http11.upgrade.UpgradeInfo;
|
|
|
import org.springframework.beans.BeanUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
@@ -28,10 +29,7 @@ import org.springframework.web.multipart.MultipartFile;
|
|
|
import javax.annotation.Resource;
|
|
|
import javax.servlet.http.HttpServletResponse;
|
|
|
import java.nio.charset.StandardCharsets;
|
|
|
-import java.util.ArrayList;
|
|
|
-import java.util.Arrays;
|
|
|
-import java.util.Date;
|
|
|
-import java.util.List;
|
|
|
+import java.util.*;
|
|
|
|
|
|
/**
|
|
|
* 关键字Controller
|
|
@@ -117,6 +115,15 @@ public class ApiController extends BaseController {
|
|
|
info.setKeyType(illegal.getKeyType());
|
|
|
}
|
|
|
wifiInfoService.insertWifiInfo(info);
|
|
|
+ Map<String, Object> wsMap = new HashMap<>();
|
|
|
+ wsMap.put("lat", info.getLat());
|
|
|
+ wsMap.put("lng", info.getLng());
|
|
|
+ wsMap.put("name", info.getSsid());
|
|
|
+ wsMap.put("type", "WIFI");
|
|
|
+ wsMap.put("time", info.getTime());
|
|
|
+ wsMap.put("illegal", info.getIsIllegal());
|
|
|
+ wsMap.put("keyword", info.getKeyType());
|
|
|
+ WebSocketUsers.sendMessageToUsersByText(JSON.toJSONString(wsMap));
|
|
|
});
|
|
|
return AjaxResult.success();
|
|
|
}
|
|
@@ -176,6 +183,16 @@ public class ApiController extends BaseController {
|
|
|
info.setKeyType(illegal.getKeyType());
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
+ Map<String, Object> wsMap = new HashMap<>();
|
|
|
+ wsMap.put("lat", info.getLat());
|
|
|
+ wsMap.put("lng", info.getLng());
|
|
|
+ wsMap.put("name", info.getName());
|
|
|
+ wsMap.put("type", "蓝牙");
|
|
|
+ wsMap.put("time", info.getTime());
|
|
|
+ wsMap.put("illegal", info.getIsIllegal());
|
|
|
+ wsMap.put("keyword", info.getKeyType());
|
|
|
+ WebSocketUsers.sendMessageToUsersByText(JSON.toJSONString(wsMap));
|
|
|
bluetoothInfoService.insertBluetoothInfo(info);
|
|
|
});
|
|
|
return AjaxResult.success();
|