zhousq_java
/
sfms_mes3.0
forked from sfms3.0/sfms3.0
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

处理 生成代码局部爆红问题

master
廉洪喜 2 years ago
committed by chenfang
parent
154d8783a2
commit
3f649337ef
9 changed files with 73 additions and 72 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/carrier/vo/CarrierExportReqVO.java
  2. 9
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/carrier/vo/CarrierPageReqVO.java
  3. 10
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/configurationsetting/vo/ConfigurationsettingBaseVO.java
  4. 8
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/owner/vo/OwnerExportReqVO.java
  5. 9
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/owner/vo/OwnerPageReqVO.java
  6. 39
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/recordsetting/RecordsettingController.java
  7. 39
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/shift/ShiftController.java
  8. 13
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/jobsetting/JobsettingDO.java
  9. 10
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/jobsetting/JobsettingMapper.java

8
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/carrier/vo/CarrierExportReqVO.java
View File

@ -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 是一致的")

9
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/carrier/vo/CarrierPageReqVO.java
View File

@ -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;

10
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/configurationsetting/vo/ConfigurationsettingBaseVO.java
View File

@ -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;

8
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/owner/vo/OwnerExportReqVO.java
View File

@ -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 是一致的")

9
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/owner/vo/OwnerPageReqVO.java
View File

@ -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;

39
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/recordsetting/RecordsettingController.java
View File

@ -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

39
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/shift/ShiftController.java
View File

@ -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

13
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/jobsetting/JobsettingDO.java
View File

@ -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;
/**
* 备注
*/

10
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/jobsetting/JobsettingMapper.java
View File

@ -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<JobsettingDO> {
.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<JobsettingDO> {
.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())

Write Preview
Loading…
Cancel
Save