Imdroid/security-monitor
2
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

1、优化解算结果曲线显示

Browse Source
This commit is contained in:
weidong 2024-05-28 14:52:44 +08:00
parent 22d2538183
commit 1bbe31c62b
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sec-beidou/src/main/java/com/imdroid/beidou/auth/AuthInterceptor.java
View File

@ -20,7 +20,7 @@ public class AuthInterceptor implements HandlerInterceptor {
@Override @Override
public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception { public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
String username = SessionUtils.getCurrentUser(request); String username = SessionUtils.getCurrentUser(request);
if (!StringUtils.hasText(username)) { if (!StringUtils.isEmpty(username)) {
return true; return true;
} }
String clientType = request.getHeader("x-imdroid-type"); String clientType = request.getHeader("x-imdroid-type");

8
sec-beidou/src/main/java/com/imdroid/beidou/controller/GnssDeviceController.java
View File

@ -106,22 +106,22 @@ public class GnssDeviceController extends BasicController{
JSONObject search = (JSONObject) JSONObject.parse(searchParams); JSONObject search = (JSONObject) JSONObject.parse(searchParams);
//设备号 //设备号
String deviceid = search.getString("deviceid"); String deviceid = search.getString("deviceid");
if (!StringUtils.hasText(deviceid)) { if (!StringUtils.isEmpty(deviceid)) {
queryWrapper.like("deviceid", deviceid); queryWrapper.like("deviceid", deviceid);
} }
//父设备号 //父设备号
String parentid = search.getString("parentid"); String parentid = search.getString("parentid");
if (!StringUtils.hasText(parentid)) { if (!StringUtils.isEmpty(parentid)) {
queryWrapper.like("parentid", parentid); queryWrapper.like("parentid", parentid);
} }
//项目号 //项目号
String project_id = search.getString("project_id"); String project_id = search.getString("project_id");
if (!StringUtils.hasText(project_id)) { if (!StringUtils.isEmpty(project_id)) {
queryWrapper.like("project_id", project_id); queryWrapper.like("project_id", project_id);
} }
//所属组织 //所属组织
String tenantname = search.getString("tenantname"); String tenantname = search.getString("tenantname");
if (!StringUtils.hasText(tenantname)) { if (!StringUtils.isEmpty(tenantname)) {
queryWrapper.like("tenantname", tenantname); queryWrapper.like("tenantname", tenantname);
} }
//设备类型 //设备类型

2
sec-beidou/src/main/java/com/imdroid/beidou/controller/OssFileController.java
View File

@ -54,7 +54,7 @@ public class OssFileController {
@RequestMapping("/upload-device-image") @RequestMapping("/upload-device-image")
public HttpResult upload(@RequestParam("file") MultipartFile multipartFile, String deviceId) throws Exception { public HttpResult upload(@RequestParam("file") MultipartFile multipartFile, String deviceId) throws Exception {
System.out.println("upload device image:" + multipartFile.getOriginalFilename()); System.out.println("upload device image:" + multipartFile.getOriginalFilename());
if (StringUtils.hasText(deviceId)) { if (StringUtils.isEmpty(deviceId)) {
return HttpResult.fail("设备编号不能为空"); return HttpResult.fail("设备编号不能为空");
} }