db/Ë«ÁÖлð¾æMESÊý¾Ý¿âÉè¼Æ.pdma.json

@@ -4,7 +4,7 @@
  "avatar": "",
  "version": "4.9.2",
  "createdTime": "2025-3-10 16:38:19",
  "updatedTime": "2025-6-25 17:44:46",
  "updatedTime": "2025-6-27 17:40:32",
  "dbConns": [],
  "profile": {
    "default": {
@@ -61559,6 +61559,24 @@
          "id": "1E6C9DB4-C399-4E62-83B3-2A92E1B3DD7D"
        },
        {
          "defKey": "warehouse_id",
          "defName": "库存地ID",
          "comment": "",
          "type": "",
          "len": "",
          "scale": "",
          "primaryKey": false,
          "notNull": false,
          "autoIncrement": false,
          "defaultValue": "",
          "hideInGraph": false,
          "refDict": "",
          "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64",
          "extProps": {},
          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
          "id": "59203E43-D518-4709-9315-BB3A8578FECE"
        },
        {
          "defKey": "inventory_status",
          "defName": "库存状态",
          "comment": "正常、已出库",
@@ -61856,6 +61874,34 @@
          "extProps": {},
          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
          "id": "33F2BEB0-416D-4A2F-8098-32E3F179755C"
        },
        {
          "defKey": "warehouse_id",
          "defName": "库存地ID",
          "comment": "",
          "type": "",
          "len": "",
          "scale": "",
          "primaryKey": false,
          "notNull": false,
          "autoIncrement": false,
          "defaultValue": "",
          "hideInGraph": false,
          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
          "refDict": "",
          "extProps": {},
          "notes": {},
          "attr1": "",
          "attr2": "",
          "attr3": "",
          "attr4": "",
          "attr5": "",
          "attr6": "",
          "attr7": "",
          "attr8": "",
          "attr9": "",
          "id": "5F007840-3FAA-4E5B-85FE-79A2DA8E8948",
          "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64"
        },
        {
          "defKey": "material_number",
@@ -62723,7 +62769,7 @@
        },
        {
          "defKey": "factory_id",
          "defName": "工厂/产线ID",
          "defName": "产线ID",
          "comment": "",
          "type": "",
          "len": "",

 src/main/java/org/jeecg/modules/flowable/service/impl/FlowThirdServiceImpl.java

ÎļþÃû´Ó src/main/java/org/jeecg/modules/dncFlow/FlowThirdServiceImpl.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package org.jeecg.modules.dncFlow;
package org.jeecg.modules.flowable.service.impl;

import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.metadata.IPage;

 src/main/java/org/jeecg/modules/ngalain/aop/LogRecordAspect.java

ÎļþÒÑɾ³ý

 src/main/java/org/jeecg/modules/ngalain/controller/NgAlainController.java

ÎļþÒÑɾ³ý

 src/main/java/org/jeecg/modules/ngalain/service/NgAlainService.java

ÎļþÒÑɾ³ý

 src/main/java/org/jeecg/modules/ngalain/service/impl/NgAlainServiceImpl.java

ÎļþÒÑɾ³ý

 src/main/java/org/jeecg/modules/system/controller/DataVersionController.java

ÎļþÒÑɾ³ý

 src/main/java/org/jeecg/modules/system/controller/SysIdentityController.java

ÎļþÒÑɾ³ý

 src/main/java/org/jeecg/modules/system/entity/DncDevicePermission.java

ÎļþÒÑɾ³ý

 src/main/java/org/jeecg/modules/system/entity/MdcEquipmentDepart.java

ÎļþÒÑɾ³ý

 src/main/java/org/jeecg/modules/system/entity/MdcProductionEquipment.java

ÎļþÒÑɾ³ý

 src/main/java/org/jeecg/modules/system/entity/SysDepartPermission.java

@@ -1,18 +1,13 @@
package org.jeecg.modules.system.entity;

import java.io.Serializable;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel;

/**

 src/main/java/org/jeecg/modules/system/entity/SysDepartRoleUser.java

@@ -1,18 +1,13 @@
package org.jeecg.modules.system.entity;

import java.io.Serializable;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel;

/**

 src/main/java/org/jeecg/modules/system/entity/SysIdentity.java

ÎļþÒÑɾ³ý

 src/main/java/org/jeecg/modules/system/mapper/DncDevicePermissionMapper.java

ÎļþÒÑɾ³ý

 src/main/java/org/jeecg/modules/system/mapper/MdcEquipmentDepartMapper.java

ÎļþÒÑɾ³ý

 src/main/java/org/jeecg/modules/system/mapper/MdcProductionEquipmentMapper.java

ÎļþÒÑɾ³ý

 src/main/java/org/jeecg/modules/system/mapper/SysIdentityMapper.java

ÎļþÒÑɾ³ý

 src/main/java/org/jeecg/modules/system/service/IDncDevicePermissionService.java

ÎļþÒÑɾ³ý

 src/main/java/org/jeecg/modules/system/service/SysIdentityService.java

ÎļþÒÑɾ³ý

 src/main/java/org/jeecg/modules/system/service/impl/DncDevicePermissionServiceImpl.java

ÎļþÒÑɾ³ý

 src/main/java/org/jeecg/modules/system/service/impl/SysDepartServiceImpl.java

@@ -54,8 +54,6 @@
    private SysDepartRoleUserMapper departRoleUserMapper;
    @Autowired
    private SysUserMapper sysUserMapper;
    @Resource
    private MdcEquipmentDepartMapper mdcEquipmentDepartMapper;

    @Override
    public List<SysDepartTreeModel> queryMyDeptTreeList(String departIds) {
@@ -288,7 +286,7 @@
        //根据部门id删除用户与部门关系
        userDepartMapper.delete(new LambdaQueryWrapper<SysUserDepart>().in(SysUserDepart::getDepId,idList));
        //根据部门id删除设备与部门关系
        mdcEquipmentDepartMapper.delete(new LambdaQueryWrapper<MdcEquipmentDepart>().in(MdcEquipmentDepart::getDepId, idList));
//        mdcEquipmentDepartMapper.delete(new LambdaQueryWrapper<MdcEquipmentDepart>().in(MdcEquipmentDepart::getDepId, idList));
        //根据部门id删除部门授权
        departPermissionMapper.delete(new LambdaQueryWrapper<SysDepartPermission>().in(SysDepartPermission::getDepartId,idList));
        //根据部门id删除部门角色
@@ -383,7 +381,7 @@
        //根据部门id删除用户与部门关系
        userDepartMapper.delete(new LambdaQueryWrapper<SysUserDepart>().in(SysUserDepart::getDepId, idList));
        //根据部门id删除设备与部门关系
        mdcEquipmentDepartMapper.delete(new LambdaQueryWrapper<MdcEquipmentDepart>().in(MdcEquipmentDepart::getDepId, idList));
//        mdcEquipmentDepartMapper.delete(new LambdaQueryWrapper<MdcEquipmentDepart>().in(MdcEquipmentDepart::getDepId, idList));
        //根据部门id删除部门授权
        departPermissionMapper.delete(new LambdaQueryWrapper<SysDepartPermission>().in(SysDepartPermission::getDepartId, idList));
        //根据部门id删除部门角色

 src/main/java/org/jeecg/modules/system/service/impl/SysIdentityServiceImpl.java

ÎļþÒÑɾ³ý

 src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java

@@ -85,10 +85,6 @@
    UserFactoryMapper userFactoryMapper;
    @Resource
    private ISysDictService sysDictService;
    @Resource
    private MdcProductionEquipmentMapper mdcProductionEquipmentMapper;
    @Resource
    private DncDevicePermissionMapper dncDevicePermissionMapper;

    @Override
    @CacheEvict(value = {CacheConstant.SYS_USERS_CACHE}, allEntries = true)
@@ -597,16 +593,16 @@
            }
        }
        //step.5 ä¿å­˜è®¾å¤‡æƒé™
        List<String> EquipmentIds= mdcProductionEquipmentMapper.selectList(new QueryWrapper<MdcProductionEquipment>().in("production_id",arr))
                .stream().map(MdcProductionEquipment::getEquipmentId).collect(Collectors.toList());
        if (oConvertUtils.isNotEmpty(EquipmentIds)) {
            for (String equipmentId : EquipmentIds) {
                DncDevicePermission dncDevicePermission=new DncDevicePermission();
                dncDevicePermission.setDeviceId(equipmentId);
                dncDevicePermission.setUserId(user.getId());
                dncDevicePermissionMapper.insert(dncDevicePermission);
            }
        }
//        List<String> EquipmentIds= mdcProductionEquipmentMapper.selectList(new QueryWrapper<MdcProductionEquipment>().in("production_id",arr))
//                .stream().map(MdcProductionEquipment::getEquipmentId).collect(Collectors.toList());
//        if (oConvertUtils.isNotEmpty(EquipmentIds)) {
//            for (String equipmentId : EquipmentIds) {
//                DncDevicePermission dncDevicePermission=new DncDevicePermission();
//                dncDevicePermission.setDeviceId(equipmentId);
//                dncDevicePermission.setUserId(user.getId());
//                dncDevicePermissionMapper.insert(dncDevicePermission);
//            }
//        }
    }

    @Override
@@ -670,17 +666,17 @@
        }
        //step.5 ä¿®æ”¹è®¾å¤‡æƒé™
        //先删后加
        dncDevicePermissionMapper.delete(new QueryWrapper<DncDevicePermission>().lambda().eq(DncDevicePermission::getUserId, user.getId()));
        List<String> EquipmentIds= mdcProductionEquipmentMapper.selectList(new QueryWrapper<MdcProductionEquipment>().in("production_id",array))
                .stream().map(MdcProductionEquipment::getEquipmentId).collect(Collectors.toList());
        if (oConvertUtils.isNotEmpty(EquipmentIds)) {
            for (String equipmentId : EquipmentIds) {
                DncDevicePermission dncDevicePermission=new DncDevicePermission();
                dncDevicePermission.setDeviceId(equipmentId);
                dncDevicePermission.setUserId(user.getId());
                dncDevicePermissionMapper.insert(dncDevicePermission);
            }
        }
//        dncDevicePermissionMapper.delete(new QueryWrapper<DncDevicePermission>().lambda().eq(DncDevicePermission::getUserId, user.getId()));
//        List<String> EquipmentIds= mdcProductionEquipmentMapper.selectList(new QueryWrapper<MdcProductionEquipment>().in("production_id",array))
//                .stream().map(MdcProductionEquipment::getEquipmentId).collect(Collectors.toList());
//        if (oConvertUtils.isNotEmpty(EquipmentIds)) {
//            for (String equipmentId : EquipmentIds) {
//                DncDevicePermission dncDevicePermission=new DncDevicePermission();
//                dncDevicePermission.setDeviceId(equipmentId);
//                dncDevicePermission.setUserId(user.getId());
//                dncDevicePermissionMapper.insert(dncDevicePermission);
//            }
//        }
        //step.6 ä¿®æ”¹æ‰‹æœºå·å’Œé‚®ç®±
        // æ›´æ–°æ‰‹æœºå·ã€é‚®ç®±ç©ºå­—符串为 null
        userMapper.updateNullByEmptyString("email");