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

1、修改非sass服务商解算结果页面的bug

Browse Source
This commit is contained in:
weidong 2024-02-28 12:04:01 +08:00
parent 5501f0bb05
commit 51d29cbf1a
5 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sec-beidou/src/main/java/com/imdroid/beidou/controller/GnssCalcDataController.java
View File

@ -94,4 +94,8 @@ public class GnssCalcDataController extends BasicController implements CommonExc
return true; return true;
} }
@Override
public String tenantIdField() {
return "d.tenantid";
}
} }

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

@ -103,7 +103,7 @@ public class GnssStatusController extends BasicController implements CommonExcel
public MPJQueryWrapper<GnssStatus> prepareQueryWrapper() { public MPJQueryWrapper<GnssStatus> prepareQueryWrapper() {
return new MPJQueryWrapper<GnssStatus>() return new MPJQueryWrapper<GnssStatus>()
.selectAll(GnssStatus.class) .selectAll(GnssStatus.class)
.select("d.devicetype as devicetype","d.tenantid as tenantid") .select("d.devicetype as devicetype")
.leftJoin("gnssdevices d on t.deviceid = d.deviceid") .leftJoin("gnssdevices d on t.deviceid = d.deviceid")
.orderByDesc("t.updatetime"); .orderByDesc("t.updatetime");
} }

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

@ -80,7 +80,7 @@ public class IndexController extends BasicController{
deviceDeployedNum = gnssDeviceMapper.selectCount(deviceQueryWrapper); deviceDeployedNum = gnssDeviceMapper.selectCount(deviceQueryWrapper);
statusQueryWrapper = new QueryWrapper<>(); statusQueryWrapper = new QueryWrapper<>();
statusQueryWrapper.ne("tenantid", tenantId); statusQueryWrapper.eq("tenantid", tenantId);
statusQueryWrapper.isNotNull("latitude"); statusQueryWrapper.isNotNull("latitude");
statusQueryWrapper.isNotNull("longitude"); statusQueryWrapper.isNotNull("longitude");
deviceList = statusMapper.selectList(statusQueryWrapper); deviceList = statusMapper.selectList(statusQueryWrapper);

2
sec-beidou/src/main/java/com/imdroid/beidou/service/CommonExcelService.java
View File

@ -144,7 +144,7 @@ public interface CommonExcelService<T, R> {
Integer tenantId = (Integer) session.getAttribute(SessionUtils.SESSION_TENANT_ID); Integer tenantId = (Integer) session.getAttribute(SessionUtils.SESSION_TENANT_ID);
if (tenantId != null && tenantId != Tenant.SAAS_PROVIDER_ID) { if (tenantId != null && tenantId != Tenant.SAAS_PROVIDER_ID) {
queryWrapper.eq("tenantid", tenantId); queryWrapper.eq(tenantIdField(), tenantId);
} }
// 条件查询 // 条件查询

6
sec-beidou/src/main/resources/templates/page/gnss_data_calc.html
View File

@ -100,9 +100,9 @@
]; ];
if([[${role}]] != "ADMIN" && [[${role}]] != "SUPER_ADMIN" && if([[${role}]] != "ADMIN" && [[${role}]] != "SUPER_ADMIN" &&
!([[${role}]] == "MANAGER" && [[${tenant_id}]] == 0)) { !([[${role}]] == "MANAGER" && [[${tenant_id}]] == 0)) {
cfg_cols[9].hide = true; data_cols[9].hide = true;
cfg_cols[10].hide = true; data_cols[10].hide = true;
cfg_cols[11].hide = true; data_cols[11].hide = true;
} }
/** /**
* 初始化表单，要加上，不然刷新部分组件可能会不加载 * 初始化表单，要加上，不然刷新部分组件可能会不加载