diff --git a/win-framework/win-common/src/main/java/com/win/framework/common/enums/CommonStatusEnum.java b/win-framework/win-common/src/main/java/com/win/framework/common/enums/CommonStatusEnum.java index 89d21855..66e79b31 100644 --- a/win-framework/win-common/src/main/java/com/win/framework/common/enums/CommonStatusEnum.java +++ b/win-framework/win-common/src/main/java/com/win/framework/common/enums/CommonStatusEnum.java @@ -5,6 +5,7 @@ import lombok.AllArgsConstructor; import lombok.Getter; import java.util.Arrays; +import java.util.stream.Stream; /** * 通用状态枚举 @@ -34,4 +35,22 @@ public enum CommonStatusEnum implements IntArrayValuable { return ARRAYS; } + public static CommonStatusEnum convert(Integer value) { + return Stream.of(values()) + .filter(bean -> bean.status.equals(value)) + .findAny() + .orElse(DISABLE); + } + + public static CommonStatusEnum convert(String description) { + return Stream.of(values()) + .filter(bean -> bean.name.equals(description)) + .findAny() + .orElse(DISABLE); + } + + public static String[] getStatusNameArray() { + return Stream.of(values()).map(CommonStatusEnum::getName).toArray(String[]::new); + } + } diff --git a/win-framework/win-spring-boot-starter-excel/src/main/java/com/win/framework/excel/core/convert/CommonStatusConverter.java b/win-framework/win-spring-boot-starter-excel/src/main/java/com/win/framework/excel/core/convert/CommonStatusConverter.java new file mode 100644 index 00000000..e284593f --- /dev/null +++ b/win-framework/win-spring-boot-starter-excel/src/main/java/com/win/framework/excel/core/convert/CommonStatusConverter.java @@ -0,0 +1,34 @@ +package com.win.framework.excel.core.convert; + +import com.alibaba.excel.converters.Converter; +import com.alibaba.excel.converters.ReadConverterContext; +import com.alibaba.excel.converters.WriteConverterContext; +import com.alibaba.excel.enums.CellDataTypeEnum; +import com.alibaba.excel.metadata.data.WriteCellData; +import com.win.framework.common.enums.CommonStatusEnum; +import lombok.extern.slf4j.Slf4j; + +@Slf4j +public class CommonStatusConverter implements Converter { + + @Override + public Class supportJavaTypeKey() { + throw new UnsupportedOperationException("暂不支持，也不需要"); + } + + @Override + public CellDataTypeEnum supportExcelTypeKey() { + throw new UnsupportedOperationException("暂不支持，也不需要"); + } + + @Override + public Integer convertToJavaData(ReadConverterContext context) { + return CommonStatusEnum.convert(context.getReadCellData().getStringValue()).getStatus(); + } + + @Override + public WriteCellData convertToExcelData(WriteConverterContext context) { + return new WriteCellData<>(CommonStatusEnum.convert(Integer.parseInt(String.valueOf(context.getValue()))).getName()); + } + +} diff --git a/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/api/logger/ApiAccessLogApiImpl.java b/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/api/logger/ApiAccessLogApiImpl.java index b191b88d..a37ea3e2 100644 --- a/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/api/logger/ApiAccessLogApiImpl.java +++ b/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/api/logger/ApiAccessLogApiImpl.java @@ -1,8 +1,6 @@ package com.win.module.infra.api.logger; import com.win.module.infra.api.logger.dto.ApiAccessLogCreateReqDTO; -import com.win.module.infra.convert.logger.ApiAccessLogConvert; -import com.win.module.infra.mq.message.logger.ApiAccessLogMessage; import com.win.module.infra.mq.producer.logger.ApiAccessLogProducer; import com.win.module.infra.service.logger.ApiAccessLogService; import org.springframework.stereotype.Service; @@ -27,9 +25,9 @@ public class ApiAccessLogApiImpl implements ApiAccessLogApi { @Override public void createApiAccessLog(ApiAccessLogCreateReqDTO createDTO) { - //apiAccessLogService.createApiAccessLog(createDTO); - ApiAccessLogMessage accessLogMessage = ApiAccessLogConvert.INSTANCE.convertMessage(createDTO); - apiAccessLogProducer.sendMessage(accessLogMessage); + apiAccessLogService.createApiAccessLog(createDTO); + //ApiAccessLogMessage accessLogMessage = ApiAccessLogConvert.INSTANCE.convertMessage(createDTO); + //apiAccessLogProducer.sendMessage(accessLogMessage); } } diff --git a/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/api/logger/ApiErrorLogApiImpl.java b/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/api/logger/ApiErrorLogApiImpl.java index 73c5eebc..f78cf538 100644 --- a/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/api/logger/ApiErrorLogApiImpl.java +++ b/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/api/logger/ApiErrorLogApiImpl.java @@ -1,8 +1,6 @@ package com.win.module.infra.api.logger; import com.win.module.infra.api.logger.dto.ApiErrorLogCreateReqDTO; -import com.win.module.infra.convert.logger.ApiErrorLogConvert; -import com.win.module.infra.mq.message.logger.ApiErrorLogMessage; import com.win.module.infra.mq.producer.logger.ApiErrorLogProducer; import com.win.module.infra.service.logger.ApiErrorLogService; import org.springframework.stereotype.Service; @@ -27,9 +25,9 @@ public class ApiErrorLogApiImpl implements ApiErrorLogApi { @Override public void createApiErrorLog(ApiErrorLogCreateReqDTO createDTO) { - //apiErrorLogService.createApiErrorLog(createDTO); - ApiErrorLogMessage errorLogMessage = ApiErrorLogConvert.INSTANCE.convertMessage(createDTO); - apiErrorLogProducer.sendMessage(errorLogMessage); + apiErrorLogService.createApiErrorLog(createDTO); + //ApiErrorLogMessage errorLogMessage = ApiErrorLogConvert.INSTANCE.convertMessage(createDTO); + //apiErrorLogProducer.sendMessage(errorLogMessage); } } diff --git a/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/api/trends/TrendsApiImpl.java b/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/api/trends/TrendsApiImpl.java index 90a748ce..d681f933 100644 --- a/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/api/trends/TrendsApiImpl.java +++ b/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/api/trends/TrendsApiImpl.java @@ -1,8 +1,6 @@ package com.win.module.infra.api.trends; import com.win.module.infra.api.trends.dto.TrendsCreateReqDTO; -import com.win.module.infra.convert.trends.TrendsConvert; -import com.win.module.infra.mq.message.trends.TrendsMessage; import com.win.module.infra.mq.producer.trends.TrendsProducer; import com.win.module.infra.service.trends.TrendsService; import org.springframework.stereotype.Service; @@ -27,9 +25,9 @@ public class TrendsApiImpl implements TrendsApi { @Override public void createTrends(TrendsCreateReqDTO createDTO) { - //trendsService.createTrends(createDTO); - TrendsMessage trendsMessage = TrendsConvert.INSTANCE.convertMessage(createDTO); - trendsProducer.sendMessage(trendsMessage); + trendsService.createTrends(createDTO); + //TrendsMessage trendsMessage = TrendsConvert.INSTANCE.convertMessage(createDTO); + //trendsProducer.sendMessage(trendsMessage); } } diff --git a/win-module-system/win-module-system-biz/src/main/java/com/win/module/system/controller/user/UserController.java b/win-module-system/win-module-system-biz/src/main/java/com/win/module/system/controller/user/UserController.java index 1de29b91..dc36e159 100644 --- a/win-module-system/win-module-system-biz/src/main/java/com/win/module/system/controller/user/UserController.java +++ b/win-module-system/win-module-system-biz/src/main/java/com/win/module/system/controller/user/UserController.java @@ -158,9 +158,11 @@ public class UserController { }); excelUsers.add(excelVO); }); - + Map mapDropDown = new HashMap<>(); + String[] statusNameArray = CommonStatusEnum.getStatusNameArray(); + mapDropDown.put(6, statusNameArray); // 输出 - ExcelUtils.write(response, "用户数据.xlsx", "用户列表", UserExcelVO.class, excelUsers); + ExcelUtils.write(response, "用户数据.xlsx", "用户列表", UserExcelVO.class, excelUsers, mapDropDown); } @GetMapping("/get-import-template") diff --git a/win-module-system/win-module-system-biz/src/main/java/com/win/module/system/controller/user/vo/user/UserExcelVO.java b/win-module-system/win-module-system-biz/src/main/java/com/win/module/system/controller/user/vo/user/UserExcelVO.java index 406b3ff8..8bb51b2d 100644 --- a/win-module-system/win-module-system-biz/src/main/java/com/win/module/system/controller/user/vo/user/UserExcelVO.java +++ b/win-module-system/win-module-system-biz/src/main/java/com/win/module/system/controller/user/vo/user/UserExcelVO.java @@ -1,6 +1,7 @@ package com.win.module.system.controller.user.vo.user; import com.win.framework.excel.core.annotations.DictFormat; +import com.win.framework.excel.core.convert.CommonStatusConverter; import com.win.framework.excel.core.convert.DictConvert; import com.win.module.system.enums.DictTypeConstants; import com.alibaba.excel.annotation.ExcelProperty; @@ -33,8 +34,8 @@ public class UserExcelVO { @DictFormat(DictTypeConstants.USER_SEX) private Integer sex; - @ExcelProperty(value = "帐号状态", converter = DictConvert.class) - @DictFormat(DictTypeConstants.COMMON_STATUS) + @ExcelProperty(value = "帐号状态", converter = CommonStatusConverter.class) + //@DictFormat(DictTypeConstants.COMMON_STATUS) private Integer status; @ExcelProperty("最后登录IP") diff --git a/win-server/src/main/resources/application.yaml b/win-server/src/main/resources/application.yaml index fb8fb185..d89f0b25 100644 --- a/win-server/src/main/resources/application.yaml +++ b/win-server/src/main/resources/application.yaml @@ -139,7 +139,7 @@ win: pubsub: enable: false # 是否开启 Redis pubsub 广播消费，默认为 true。这里设置成 false，可以按需开启 stream: - enable: true # 是否开启 Redis stream 集群消费，默认为 true。这里设置成 false，可以按需开启 + enable: false # 是否开启 Redis stream 集群消费，默认为 true。这里设置成 false，可以按需开启 tenant: # 多租户相关配置项 enable: true ignore-urls: