Merge remote-tracking branch 'origin/master'

cuilei

2 天以前 c71714508fbe3ace3543423c7700d7bbcca90056

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

@@ -7,7 +7,6 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.extern.slf4j.Slf4j;
import org.apache.catalina.User;
import org.apache.commons.lang3.StringUtils;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.constant.CacheConstant;
@@ -83,12 +82,10 @@
   SysRoleIndexMapper sysRoleIndexMapper;
   @Resource
   UserFactoryMapper userFactoryMapper;
//   @Resource
//   MdcUserProductionMapper mdcUserProductionMapper;
   @Resource
   private ISysDictService sysDictService;
   @Resource
   private MdcProductionEquipmentMapper mdcProductionEquipmentMapper;
   @Resource
   private DncDevicePermissionMapper dncDevicePermissionMapper;

    @Override
    @CacheEvict(value = {CacheConstant.SYS_USERS_CACHE}, allEntries = true)
@@ -591,22 +588,22 @@
      //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 保存设备权限
      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
@@ -663,24 +660,25 @@
      //先删后加
      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()));
      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");
@@ -822,4 +820,21 @@
   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);
   }

   @Override
   public void editUser(SysUser sysUser) {
      userMapper.updateById(sysUser);
   }
}