syy/SYYTe
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

格式化代码

This commit is contained in:
阿沐 2022-12-07 13:14:19 +08:00
parent 793477cbb3
commit c3539f4e51
4 changed files with 3 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
maku-boot-system/src/main/java/net/maku/system/service/impl/SysDictTypeServiceImpl.java
View File

@ -25,7 +25,6 @@ import org.springframework.beans.factory.InitializingBean;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -41,7 +40,6 @@ import java.util.stream.Collectors;
@AllArgsConstructor @AllArgsConstructor
public class SysDictTypeServiceImpl extends BaseServiceImpl<SysDictTypeDao, SysDictTypeEntity> implements SysDictTypeService, InitializingBean { public class SysDictTypeServiceImpl extends BaseServiceImpl<SysDictTypeDao, SysDictTypeEntity> implements SysDictTypeService, InitializingBean {
private final SysDictDataDao sysDictDataDao; private final SysDictDataDao sysDictDataDao;
private final DictionaryTransService dictionaryTransService; private final DictionaryTransService dictionaryTransService;
@Override @Override
@ -137,13 +135,12 @@ public class SysDictTypeServiceImpl extends BaseServiceImpl<SysDictTypeDao, SysD
public void refreshTransCache() { public void refreshTransCache() {
// 异步不阻塞主线程，不会 增加启动用时 // 异步不阻塞主线程，不会 增加启动用时
CompletableFuture.supplyAsync(() -> { CompletableFuture.supplyAsync(() -> {
//获取所有的字典项数据 // 获取所有的字典项数据
List<SysDictDataEntity> dataList = sysDictDataDao.selectList(new LambdaQueryWrapper<>()); List<SysDictDataEntity> dataList = sysDictDataDao.selectList(new LambdaQueryWrapper<>());
//根据类型分组 // 根据类型分组
Map<Long, List<SysDictDataEntity>> dictTypeDataMap = dataList.stream().collect(Collectors Map<Long, List<SysDictDataEntity>> dictTypeDataMap = dataList.stream().collect(Collectors
.groupingBy(SysDictDataEntity::getDictTypeId)); .groupingBy(SysDictDataEntity::getDictTypeId));
List<SysDictTypeEntity> dictTypeEntities = super.list(); List<SysDictTypeEntity> dictTypeEntities = super.list();
List<SysDictDataEntity> tempDataEntityList;
for (SysDictTypeEntity dictTypeEntity : dictTypeEntities) { for (SysDictTypeEntity dictTypeEntity : dictTypeEntities) {
if (dictTypeDataMap.containsKey(dictTypeEntity.getId())) { if (dictTypeDataMap.containsKey(dictTypeEntity.getId())) {
dictionaryTransService.refreshCache(dictTypeEntity.getDictType(), dictTypeDataMap.get(dictTypeEntity.getId()) dictionaryTransService.refreshCache(dictTypeEntity.getDictType(), dictTypeDataMap.get(dictTypeEntity.getId())

2
maku-boot-system/src/main/java/net/maku/system/service/impl/SysLogLoginServiceImpl.java
View File

@ -10,7 +10,6 @@ import lombok.SneakyThrows;
import net.maku.framework.common.page.PageResult; import net.maku.framework.common.page.PageResult;
import net.maku.framework.common.service.impl.BaseServiceImpl; import net.maku.framework.common.service.impl.BaseServiceImpl;
import net.maku.framework.common.utils.*; import net.maku.framework.common.utils.*;
import net.maku.storage.service.StorageService;
import net.maku.system.convert.SysLogLoginConvert; import net.maku.system.convert.SysLogLoginConvert;
import net.maku.system.dao.SysLogLoginDao; import net.maku.system.dao.SysLogLoginDao;
import net.maku.system.entity.SysLogLoginEntity; import net.maku.system.entity.SysLogLoginEntity;
@ -32,7 +31,6 @@ import java.util.List;
@Service @Service
@AllArgsConstructor @AllArgsConstructor
public class SysLogLoginServiceImpl extends BaseServiceImpl<SysLogLoginDao, SysLogLoginEntity> implements SysLogLoginService { public class SysLogLoginServiceImpl extends BaseServiceImpl<SysLogLoginDao, SysLogLoginEntity> implements SysLogLoginService {
private final TransService transService; private final TransService transService;
@Override @Override

9
maku-boot-system/src/main/java/net/maku/system/vo/SysUserExcelVO.java
View File

@ -2,20 +2,11 @@ package net.maku.system.vo;
import com.alibaba.excel.annotation.ExcelIgnore; import com.alibaba.excel.annotation.ExcelIgnore;
import com.alibaba.excel.annotation.ExcelProperty; 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.anno.Trans;
import com.fhs.core.trans.constant.TransType; import com.fhs.core.trans.constant.TransType;
import com.fhs.core.trans.vo.TransPojo; import com.fhs.core.trans.vo.TransPojo;
import lombok.Data; import lombok.Data;
import net.maku.framework.common.excel.DateConverter; 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.io.Serializable;
import java.util.Date; import java.util.Date;

2
maku-boot-system/src/main/java/net/maku/system/vo/SysUserVO.java
View File

@ -60,7 +60,7 @@ public class SysUserVO implements Serializable, TransPojo {
@Schema(description = "机构ID", required = true) @Schema(description = "机构ID", required = true)
@NotNull(message = "机构ID不能为空") @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; private Long orgId;
@Schema(description = "状态 0：停用 1：正常", required = true) @Schema(description = "状态 0：停用 1：正常", required = true)