Merge branch 'feature/beidou' into develop
This commit is contained in:
commit
4a394849a1
@ -110,6 +110,13 @@ public class GnssDeviceController extends BasicController{
|
|||||||
tenants = tenantMapper.selectList(queryWrapper);
|
tenants = tenantMapper.selectList(queryWrapper);
|
||||||
}
|
}
|
||||||
GnssDevice device = gnssDeviceMapper.selectById(id);
|
GnssDevice device = gnssDeviceMapper.selectById(id);
|
||||||
|
if(device.getDeviceid().startsWith("6") || device.getDeviceid().startsWith("7")){
|
||||||
|
if(!device.getHas_battery()){
|
||||||
|
device.setHas_battery(true);
|
||||||
|
device.setChange_flag(GnssDevice.PARA_MASK_HAS_BATTERY);
|
||||||
|
gnssDeviceMapper.updateById(device);
|
||||||
|
}
|
||||||
|
}
|
||||||
m.addAttribute("tenant_list", tenants);
|
m.addAttribute("tenant_list", tenants);
|
||||||
m.addAttribute("gnss_group_list", gnssGroups);
|
m.addAttribute("gnss_group_list", gnssGroups);
|
||||||
m.addAttribute("gnss_group_calc_list", gnssGroupCalcs);
|
m.addAttribute("gnss_group_calc_list", gnssGroupCalcs);
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user