From 3f649337ef319e150de39aa935a7d0e3da3aa384 Mon Sep 17 00:00:00 2001 From: "hongxi.lian" Date: Thu, 12 Oct 2023 09:06:16 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=20=20=E7=94=9F=E6=88=90?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=B1=80=E9=83=A8=E7=88=86=E7=BA=A2=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../carrier/vo/CarrierExportReqVO.java | 8 ++-- .../carrier/vo/CarrierPageReqVO.java | 9 +++-- .../vo/ConfigurationsettingBaseVO.java | 10 +++-- .../controller/owner/vo/OwnerExportReqVO.java | 8 ++-- .../controller/owner/vo/OwnerPageReqVO.java | 9 +++-- .../RecordsettingController.java | 39 +++++++++---------- .../wms/controller/shift/ShiftController.java | 39 +++++++++---------- .../dataobject/jobsetting/JobsettingDO.java | 13 +++---- .../mysql/jobsetting/JobsettingMapper.java | 10 ++--- 9 files changed, 73 insertions(+), 72 deletions(-) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/carrier/vo/CarrierExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/carrier/vo/CarrierExportReqVO.java index 1283cdab..09f5180a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/carrier/vo/CarrierExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/carrier/vo/CarrierExportReqVO.java @@ -1,12 +1,12 @@ package com.win.module.wms.controller.carrier.vo; -import lombok.*; -import java.util.*; import io.swagger.v3.oas.annotations.media.Schema; -import com.win.framework.common.pojo.PageParam; -import java.time.LocalDateTime; +import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; +import java.math.BigDecimal; +import java.time.LocalDateTime; + import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; @Schema(description = "管理后台 - 承运商 Excel 导出 Request VO，参数和 CarrierPageReqVO 是一致的") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/carrier/vo/CarrierPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/carrier/vo/CarrierPageReqVO.java index 2fc550e3..3c4c41c5 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/carrier/vo/CarrierPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/carrier/vo/CarrierPageReqVO.java @@ -1,10 +1,13 @@ package com.win.module.wms.controller.carrier.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.math.BigDecimal; import java.time.LocalDateTime; import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/configurationsetting/vo/ConfigurationsettingBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/configurationsetting/vo/ConfigurationsettingBaseVO.java index b04224c2..f6f1d945 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/configurationsetting/vo/ConfigurationsettingBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/configurationsetting/vo/ConfigurationsettingBaseVO.java @@ -1,9 +1,9 @@ package com.win.module.wms.controller.configurationsetting.vo; import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; -import java.util.*; -import javax.validation.constraints.*; +import lombok.Data; + +import javax.validation.constraints.NotNull; /** * 配置设置 Base VO，提供给添加、修改、详细的子 VO 使用 @@ -12,6 +12,10 @@ import javax.validation.constraints.*; @Data public class ConfigurationsettingBaseVO { + + @Schema(description = "id", example = "id") + private Long id; + @Schema(description = "策略类型", requiredMode = Schema.RequiredMode.REQUIRED) @NotNull(message = "策略类型不能为空") private String strategyType; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/owner/vo/OwnerExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/owner/vo/OwnerExportReqVO.java index 21a5189e..14efbd85 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/owner/vo/OwnerExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/owner/vo/OwnerExportReqVO.java @@ -1,12 +1,12 @@ package com.win.module.wms.controller.owner.vo; -import lombok.*; -import java.util.*; import io.swagger.v3.oas.annotations.media.Schema; -import com.win.framework.common.pojo.PageParam; -import java.time.LocalDateTime; +import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; +import java.math.BigDecimal; +import java.time.LocalDateTime; + import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; @Schema(description = "管理后台 - 货主 Excel 导出 Request VO，参数和 OwnerPageReqVO 是一致的") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/owner/vo/OwnerPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/owner/vo/OwnerPageReqVO.java index 9b75c685..9c7f70c9 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/owner/vo/OwnerPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/owner/vo/OwnerPageReqVO.java @@ -1,10 +1,13 @@ package com.win.module.wms.controller.owner.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.math.BigDecimal; import java.time.LocalDateTime; import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; 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 55219ff9..5db85267 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 @@ -1,32 +1,29 @@ package com.win.module.wms.controller.recordsetting; +import com.win.framework.common.pojo.CommonResult; +import com.win.framework.common.pojo.PageResult; +import com.win.framework.excel.core.util.ExcelUtils; +import com.win.framework.operatelog.core.annotations.OperateLog; import com.win.module.wms.controller.recordsetting.vo.*; -import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; -import org.springframework.validation.annotation.Validated; -import org.springframework.security.access.prepost.PreAuthorize; -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.Parameter; +import com.win.module.wms.convert.recordsetting.RecordsettingConvert; +import com.win.module.wms.dal.dataobject.recordsetting.RecordsettingDO; +import com.win.module.wms.service.recordsetting.RecordsettingService; import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; -import javax.validation.*; -import javax.servlet.http.*; -import java.util.*; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; import java.io.IOException; +import java.util.Collection; +import java.util.List; -import com.win.framework.common.pojo.PageResult; -import com.win.framework.common.pojo.CommonResult; import static com.win.framework.common.pojo.CommonResult.success; - -import com.win.framework.excel.core.util.ExcelUtils; - -import com.win.framework.operatelog.core.annotations.OperateLog; -import static com.win.framework.operatelog.core.enums.OperateTypeEnum.*; - -import com.win.module.wms.controller.admin.recordsetting.vo.*; -import com.win.module.wms.dal.dataobject.recordsetting.RecordsettingDO; -import com.win.module.wms.convert.recordsetting.RecordsettingConvert; -import com.win.module.wms.service.recordsetting.RecordsettingService; +import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; @Tag(name = "管理后台 - 记录设置") @RestController 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 92b62d84..367a78dc 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 @@ -1,32 +1,29 @@ package com.win.module.wms.controller.shift; +import com.win.framework.common.pojo.CommonResult; +import com.win.framework.common.pojo.PageResult; +import com.win.framework.excel.core.util.ExcelUtils; +import com.win.framework.operatelog.core.annotations.OperateLog; import com.win.module.wms.controller.shift.vo.*; -import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; -import org.springframework.validation.annotation.Validated; -import org.springframework.security.access.prepost.PreAuthorize; -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.Parameter; +import com.win.module.wms.convert.shift.ShiftConvert; +import com.win.module.wms.dal.dataobject.shift.ShiftDO; +import com.win.module.wms.service.shift.ShiftService; import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; -import javax.validation.*; -import javax.servlet.http.*; -import java.util.*; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; import java.io.IOException; +import java.util.Collection; +import java.util.List; -import com.win.framework.common.pojo.PageResult; -import com.win.framework.common.pojo.CommonResult; import static com.win.framework.common.pojo.CommonResult.success; - -import com.win.framework.excel.core.util.ExcelUtils; - -import com.win.framework.operatelog.core.annotations.OperateLog; -import static com.win.framework.operatelog.core.enums.OperateTypeEnum.*; - -import com.win.module.wms.controller.admin.shift.vo.*; -import com.win.module.wms.dal.dataobject.shift.ShiftDO; -import com.win.module.wms.convert.shift.ShiftConvert; -import com.win.module.wms.service.shift.ShiftService; +import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; @Tag(name = "管理后台 - 班次") @RestController diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/jobsetting/JobsettingDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/jobsetting/JobsettingDO.java index f3c73f59..82e96857 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/jobsetting/JobsettingDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/jobsetting/JobsettingDO.java @@ -1,14 +1,11 @@ package com.win.module.wms.dal.dataobject.jobsetting; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.win.framework.mybatis.core.dataobject.BaseDO; import lombok.*; -import java.util.*; -import java.time.LocalDateTime; -import java.time.LocalDateTime; -import java.time.LocalDateTime; -import java.time.LocalDateTime; + import java.time.LocalDateTime; -import com.baomidou.mybatisplus.annotation.*; -import com.win.framework.mybatis.core.dataobject.BaseDO; /** * 任务设置 DO @@ -44,7 +41,7 @@ public class JobsettingDO extends BaseDO { /** * 失效时间 */ - private LocalDateTime expire-time; + private LocalDateTime expireTime; /** * 备注 */ diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/jobsetting/JobsettingMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/jobsetting/JobsettingMapper.java index 70bf6682..685033ef 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/jobsetting/JobsettingMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/jobsetting/JobsettingMapper.java @@ -1,15 +1,15 @@ package com.win.module.wms.dal.mysql.jobsetting; -import java.util.*; - import com.win.framework.common.pojo.PageResult; -import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; import com.win.framework.mybatis.core.mapper.BaseMapperX; +import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; import com.win.module.wms.controller.jobsetting.vo.JobsettingExportReqVO; import com.win.module.wms.controller.jobsetting.vo.JobsettingPageReqVO; import com.win.module.wms.dal.dataobject.jobsetting.JobsettingDO; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 任务设置 Mapper * @@ -23,7 +23,7 @@ public interface JobsettingMapper extends BaseMapperX { .eqIfPresent(JobsettingDO::getCode, reqVO.getCode()) .eqIfPresent(JobsettingDO::getValidMinutes, reqVO.getValidMinutes()) .betweenIfPresent(JobsettingDO::getActiveTime, reqVO.getActiveTime()) - .betweenIfPresent(JobsettingDO::getExpire-time, reqVO.getExpire-time()) + .betweenIfPresent(JobsettingDO::getExpireTime, reqVO.getExpireTime()) .eqIfPresent(JobsettingDO::getRemark, reqVO.getRemark()) .betweenIfPresent(JobsettingDO::getCreateTime, reqVO.getCreateTime()) .eqIfPresent(JobsettingDO::getCreator, reqVO.getCreator()) @@ -47,7 +47,7 @@ public interface JobsettingMapper extends BaseMapperX { .eqIfPresent(JobsettingDO::getCode, reqVO.getCode()) .eqIfPresent(JobsettingDO::getValidMinutes, reqVO.getValidMinutes()) .betweenIfPresent(JobsettingDO::getActiveTime, reqVO.getActiveTime()) - .betweenIfPresent(JobsettingDO::getExpire-time, reqVO.getExpire-time()) + .betweenIfPresent(JobsettingDO::getExpireTime, reqVO.getExpireTime()) .eqIfPresent(JobsettingDO::getRemark, reqVO.getRemark()) .betweenIfPresent(JobsettingDO::getCreateTime, reqVO.getCreateTime()) .eqIfPresent(JobsettingDO::getCreator, reqVO.getCreator())