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

yanyang #35

Merged
yanyang merged 2 commits from yanyang into master 2023-12-28 09:29:33 +08:00
Conversation 0 Commits 2 Files Changed 42 +153 -79
42 changed files with 153 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ym-generator/src/main/java/com/cnbm/generator/code/controller/ProductLevelController.java
View File

@ -31,7 +31,7 @@ import java.util.Map;
* 产品等级 表 前端控制器 * 产品等级 表 前端控制器
* *
* @author codeGenerator * @author codeGenerator
* @since 2023-12-21 * @since 2023-12-28
*/ */
@RestController @RestController
@RequestMapping("/code/productLevel") @RequestMapping("/code/productLevel")

2
ym-generator/src/main/java/com/cnbm/generator/code/controller/ScenesController.java
View File

@ -31,7 +31,7 @@ import java.util.Map;
* 场景 表 前端控制器 * 场景 表 前端控制器
* *
* @author codeGenerator * @author codeGenerator
* @since 2023-12-21 * @since 2023-12-28
*/ */
@RestController @RestController
@RequestMapping("/code/scenes") @RequestMapping("/code/scenes")

2
ym-generator/src/main/java/com/cnbm/generator/code/controller/WorkingTimeController.java
View File

@ -31,7 +31,7 @@ import java.util.Map;
* 班次时间段 表 前端控制器 * 班次时间段 表 前端控制器
* *
* @author codeGenerator * @author codeGenerator
* @since 2023-12-20 * @since 2023-12-28
*/ */
@RestController @RestController
@RequestMapping("/code/workingTime") @RequestMapping("/code/workingTime")

7
ym-generator/src/main/java/com/cnbm/generator/code/dto/ProductLevelDTO.java
View File

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

5
ym-generator/src/main/java/com/cnbm/generator/code/dto/ScenesDTO.java
View File

@ -14,7 +14,7 @@ import java.math.BigDecimal;
* 场景 表 * 场景 表
* *
* @author codeGenerator * @author codeGenerator
* @since 2023-12-21 * @since 2023-12-28
*/ */
@Data @Data
@ApiModel(value = "场景 表DTO对象") @ApiModel(value = "场景 表DTO对象")
@ -56,4 +56,7 @@ public class ScenesDTO implements Serializable {
@ApiModelProperty(value = "版本号") @ApiModelProperty(value = "版本号")
private Integer version; private Integer version;
@ApiModelProperty(value = "场景code")
private String code;
} }

5
ym-generator/src/main/java/com/cnbm/generator/code/dto/WorkingTimeDTO.java
View File

@ -14,7 +14,7 @@ import java.math.BigDecimal;
* 班次时间段 表 * 班次时间段 表
* *
* @author codeGenerator * @author codeGenerator
* @since 2023-12-20 * @since 2023-12-28
*/ */
@Data @Data
@ApiModel(value = "班次时间段 表DTO对象") @ApiModel(value = "班次时间段 表DTO对象")
@ -62,4 +62,7 @@ public class WorkingTimeDTO implements Serializable {
@ApiModelProperty(value = "版本号") @ApiModelProperty(value = "版本号")
private Integer version; private Integer version;
@ApiModelProperty(value = "班次代码")
private String code;
} }

9
ym-generator/src/main/java/com/cnbm/generator/code/entity/ProductLevel.java
View File

@ -14,7 +14,7 @@ import lombok.Data;
* </p> * </p>
* *
* @author codeGenerator * @author codeGenerator
* @since 2023-12-21 * @since 2023-12-28
*/ */
@Data @Data
@TableName("t_product_level") @TableName("t_product_level")
@ -30,7 +30,7 @@ public class ProductLevel implements Serializable {
private String productName; private String productName;
@ApiModelProperty("产品等级，A1/A2/A3/A4/NK") @ApiModelProperty("产品等级，A1/A2/A3/A4/NK")
private LocalDateTime productLevel; private String productLevel;
@ApiModelProperty("备注") @ApiModelProperty("备注")
private String remark; private String remark;
@ -60,6 +60,9 @@ public class ProductLevel implements Serializable {
@ApiModelProperty("版本号") @ApiModelProperty("版本号")
private Integer version; private Integer version;
@ApiModelProperty("产品等级代码")
private String code;
public static final String ID = "id"; public static final String ID = "id";
@ -85,4 +88,6 @@ public class ProductLevel implements Serializable {
public static final String VERSION = "version"; public static final String VERSION = "version";
public static final String CODE = "code";
} }

7
ym-generator/src/main/java/com/cnbm/generator/code/entity/Scenes.java
View File

@ -14,7 +14,7 @@ import lombok.Data;
* </p> * </p>
* *
* @author codeGenerator * @author codeGenerator
* @since 2023-12-21 * @since 2023-12-28
*/ */
@Data @Data
@TableName("t_scenes") @TableName("t_scenes")
@ -57,6 +57,9 @@ public class Scenes implements Serializable {
@ApiModelProperty("版本号") @ApiModelProperty("版本号")
private Integer version; private Integer version;
@ApiModelProperty("场景code")
private String code;
public static final String ID = "id"; public static final String ID = "id";
@ -80,4 +83,6 @@ public class Scenes implements Serializable {
public static final String VERSION = "version"; public static final String VERSION = "version";
public static final String CODE = "code";
} }

7
ym-generator/src/main/java/com/cnbm/generator/code/entity/WorkingTime.java
View File

@ -14,7 +14,7 @@ import lombok.Data;
* </p> * </p>
* *
* @author codeGenerator * @author codeGenerator
* @since 2023-12-20 * @since 2023-12-28
*/ */
@Data @Data
@TableName("t_working_time") @TableName("t_working_time")
@ -63,6 +63,9 @@ public class WorkingTime implements Serializable {
@ApiModelProperty("版本号") @ApiModelProperty("版本号")
private Integer version; private Integer version;
@ApiModelProperty("班次代码")
private String code;
public static final String ID = "id"; public static final String ID = "id";
@ -90,4 +93,6 @@ public class WorkingTime implements Serializable {
public static final String VERSION = "version"; public static final String VERSION = "version";
public static final String CODE = "code";
} }

6
ym-generator/src/main/java/com/cnbm/generator/code/excel/ProductLevelExcel.java
View File

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

4
ym-generator/src/main/java/com/cnbm/generator/code/excel/ScenesExcel.java
View File

@ -12,7 +12,7 @@ import java.util.Date;
* 场景 表 * 场景 表
* *
* @author codeGenerator * @author codeGenerator
* @since 2023-12-21 * @since 2023-12-28
*/ */
@Data @Data
public class ScenesExcel { public class ScenesExcel {
@ -38,5 +38,7 @@ public class ScenesExcel {
private LocalDateTime updateTime; private LocalDateTime updateTime;
@Excel(name = "版本号") @Excel(name = "版本号")
private Integer version; private Integer version;
@Excel(name = "场景code")
private String code;
} }

4
ym-generator/src/main/java/com/cnbm/generator/code/excel/WorkingTimeExcel.java
View File

@ -12,7 +12,7 @@ import java.util.Date;
* 班次时间段 表 * 班次时间段 表
* *
* @author codeGenerator * @author codeGenerator
* @since 2023-12-20 * @since 2023-12-28
*/ */
@Data @Data
public class WorkingTimeExcel { public class WorkingTimeExcel {
@ -42,5 +42,7 @@ public class WorkingTimeExcel {
private LocalDateTime updateTime; private LocalDateTime updateTime;
@Excel(name = "版本号") @Excel(name = "版本号")
private Integer version; private Integer version;
@Excel(name = "班次代码")
private String code;
} }

2
ym-generator/src/main/java/com/cnbm/generator/code/mapper/ProductLevelMapper.java
View File

@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Mapper;
* 产品等级 表 * 产品等级 表
* *
* @author codeGenerator * @author codeGenerator
* @since 2023-12-21 * @since 2023-12-28
*/ */
@Mapper @Mapper
public interface ProductLevelMapper extends BaseDao<ProductLevel> { public interface ProductLevelMapper extends BaseDao<ProductLevel> {

1
ym-generator/src/main/java/com/cnbm/generator/code/mapper/ProductLevelMapper.xml
View File

@ -14,6 +14,7 @@
<id column="updater_name" property="updaterName" /> <id column="updater_name" property="updaterName" />
<id column="update_time" property="updateTime" /> <id column="update_time" property="updateTime" />
<id column="version" property="version" /> <id column="version" property="version" />
<id column="code" property="code" />
</resultMap> </resultMap>
</mapper> </mapper>

2
ym-generator/src/main/java/com/cnbm/generator/code/mapper/ScenesMapper.java
View File

@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Mapper;
* 场景 表 * 场景 表
* *
* @author codeGenerator * @author codeGenerator
* @since 2023-12-21 * @since 2023-12-28
*/ */
@Mapper @Mapper
public interface ScenesMapper extends BaseDao<Scenes> { public interface ScenesMapper extends BaseDao<Scenes> {

1
ym-generator/src/main/java/com/cnbm/generator/code/mapper/ScenesMapper.xml
View File

@ -13,6 +13,7 @@
<id column="updater_name" property="updaterName" /> <id column="updater_name" property="updaterName" />
<id column="update_time" property="updateTime" /> <id column="update_time" property="updateTime" />
<id column="version" property="version" /> <id column="version" property="version" />
<id column="code" property="code" />
</resultMap> </resultMap>
</mapper> </mapper>

2
ym-generator/src/main/java/com/cnbm/generator/code/mapper/WorkingTimeMapper.java
View File

@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Mapper;
* 班次时间段 表 * 班次时间段 表
* *
* @author codeGenerator * @author codeGenerator
* @since 2023-12-20 * @since 2023-12-28
*/ */
@Mapper @Mapper
public interface WorkingTimeMapper extends BaseDao<WorkingTime> { public interface WorkingTimeMapper extends BaseDao<WorkingTime> {

1
ym-generator/src/main/java/com/cnbm/generator/code/mapper/WorkingTimeMapper.xml
View File

@ -15,6 +15,7 @@
<id column="updater_name" property="updaterName" /> <id column="updater_name" property="updaterName" />
<id column="update_time" property="updateTime" /> <id column="update_time" property="updateTime" />
<id column="version" property="version" /> <id column="version" property="version" />
<id column="code" property="code" />
</resultMap> </resultMap>
</mapper> </mapper>

12
ym-generator/src/main/java/com/cnbm/generator/code/mysql/ProductLevelmysql.sql
View File

@ -1,7 +1,7 @@
-- 菜单初始SQL -- 菜单初始SQL
INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date)VALUES (1737669381515964417, 1067246875800000035, '产品等级 表', 'basic/productLevel', NULL, 0, 'icon-desktop', 0, 1067246875800000001, now(), 1067246875800000001, now()); INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date)VALUES (1740170405581496322, 1067246875800000035, '产品等级 表', 'code/productLevel', NULL, 0, 'icon-desktop', 0, 1067246875800000001, now(), 1067246875800000001, now());
INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1737669381515964418, 1737669381515964417, '查看', NULL, 'basic:productLevel:page,basic:productLevel:info', 1, NULL, 0, 1067246875800000001, now(), 1067246875800000001, now()); INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1740170405581496323, 1740170405581496322, '查看', NULL, 'code:productLevel:page,code:productLevel:info', 1, NULL, 0, 1067246875800000001, now(), 1067246875800000001, now());
INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1737669381515964419, 1737669381515964417, '新增', NULL, 'basic:productLevel:save', 1, NULL, 1, 1067246875800000001, now(), 1067246875800000001, now()); INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1740170405581496324, 1740170405581496322, '新增', NULL, 'code:productLevel:save', 1, NULL, 1, 1067246875800000001, now(), 1067246875800000001, now());
INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1737669381515964420, 1737669381515964417, '修改', NULL, 'basic:productLevel:update', 1, NULL, 2, 1067246875800000001, now(), 1067246875800000001, now()); INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1740170405581496325, 1740170405581496322, '修改', NULL, 'code:productLevel:update', 1, NULL, 2, 1067246875800000001, now(), 1067246875800000001, now());
INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1737669381515964421, 1737669381515964417, '删除', NULL, 'basic:productLevel:delete', 1, NULL, 3, 1067246875800000001, now(), 1067246875800000001, now()); INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1740170405581496326, 1740170405581496322, '删除', NULL, 'code:productLevel:delete', 1, NULL, 3, 1067246875800000001, now(), 1067246875800000001, now());
INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1737669381515964422, 1737669381515964417, '导出', NULL, 'basic:productLevel:export', 1, NULL, 4, 1067246875800000001, now(), 1067246875800000001, now()); INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1740170405581496327, 1740170405581496322, '导出', NULL, 'code:productLevel:export', 1, NULL, 4, 1067246875800000001, now(), 1067246875800000001, now());

12
ym-generator/src/main/java/com/cnbm/generator/code/mysql/Scenesmysql.sql
View File

@ -1,7 +1,7 @@
-- 菜单初始SQL -- 菜单初始SQL
INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date)VALUES (1737669220261810177, 1067246875800000035, '场景 表', 'code/scenes', NULL, 0, 'icon-desktop', 0, 1067246875800000001, now(), 1067246875800000001, now()); INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date)VALUES (1740173054175444994, 1067246875800000035, '场景 表', 'code/scenes', NULL, 0, 'icon-desktop', 0, 1067246875800000001, now(), 1067246875800000001, now());
INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1737669220261810178, 1737669220261810177, '查看', NULL, 'code:scenes:page,code:scenes:info', 1, NULL, 0, 1067246875800000001, now(), 1067246875800000001, now()); INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1740173054175444995, 1740173054175444994, '查看', NULL, 'code:scenes:page,code:scenes:info', 1, NULL, 0, 1067246875800000001, now(), 1067246875800000001, now());
INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1737669220261810179, 1737669220261810177, '新增', NULL, 'code:scenes:save', 1, NULL, 1, 1067246875800000001, now(), 1067246875800000001, now()); INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1740173054175444996, 1740173054175444994, '新增', NULL, 'code:scenes:save', 1, NULL, 1, 1067246875800000001, now(), 1067246875800000001, now());
INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1737669220261810180, 1737669220261810177, '修改', NULL, 'code:scenes:update', 1, NULL, 2, 1067246875800000001, now(), 1067246875800000001, now()); INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1740173054175444997, 1740173054175444994, '修改', NULL, 'code:scenes:update', 1, NULL, 2, 1067246875800000001, now(), 1067246875800000001, now());
INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1737669220261810181, 1737669220261810177, '删除', NULL, 'code:scenes:delete', 1, NULL, 3, 1067246875800000001, now(), 1067246875800000001, now()); INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1740173054175444998, 1740173054175444994, '删除', NULL, 'code:scenes:delete', 1, NULL, 3, 1067246875800000001, now(), 1067246875800000001, now());
INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1737669220261810182, 1737669220261810177, '导出', NULL, 'code:scenes:export', 1, NULL, 4, 1067246875800000001, now(), 1067246875800000001, now()); INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1740173054175444999, 1740173054175444994, '导出', NULL, 'code:scenes:export', 1, NULL, 4, 1067246875800000001, now(), 1067246875800000001, now());

12
ym-generator/src/main/java/com/cnbm/generator/code/mysql/WorkingTimemysql.sql
View File

@ -1,7 +1,7 @@
-- 菜单初始SQL -- 菜单初始SQL
INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date)VALUES (1737360876993064962, 1067246875800000035, '班次时间段 表', 'code/workingTime', NULL, 0, 'icon-desktop', 0, 1067246875800000001, now(), 1067246875800000001, now()); INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date)VALUES (1740170256717230082, 1067246875800000035, '班次时间段 表', 'code/workingTime', NULL, 0, 'icon-desktop', 0, 1067246875800000001, now(), 1067246875800000001, now());
INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1737360876993064963, 1737360876993064962, '查看', NULL, 'code:workingTime:page,code:workingTime:info', 1, NULL, 0, 1067246875800000001, now(), 1067246875800000001, now()); INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1740170256717230083, 1740170256717230082, '查看', NULL, 'code:workingTime:page,code:workingTime:info', 1, NULL, 0, 1067246875800000001, now(), 1067246875800000001, now());
INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1737360876993064964, 1737360876993064962, '新增', NULL, 'code:workingTime:save', 1, NULL, 1, 1067246875800000001, now(), 1067246875800000001, now()); INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1740170256717230084, 1740170256717230082, '新增', NULL, 'code:workingTime:save', 1, NULL, 1, 1067246875800000001, now(), 1067246875800000001, now());
INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1737360876993064965, 1737360876993064962, '修改', NULL, 'code:workingTime:update', 1, NULL, 2, 1067246875800000001, now(), 1067246875800000001, now()); INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1740170256717230085, 1740170256717230082, '修改', NULL, 'code:workingTime:update', 1, NULL, 2, 1067246875800000001, now(), 1067246875800000001, now());
INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1737360876993064966, 1737360876993064962, '删除', NULL, 'code:workingTime:delete', 1, NULL, 3, 1067246875800000001, now(), 1067246875800000001, now()); INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1740170256717230086, 1740170256717230082, '删除', NULL, 'code:workingTime:delete', 1, NULL, 3, 1067246875800000001, now(), 1067246875800000001, now());
INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1737360876993064967, 1737360876993064962, '导出', NULL, 'code:workingTime:export', 1, NULL, 4, 1067246875800000001, now(), 1067246875800000001, now()); INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1740170256717230087, 1740170256717230082, '导出', NULL, 'code:workingTime:export', 1, NULL, 4, 1067246875800000001, now(), 1067246875800000001, now());

2
ym-generator/src/main/java/com/cnbm/generator/code/service/ProductLevelServiceBiz.java
View File

@ -8,7 +8,7 @@ import com.cnbm.generator.code.entity.ProductLevel;
* 产品等级 表 * 产品等级 表
* *
* @author codeGenerator * @author codeGenerator
* @since 2023-12-21 * @since 2023-12-28
*/ */
public interface ProductLevelServiceBiz extends CrudService<ProductLevel, ProductLevelDTO> { public interface ProductLevelServiceBiz extends CrudService<ProductLevel, ProductLevelDTO> {

2
ym-generator/src/main/java/com/cnbm/generator/code/service/ScenesServiceBiz.java
View File

@ -8,7 +8,7 @@ import com.cnbm.generator.code.entity.Scenes;
* 场景 表 * 场景 表
* *
* @author codeGenerator * @author codeGenerator
* @since 2023-12-21 * @since 2023-12-28
*/ */
public interface ScenesServiceBiz extends CrudService<Scenes, ScenesDTO> { public interface ScenesServiceBiz extends CrudService<Scenes, ScenesDTO> {

2
ym-generator/src/main/java/com/cnbm/generator/code/service/WorkingTimeServiceBiz.java
View File

@ -8,7 +8,7 @@ import com.cnbm.generator.code.entity.WorkingTime;
* 班次时间段 表 * 班次时间段 表
* *
* @author codeGenerator * @author codeGenerator
* @since 2023-12-20 * @since 2023-12-28
*/ */
public interface WorkingTimeServiceBiz extends CrudService<WorkingTime, WorkingTimeDTO> { public interface WorkingTimeServiceBiz extends CrudService<WorkingTime, WorkingTimeDTO> {

2
ym-generator/src/main/java/com/cnbm/generator/code/service/impl/ProductLevelServiceBizImpl.java
View File

@ -15,7 +15,7 @@ import java.util.Map;
* 产品等级 表 * 产品等级 表
* *
* @author codeGenerator * @author codeGenerator
* @since 2023-12-21 * @since 2023-12-28
*/ */
@Service @Service
public class ProductLevelServiceBizImpl extends CrudServiceImpl<ProductLevelMapper, ProductLevel, ProductLevelDTO> implements ProductLevelServiceBiz { public class ProductLevelServiceBizImpl extends CrudServiceImpl<ProductLevelMapper, ProductLevel, ProductLevelDTO> implements ProductLevelServiceBiz {

2
ym-generator/src/main/java/com/cnbm/generator/code/service/impl/ScenesServiceBizImpl.java
View File

@ -15,7 +15,7 @@ import java.util.Map;
* 场景 表 * 场景 表
* *
* @author codeGenerator * @author codeGenerator
* @since 2023-12-21 * @since 2023-12-28
*/ */
@Service @Service
public class ScenesServiceBizImpl extends CrudServiceImpl<ScenesMapper, Scenes, ScenesDTO> implements ScenesServiceBiz { public class ScenesServiceBizImpl extends CrudServiceImpl<ScenesMapper, Scenes, ScenesDTO> implements ScenesServiceBiz {

2
ym-generator/src/main/java/com/cnbm/generator/code/service/impl/WorkingTimeServiceBizImpl.java
View File

@ -15,7 +15,7 @@ import java.util.Map;
* 班次时间段 表 * 班次时间段 表
* *
* @author codeGenerator * @author codeGenerator
* @since 2023-12-20 * @since 2023-12-28
*/ */
@Service @Service
public class WorkingTimeServiceBizImpl extends CrudServiceImpl<WorkingTimeMapper, WorkingTime, WorkingTimeDTO> implements WorkingTimeServiceBiz { public class WorkingTimeServiceBizImpl extends CrudServiceImpl<WorkingTimeMapper, WorkingTime, WorkingTimeDTO> implements WorkingTimeServiceBiz {

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.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.LIMIT, value = "每页显示记录数", paramType = "query",required = true, dataTypeClass=Integer.class) ,
@ApiImplicitParam(name = Constant.ORDER_FIELD, value = "排序字段", paramType = "query", dataTypeClass=String.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')") // @PreAuthorize("@ex.hasAuthority('basic:productLevel:page')")
public Result<PageData<ProductLevelDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params){ 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.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.LIMIT, value = "每页显示记录数", paramType = "query",required = true, dataTypeClass=Integer.class) ,
@ApiImplicitParam(name = Constant.ORDER_FIELD, value = "排序字段", paramType = "query", dataTypeClass=String.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')") // @PreAuthorize("@ex.hasAuthority('basic:scenes:page')")
public Result<PageData<ScenesDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params){ 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.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.LIMIT, value = "每页显示记录数", paramType = "query",required = true, dataTypeClass=Integer.class) ,
@ApiImplicitParam(name = Constant.ORDER_FIELD, value = "排序字段", paramType = "query", dataTypeClass=String.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){ public Result<PageData<WorkingTimeDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params){
PageData<WorkingTimeDTO> page = workingTimeService.page(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.io.Serializable;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.math.BigDecimal;
/** /**
* 产品等级 表 * 产品等级 表
* *
* @author codeGenerator * @author codeGenerator
* @since 2023-12-21 * @since 2023-12-28
*/ */
@Data @Data
@ApiModel(value = "产品等级 表DTO对象") @ApiModel(value = "产品等级 表DTO对象")
public class ProductLevelDTO implements Serializable { 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; private String productName;
@ApiModelProperty(value = "产品等级，A1/A2/A3/A4/NK") @ApiModelProperty(value = "产品等级，A1/A2/A3/A4/NK")
private LocalDateTime productLevel; private String productLevel;
@ApiModelProperty(value = "备注") @ApiModelProperty(value = "备注")
private String remark; private String remark;
@ -57,4 +59,7 @@ public class ProductLevelDTO implements Serializable {
@ApiModelProperty(value = "版本号") @ApiModelProperty(value = "版本号")
private Integer version; 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.io.Serializable;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.math.BigDecimal;
/** /**
* 场景 表 * 场景 表
* *
* @author codeGenerator * @author codeGenerator
* @since 2023-12-21 * @since 2023-12-28
*/ */
@Data @Data
@ApiModel(value = "场景 表DTO对象") @ApiModel(value = "场景 表DTO对象")
public class ScenesDTO implements Serializable { 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 = "版本号") @ApiModelProperty(value = "版本号")
private Integer version; 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; package com.cnbm.packing.dto;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
@ -8,17 +7,19 @@ import lombok.Data;
import java.io.Serializable; import java.io.Serializable;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.math.BigDecimal;
/** /**
* 班次时间段 表 * 班次时间段 表
* *
* @author codeGenerator * @author codeGenerator
* @since 2023-12-19 * @since 2023-12-28
*/ */
@Data @Data
@ApiModel(value = "班次时间段 表DTO对象") @ApiModel(value = "班次时间段 表DTO对象")
public class WorkingTimeDTO implements Serializable { 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; private String orderName;
@ApiModelProperty(value = "班次开始时间, 0点 - 24点") @ApiModelProperty(value = "班次开始时间, 0点 - 24点")
@JsonFormat(pattern = "HH:mm:ss")
private LocalDateTime beginTime; private LocalDateTime beginTime;
@ApiModelProperty(value = "班次结束时间, 0点 - 24点") @ApiModelProperty(value = "班次结束时间, 0点 - 24点")
@JsonFormat(pattern = "HH:mm:ss")
private LocalDateTime endTime; private LocalDateTime endTime;
@ApiModelProperty(value = "备注") @ApiModelProperty(value = "备注")
@ -63,4 +62,7 @@ public class WorkingTimeDTO implements Serializable {
@ApiModelProperty(value = "版本号") @ApiModelProperty(value = "版本号")
private Integer version; 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.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.time.LocalDateTime;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import java.io.Serializable;
import java.time.LocalDateTime;
/** /**
* <p> * <p>
* 产品等级 表 * 产品等级 表
* </p> * </p>
* *
* @author codeGenerator * @author codeGenerator
* @since 2023-12-21 * @since 2023-12-28
*/ */
@Data @Data
@TableName("t_product_level") @TableName("t_product_level")
@ -31,7 +30,7 @@ public class ProductLevel implements Serializable {
private String productName; private String productName;
@ApiModelProperty("产品等级，A1/A2/A3/A4/NK") @ApiModelProperty("产品等级，A1/A2/A3/A4/NK")
private LocalDateTime productLevel; private String productLevel;
@ApiModelProperty("备注") @ApiModelProperty("备注")
private String remark; private String remark;
@ -61,6 +60,9 @@ public class ProductLevel implements Serializable {
@ApiModelProperty("版本号") @ApiModelProperty("版本号")
private Integer version; private Integer version;
@ApiModelProperty("产品等级代码")
private String code;
public static final String ID = "id"; 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 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.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.time.LocalDateTime;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import java.io.Serializable;
import java.time.LocalDateTime;
/** /**
* <p> * <p>
* 场景 表 * 场景 表
* </p> * </p>
* *
* @author codeGenerator * @author codeGenerator
* @since 2023-12-21 * @since 2023-12-28
*/ */
@Data @Data
@TableName("t_scenes") @TableName("t_scenes")
@ -58,6 +57,9 @@ public class Scenes implements Serializable {
@ApiModelProperty("版本号") @ApiModelProperty("版本号")
private Integer version; private Integer version;
@ApiModelProperty("场景code")
private String code;
public static final String ID = "id"; 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 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.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.time.LocalDateTime;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import java.io.Serializable;
import java.time.LocalDateTime;
/** /**
* <p> * <p>
* 班次时间段 表 * 班次时间段 表
* </p> * </p>
* *
* @author codeGenerator * @author codeGenerator
* @since 2023-12-19 * @since 2023-12-28
*/ */
@Data @Data
@TableName("t_working_time") @TableName("t_working_time")
@ -64,6 +63,9 @@ public class WorkingTime implements Serializable {
@ApiModelProperty("版本号") @ApiModelProperty("版本号")
private Integer version; private Integer version;
@ApiModelProperty("班次代码")
private String code;
public static final String ID = "id"; 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 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 lombok.Data;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.math.BigDecimal;
import java.util.Date;
/** /**
* 产品等级 表 * 产品等级 表
* *
* @author codeGenerator * @author codeGenerator
* @since 2023-12-21 * @since 2023-12-28
*/ */
@Data @Data
public class ProductLevelExcel { public class ProductLevelExcel {
@ -18,7 +21,7 @@ public class ProductLevelExcel {
@Excel(name = "产品名") @Excel(name = "产品名")
private String productName; private String productName;
@Excel(name = "产品等级，A1/A2/A3/A4/NK") @Excel(name = "产品等级，A1/A2/A3/A4/NK")
private LocalDateTime productLevel; private String productLevel;
@Excel(name = "备注") @Excel(name = "备注")
private String remark; private String remark;
@Excel(name = "删除标志，是否有效:1 可用 0不可用") @Excel(name = "删除标志，是否有效:1 可用 0不可用")
@ -37,5 +40,7 @@ public class ProductLevelExcel {
private LocalDateTime updateTime; private LocalDateTime updateTime;
@Excel(name = "版本号") @Excel(name = "版本号")
private Integer version; 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 lombok.Data;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.math.BigDecimal;
import java.util.Date;
/** /**
* 场景 表 * 场景 表
* *
* @author codeGenerator * @author codeGenerator
* @since 2023-12-21 * @since 2023-12-28
*/ */
@Data @Data
public class ScenesExcel { public class ScenesExcel {
@ -35,5 +38,7 @@ public class ScenesExcel {
private LocalDateTime updateTime; private LocalDateTime updateTime;
@Excel(name = "版本号") @Excel(name = "版本号")
private Integer version; 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 lombok.Data;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.math.BigDecimal;
import java.util.Date;
/** /**
* 班次时间段 表 * 班次时间段 表
* *
* @author codeGenerator * @author codeGenerator
* @since 2023-12-19 * @since 2023-12-28
*/ */
@Data @Data
public class WorkingTimeExcel { public class WorkingTimeExcel {
@ -39,5 +42,7 @@ public class WorkingTimeExcel {
private LocalDateTime updateTime; private LocalDateTime updateTime;
@Excel(name = "版本号") @Excel(name = "版本号")
private Integer version; 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 @Override
public QueryWrapper<ProductLevel> getWrapper(Map<String, Object> params){ 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<>(); QueryWrapper<ProductLevel> wrapper = new QueryWrapper<>();
wrapper.eq(StringUtils.isNotBlank(id), "id", id); wrapper.like(StringUtils.isNotBlank(name), ProductLevel.PRODUCT_LEVEL, name);
return wrapper; 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 @Override
public QueryWrapper<Scenes> getWrapper(Map<String, Object> params){ 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<>(); QueryWrapper<Scenes> wrapper = new QueryWrapper<>();
wrapper.eq(StringUtils.isNotBlank(id), "id", id); wrapper.like(StringUtils.isNotBlank(name), Scenes.SCENES_NAME, name);
return wrapper; 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.entity.WorkingTime;
import com.cnbm.packing.mapper.WorkingTimeMapper; import com.cnbm.packing.mapper.WorkingTimeMapper;
import com.cnbm.packing.service.WorkingTimeServiceBiz; import com.cnbm.packing.service.WorkingTimeServiceBiz;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@ -40,10 +39,10 @@ public class WorkingTimeServiceBizImpl extends CrudServiceImpl<WorkingTimeMapper
@Override @Override
public QueryWrapper<WorkingTime> getWrapper(Map<String, Object> params){ 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<>(); QueryWrapper<WorkingTime> wrapper = new QueryWrapper<>();
wrapper.eq(StringUtils.isNotBlank(id), "id", id); wrapper.like(StringUtils.isNotBlank(name), WorkingTime.ORDER_NAME, name);
return wrapper; return wrapper;
} }