diff --git a/win-framework/win-spring-boot-starter-mybatis/src/main/java/com/win/framework/datasource/package-info.java b/win-framework/win-spring-boot-starter-mybatis/src/main/java/com/win/framework/datasource/package-info.java deleted file mode 100644 index 400098e7..00000000 --- a/win-framework/win-spring-boot-starter-mybatis/src/main/java/com/win/framework/datasource/package-info.java +++ /dev/null @@ -1,5 +0,0 @@ -/** - * 数据库连接池，采用 Druid - * 多数据源，采用爆米花 - */ -package com.win.framework.datasource; diff --git a/win-framework/win-spring-boot-starter-mybatis/src/main/java/com/win/framework/package-info.java b/win-framework/win-spring-boot-starter-mybatis/src/main/java/com/win/framework/package-info.java deleted file mode 100644 index b858371b..00000000 --- a/win-framework/win-spring-boot-starter-mybatis/src/main/java/com/win/framework/package-info.java +++ /dev/null @@ -1 +0,0 @@ -package com.win.framework; diff --git a/win-framework/win-spring-boot-starter-web/src/main/java/com/win/framework/package-info.java b/win-framework/win-spring-boot-starter-web/src/main/java/com/win/framework/package-info.java deleted file mode 100644 index e00af685..00000000 --- a/win-framework/win-spring-boot-starter-web/src/main/java/com/win/framework/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * Web 框架，全局异常、API 日志等 - */ -package com.win.framework; 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 ab593eb4..36367eb6 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,7 +1,9 @@ package com.win.module.infra.api.logger; import com.win.module.infra.api.logger.dto.ApiAccessLogCreateReqDTO; -import com.win.module.infra.service.logger.ApiAccessLogService; +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 org.springframework.stereotype.Service; import org.springframework.validation.annotation.Validated; @@ -17,11 +19,12 @@ import javax.annotation.Resource; public class ApiAccessLogApiImpl implements ApiAccessLogApi { @Resource - private ApiAccessLogService apiAccessLogService; + private ApiAccessLogProducer apiAccessLogProducer; @Override public void createApiAccessLog(ApiAccessLogCreateReqDTO createDTO) { - 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 497a1035..c3664cf1 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,7 +1,9 @@ package com.win.module.infra.api.logger; import com.win.module.infra.api.logger.dto.ApiErrorLogCreateReqDTO; -import com.win.module.infra.service.logger.ApiErrorLogService; +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 org.springframework.stereotype.Service; import org.springframework.validation.annotation.Validated; @@ -17,11 +19,12 @@ import javax.annotation.Resource; public class ApiErrorLogApiImpl implements ApiErrorLogApi { @Resource - private ApiErrorLogService apiErrorLogService; + private ApiErrorLogProducer apiErrorLogProducer; @Override public void createApiErrorLog(ApiErrorLogCreateReqDTO createDTO) { - 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 c60a0f62..1aeb4681 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,7 +1,9 @@ package com.win.module.infra.api.trends; import com.win.module.infra.api.trends.dto.TrendsCreateReqDTO; -import com.win.module.infra.service.trends.TrendsService; +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 org.springframework.stereotype.Service; import org.springframework.validation.annotation.Validated; @@ -17,10 +19,12 @@ import javax.annotation.Resource; public class TrendsApiImpl implements TrendsApi { @Resource - private TrendsService trendsService; + private TrendsProducer trendsProducer; @Override public void createTrends(TrendsCreateReqDTO createDTO) { - trendsService.createTrends(createDTO); + TrendsMessage trendsMessage = TrendsConvert.INSTANCE.convertMessage(createDTO); + trendsProducer.sendMessage(trendsMessage); } + } diff --git a/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/controller/remark/RemarkController.java b/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/controller/remark/RemarkController.java index 423b5d2c..bfd706d4 100644 --- a/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/controller/remark/RemarkController.java +++ b/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/controller/remark/RemarkController.java @@ -7,6 +7,8 @@ import com.win.module.infra.controller.remark.vo.RemarkRespVO; import com.win.module.infra.convert.remark.RemarkConvert; import com.win.module.infra.dal.dataobject.remark.RemarkDO; import com.win.module.infra.service.remark.RemarkService; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; @@ -29,6 +31,9 @@ public class RemarkController { @Resource private RemarkService remarkService; + @Resource + private AdminUserApi adminUserApi; + @PostMapping("/create") @Operation(summary = "创建备注") @PreAuthorize("@ss.hasPermission('infra:remark:create')") @@ -50,7 +55,15 @@ public class RemarkController { @PreAuthorize("@ss.hasPermission('infra:remark:query')") public CommonResult> getRemarkList(@Valid RemarkListReqVO listVO) { List list = remarkService.getRemarkList(listVO); - return success(RemarkConvert.INSTANCE.convertList(list)); + List remarkRespVOList = RemarkConvert.INSTANCE.convertList(list); + for(RemarkRespVO remarkRespVO : remarkRespVOList) { + AdminUserRespDTO user = adminUserApi.getUser(Long.parseLong(remarkRespVO.getCreator())); + if(user != null) { + remarkRespVO.setNickname(user.getNickname()); + remarkRespVO.setAvatar(user.getAvatar()); + } + } + return success(remarkRespVOList); } } diff --git a/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/controller/remark/vo/RemarkRespVO.java b/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/controller/remark/vo/RemarkRespVO.java index 9a3d0a5a..e47274ab 100644 --- a/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/controller/remark/vo/RemarkRespVO.java +++ b/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/controller/remark/vo/RemarkRespVO.java @@ -13,4 +13,13 @@ public class RemarkRespVO extends RemarkBaseVO { @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) private LocalDateTime createTime; + @Schema(description = "用户id") + private String creator; + + @Schema(description = "用户昵称") + private String nickname; + + @Schema(description = "用户头像") + private String avatar; + } diff --git a/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/controller/trends/TrendsController.java b/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/controller/trends/TrendsController.java index 8785fe38..8a17b43a 100644 --- a/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/controller/trends/TrendsController.java +++ b/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/controller/trends/TrendsController.java @@ -11,6 +11,8 @@ import com.win.module.infra.controller.trends.vo.TrendsRespVO; import com.win.module.infra.convert.trends.TrendsConvert; import com.win.module.infra.dal.dataobject.trends.TrendsDO; import com.win.module.infra.service.trends.TrendsService; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; @@ -39,6 +41,9 @@ public class TrendsController { @Resource private TrendsService trendsService; + @Resource + private AdminUserApi adminUserApi; + @GetMapping("/get") @Operation(summary = "获得动态记录") @Parameter(name = "id", description = "编号", required = true, example = "1024") @@ -53,7 +58,15 @@ public class TrendsController { @PreAuthorize("@ss.hasPermission('infra:trends:query')") public CommonResult> getTrendsList(@Valid TrendsExportReqVO exportReqVO) { List list = trendsService.getTrendsList(exportReqVO); - return success(TrendsConvert.INSTANCE.convertList(list)); + List trendsRespVOList = TrendsConvert.INSTANCE.convertList(list); + for(TrendsRespVO trendsRespVO : trendsRespVOList) { + AdminUserRespDTO user = adminUserApi.getUser(Long.parseLong(trendsRespVO.getCreator())); + if(user != null) { + trendsRespVO.setNickname(user.getNickname()); + trendsRespVO.setAvatar(user.getAvatar()); + } + } + return success(trendsRespVOList); } @GetMapping("/page") diff --git a/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/controller/trends/vo/TrendsBaseVO.java b/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/controller/trends/vo/TrendsBaseVO.java index 37610511..40326ec8 100644 --- a/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/controller/trends/vo/TrendsBaseVO.java +++ b/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/controller/trends/vo/TrendsBaseVO.java @@ -1,12 +1,9 @@ package com.win.module.infra.controller.trends.vo; import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; -import java.util.*; -import java.time.LocalDateTime; -import java.time.LocalDateTime; -import java.time.LocalDateTime; -import javax.validation.constraints.*; +import lombok.Data; + +import javax.validation.constraints.NotNull; /** * 动态记录 Base VO，提供给添加、修改、详细的子 VO 使用 @@ -23,9 +20,9 @@ public class TrendsBaseVO { @NotNull(message = "表数据id不能为空") private Long tableId; - @Schema(description = "类型1增加2删除3修改", requiredMode = Schema.RequiredMode.REQUIRED, example = "2") - @NotNull(message = "类型1增加2删除3修改不能为空") - private Byte type; + @Schema(description = "类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "2") + @NotNull(message = "类型") + private Integer type; @Schema(description = "内容") private String content; diff --git a/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/controller/trends/vo/TrendsExcelVO.java b/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/controller/trends/vo/TrendsExcelVO.java index 58a249a0..ff571b1c 100644 --- a/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/controller/trends/vo/TrendsExcelVO.java +++ b/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/controller/trends/vo/TrendsExcelVO.java @@ -1,13 +1,9 @@ package com.win.module.infra.controller.trends.vo; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; -import java.util.*; -import java.time.LocalDateTime; -import java.time.LocalDateTime; -import java.time.LocalDateTime; - import com.alibaba.excel.annotation.ExcelProperty; +import lombok.Data; + +import java.time.LocalDateTime; /** * 动态记录 Excel VO @@ -23,7 +19,7 @@ public class TrendsExcelVO { @ExcelProperty("表数据id") private Long tableId; - @ExcelProperty("类型1增加2删除3修改") + @ExcelProperty("类型") private Byte type; @ExcelProperty("创建时间") diff --git a/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/controller/trends/vo/TrendsPageReqVO.java b/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/controller/trends/vo/TrendsPageReqVO.java index 546ccfd4..7aaf9dc0 100644 --- a/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/controller/trends/vo/TrendsPageReqVO.java +++ b/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/controller/trends/vo/TrendsPageReqVO.java @@ -1,10 +1,12 @@ package com.win.module.infra.controller.trends.vo; -import lombok.*; -import java.util.*; -import io.swagger.v3.oas.annotations.media.Schema; import com.win.framework.common.pojo.PageParam; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; import org.springframework.format.annotation.DateTimeFormat; + import java.time.LocalDateTime; import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; @@ -21,7 +23,7 @@ public class TrendsPageReqVO extends PageParam { @Schema(description = "表数据id", example = "9210") private Long tableId; - @Schema(description = "类型1增加2删除3修改", example = "2") + @Schema(description = "类型", example = "2") private Byte type; @Schema(description = "创建时间") diff --git a/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/controller/trends/vo/TrendsRespVO.java b/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/controller/trends/vo/TrendsRespVO.java index 171b313a..62b419b9 100644 --- a/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/controller/trends/vo/TrendsRespVO.java +++ b/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/controller/trends/vo/TrendsRespVO.java @@ -13,4 +13,13 @@ public class TrendsRespVO extends TrendsBaseVO { @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) private LocalDateTime createTime; + @Schema(description = "用户id") + private String creator; + + @Schema(description = "用户昵称") + private String nickname; + + @Schema(description = "用户头像") + private String avatar; + } diff --git a/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/convert/logger/ApiAccessLogConvert.java b/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/convert/logger/ApiAccessLogConvert.java index 45dcd3cd..a95faeb6 100644 --- a/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/convert/logger/ApiAccessLogConvert.java +++ b/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/convert/logger/ApiAccessLogConvert.java @@ -5,6 +5,7 @@ import com.win.module.infra.api.logger.dto.ApiAccessLogCreateReqDTO; import com.win.module.infra.controller.logger.vo.apiaccesslog.ApiAccessLogExcelVO; import com.win.module.infra.controller.logger.vo.apiaccesslog.ApiAccessLogRespVO; import com.win.module.infra.dal.dataobject.logger.ApiAccessLogDO; +import com.win.module.infra.mq.message.logger.ApiAccessLogMessage; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; @@ -30,4 +31,8 @@ public interface ApiAccessLogConvert { ApiAccessLogDO convert(ApiAccessLogCreateReqDTO bean); + ApiAccessLogCreateReqDTO convert(ApiAccessLogMessage bean); + + ApiAccessLogMessage convertMessage(ApiAccessLogCreateReqDTO bean); + } diff --git a/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/convert/logger/ApiErrorLogConvert.java b/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/convert/logger/ApiErrorLogConvert.java index fc99fae0..97909867 100644 --- a/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/convert/logger/ApiErrorLogConvert.java +++ b/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/convert/logger/ApiErrorLogConvert.java @@ -5,6 +5,7 @@ import com.win.module.infra.api.logger.dto.ApiErrorLogCreateReqDTO; import com.win.module.infra.controller.logger.vo.apierrorlog.ApiErrorLogExcelVO; import com.win.module.infra.controller.logger.vo.apierrorlog.ApiErrorLogRespVO; import com.win.module.infra.dal.dataobject.logger.ApiErrorLogDO; +import com.win.module.infra.mq.message.logger.ApiErrorLogMessage; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; @@ -28,4 +29,8 @@ public interface ApiErrorLogConvert { ApiErrorLogDO convert(ApiErrorLogCreateReqDTO bean); + ApiErrorLogCreateReqDTO convert(ApiErrorLogMessage bean); + + ApiErrorLogMessage convertMessage(ApiErrorLogCreateReqDTO bean); + } diff --git a/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/convert/package-info.java b/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/convert/package-info.java deleted file mode 100644 index 1853a76f..00000000 --- a/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/convert/package-info.java +++ /dev/null @@ -1,6 +0,0 @@ -/** - * 提供 POJO 类的实体转换 - * - * 目前使用 MapStruct 框架 - */ -package com.win.module.infra.convert; diff --git a/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/convert/trends/TrendsConvert.java b/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/convert/trends/TrendsConvert.java index d405b4de..3f60a82b 100644 --- a/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/convert/trends/TrendsConvert.java +++ b/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/convert/trends/TrendsConvert.java @@ -7,6 +7,7 @@ import com.win.module.infra.controller.trends.vo.TrendsExcelVO; import com.win.module.infra.controller.trends.vo.TrendsRespVO; import com.win.module.infra.controller.trends.vo.TrendsUpdateReqVO; import com.win.module.infra.dal.dataobject.trends.TrendsDO; +import com.win.module.infra.mq.message.trends.TrendsMessage; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; @@ -36,4 +37,8 @@ public interface TrendsConvert { TrendsDO convert(TrendsCreateReqDTO trendsDTO); + TrendsCreateReqDTO convert(TrendsMessage bean); + + TrendsMessage convertMessage(TrendsCreateReqDTO bean); + } diff --git a/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/mq/consumer/logger/ApiAccessLogConsumer.java b/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/mq/consumer/logger/ApiAccessLogConsumer.java new file mode 100644 index 00000000..b3e88e1e --- /dev/null +++ b/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/mq/consumer/logger/ApiAccessLogConsumer.java @@ -0,0 +1,32 @@ +package com.win.module.infra.mq.consumer.logger; + +import com.win.framework.mq.core.stream.AbstractStreamMessageListener; +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.service.logger.ApiAccessLogService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; + +/** + * 访问日志消费端 + * + * @author zzf + */ +@Component +@Slf4j +public class ApiAccessLogConsumer extends AbstractStreamMessageListener { + + @Resource + private ApiAccessLogService apiAccessLogService; + + @Override + public void onMessage(ApiAccessLogMessage message) { + log.info("[onMessage][消息内容({})]", message); + ApiAccessLogCreateReqDTO apiAccessLog = ApiAccessLogConvert.INSTANCE.convert(message); + apiAccessLogService.createApiAccessLog(apiAccessLog); + } + +} diff --git a/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/mq/consumer/logger/ApiErrorLogConsumer.java b/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/mq/consumer/logger/ApiErrorLogConsumer.java new file mode 100644 index 00000000..c129b399 --- /dev/null +++ b/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/mq/consumer/logger/ApiErrorLogConsumer.java @@ -0,0 +1,32 @@ +package com.win.module.infra.mq.consumer.logger; + +import com.win.framework.mq.core.stream.AbstractStreamMessageListener; +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.service.logger.ApiErrorLogService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; + +/** + * 访问日志消费端 + * + * @author zzf + */ +@Component +@Slf4j +public class ApiErrorLogConsumer extends AbstractStreamMessageListener { + + @Resource + private ApiErrorLogService apiErrorLogService; + + @Override + public void onMessage(ApiErrorLogMessage message) { + log.info("[onMessage][消息内容({})]", message); + ApiErrorLogCreateReqDTO apiAccessLog = ApiErrorLogConvert.INSTANCE.convert(message); + apiErrorLogService.createApiErrorLog(apiAccessLog); + } + +} diff --git a/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/mq/consumer/package-info.java b/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/mq/consumer/package-info.java deleted file mode 100644 index 3a240320..00000000 --- a/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/mq/consumer/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * 消息队列的消费者 - */ -package com.win.module.infra.mq.consumer; diff --git a/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/mq/consumer/trends/TrendsConsumer.java b/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/mq/consumer/trends/TrendsConsumer.java new file mode 100644 index 00000000..2dd3d7dd --- /dev/null +++ b/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/mq/consumer/trends/TrendsConsumer.java @@ -0,0 +1,32 @@ +package com.win.module.infra.mq.consumer.trends; + +import com.win.framework.mq.core.stream.AbstractStreamMessageListener; +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.service.trends.TrendsService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; + +/** + * 访问日志消费端 + * + * @author zzf + */ +@Component +@Slf4j +public class TrendsConsumer extends AbstractStreamMessageListener { + + @Resource + private TrendsService trendsService; + + @Override + public void onMessage(TrendsMessage message) { + log.info("[onMessage][消息内容({})]", message); + TrendsCreateReqDTO trendsCreateReqDTO = TrendsConvert.INSTANCE.convert(message); + trendsService.createTrends(trendsCreateReqDTO); + } + +} diff --git a/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/mq/message/logger/ApiAccessLogMessage.java b/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/mq/message/logger/ApiAccessLogMessage.java new file mode 100644 index 00000000..437535ff --- /dev/null +++ b/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/mq/message/logger/ApiAccessLogMessage.java @@ -0,0 +1,89 @@ +package com.win.module.infra.mq.message.logger; + +import com.win.framework.mq.core.stream.AbstractStreamMessage; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import javax.validation.constraints.NotNull; +import java.time.LocalDateTime; + +/** + * 短信发送消息 + * + * @author 闻荫源码 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class ApiAccessLogMessage extends AbstractStreamMessage { + + /** + * 链路追踪编号 + */ + private String traceId; + /** + * 用户编号 + */ + private Long userId; + /** + * 应用名 + */ + @NotNull(message = "应用名不能为空") + private String applicationName; + + /** + * 请求方法名 + */ + @NotNull(message = "http 请求方法不能为空") + private String requestMethod; + /** + * 访问地址 + */ + @NotNull(message = "访问地址不能为空") + private String requestUrl; + /** + * 请求参数 + */ + @NotNull(message = "请求参数不能为空") + private String requestParams; + /** + * 用户 IP + */ + @NotNull(message = "ip 不能为空") + private String userIp; + /** + * 浏览器 UA + */ + @NotNull(message = "User-Agent 不能为空") + private String userAgent; + + /** + * 开始请求时间 + */ + @NotNull(message = "开始请求时间不能为空") + private LocalDateTime beginTime; + /** + * 结束请求时间 + */ + @NotNull(message = "结束请求时间不能为空") + private LocalDateTime endTime; + /** + * 执行时长，单位：毫秒 + */ + @NotNull(message = "执行时长不能为空") + private Integer duration; + /** + * 结果码 + */ + @NotNull(message = "错误码不能为空") + private Integer resultCode; + /** + * 结果提示 + */ + private String resultMsg; + + @Override + public String getStreamKey() { + return "api.access.log.create"; + } + +} diff --git a/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/mq/message/logger/ApiErrorLogMessage.java b/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/mq/message/logger/ApiErrorLogMessage.java new file mode 100644 index 00000000..3d2341cd --- /dev/null +++ b/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/mq/message/logger/ApiErrorLogMessage.java @@ -0,0 +1,110 @@ +package com.win.module.infra.mq.message.logger; + +import com.win.framework.mq.core.stream.AbstractStreamMessage; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import javax.validation.constraints.NotNull; +import java.time.LocalDateTime; + +/** + * 短信发送消息 + * + * @author 闻荫源码 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class ApiErrorLogMessage extends AbstractStreamMessage { + + /** + * 链路编号 + */ + private String traceId; + /** + * 账号编号 + */ + private Long userId; + /** + * 应用名 + */ + @NotNull(message = "应用名不能为空") + private String applicationName; + + /** + * 请求方法名 + */ + @NotNull(message = "http 请求方法不能为空") + private String requestMethod; + /** + * 访问地址 + */ + @NotNull(message = "访问地址不能为空") + private String requestUrl; + /** + * 请求参数 + */ + @NotNull(message = "请求参数不能为空") + private String requestParams; + /** + * 用户 IP + */ + @NotNull(message = "ip 不能为空") + private String userIp; + /** + * 浏览器 UA + */ + @NotNull(message = "User-Agent 不能为空") + private String userAgent; + + /** + * 异常时间 + */ + @NotNull(message = "异常时间不能为空") + private LocalDateTime exceptionTime; + /** + * 异常名 + */ + @NotNull(message = "异常名不能为空") + private String exceptionName; + /** + * 异常发生的类全名 + */ + @NotNull(message = "异常发生的类全名不能为空") + private String exceptionClassName; + /** + * 异常发生的类文件 + */ + @NotNull(message = "异常发生的类文件不能为空") + private String exceptionFileName; + /** + * 异常发生的方法名 + */ + @NotNull(message = "异常发生的方法名不能为空") + private String exceptionMethodName; + /** + * 异常发生的方法所在行 + */ + @NotNull(message = "异常发生的方法所在行不能为空") + private Integer exceptionLineNumber; + /** + * 异常的栈轨迹异常的栈轨迹 + */ + @NotNull(message = "异常的栈轨迹不能为空") + private String exceptionStackTrace; + /** + * 异常导致的根消息 + */ + @NotNull(message = "异常导致的根消息不能为空") + private String exceptionRootCauseMessage; + /** + * 异常导致的消息 + */ + @NotNull(message = "异常导致的消息不能为空") + private String exceptionMessage; + + @Override + public String getStreamKey() { + return "api.error.log.create"; + } + +} diff --git a/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/mq/message/package-info.java b/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/mq/message/package-info.java deleted file mode 100644 index 02209dff..00000000 --- a/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/mq/message/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * 消息队列的消息 - */ -package com.win.module.infra.mq.message; diff --git a/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/mq/message/trends/TrendsMessage.java b/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/mq/message/trends/TrendsMessage.java new file mode 100644 index 00000000..4741a2db --- /dev/null +++ b/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/mq/message/trends/TrendsMessage.java @@ -0,0 +1,35 @@ +package com.win.module.infra.mq.message.trends; + +import com.win.framework.mq.core.stream.AbstractStreamMessage; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import javax.validation.constraints.NotNull; + +/** + * 短信发送消息 + * + * @author 闻荫源码 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class TrendsMessage extends AbstractStreamMessage { + + @NotNull(message = "表名不能为空") + private String tableName; + + @NotNull(message = "表数据id不能为空") + private Long tableId; + + @NotNull(message = "类型不能为空") + private Integer type; + + @NotNull(message = "内容不能为空") + private String content; + + @Override + public String getStreamKey() { + return "trends.create"; + } + +} diff --git a/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/mq/producer/logger/ApiAccessLogProducer.java b/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/mq/producer/logger/ApiAccessLogProducer.java new file mode 100644 index 00000000..3c84bffb --- /dev/null +++ b/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/mq/producer/logger/ApiAccessLogProducer.java @@ -0,0 +1,26 @@ +package com.win.module.infra.mq.producer.logger; + +import com.win.framework.mq.core.RedisMQTemplate; +import com.win.module.infra.mq.message.logger.ApiAccessLogMessage; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; + +@Slf4j +@Component +public class ApiAccessLogProducer { + + @Resource + private RedisMQTemplate redisMQTemplate; + + /** + * 创建访问记录 + * + * @param apiAccessLogMessage + */ + public void sendMessage(ApiAccessLogMessage apiAccessLogMessage) { + redisMQTemplate.send(apiAccessLogMessage); + } + +} diff --git a/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/mq/producer/logger/ApiErrorLogProducer.java b/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/mq/producer/logger/ApiErrorLogProducer.java new file mode 100644 index 00000000..40789ae4 --- /dev/null +++ b/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/mq/producer/logger/ApiErrorLogProducer.java @@ -0,0 +1,26 @@ +package com.win.module.infra.mq.producer.logger; + +import com.win.framework.mq.core.RedisMQTemplate; +import com.win.module.infra.mq.message.logger.ApiErrorLogMessage; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; + +@Slf4j +@Component +public class ApiErrorLogProducer { + + @Resource + private RedisMQTemplate redisMQTemplate; + + /** + * 创建访问记录 + * + * @param apiErrorLogMessage + */ + public void sendMessage(ApiErrorLogMessage apiErrorLogMessage) { + redisMQTemplate.send(apiErrorLogMessage); + } + +} diff --git a/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/mq/producer/package-info.java b/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/mq/producer/package-info.java deleted file mode 100644 index 1c75e0d8..00000000 --- a/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/mq/producer/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * 消息队列的生产者 - */ -package com.win.module.infra.mq.producer; diff --git a/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/mq/producer/trends/TrendsProducer.java b/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/mq/producer/trends/TrendsProducer.java new file mode 100644 index 00000000..897512c1 --- /dev/null +++ b/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/mq/producer/trends/TrendsProducer.java @@ -0,0 +1,26 @@ +package com.win.module.infra.mq.producer.trends; + +import com.win.framework.mq.core.RedisMQTemplate; +import com.win.module.infra.mq.message.trends.TrendsMessage; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; + +@Slf4j +@Component +public class TrendsProducer { + + @Resource + private RedisMQTemplate redisMQTemplate; + + /** + * 创建访问记录 + * + * @param trendsMessage + */ + public void sendMessage(TrendsMessage trendsMessage) { + redisMQTemplate.send(trendsMessage); + } + +} diff --git a/win-module-system/win-module-system-api/src/main/java/com/win/module/system/api/user/dto/AdminUserRespDTO.java b/win-module-system/win-module-system-api/src/main/java/com/win/module/system/api/user/dto/AdminUserRespDTO.java index b359e4b2..d0378f69 100644 --- a/win-module-system/win-module-system-api/src/main/java/com/win/module/system/api/user/dto/AdminUserRespDTO.java +++ b/win-module-system/win-module-system-api/src/main/java/com/win/module/system/api/user/dto/AdminUserRespDTO.java @@ -40,5 +40,8 @@ public class AdminUserRespDTO { * 手机号码 */ private String mobile; - + /** + * 用户头像 + */ + private String avatar; } diff --git a/win-module-system/win-module-system-biz/src/main/java/com/win/module/system/mq/producer/mail/MailProducer.java b/win-module-system/win-module-system-biz/src/main/java/com/win/module/system/mq/producer/mail/MailProducer.java index 0989b474..2fa8bb53 100644 --- a/win-module-system/win-module-system-biz/src/main/java/com/win/module/system/mq/producer/mail/MailProducer.java +++ b/win-module-system/win-module-system-biz/src/main/java/com/win/module/system/mq/producer/mail/MailProducer.java @@ -30,7 +30,7 @@ public class MailProducer { * @param title 邮件标题 * @param content 邮件内容 */ - public void sendMailSendMessage(Long sendLogId, String mail, Long accountId, + public void sendMessage(Long sendLogId, String mail, Long accountId, String nickname, String title, String content) { MailSendMessage message = new MailSendMessage() .setLogId(sendLogId).setMail(mail).setAccountId(accountId) diff --git a/win-module-system/win-module-system-biz/src/main/java/com/win/module/system/mq/producer/sms/SmsProducer.java b/win-module-system/win-module-system-biz/src/main/java/com/win/module/system/mq/producer/sms/SmsProducer.java index 201d8f1f..f0e130af 100644 --- a/win-module-system/win-module-system-biz/src/main/java/com/win/module/system/mq/producer/sms/SmsProducer.java +++ b/win-module-system/win-module-system-biz/src/main/java/com/win/module/system/mq/producer/sms/SmsProducer.java @@ -31,7 +31,7 @@ public class SmsProducer { * @param apiTemplateId 短信模板编号 * @param templateParams 短信模板参数 */ - public void sendSmsSendMessage(Long logId, String mobile, + public void sendMessage(Long logId, String mobile, Long channelId, String apiTemplateId, List> templateParams) { SmsSendMessage message = new SmsSendMessage().setLogId(logId).setMobile(mobile); message.setChannelId(channelId).setApiTemplateId(apiTemplateId).setTemplateParams(templateParams); diff --git a/win-module-system/win-module-system-biz/src/main/java/com/win/module/system/service/mail/MailSendServiceImpl.java b/win-module-system/win-module-system-biz/src/main/java/com/win/module/system/service/mail/MailSendServiceImpl.java index 38764038..62d912ab 100644 --- a/win-module-system/win-module-system-biz/src/main/java/com/win/module/system/service/mail/MailSendServiceImpl.java +++ b/win-module-system/win-module-system-biz/src/main/java/com/win/module/system/service/mail/MailSendServiceImpl.java @@ -79,7 +79,7 @@ public class MailSendServiceImpl implements MailSendService { account, template, content, templateParams, isSend); // 发送 MQ 消息，异步执行发送短信 if (isSend) { - mailProducer.sendMailSendMessage(sendLogId, mail, account.getId(), + mailProducer.sendMessage(sendLogId, mail, account.getId(), template.getNickname(), title, content); } return sendLogId; diff --git a/win-module-system/win-module-system-biz/src/main/java/com/win/module/system/service/sms/SmsSendServiceImpl.java b/win-module-system/win-module-system-biz/src/main/java/com/win/module/system/service/sms/SmsSendServiceImpl.java index 41756c66..c446a2bb 100644 --- a/win-module-system/win-module-system-biz/src/main/java/com/win/module/system/service/sms/SmsSendServiceImpl.java +++ b/win-module-system/win-module-system-biz/src/main/java/com/win/module/system/service/sms/SmsSendServiceImpl.java @@ -81,7 +81,7 @@ public class SmsSendServiceImpl implements SmsSendService { // 发送 MQ 消息，异步执行发送短信 if (isSend) { - smsProducer.sendSmsSendMessage(sendLogId, mobile, template.getChannelId(), + smsProducer.sendMessage(sendLogId, mobile, template.getChannelId(), template.getApiTemplateId(), newTemplateParams); } return sendLogId; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/businesstype/BusinesstypeController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/businesstype/BusinesstypeController.java index be6e2c5a..d903c6d3 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/businesstype/BusinesstypeController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/businesstype/BusinesstypeController.java @@ -111,6 +111,8 @@ public class BusinesstypeController { mapDropDown.put(2, itemTypes); String[] itemStatuses = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.ITEM_STATUS); mapDropDown.put(3, itemStatuses); + String[] onTheWayArea = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE); + mapDropDown.put(3, onTheWayArea); String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE); mapDropDown.put(7, available); // 输出 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/location/LocationController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/location/LocationController.java index 34ae74ac..cac1405b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/location/LocationController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/location/LocationController.java @@ -112,10 +112,10 @@ public class LocationController { // 手动创建导出 demo List list = Arrays.asList(); Map mapDropDown = new HashMap<>(); - String[] type = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.DOCUMENT_TYPE); - mapDropDown.put(3, type); - String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.PACK_UNIT); - mapDropDown.put(10, available);; + String[] type = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.LOCATION_TYPE); + mapDropDown.put(7, type); + String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE); + mapDropDown.put(18, available);; // 输出 ExcelUtils.write(response, "库位导入模板.xls", "库位列表", LocationImportExcelVO.class, list,mapDropDown); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/location/vo/LocationImportExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/location/vo/LocationImportExcelVO.java index 598e248d..6ff8a014 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/location/vo/LocationImportExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/location/vo/LocationImportExcelVO.java @@ -73,7 +73,7 @@ public class LocationImportExcelVO { private String userGroupCode; @ExcelProperty(value = "是否可用", converter = DictConvert.class) - @DictFormat(DictTypeConstants.LOCATION_TYPE) + @DictFormat(DictTypeConstants.TRUE_FALSE) private String available; @ExcelProperty(value = "生效时间") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/paramsetting/ParamsettingController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/paramsetting/ParamsettingController.java index ae98a304..48f6118b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/paramsetting/ParamsettingController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/paramsetting/ParamsettingController.java @@ -108,12 +108,11 @@ public class ParamsettingController { Map mapDropDown = new HashMap<>(); String[] usableOpeartors = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.STRATEGY_PARAM_OPEARTOR); mapDropDown.put(3, usableOpeartors); - String[] currency = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.CURRENCY); - mapDropDown.put(11, currency); - String[] type = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.OWNER_TYPE); - mapDropDown.put(13, type);; - String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE); - mapDropDown.put(14, available);; + String[] dataType = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.DATA_TYPE); + mapDropDown.put(4, dataType); + String[] isRequired = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE); + mapDropDown.put(8, isRequired); + // 输出 ExcelUtils.write(response, "参数设置导入模板.xls", "参数设置列表", ParamsettingImportExcelVO.class, list,mapDropDown); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionline/ProductionlineController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionline/ProductionlineController.java index cc1355cb..9736f9f9 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionline/ProductionlineController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionline/ProductionlineController.java @@ -110,7 +110,7 @@ public class ProductionlineController { String[] type = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.PROCESS_TYPE); mapDropDown.put(3, type); String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE); - mapDropDown.put(6, available);; + mapDropDown.put(7, available);; // 输出 ExcelUtils.write(response, "参数设置导入模板.xls", "参数设置列表", ProductionlineImportExcelVO.class, list,mapDropDown); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/recordsetting/RecordsettingController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/recordsetting/RecordsettingController.java index 845db237..e93951e5 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/recordsetting/RecordsettingController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/recordsetting/RecordsettingController.java @@ -106,10 +106,11 @@ public class RecordsettingController { // 手动创建导出 demo List list = Arrays.asList(); Map mapDropDown = new HashMap<>(); - String[] currency = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.CURRENCY); - mapDropDown.put(2, currency); + String[] interfaceType = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.INTERFACE_TYPE); + mapDropDown.put(1, interfaceType); + String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE); - mapDropDown.put(4, available); + mapDropDown.put(2, available); // 输出 ExcelUtils.write(response, "记录设置导入模板.xls", "记录设置列表", RecordsettingImportExcelVO.class, list,mapDropDown); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/rule/RuleController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/rule/RuleController.java index a4fad7d5..6a8d903c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/rule/RuleController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/rule/RuleController.java @@ -114,8 +114,7 @@ public class RuleController { ); // 手动创建导出 demo Map mapDropDown = new HashMap<>(); - String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE); - mapDropDown.put(4, available); + // 输出 // 输出 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/saleprice/SalepriceController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/saleprice/SalepriceController.java index 4b8bb14c..7d94bd01 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/saleprice/SalepriceController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/saleprice/SalepriceController.java @@ -111,6 +111,8 @@ public class SalepriceController { Map mapDropDown = new HashMap<>(); String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE); mapDropDown.put(4, available); + String[] currency = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.CURRENCY); + mapDropDown.put(2, currency); // 输出 // 输出 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/shift/ShiftController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/shift/ShiftController.java index 67247350..deb374a8 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/shift/ShiftController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/shift/ShiftController.java @@ -110,7 +110,9 @@ public class ShiftController { // 手动创建导出 demo Map mapDropDown = new HashMap<>(); String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE); - mapDropDown.put(4, available); + mapDropDown.put(9, available); + String[] endAtNextDay = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE); + mapDropDown.put(8, endAtNextDay); // 输出 // 输出 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/stdcostprice/StdcostpriceController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/stdcostprice/StdcostpriceController.java index 6666a13b..33d63938 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/stdcostprice/StdcostpriceController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/stdcostprice/StdcostpriceController.java @@ -111,6 +111,9 @@ public class StdcostpriceController { Map mapDropDown = new HashMap<>(); String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE); mapDropDown.put(4, available); + String[] currency = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.CURRENCY); + mapDropDown.put(2, currency); + // 输出 // 输出 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/stdcostprice/vo/StdcostpriceImportExcelVo.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/stdcostprice/vo/StdcostpriceImportExcelVo.java index a3dbbb8f..1a1098bb 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/stdcostprice/vo/StdcostpriceImportExcelVo.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/stdcostprice/vo/StdcostpriceImportExcelVo.java @@ -36,8 +36,7 @@ public class StdcostpriceImportExcelVo { @DictFormat(DictTypeConstants.CURRENCY) private String currency; - @Schema(description = "价格", requiredMode = Schema.RequiredMode.REQUIRED) - @NotNull(message = "价格不能为空") + @ExcelProperty("价格") private BigDecimal price; @ExcelProperty(value = "是否可用", converter = DictConvert.class) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplier/SupplierController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplier/SupplierController.java index b1e2a680..740700be 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplier/SupplierController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplier/SupplierController.java @@ -108,8 +108,12 @@ public class SupplierController { ); // 手动创建导出 demo Map mapDropDown = new HashMap<>(); + String[] currency = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.CURRENCY); + mapDropDown.put(11, currency); + String[] type = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.SUPPLIER_TYPE); + mapDropDown.put(13, type); String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE); - mapDropDown.put(4, available); + mapDropDown.put(14, available); // 输出 // 输出 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplieritem/SupplieritemController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplieritem/SupplieritemController.java index b1e8e096..720ec668 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplieritem/SupplieritemController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplieritem/SupplieritemController.java @@ -111,7 +111,16 @@ public class SupplieritemController { // 手动创建导出 demo Map mapDropDown = new HashMap<>(); String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE); - mapDropDown.put(4, available); + mapDropDown.put(13, available); + String[] supplierUom = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.UOM); + mapDropDown.put(3, supplierUom); + String[] packUnit = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.PACK_UNIT); + mapDropDown.put(5, packUnit); + String[] altPackUnit = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.PACK_UNIT); + mapDropDown.put(7, altPackUnit); + String[] settlementType = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.SETTLEMENT_TYPE); + mapDropDown.put(12, settlementType); + // 输出 // 输出 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplieritem/vo/SupplieriteamImportExcelVo.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplieritem/vo/SupplieriteamImportExcelVo.java index de776e3f..61785b84 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplieritem/vo/SupplieriteamImportExcelVo.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplieritem/vo/SupplieriteamImportExcelVo.java @@ -26,7 +26,6 @@ import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY public class SupplieriteamImportExcelVo { - @ExcelProperty("供应商代码") private String supplierCode; @@ -36,7 +35,7 @@ public class SupplieriteamImportExcelVo { @ExcelProperty("供应商物料代码") private String supplierItemCode; - @ExcelProperty(value = "是否为空", converter = DictConvert.class) + @ExcelProperty(value = "计量单位", converter = DictConvert.class) @DictFormat(DictTypeConstants.UOM) private String supplierUom; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/systemcalendar/SystemcalendarController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/systemcalendar/SystemcalendarController.java index 0bc6ef8b..6486dd0c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/systemcalendar/SystemcalendarController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/systemcalendar/SystemcalendarController.java @@ -110,7 +110,7 @@ public class SystemcalendarController { // 手动创建导出 demo Map mapDropDown = new HashMap<>(); String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE); - mapDropDown.put(4, available); + mapDropDown.put(3, available); // 输出 // 输出 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/team/TeamController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/team/TeamController.java index 6f9bf333..3832e00c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/team/TeamController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/team/TeamController.java @@ -112,7 +112,7 @@ public class TeamController { // 手动创建导出 demo Map mapDropDown = new HashMap<>(); String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE); - mapDropDown.put(4, available); + mapDropDown.put(7, available); // 输出 // 输出 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transactiontype/TransactiontypeController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transactiontype/TransactiontypeController.java index 8cfba502..98f03b1c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transactiontype/TransactiontypeController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transactiontype/TransactiontypeController.java @@ -112,8 +112,12 @@ public class TransactiontypeController { ); // 手动创建导出 demo Map mapDropDown = new HashMap<>(); + String[] allowNegative = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE); + mapDropDown.put(7, allowNegative); String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE); - mapDropDown.put(4, available); + mapDropDown.put(8, available); + String[] isSoftDeleted = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE); + mapDropDown.put(9, isSoftDeleted); // 输出 // 输出 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/warehouse/WarehouseController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/warehouse/WarehouseController.java index e7b57f30..6e782ba5 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/warehouse/WarehouseController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/warehouse/WarehouseController.java @@ -118,6 +118,8 @@ public class WarehouseController { Map mapDropDown = new HashMap<>(); String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE); mapDropDown.put(4, available); + String[] type = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.WAREHOUSE_TYPE); + mapDropDown.put(3, type); // 输出 // 输出 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/workshop/WorkshopController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/workshop/WorkshopController.java index c821df58..abf1c9a7 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/workshop/WorkshopController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/workshop/WorkshopController.java @@ -108,7 +108,9 @@ public class WorkshopController { List list = Arrays.asList(); Map mapDropDown = new HashMap<>(); String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE); - mapDropDown.put(6, available); + mapDropDown.put(4, available); + String[] type = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.WORKSHOP_TYPE); + mapDropDown.put(3, type); // 输出 ExcelUtils.write(response, "车间导入模板.xls", "车间列表", WorkshopImportExcelVo.class, list,mapDropDown); }