MDC设备树和设备权限改造

Lius

7 天以前 904727f59b7e10a291ce7d1576e33192a619f2f2

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

@@ -24,6 +24,8 @@
import org.jeecg.modules.base.entity.UserFactory;
import org.jeecg.modules.base.mapper.UserFactoryMapper;
import org.jeecg.modules.base.service.BaseCommonService;
import org.jeecg.modules.mdc.entity.MdcUserProduction;
import org.jeecg.modules.mdc.mapper.MdcUserProductionMapper;
import org.jeecg.modules.system.entity.*;
import org.jeecg.modules.system.mapper.*;
import org.jeecg.modules.system.model.SysUserSysDepartModel;
@@ -83,6 +85,8 @@
   SysRoleIndexMapper sysRoleIndexMapper;
   @Resource
   UserFactoryMapper userFactoryMapper;
   @Resource
   MdcUserProductionMapper mdcUserProductionMapper;
   @Resource
   private ISysDictService sysDictService;

@@ -587,9 +591,9 @@
      //step.4 保存所属产线
      if (oConvertUtils.isNotEmpty(selectedProductions)) {
         arr = selectedProductions.split(",");
         for (String factoryId : arr) {
            UserFactory userFactory = new UserFactory(user.getId(), factoryId);
            userFactoryMapper.insert(userFactory);
         for (String productionId : arr) {
            UserFactory mdcUserProduction = new UserFactory(productionId, user.getId());
            userFactoryMapper.insert(mdcUserProduction);
         }
      }
      //step.5 保存设备权限
@@ -659,11 +663,12 @@
      //先删后加
      userFactoryMapper.delete(new QueryWrapper<UserFactory>().lambda().eq(UserFactory::getUserId, user.getId()));
      if (oConvertUtils.isNotEmpty(productions)) {
         for (String factoryId : array) {
            UserFactory userFactory = new UserFactory(user.getId(), factoryId);
            userFactoryMapper.insert(userFactory);
         for (String productionId : array) {
            UserFactory mdcUserProduction = new UserFactory(productionId, user.getId());
            userFactoryMapper.insert(mdcUserProduction);
         }
      }

      //step.5 修改设备权限
      //先删后加
//      dncDevicePermissionMapper.delete(new QueryWrapper<DncDevicePermission>().lambda().eq(DncDevicePermission::getUserId, user.getId()));
@@ -818,4 +823,16 @@
   public IPage<SysUser> getUserByGroupId(Page<SysUser> page, String groupId, String username) {
      return userMapper.getUserByGroupId(page,groupId,username);
   }

   /**
    * 根据产线Id查询
    * @param page
    * @param factoryId 班组id
    * @param username 用户账户名称
    * @return
    */
   @Override
   public IPage<SysUser> getUserByFactoryId(Page<SysUser> page, String factoryId, String username) {
      return userMapper.getUserByFactoryId(page,factoryId,username);
   }
}