diff --git a/modules/thing/src/main/java/com/thing/thing/dict/service/impl/IotThingDictServiceImpl.java b/modules/thing/src/main/java/com/thing/thing/dict/service/impl/IotThingDictServiceImpl.java index bd5992c..f9b6565 100644 --- a/modules/thing/src/main/java/com/thing/thing/dict/service/impl/IotThingDictServiceImpl.java +++ b/modules/thing/src/main/java/com/thing/thing/dict/service/impl/IotThingDictServiceImpl.java @@ -9,8 +9,6 @@ import com.mybatisflex.core.constant.SqlConsts; import com.mybatisflex.core.paginate.Page; import com.mybatisflex.core.query.QueryCondition; import com.mybatisflex.core.query.QueryWrapper; -import com.mybatisflex.core.row.Db; -import com.mybatisflex.core.update.UpdateChain; import com.thing.common.core.enumeration.DictTypeEnum; import com.thing.common.core.enumeration.IsDefaultEnum; import com.thing.common.core.exception.SysException; @@ -391,11 +389,9 @@ public class IotThingDictServiceImpl extends BaseServiceImpl noDefaultList = mapper.selectListByQuery(QueryWrapper.create().eq(IotThingDictEntity::getTenantCode, UserContext.getRealTenantCode()) .eq(IotThingDictEntity::getIsDefault, 1).ne(IotThingDictEntity::getId, id)); - //自定义字典列表 List defaultList = mapper.selectListByQuery(QueryWrapper.create() .eq(IotThingDictEntity::getIsDefault, 0).ne(IotThingDictEntity::getId, id)); @@ -425,32 +421,18 @@ public class IotThingDictServiceImpl extends BaseServiceImpl { s.setSort(aLong.incrementAndGet()); - // mapper.update(s); }); resList.addAll(list); iotThingDictEntity.setSort(aLong.incrementAndGet()); resList.add(iotThingDictEntity); - List list1 = iotThingDictEntities.stream().filter(s -> s.getSort() > sort).toList(); list1.stream().sorted(Comparator.comparing(IotThingDictEntity::getSort)) .forEach(s -> { s.setSort(aLong.incrementAndGet()); -// mapper.update(s); }); resList.addAll(list1); - } - resList.forEach(s -> mapper.update(s)); - -// Db.executeBatch(iotThingDictEntities.size(), 1000, IotThingDictMapper.class, (mapper, index) -> { -// IotThingDictEntity account = iotThingDictEntities.get(index); -// UpdateChain.of(account).update(); -// }); - - // iotThingDictEntities.forEach(s -> mapper.update(s)); -// -// int i = Db.updateEntitiesBatch(iotThingDictEntities, 1000); -// System.out.println(i); + this.updateBatch(resList); } } \ No newline at end of file