新增层级结构工艺规程版本、结构树表、新权限表 修改原有权限验证 删除原有代码

lyh

2025-03-06 c06fab29ca7826a6dc9736c1ba8ce1e26a11c829

 lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/DeviceInfoServiceImpl.java

@@ -63,8 +63,6 @@
    @Lazy
    private IProductInfoService productInfoService;
    @Autowired
    private INcLogInfoService iNcLogInfoService;
    @Autowired
    private IMdcProductionService mdcProductionService;
    @Autowired
    private IMdcEquipmentService mdcEquipmentService;
@@ -100,15 +98,6 @@
        if(group == null) {
            ExceptionCast.cast(DeviceCode.DEVICE_GROUP_NONE);
        }
        //添加日志
        NcLogInfo ncLogInfo = new NcLogInfo();
        //模块
        ncLogInfo.setModuleInfo("设备结构树");
        //类型
        ncLogInfo.setOperateType(2);
        //日志内容
        ncLogInfo.setLogContent("设备名称："+deviceInfo.getDeviceName()+"，设备编号："+deviceInfo.getDeviceNo());
        iNcLogInfoService.saveLogNcInfos(ncLogInfo);
        boolean b = super.save(deviceInfo);
        if(!b) {
            ExceptionCast.cast(DeviceCode.DEVICE_SAVE_ERROR);
@@ -151,17 +140,6 @@
            ExceptionCast.cast(DeviceCode.DEVICE_NOT_EXIST);
        deviceInfo.setDeviceId(id);
        deviceInfo.setGroupId(null);
        //添加日志
        NcLogInfo ncLogInfo = new NcLogInfo();
        //模块
        ncLogInfo.setModuleInfo("设备结构树");
        //类型
        ncLogInfo.setOperateType(3);
        //日志内容
        ncLogInfo.setLogContent("设备名称："+deviceInfo.getDeviceName());
        //修改保存备注
        ncLogInfo.setRemark(JSONObject.toJSONString(en));
        iNcLogInfoService.saveLogNcInfos(ncLogInfo);
        return super.updateById(deviceInfo);
    }

@@ -185,15 +163,6 @@
        b = devicePermissionStreamService.deleteDepartByDeviceId(en.getGroupId(), en.getDeviceId());
        if(!b)
            ExceptionCast.cast(CommonCode.FAIL);
        //添加日志
        NcLogInfo ncLogInfo = new NcLogInfo();
        //模块
        ncLogInfo.setModuleInfo("设备结构树");
        //类型
        ncLogInfo.setOperateType(4);
        //日志内容
        ncLogInfo.setLogContent("设备名称："+en.getDeviceName());
        iNcLogInfoService.saveLogNcInfos(ncLogInfo);
        return super.removeById(en.getDeviceId());
    }

@@ -369,6 +338,8 @@
    @Override
    @Transactional(rollbackFor = {Exception.class})
    public boolean assignAddUser(MdcEquipment mdcEquipment, Collection<SysUser> userList) {


        if(mdcEquipment == null || userList == null || userList.isEmpty())
            ExceptionCast.cast(CommonCode.INVALID_PARAM);
        MdcProductionEquipment mdcProductionEquipment=mdcProductionEquipmentService
@@ -387,7 +358,7 @@
            if(stream == null) {
                stream = new DevicePermissionStream();
                stream.setUserId(item.getId());
                stream.setGroupId(mdcProductionEquipment.getId());
                stream.setGroupId(mdcProductionEquipment.getProductionId());
                stream.setDeviceId(mdcEquipment.getId());
                permissionStreamList.add(stream);
            }