调用mes导入工程参数修改，Excel表数据流程卡号一致;增加读取层号/工程号方法; 工程号一致覆盖更新

huang

3 天以前 16f4bb3c28fc85cffcc511718c903ada9fdab134

 mes-processes/mes-plcSend/src/main/java/com/mes/device/controller/DeviceGroupController.java

@@ -294,7 +294,7 @@
    public Result<Void> addDeviceToGroup(
            @Valid @RequestBody DeviceGroupRequest request) {
        try {
            deviceGroupRelationService.addDeviceToGroup(request.getGroupId(), request.getDeviceId(), 
            deviceGroupRelationService.addDeviceToGroup(request.getGroupId(), request.getId(), 
                request.getDeviceRole() != null ? request.getDeviceRole() : "MEMBER");
            return Result.success(null);
        } catch (Exception e) {
@@ -311,7 +311,7 @@
    public Result<Void> removeDeviceFromGroup(
            @Valid @RequestBody DeviceGroupRequest request) {
        try {
            deviceGroupRelationService.removeDeviceFromGroup(request.getGroupId(), request.getDeviceId());
            deviceGroupRelationService.removeDeviceFromGroup(request.getGroupId(), request.getId());
            return Result.success(null);
        } catch (Exception e) {
            log.error("从设备组移除设备失败", e);
@@ -327,7 +327,7 @@
    public Result<Void> updateDeviceRole(
            @Valid @RequestBody DeviceGroupRequest request) {
        try {
            deviceGroupRelationService.updateDeviceRole(request.getGroupId(), request.getDeviceId(), 
            deviceGroupRelationService.updateDeviceRole(request.getGroupId(), request.getId(), 
                request.getDeviceRole());
            return Result.success(null);
        } catch (Exception e) {
@@ -360,7 +360,7 @@
    public Result<List<DeviceGroupVO.GroupInfo>> getDeviceGroups(
            @Valid @RequestBody DeviceGroupRequest request) {
        try {
            List<DeviceGroupVO.GroupInfo> groups = deviceGroupRelationService.getDeviceGroups(request.getDeviceId());
            List<DeviceGroupVO.GroupInfo> groups = deviceGroupRelationService.getDeviceGroups(request.getId());
            return Result.success(groups);
        } catch (Exception e) {
            log.error("获取设备设备组列表失败", e);