opt: LMS解包区任务完成点位赋值,ACS数据初始化结构

This commit is contained in:
2025-08-12 17:29:49 +08:00
parent 2e87d667c6
commit 0f2cb09f22
15 changed files with 1862 additions and 13 deletions

View File

@@ -19,9 +19,7 @@ public enum DeviceType {
plcDb("plcDb块", 13),
shadow("影子设备", 15),
button("按钮",14),
other("其他设备", 16),
unpacking("解包机", 17),
unpacking_converyor("解包机输送线", 18);
other("其他设备", 16);
private String code;

View File

@@ -44,7 +44,7 @@ public class UnpackingConveyorDefination implements OpcDeviceDriverDefination {
@Override
public List<DeviceType> getFitDeviceTypes() {
List<DeviceType> types = new LinkedList();
types.add(DeviceType.unpacking_converyor);
types.add(DeviceType.conveyor);
return types;
}

View File

@@ -45,7 +45,7 @@ public class UnpackingMachineDefination implements OpcDeviceDriverDefination {
@Override
public List<DeviceType> getFitDeviceTypes() {
List<DeviceType> types = new LinkedList();
types.add(DeviceType.unpacking);
types.add(DeviceType.station);
return types;
}

View File

@@ -133,6 +133,9 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
}
// 删除当前角色绑定的菜单
roleMapper.deleteRoleMenuBatchRoleIds(Arrays.asList(roleId));
if (menuIds.size() == 0) {
throw new BadRequestException("角色不能没有菜单权限!");
}
// 插入数据
roleMapper.insertRoleMenu(roleId, menuIds);
}

File diff suppressed because it is too large Load Diff