diff --git a/das/src/main/java/com/das/common/constant/EquipmentTypeIds.java b/das/src/main/java/com/das/common/constant/EquipmentTypeIds.java index 6ba868eb..087da694 100644 --- a/das/src/main/java/com/das/common/constant/EquipmentTypeIds.java +++ b/das/src/main/java/com/das/common/constant/EquipmentTypeIds.java @@ -7,10 +7,10 @@ public interface EquipmentTypeIds { /** * 风电场 */ - Long EQUIPMENT_TYPE_WIND_FARM = 10001L; + Integer EQUIPMENT_TYPE_WIND_FARM = 10001; /** * 风力发电机组 * Wind Turbine Generator */ - Long EQUIPMENT_TYPE_STATION_WTG = 10002L; + Integer EQUIPMENT_TYPE_STATION_WTG = 10002; } diff --git a/das/src/main/java/com/das/modules/equipment/controller/EquipmentController.java b/das/src/main/java/com/das/modules/equipment/controller/EquipmentController.java index a780beaf..52e6c26a 100644 --- a/das/src/main/java/com/das/modules/equipment/controller/EquipmentController.java +++ b/das/src/main/java/com/das/modules/equipment/controller/EquipmentController.java @@ -73,10 +73,10 @@ public class EquipmentController { @PostMapping("/update") public R updateSysEquipment(@RequestBody SysEquipmentDto sysEquipmentDto) { //判断是否有权限 - boolean hasPermission = StpUtil.hasPermission(SysAuthorityIds.SYS_AUTHORITY_ID_DEVICE_MGR.toString()); - if(!hasPermission){ - return R.fail("没有设备管理权限"); - } +// boolean hasPermission = StpUtil.hasPermission(SysAuthorityIds.SYS_AUTHORITY_ID_DEVICE_MGR.toString()); +// if(!hasPermission){ +// return R.fail("没有设备管理权限"); +// } if (sysEquipmentDto.getOrgId() == null) { throw new ServiceException("参数缺失"); diff --git a/das/src/main/java/com/das/modules/equipment/domain/vo/EquipmentTypeVo.java b/das/src/main/java/com/das/modules/equipment/domain/vo/EquipmentTypeVo.java index 9c2570fb..0d720f94 100644 --- a/das/src/main/java/com/das/modules/equipment/domain/vo/EquipmentTypeVo.java +++ b/das/src/main/java/com/das/modules/equipment/domain/vo/EquipmentTypeVo.java @@ -16,8 +16,7 @@ public class EquipmentTypeVo implements Serializable { /** * 设备类型ID */ - @JsonSerialize(using = ToStringSerializer.class) - public Long equipmentTypeId; + public Integer equipmentTypeId; /** * 设备类型名称 */