diff --git a/maku-boot-system/src/main/java/net/maku/system/service/impl/SysDictTypeServiceImpl.java b/maku-boot-system/src/main/java/net/maku/system/service/impl/SysDictTypeServiceImpl.java index 92d2e4f..871f619 100644 --- a/maku-boot-system/src/main/java/net/maku/system/service/impl/SysDictTypeServiceImpl.java +++ b/maku-boot-system/src/main/java/net/maku/system/service/impl/SysDictTypeServiceImpl.java @@ -25,7 +25,6 @@ import org.springframework.beans.factory.InitializingBean; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import javax.annotation.Resource; import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -41,7 +40,6 @@ import java.util.stream.Collectors; @AllArgsConstructor public class SysDictTypeServiceImpl extends BaseServiceImpl implements SysDictTypeService, InitializingBean { private final SysDictDataDao sysDictDataDao; - private final DictionaryTransService dictionaryTransService; @Override @@ -137,13 +135,12 @@ public class SysDictTypeServiceImpl extends BaseServiceImpl { - //获取所有的字典项数据 + // 获取所有的字典项数据 List dataList = sysDictDataDao.selectList(new LambdaQueryWrapper<>()); - //根据类型分组 + // 根据类型分组 Map> dictTypeDataMap = dataList.stream().collect(Collectors .groupingBy(SysDictDataEntity::getDictTypeId)); List dictTypeEntities = super.list(); - List tempDataEntityList; for (SysDictTypeEntity dictTypeEntity : dictTypeEntities) { if (dictTypeDataMap.containsKey(dictTypeEntity.getId())) { dictionaryTransService.refreshCache(dictTypeEntity.getDictType(), dictTypeDataMap.get(dictTypeEntity.getId()) diff --git a/maku-boot-system/src/main/java/net/maku/system/service/impl/SysLogLoginServiceImpl.java b/maku-boot-system/src/main/java/net/maku/system/service/impl/SysLogLoginServiceImpl.java index 49fb40c..4a7dd49 100644 --- a/maku-boot-system/src/main/java/net/maku/system/service/impl/SysLogLoginServiceImpl.java +++ b/maku-boot-system/src/main/java/net/maku/system/service/impl/SysLogLoginServiceImpl.java @@ -10,7 +10,6 @@ import lombok.SneakyThrows; import net.maku.framework.common.page.PageResult; import net.maku.framework.common.service.impl.BaseServiceImpl; import net.maku.framework.common.utils.*; -import net.maku.storage.service.StorageService; import net.maku.system.convert.SysLogLoginConvert; import net.maku.system.dao.SysLogLoginDao; import net.maku.system.entity.SysLogLoginEntity; @@ -32,7 +31,6 @@ import java.util.List; @Service @AllArgsConstructor public class SysLogLoginServiceImpl extends BaseServiceImpl implements SysLogLoginService { - private final TransService transService; @Override diff --git a/maku-boot-system/src/main/java/net/maku/system/vo/SysUserExcelVO.java b/maku-boot-system/src/main/java/net/maku/system/vo/SysUserExcelVO.java index e9276aa..c2dffdd 100644 --- a/maku-boot-system/src/main/java/net/maku/system/vo/SysUserExcelVO.java +++ b/maku-boot-system/src/main/java/net/maku/system/vo/SysUserExcelVO.java @@ -2,20 +2,11 @@ package net.maku.system.vo; import com.alibaba.excel.annotation.ExcelIgnore; import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.converters.Converter; -import com.alibaba.excel.metadata.GlobalConfiguration; -import com.alibaba.excel.metadata.data.ReadCellData; -import com.alibaba.excel.metadata.data.WriteCellData; -import com.alibaba.excel.metadata.property.ExcelContentProperty; import com.fhs.core.trans.anno.Trans; import com.fhs.core.trans.constant.TransType; import com.fhs.core.trans.vo.TransPojo; import lombok.Data; import net.maku.framework.common.excel.DateConverter; -import net.maku.framework.common.utils.DateUtils; -import net.maku.system.enums.SuperAdminEnum; -import net.maku.system.enums.UserGenderEnum; -import net.maku.system.enums.UserStatusEnum; import java.io.Serializable; import java.util.Date; diff --git a/maku-boot-system/src/main/java/net/maku/system/vo/SysUserVO.java b/maku-boot-system/src/main/java/net/maku/system/vo/SysUserVO.java index 97f43a3..58dd899 100644 --- a/maku-boot-system/src/main/java/net/maku/system/vo/SysUserVO.java +++ b/maku-boot-system/src/main/java/net/maku/system/vo/SysUserVO.java @@ -60,7 +60,7 @@ public class SysUserVO implements Serializable, TransPojo { @Schema(description = "机构ID", required = true) @NotNull(message = "机构ID不能为空") - @Trans(type = TransType.SIMPLE,target = SysOrgEntity.class,fields = "name",ref = "orgName") + @Trans(type = TransType.SIMPLE, target = SysOrgEntity.class, fields = "name", ref = "orgName") private Long orgId; @Schema(description = "状态 0:停用 1:正常", required = true)