Merge branch 'master' into feature/beidou

This commit is contained in:
fengyarnom 2025-06-12 18:11:01 +08:00
commit 7224ece179

View File

@ -109,6 +109,13 @@ public class GnssDeviceController extends BasicController{
tenants = tenantMapper.selectList(queryWrapper);
}
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("gnss_group_list", gnssGroups);
m.addAttribute("gnss_group_calc_list", gnssGroupCalcs);