CaiXiang/cigs4
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

新增code字段

Browse Source
This commit is contained in:
闫阳
2023-12-28 09:28:44 +08:00
parent 81ec2cd27a
commit db85a7025d
42 changed files with 153 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ym-packing/src/main/java/com/cnbm/packing/controller/ProductLevelController.java
View File

@@ -46,7 +46,8 @@ public class ProductLevelController {
@ApiImplicitParam(name = Constant.PAGE, value = "当前页码，从1开始", paramType = "query", required = true, dataTypeClass=Integer.class) ,
@ApiImplicitParam(name = Constant.LIMIT, value = "每页显示记录数", paramType = "query",required = true, dataTypeClass=Integer.class) ,
@ApiImplicitParam(name = Constant.ORDER_FIELD, value = "排序字段", paramType = "query", dataTypeClass=String.class) ,
@ApiImplicitParam(name = Constant.ORDER, value = "排序方式，可选值(asc、desc)", paramType = "query", dataTypeClass=String.class)
@ApiImplicitParam(name = Constant.ORDER, value = "排序方式，可选值(asc、desc)", paramType = "query", dataTypeClass=String.class),
@ApiImplicitParam(name = "name", value = "产品等级名", paramType = "query", dataTypeClass = String.class)
})
// @PreAuthorize("@ex.hasAuthority('basic:productLevel:page')")
public Result<PageData<ProductLevelDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params){

3
ym-packing/src/main/java/com/cnbm/packing/controller/ScenesController.java
View File

@@ -46,7 +46,8 @@ public class ScenesController {
@ApiImplicitParam(name = Constant.PAGE, value = "当前页码，从1开始", paramType = "query", required = true, dataTypeClass=Integer.class) ,
@ApiImplicitParam(name = Constant.LIMIT, value = "每页显示记录数", paramType = "query",required = true, dataTypeClass=Integer.class) ,
@ApiImplicitParam(name = Constant.ORDER_FIELD, value = "排序字段", paramType = "query", dataTypeClass=String.class) ,
@ApiImplicitParam(name = Constant.ORDER, value = "排序方式，可选值(asc、desc)", paramType = "query", dataTypeClass=String.class)
@ApiImplicitParam(name = Constant.ORDER, value = "排序方式，可选值(asc、desc)", paramType = "query", dataTypeClass=String.class),
@ApiImplicitParam(name = "name", value = "场景名", paramType = "query", dataTypeClass = String.class)
})
// @PreAuthorize("@ex.hasAuthority('basic:scenes:page')")
public Result<PageData<ScenesDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params){

3
ym-packing/src/main/java/com/cnbm/packing/controller/WorkingTimeController.java
View File

@@ -48,7 +48,8 @@ public class WorkingTimeController {
@ApiImplicitParam(name = Constant.PAGE, value = "当前页码，从1开始", paramType = "query", required = true, dataTypeClass=Integer.class) ,
@ApiImplicitParam(name = Constant.LIMIT, value = "每页显示记录数", paramType = "query",required = true, dataTypeClass=Integer.class) ,
@ApiImplicitParam(name = Constant.ORDER_FIELD, value = "排序字段", paramType = "query", dataTypeClass=String.class) ,
@ApiImplicitParam(name = Constant.ORDER, value = "排序方式，可选值(asc、desc)", paramType = "query", dataTypeClass=String.class)
@ApiImplicitParam(name = Constant.ORDER, value = "排序方式，可选值(asc、desc)", paramType = "query", dataTypeClass=String.class) ,
@ApiImplicitParam(name = "name", value = "班次名", paramType = "query", dataTypeClass = String.class)
})
public Result<PageData<WorkingTimeDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params){
PageData<WorkingTimeDTO> page = workingTimeService.page(params);

11
ym-packing/src/main/java/com/cnbm/packing/dto/ProductLevelDTO.java
View File

@@ -7,17 +7,19 @@ import lombok.Data;
import java.io.Serializable;
import java.time.LocalDateTime;
import java.math.BigDecimal;
/**
* 产品等级 表
*
* @author codeGenerator
* @since 2023-12-21
* @since 2023-12-28
*/
@Data
@ApiModel(value = "产品等级 表DTO对象")
public class ProductLevelDTO implements Serializable {
private static final long serialVersionUID = 1L;
private static final long serialVersionUID = 1L;
@@ -28,7 +30,7 @@ public class ProductLevelDTO implements Serializable {
private String productName;
@ApiModelProperty(value = "产品等级，A1/A2/A3/A4/NK")
private LocalDateTime productLevel;
private String productLevel;
@ApiModelProperty(value = "备注")
private String remark;
@@ -57,4 +59,7 @@ public class ProductLevelDTO implements Serializable {
@ApiModelProperty(value = "版本号")
private Integer version;
@ApiModelProperty(value = "产品等级代码")
private String code;
}

9
ym-packing/src/main/java/com/cnbm/packing/dto/ScenesDTO.java
View File

@@ -7,17 +7,19 @@ import lombok.Data;
import java.io.Serializable;
import java.time.LocalDateTime;
import java.math.BigDecimal;
/**
* 场景 表
*
* @author codeGenerator
* @since 2023-12-21
* @since 2023-12-28
*/
@Data
@ApiModel(value = "场景 表DTO对象")
public class ScenesDTO implements Serializable {
private static final long serialVersionUID = 1L;
private static final long serialVersionUID = 1L;
@@ -54,4 +56,7 @@ public class ScenesDTO implements Serializable {
@ApiModelProperty(value = "版本号")
private Integer version;
@ApiModelProperty(value = "场景code")
private String code;
}

12
ym-packing/src/main/java/com/cnbm/packing/dto/WorkingTimeDTO.java
View File

@@ -1,6 +1,5 @@
package com.cnbm.packing.dto;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -8,17 +7,19 @@ import lombok.Data;
import java.io.Serializable;
import java.time.LocalDateTime;
import java.math.BigDecimal;
/**
* 班次时间段 表
*
* @author codeGenerator
* @since 2023-12-19
* @since 2023-12-28
*/
@Data
@ApiModel(value = "班次时间段 表DTO对象")
public class WorkingTimeDTO implements Serializable {
private static final long serialVersionUID = 1L;
private static final long serialVersionUID = 1L;
@@ -29,11 +30,9 @@ public class WorkingTimeDTO implements Serializable {
private String orderName;
@ApiModelProperty(value = "班次开始时间, 0点 - 24点")
@JsonFormat(pattern = "HH:mm:ss")
private LocalDateTime beginTime;
@ApiModelProperty(value = "班次结束时间, 0点 - 24点")
@JsonFormat(pattern = "HH:mm:ss")
private LocalDateTime endTime;
@ApiModelProperty(value = "备注")
@@ -63,4 +62,7 @@ public class WorkingTimeDTO implements Serializable {
@ApiModelProperty(value = "版本号")
private Integer version;
@ApiModelProperty(value = "班次代码")
private String code;
}

14
ym-packing/src/main/java/com/cnbm/packing/entity/ProductLevel.java
View File

@@ -2,20 +2,19 @@ package com.cnbm.packing.entity;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.time.LocalDateTime;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
import java.time.LocalDateTime;
/**
* <p>
* 产品等级 表
* </p>
*
* @author codeGenerator
* @since 2023-12-21
* @since 2023-12-28
*/
@Data
@TableName("t_product_level")
@@ -31,7 +30,7 @@ public class ProductLevel implements Serializable {
private String productName;
@ApiModelProperty("产品等级，A1/A2/A3/A4/NK")
private LocalDateTime productLevel;
private String productLevel;
@ApiModelProperty("备注")
private String remark;
@@ -61,6 +60,9 @@ public class ProductLevel implements Serializable {
@ApiModelProperty("版本号")
private Integer version;
@ApiModelProperty("产品等级代码")
private String code;
public static final String ID = "id";
@@ -86,4 +88,6 @@ public class ProductLevel implements Serializable {
public static final String VERSION = "version";
public static final String CODE = "code";
}

12
ym-packing/src/main/java/com/cnbm/packing/entity/Scenes.java
View File

@@ -2,20 +2,19 @@ package com.cnbm.packing.entity;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.time.LocalDateTime;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
import java.time.LocalDateTime;
/**
* <p>
* 场景 表
* </p>
*
* @author codeGenerator
* @since 2023-12-21
* @since 2023-12-28
*/
@Data
@TableName("t_scenes")
@@ -58,6 +57,9 @@ public class Scenes implements Serializable {
@ApiModelProperty("版本号")
private Integer version;
@ApiModelProperty("场景code")
private String code;
public static final String ID = "id";
@@ -81,4 +83,6 @@ public class Scenes implements Serializable {
public static final String VERSION = "version";
public static final String CODE = "code";
}

12
ym-packing/src/main/java/com/cnbm/packing/entity/WorkingTime.java
View File

@@ -2,20 +2,19 @@ package com.cnbm.packing.entity;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.time.LocalDateTime;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
import java.time.LocalDateTime;
/**
* <p>
* 班次时间段 表
* </p>
*
* @author codeGenerator
* @since 2023-12-19
* @since 2023-12-28
*/
@Data
@TableName("t_working_time")
@@ -64,6 +63,9 @@ public class WorkingTime implements Serializable {
@ApiModelProperty("版本号")
private Integer version;
@ApiModelProperty("班次代码")
private String code;
public static final String ID = "id";
@@ -91,4 +93,6 @@ public class WorkingTime implements Serializable {
public static final String VERSION = "version";
public static final String CODE = "code";
}

9
ym-packing/src/main/java/com/cnbm/packing/excel/ProductLevelExcel.java
View File

@@ -4,12 +4,15 @@ import cn.afterturn.easypoi.excel.annotation.Excel;
import lombok.Data;
import java.time.LocalDateTime;
import java.math.BigDecimal;
import java.util.Date;
/**
* 产品等级 表
*
* @author codeGenerator
* @since 2023-12-21
* @since 2023-12-28
*/
@Data
public class ProductLevelExcel {
@@ -18,7 +21,7 @@ public class ProductLevelExcel {
@Excel(name = "产品名")
private String productName;
@Excel(name = "产品等级，A1/A2/A3/A4/NK")
private LocalDateTime productLevel;
private String productLevel;
@Excel(name = "备注")
private String remark;
@Excel(name = "删除标志，是否有效:1 可用 0不可用")
@@ -37,5 +40,7 @@ public class ProductLevelExcel {
private LocalDateTime updateTime;
@Excel(name = "版本号")
private Integer version;
@Excel(name = "产品等级代码")
private String code;
}

7
ym-packing/src/main/java/com/cnbm/packing/excel/ScenesExcel.java
View File

@@ -4,12 +4,15 @@ import cn.afterturn.easypoi.excel.annotation.Excel;
import lombok.Data;
import java.time.LocalDateTime;
import java.math.BigDecimal;
import java.util.Date;
/**
* 场景 表
*
* @author codeGenerator
* @since 2023-12-21
* @since 2023-12-28
*/
@Data
public class ScenesExcel {
@@ -35,5 +38,7 @@ public class ScenesExcel {
private LocalDateTime updateTime;
@Excel(name = "版本号")
private Integer version;
@Excel(name = "场景code")
private String code;
}

7
ym-packing/src/main/java/com/cnbm/packing/excel/WorkingTimeExcel.java
View File

@@ -4,12 +4,15 @@ import cn.afterturn.easypoi.excel.annotation.Excel;
import lombok.Data;
import java.time.LocalDateTime;
import java.math.BigDecimal;
import java.util.Date;
/**
* 班次时间段 表
*
* @author codeGenerator
* @since 2023-12-19
* @since 2023-12-28
*/
@Data
public class WorkingTimeExcel {
@@ -39,5 +42,7 @@ public class WorkingTimeExcel {
private LocalDateTime updateTime;
@Excel(name = "版本号")
private Integer version;
@Excel(name = "班次代码")
private String code;
}

4
ym-packing/src/main/java/com/cnbm/packing/service/impl/ProductLevelServiceBizImpl.java
View File

@@ -33,10 +33,10 @@ public class ProductLevelServiceBizImpl extends CrudServiceImpl<ProductLevelMapp
@Override
public QueryWrapper<ProductLevel> getWrapper(Map<String, Object> params){
String id = (String)params.get("id");
String name = (String) params.get("name");
QueryWrapper<ProductLevel> wrapper = new QueryWrapper<>();
wrapper.eq(StringUtils.isNotBlank(id), "id", id);
wrapper.like(StringUtils.isNotBlank(name), ProductLevel.PRODUCT_LEVEL, name);
return wrapper;
}

4
ym-packing/src/main/java/com/cnbm/packing/service/impl/ScenesServiceBizImpl.java
View File

@@ -33,10 +33,10 @@ public class ScenesServiceBizImpl extends CrudServiceImpl<ScenesMapper, Scenes,
@Override
public QueryWrapper<Scenes> getWrapper(Map<String, Object> params){
String id = (String)params.get("id");
String name = (String) params.get("name");
QueryWrapper<Scenes> wrapper = new QueryWrapper<>();
wrapper.eq(StringUtils.isNotBlank(id), "id", id);
wrapper.like(StringUtils.isNotBlank(name), Scenes.SCENES_NAME, name);
return wrapper;
}

5
ym-packing/src/main/java/com/cnbm/packing/service/impl/WorkingTimeServiceBizImpl.java
View File

@@ -12,7 +12,6 @@ import com.cnbm.packing.dto.WorkingTimeDTO;
import com.cnbm.packing.entity.WorkingTime;
import com.cnbm.packing.mapper.WorkingTimeMapper;
import com.cnbm.packing.service.WorkingTimeServiceBiz;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -40,10 +39,10 @@ public class WorkingTimeServiceBizImpl extends CrudServiceImpl<WorkingTimeMapper
@Override
public QueryWrapper<WorkingTime> getWrapper(Map<String, Object> params){
String id = (String)params.get("id");
String name = (String) params.get("name");
QueryWrapper<WorkingTime> wrapper = new QueryWrapper<>();
wrapper.eq(StringUtils.isNotBlank(id), "id", id);
wrapper.like(StringUtils.isNotBlank(name), WorkingTime.ORDER_NAME, name);
return wrapper;
}