diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/constant/FormulaConst.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/constant/FormulaConst.java new file mode 100644 index 00000000..47905fa5 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/constant/FormulaConst.java @@ -0,0 +1,13 @@ +package org.springblade.desk.basic.constant; + +public interface FormulaConst { + + /** + * + */ + final Integer TYPE_1 = 1; + /** + * + */ + final Integer TYPE_2 = 2; +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/ShiftController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/ShiftController.java new file mode 100644 index 00000000..2e4d1193 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/ShiftController.java @@ -0,0 +1,138 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.Valid; +import lombok.AllArgsConstructor; +import org.springblade.core.boot.ctrl.BladeController; +import org.springblade.core.excel.util.ExcelUtil; +import org.springblade.core.mp.support.Condition; +import org.springblade.core.mp.support.Query; +import org.springblade.core.secure.BladeUser; +import org.springblade.core.secure.annotation.IsAdmin; +import org.springblade.core.tool.api.R; +import org.springblade.core.tool.utils.DateUtil; +import org.springblade.core.tool.utils.Func; +import org.springblade.desk.basic.excel.gen.ShiftGenExcel; +import org.springblade.desk.basic.pojo.entity.Shift; +import org.springblade.desk.basic.pojo.vo.gen.ShiftGenVO; +import org.springblade.desk.basic.service.gen.IShiftGenService; +import org.springblade.desk.basic.wrapper.gen.ShiftGenWrapper; +import org.springframework.web.bind.annotation.*; + +import java.util.List; +import java.util.Map; + +/** + * [班次] 控制器 + * + * @author Tom Shuo + * @since 2025-11-20 + */ +@RestController +@AllArgsConstructor +@RequestMapping("/Shift") +@Tag(name = "[班次]", description = "[班次]接口") +public class ShiftController extends BladeController { + + private final IShiftGenService shiftGenService; + + /** + * [班次] 详情 + */ + @GetMapping("/detail") + @ApiOperationSupport(order = 1) + @Operation(summary = "详情", description = "传入Shift") + public R detail(Shift shift) { + Shift detail = shiftGenService.getOne(Condition.getQueryWrapper(shift)); + return R.data(ShiftGenWrapper.build().entityVO(detail)); + } + + /** + * [班次] 分页 + */ + @GetMapping("/list") + @ApiOperationSupport(order = 2) + @Operation(summary = "分页", description = "传入Shift") + public R> list(@Parameter(hidden = true) @RequestParam Map shift, Query query) { + IPage pages = shiftGenService.page(Condition.getPage(query), Condition.getQueryWrapper(shift, Shift.class)); + return R.data(ShiftGenWrapper.build().pageVO(pages)); + } + + + /** + * [班次] 自定义分页 + */ + @GetMapping("/page") + @ApiOperationSupport(order = 3) + @Operation(summary = "分页", description = "传入Shift") + public R> page(ShiftGenVO shift, Query query) { + IPage pages = shiftGenService.selectShiftPage(Condition.getPage(query), shift); + return R.data(pages); + } + + /** + * [班次] 新增 + */ + @PostMapping("/save") + @ApiOperationSupport(order = 4) + @Operation(summary = "新增", description = "传入Shift") + public R save(@Valid @RequestBody Shift shift) { + return R.status(shiftGenService.save(shift)); + } + + /** + * [班次] 修改 + */ + @PostMapping("/update") + @ApiOperationSupport(order = 5) + @Operation(summary = "修改", description = "传入Shift") + public R update(@Valid @RequestBody Shift shift) { + return R.status(shiftGenService.updateById(shift)); + } + + /** + * [班次] 新增或修改 + */ + @PostMapping("/submit") + @ApiOperationSupport(order = 6) + @Operation(summary = "新增或修改", description = "传入Shift") + public R submit(@Valid @RequestBody Shift shift) { + return R.status(shiftGenService.saveOrUpdate(shift)); + } + + /** + * [班次] 删除 + */ + @PostMapping("/remove") + @ApiOperationSupport(order = 7) + @Operation(summary = "逻辑删除", description = "传入ids") + public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { + return R.status(shiftGenService.deleteLogic(Func.toLongList(ids))); + } + + /** + * 导出数据 + */ + @IsAdmin + @GetMapping("/export-excel") + @ApiOperationSupport(order = 8) + @Operation(summary = "导出数据", description = "传入Shift") + public void exportShift(@Parameter(hidden = true) @RequestParam Map shift, BladeUser bladeUser, HttpServletResponse response) { + QueryWrapper queryWrapper = Condition.getQueryWrapper(shift, Shift.class); + //if (!AuthUtil.isAdministrator()) { + // queryWrapper.lambda().eq(Shift::getTenantId, bladeUser.getTenantId()); + //} + //queryWrapper.lambda().eq(ShiftEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); + List list = shiftGenService.exportShift(queryWrapper); + ExcelUtil.export(response, "[班次]数据" + DateUtil.time(), "[班次]数据表", list, ShiftGenExcel.class); + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/TeamController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/TeamController.java new file mode 100644 index 00000000..5841fd62 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/TeamController.java @@ -0,0 +1,138 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.Valid; +import lombok.AllArgsConstructor; +import org.springblade.core.boot.ctrl.BladeController; +import org.springblade.core.excel.util.ExcelUtil; +import org.springblade.core.mp.support.Condition; +import org.springblade.core.mp.support.Query; +import org.springblade.core.secure.BladeUser; +import org.springblade.core.secure.annotation.IsAdmin; +import org.springblade.core.tool.api.R; +import org.springblade.core.tool.utils.DateUtil; +import org.springblade.core.tool.utils.Func; +import org.springblade.desk.basic.excel.gen.TeamGenExcel; +import org.springblade.desk.basic.pojo.entity.Team; +import org.springblade.desk.basic.pojo.vo.gen.TeamGenVO; +import org.springblade.desk.basic.service.gen.ITeamGenService; +import org.springblade.desk.basic.wrapper.gen.TeamGenWrapper; +import org.springframework.web.bind.annotation.*; + +import java.util.List; +import java.util.Map; + +/** + * [班组] 控制器 + * + * @author Tom Shuo + * @since 2025-11-20 + */ +@RestController +@AllArgsConstructor +@RequestMapping("/Team") +@Tag(name = "[班组]", description = "[班组]接口") +public class TeamController extends BladeController { + + private final ITeamGenService teamGenService; + + /** + * [班组] 详情 + */ + @GetMapping("/detail") + @ApiOperationSupport(order = 1) + @Operation(summary = "详情", description = "传入Team") + public R detail(Team team) { + Team detail = teamGenService.getOne(Condition.getQueryWrapper(team)); + return R.data(TeamGenWrapper.build().entityVO(detail)); + } + + /** + * [班组] 分页 + */ + @GetMapping("/list") + @ApiOperationSupport(order = 2) + @Operation(summary = "分页", description = "传入Team") + public R> list(@Parameter(hidden = true) @RequestParam Map team, Query query) { + IPage pages = teamGenService.page(Condition.getPage(query), Condition.getQueryWrapper(team, Team.class)); + return R.data(TeamGenWrapper.build().pageVO(pages)); + } + + + /** + * [班组] 自定义分页 + */ + @GetMapping("/page") + @ApiOperationSupport(order = 3) + @Operation(summary = "分页", description = "传入Team") + public R> page(TeamGenVO team, Query query) { + IPage pages = teamGenService.selectTeamPage(Condition.getPage(query), team); + return R.data(pages); + } + + /** + * [班组] 新增 + */ + @PostMapping("/save") + @ApiOperationSupport(order = 4) + @Operation(summary = "新增", description = "传入Team") + public R save(@Valid @RequestBody Team team) { + return R.status(teamGenService.save(team)); + } + + /** + * [班组] 修改 + */ + @PostMapping("/update") + @ApiOperationSupport(order = 5) + @Operation(summary = "修改", description = "传入Team") + public R update(@Valid @RequestBody Team team) { + return R.status(teamGenService.updateById(team)); + } + + /** + * [班组] 新增或修改 + */ + @PostMapping("/submit") + @ApiOperationSupport(order = 6) + @Operation(summary = "新增或修改", description = "传入Team") + public R submit(@Valid @RequestBody Team team) { + return R.status(teamGenService.saveOrUpdate(team)); + } + + /** + * [班组] 删除 + */ + @PostMapping("/remove") + @ApiOperationSupport(order = 7) + @Operation(summary = "逻辑删除", description = "传入ids") + public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { + return R.status(teamGenService.deleteLogic(Func.toLongList(ids))); + } + + /** + * 导出数据 + */ + @IsAdmin + @GetMapping("/export-excel") + @ApiOperationSupport(order = 8) + @Operation(summary = "导出数据", description = "传入Team") + public void exportTeam(@Parameter(hidden = true) @RequestParam Map team, BladeUser bladeUser, HttpServletResponse response) { + QueryWrapper queryWrapper = Condition.getQueryWrapper(team, Team.class); + //if (!AuthUtil.isAdministrator()) { + // queryWrapper.lambda().eq(Team::getTenantId, bladeUser.getTenantId()); + //} + //queryWrapper.lambda().eq(TeamEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); + List list = teamGenService.exportTeam(queryWrapper); + ExcelUtil.export(response, "[班组]数据" + DateUtil.time(), "[班组]数据表", list, TeamGenExcel.class); + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/WorkstationController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/WorkstationController.java new file mode 100644 index 00000000..a870192a --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/WorkstationController.java @@ -0,0 +1,138 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.Valid; +import lombok.AllArgsConstructor; +import org.springblade.core.boot.ctrl.BladeController; +import org.springblade.core.excel.util.ExcelUtil; +import org.springblade.core.mp.support.Condition; +import org.springblade.core.mp.support.Query; +import org.springblade.core.secure.BladeUser; +import org.springblade.core.secure.annotation.IsAdmin; +import org.springblade.core.tool.api.R; +import org.springblade.core.tool.utils.DateUtil; +import org.springblade.core.tool.utils.Func; +import org.springblade.desk.basic.excel.gen.WorkstationGenExcel; +import org.springblade.desk.basic.pojo.entity.Workstation; +import org.springblade.desk.basic.pojo.vo.gen.WorkstationGenVO; +import org.springblade.desk.basic.service.gen.IWorkstationGenService; +import org.springblade.desk.basic.wrapper.gen.WorkstationGenWrapper; +import org.springframework.web.bind.annotation.*; + +import java.util.List; +import java.util.Map; + +/** + * [作业中心] 控制器 + * + * @author Tom Shuo + * @since 2025-11-20 + */ +@RestController +@AllArgsConstructor +@RequestMapping("/Workstation") +@Tag(name = "[作业中心]", description = "[作业中心]接口") +public class WorkstationController extends BladeController { + + private final IWorkstationGenService workstationGenService; + + /** + * [作业中心] 详情 + */ + @GetMapping("/detail") + @ApiOperationSupport(order = 1) + @Operation(summary = "详情", description = "传入Workstation") + public R detail(Workstation workstation) { + Workstation detail = workstationGenService.getOne(Condition.getQueryWrapper(workstation)); + return R.data(WorkstationGenWrapper.build().entityVO(detail)); + } + + /** + * [作业中心] 分页 + */ + @GetMapping("/list") + @ApiOperationSupport(order = 2) + @Operation(summary = "分页", description = "传入Workstation") + public R> list(@Parameter(hidden = true) @RequestParam Map workstation, Query query) { + IPage pages = workstationGenService.page(Condition.getPage(query), Condition.getQueryWrapper(workstation, Workstation.class)); + return R.data(WorkstationGenWrapper.build().pageVO(pages)); + } + + + /** + * [作业中心] 自定义分页 + */ + @GetMapping("/page") + @ApiOperationSupport(order = 3) + @Operation(summary = "分页", description = "传入Workstation") + public R> page(WorkstationGenVO workstation, Query query) { + IPage pages = workstationGenService.selectWorkstationPage(Condition.getPage(query), workstation); + return R.data(pages); + } + + /** + * [作业中心] 新增 + */ + @PostMapping("/save") + @ApiOperationSupport(order = 4) + @Operation(summary = "新增", description = "传入Workstation") + public R save(@Valid @RequestBody Workstation workstation) { + return R.status(workstationGenService.save(workstation)); + } + + /** + * [作业中心] 修改 + */ + @PostMapping("/update") + @ApiOperationSupport(order = 5) + @Operation(summary = "修改", description = "传入Workstation") + public R update(@Valid @RequestBody Workstation workstation) { + return R.status(workstationGenService.updateById(workstation)); + } + + /** + * [作业中心] 新增或修改 + */ + @PostMapping("/submit") + @ApiOperationSupport(order = 6) + @Operation(summary = "新增或修改", description = "传入Workstation") + public R submit(@Valid @RequestBody Workstation workstation) { + return R.status(workstationGenService.saveOrUpdate(workstation)); + } + + /** + * [作业中心] 删除 + */ + @PostMapping("/remove") + @ApiOperationSupport(order = 7) + @Operation(summary = "逻辑删除", description = "传入ids") + public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { + return R.status(workstationGenService.deleteLogic(Func.toLongList(ids))); + } + + /** + * 导出数据 + */ + @IsAdmin + @GetMapping("/export-excel") + @ApiOperationSupport(order = 8) + @Operation(summary = "导出数据", description = "传入Workstation") + public void exportWorkstation(@Parameter(hidden = true) @RequestParam Map workstation, BladeUser bladeUser, HttpServletResponse response) { + QueryWrapper queryWrapper = Condition.getQueryWrapper(workstation, Workstation.class); + //if (!AuthUtil.isAdministrator()) { + // queryWrapper.lambda().eq(Workstation::getTenantId, bladeUser.getTenantId()); + //} + //queryWrapper.lambda().eq(WorkstationEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); + List list = workstationGenService.exportWorkstation(queryWrapper); + ExcelUtil.export(response, "[作业中心]数据" + DateUtil.time(), "[作业中心]数据表", list, WorkstationGenExcel.class); + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/excel/gen/ShiftGenExcel.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/excel/gen/ShiftGenExcel.java new file mode 100644 index 00000000..661c5075 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/excel/gen/ShiftGenExcel.java @@ -0,0 +1,62 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.excel.gen; + + +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; + + +/** + * [班次] Excel实体类 + * + * @author Tom Shuo + * @since 2025-11-20 + */ +@Data +@ColumnWidth(25) +@HeadRowHeight(20) +@ContentRowHeight(18) +public class ShiftGenExcel implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * [班次]编码 + */ + @ColumnWidth(20) + @ExcelProperty("[班次]编码") + private String shiftCode; + /** + * [班次]类型 + */ + @ColumnWidth(20) + @ExcelProperty("[班次]类型") + private Long shiftType; + /** + * [班次]名称 + */ + @ColumnWidth(20) + @ExcelProperty("[班次]名称") + private String name; + /** + * 排序 + */ + @ColumnWidth(20) + @ExcelProperty("排序") + private Long sort; + /** + * 备注 + */ + @ColumnWidth(20) + @ExcelProperty("备注") + private String remark; +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/excel/gen/TeamGenExcel.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/excel/gen/TeamGenExcel.java new file mode 100644 index 00000000..a9a0f41b --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/excel/gen/TeamGenExcel.java @@ -0,0 +1,183 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.excel.gen; + + +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.math.BigDecimal; + + +/** + * [班组] Excel实体类 + * + * @author Tom Shuo + * @since 2025-11-20 + */ +@Data +@ColumnWidth(25) +@HeadRowHeight(20) +@ContentRowHeight(18) +public class TeamGenExcel implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * [班组]编码 + */ + @ColumnWidth(20) + @ExcelProperty("[班组]编码") + private String teamCode; + /** + * [班组]类型:[1]:针孔;[2]:壳体;[3]:烧结;[4]:园区; + */ + @ColumnWidth(20) + @ExcelProperty("[班组]类型:[1]:针孔;[2]:壳体;[3]:烧结;[4]:园区;") + private Long teamType; + /** + * [班组]名称 + */ + @ColumnWidth(20) + @ExcelProperty("[班组]名称") + private String name; + /** + * 班组长[用户]id + */ + @ColumnWidth(20) + @ExcelProperty("班组长[用户]id") + private BigDecimal leaderUserId; + /** + * 计划员[用户]id + */ + @ColumnWidth(20) + @ExcelProperty("计划员[用户]id") + private BigDecimal plannerUserId; + /** + * 调度员[用户]id + */ + @ColumnWidth(20) + @ExcelProperty("调度员[用户]id") + private BigDecimal dispatchUserId; + /** + * [XXXX]id + */ + @ColumnWidth(20) + @ExcelProperty("[XXXX]id") + private BigDecimal myId4; + /** + * 是否特殊 + */ + @ColumnWidth(20) + @ExcelProperty("是否特殊") + private Long flagSpecial; + /** + * MY_NUM2 + */ + @ColumnWidth(20) + @ExcelProperty("MY_NUM2") + private Long myNum2; + /** + * MY_NUM3 + */ + @ColumnWidth(20) + @ExcelProperty("MY_NUM3") + private Long myNum3; + /** + * MY_NUM4 + */ + @ColumnWidth(20) + @ExcelProperty("MY_NUM4") + private Long myNum4; + /** + * + */ + @ColumnWidth(20) + @ExcelProperty("") + private Long myNum5; + /** + * + */ + @ColumnWidth(20) + @ExcelProperty("") + private Long myNum6; + /** + * + */ + @ColumnWidth(20) + @ExcelProperty("") + private Long myNum7; + /** + * + */ + @ColumnWidth(20) + @ExcelProperty("") + private Long myNum8; + /** + * MY_CHA1 + */ + @ColumnWidth(20) + @ExcelProperty("MY_CHA1") + private String myCha1; + /** + * MY_CHA2 + */ + @ColumnWidth(20) + @ExcelProperty("MY_CHA2") + private String myCha2; + /** + * MY_CHA3 + */ + @ColumnWidth(20) + @ExcelProperty("MY_CHA3") + private String myCha3; + /** + * MY_CHA4 + */ + @ColumnWidth(20) + @ExcelProperty("MY_CHA4") + private String myCha4; + /** + * + */ + @ColumnWidth(20) + @ExcelProperty("") + private String myCha5; + /** + * + */ + @ColumnWidth(20) + @ExcelProperty("") + private String myCha6; + /** + * + */ + @ColumnWidth(20) + @ExcelProperty("") + private String myCha7; + /** + * + */ + @ColumnWidth(20) + @ExcelProperty("") + private String myCha8; + /** + * 排序 + */ + @ColumnWidth(20) + @ExcelProperty("排序") + private Long sort; + /** + * 备注 + */ + @ColumnWidth(20) + @ExcelProperty("备注") + private String remark; +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/excel/gen/WorkstationGenExcel.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/excel/gen/WorkstationGenExcel.java new file mode 100644 index 00000000..cf9a96b0 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/excel/gen/WorkstationGenExcel.java @@ -0,0 +1,99 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.excel.gen; + + +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.math.BigDecimal; + + +/** + * [作业中心] Excel实体类 + * + * @author Tom Shuo + * @since 2025-11-20 + */ +@Data +@ColumnWidth(25) +@HeadRowHeight(20) +@ContentRowHeight(18) +public class WorkstationGenExcel implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * [作业中心]编码 + */ + @ColumnWidth(20) + @ExcelProperty("[作业中心]编码") + private String workstationCode; + /** + * [作业中心]类型 + */ + @ColumnWidth(20) + @ExcelProperty("[作业中心]类型") + private Long workstationType; + /** + * [作业中心]名称 + */ + @ColumnWidth(20) + @ExcelProperty("[作业中心]名称") + private String name; + /** + * 工艺主管[用户]id + */ + @ColumnWidth(20) + @ExcelProperty("工艺主管[用户]id") + private BigDecimal processUserId; + /** + * 交付中心 + */ + @ColumnWidth(20) + @ExcelProperty("交付中心") + private String deliveryCenter; + /** + * 排序 + */ + @ColumnWidth(20) + @ExcelProperty("排序") + private Long sort; + /** + * 备注 + */ + @ColumnWidth(20) + @ExcelProperty("备注") + private String remark; + /** + * 业务标识 + */ + @ColumnWidth(20) + @ExcelProperty("业务标识") + private String bizTag; + /** + * 检验标记 + */ + @ColumnWidth(20) + @ExcelProperty("检验标记") + private Long flagTest; + /** + * 镀后标记 + */ + @ColumnWidth(20) + @ExcelProperty("镀后标记") + private Long flagAfterPlating; + /** + * 是否大批量 + */ + @ColumnWidth(20) + @ExcelProperty("是否大批量") + private Long flagBigBat; +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/gen/ShiftGenMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/gen/ShiftGenMapper.java new file mode 100644 index 00000000..332b96aa --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/gen/ShiftGenMapper.java @@ -0,0 +1,40 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.mapper.gen; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.apache.ibatis.annotations.Param; +import org.springblade.desk.basic.excel.gen.ShiftGenExcel; +import org.springblade.desk.basic.pojo.entity.Shift; +import org.springblade.desk.basic.pojo.vo.gen.ShiftGenVO; + +import java.util.List; + +/** + * [班次] Mapper 接口 + * + * @author Tom Shuo + * @since 2025-11-20 + */ +public interface ShiftGenMapper extends BaseMapper { + + /** + * 自定义分页 + * + * @param page 分页参数 + * @param shift 查询参数 + * @return List + */ + List selectShiftPage(IPage page, ShiftGenVO shift); + + /** + * 获取导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportShift(@Param("ew") Wrapper queryWrapper); +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/gen/ShiftGenMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/gen/ShiftGenMapper.xml new file mode 100644 index 00000000..eabc94a3 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/gen/ShiftGenMapper.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/gen/TeamGenMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/gen/TeamGenMapper.java new file mode 100644 index 00000000..cef744db --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/gen/TeamGenMapper.java @@ -0,0 +1,40 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.mapper.gen; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.apache.ibatis.annotations.Param; +import org.springblade.desk.basic.excel.gen.TeamGenExcel; +import org.springblade.desk.basic.pojo.entity.Team; +import org.springblade.desk.basic.pojo.vo.gen.TeamGenVO; + +import java.util.List; + +/** + * [班组] Mapper 接口 + * + * @author Tom Shuo + * @since 2025-11-20 + */ +public interface TeamGenMapper extends BaseMapper { + + /** + * 自定义分页 + * + * @param page 分页参数 + * @param team 查询参数 + * @return List + */ + List selectTeamPage(IPage page, TeamGenVO team); + + /** + * 获取导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportTeam(@Param("ew") Wrapper queryWrapper); +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/gen/TeamGenMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/gen/TeamGenMapper.xml new file mode 100644 index 00000000..efa6e443 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/gen/TeamGenMapper.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/gen/WorkstationGenMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/gen/WorkstationGenMapper.java new file mode 100644 index 00000000..6587b9ef --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/gen/WorkstationGenMapper.java @@ -0,0 +1,40 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.mapper.gen; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.apache.ibatis.annotations.Param; +import org.springblade.desk.basic.excel.gen.WorkstationGenExcel; +import org.springblade.desk.basic.pojo.entity.Workstation; +import org.springblade.desk.basic.pojo.vo.gen.WorkstationGenVO; + +import java.util.List; + +/** + * [作业中心] Mapper 接口 + * + * @author Tom Shuo + * @since 2025-11-20 + */ +public interface WorkstationGenMapper extends BaseMapper { + + /** + * 自定义分页 + * + * @param page 分页参数 + * @param workstation 查询参数 + * @return List + */ + List selectWorkstationPage(IPage page, WorkstationGenVO workstation); + + /** + * 获取导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportWorkstation(@Param("ew") Wrapper queryWrapper); +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/gen/WorkstationGenMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/gen/WorkstationGenMapper.xml new file mode 100644 index 00000000..e337fb7b --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/gen/WorkstationGenMapper.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/gen/BaWorkstationGenDTO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/gen/BaWorkstationGenDTO.java new file mode 100644 index 00000000..6f04476b --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/gen/BaWorkstationGenDTO.java @@ -0,0 +1,24 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.pojo.dto.gen; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.basic.pojo.entity.BaWorkstation; + +import java.io.Serial; + +/** + * [作业中心] 数据传输对象实体类 + * + * @author Tom Shuo + * @since 2025-11-20 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class BaWorkstationGenDTO extends BaWorkstation { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/gen/ShiftGenDTO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/gen/ShiftGenDTO.java new file mode 100644 index 00000000..cb2d13a3 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/gen/ShiftGenDTO.java @@ -0,0 +1,24 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.pojo.dto.gen; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.basic.pojo.entity.Shift; + +import java.io.Serial; + +/** + * [班次] 数据传输对象实体类 + * + * @author Tom Shuo + * @since 2025-11-20 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class ShiftGenDTO extends Shift { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/gen/TeamGenDTO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/gen/TeamGenDTO.java new file mode 100644 index 00000000..b73d6e6e --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/gen/TeamGenDTO.java @@ -0,0 +1,24 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.pojo.dto.gen; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.basic.pojo.entity.Team; + +import java.io.Serial; + +/** + * [班组] 数据传输对象实体类 + * + * @author Tom Shuo + * @since 2025-11-20 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class TeamGenDTO extends Team { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/gen/WorkstationGenDTO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/gen/WorkstationGenDTO.java new file mode 100644 index 00000000..2a0f2aa8 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/gen/WorkstationGenDTO.java @@ -0,0 +1,24 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.pojo.dto.gen; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.basic.pojo.entity.Workstation; + +import java.io.Serial; + +/** + * [作业中心] 数据传输对象实体类 + * + * @author Tom Shuo + * @since 2025-11-20 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class WorkstationGenDTO extends Workstation { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/BaWorkstation.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/BaWorkstation.java new file mode 100644 index 00000000..12ddbca4 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/BaWorkstation.java @@ -0,0 +1,103 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.pojo.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.core.mp.base.BaseEntity; + +import java.io.Serial; +import java.math.BigDecimal; + +/** + * [作业中心] 实体类 + * + * @author Tom Shuo + * @since 2025-11-20 + */ +@Data +@TableName("BA_WORKSTATION") +@Schema(description = "BaWorkstation Entity对象") +@EqualsAndHashCode(callSuper = true) +public class BaWorkstation extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * [作业中心]编码 + */ + public static final String COL_CODE = "CODE"; + /** + * [作业中心]类型 + */ + public static final String COL_WORKSTATION_TYPE = "WORKSTATION_TYPE"; + /** + * [作业中心]名称 + */ + public static final String COL_NAME = "NAME"; + /** + * 工艺主管[用户]id + */ + public static final String COL_PROCESS_USER_ID = "PROCESS_USER_ID"; + /** + * 交付中心 + */ + public static final String COL_DELIVERY_CENTER = "DELIVERY_CENTER"; + /** + * 排序 + */ + public static final String COL_SORT = "SORT"; + /** + * 备注 + */ + public static final String COL_REMARK = "REMARK"; + /** + * 业务标识 + */ + public static final String COL_BIZ_TAG = "BIZ_TAG"; + + /** + * [作业中心]编码 + */ + @Schema(description = "[作业中心]编码") + private String code; + /** + * [作业中心]类型 + */ + @Schema(description = "[作业中心]类型") + private Long workstationType; + /** + * [作业中心]名称 + */ + @Schema(description = "[作业中心]名称") + private String name; + /** + * 工艺主管[用户]id + */ + @Schema(description = "工艺主管[用户]id") + private BigDecimal processUserId; + /** + * 交付中心 + */ + @Schema(description = "交付中心") + private String deliveryCenter; + /** + * 排序 + */ + @Schema(description = "排序") + private Long sort; + /** + * 备注 + */ + @Schema(description = "备注") + private String remark; + /** + * 业务标识 + */ + @Schema(description = "业务标识") + private String bizTag; +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/Shift.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/Shift.java new file mode 100644 index 00000000..4e3a9e57 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/Shift.java @@ -0,0 +1,75 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.pojo.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.core.mp.base.BaseEntity; + +import java.io.Serial; + +/** + * [班次] 实体类 + * + * @author Tom Shuo + * @since 2025-11-20 + */ +@Data +@TableName("BA_SHIFT") +@Schema(description = "Shift Entity对象") +@EqualsAndHashCode(callSuper = true) +public class Shift extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * [班次]编码 + */ + public static final String COL_SHIFT_CODE = "SHIFT_CODE"; + /** + * [班次]类型 + */ + public static final String COL_SHIFT_TYPE = "SHIFT_TYPE"; + /** + * [班次]名称 + */ + public static final String COL_NAME = "NAME"; + /** + * 排序 + */ + public static final String COL_SORT = "SORT"; + /** + * 备注 + */ + public static final String COL_REMARK = "REMARK"; + + /** + * [班次]编码 + */ + @Schema(description = "[班次]编码") + private String shiftCode; + /** + * [班次]类型 + */ + @Schema(description = "[班次]类型") + private Long shiftType; + /** + * [班次]名称 + */ + @Schema(description = "[班次]名称") + private String name; + /** + * 排序 + */ + @Schema(description = "排序") + private Long sort; + /** + * 备注 + */ + @Schema(description = "备注") + private String remark; +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/Team.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/Team.java new file mode 100644 index 00000000..bb536776 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/Team.java @@ -0,0 +1,256 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.pojo.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.core.mp.base.BaseEntity; + +import java.io.Serial; +import java.math.BigDecimal; + +/** + * [班组] 实体类 + * + * @author Tom Shuo + * @since 2025-11-20 + */ +@Data +@TableName("BA_TEAM") +@Schema(description = "Team Entity对象") +@EqualsAndHashCode(callSuper = true) +public class Team extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * [班组]编码 + */ + public static final String COL_TEAM_CODE = "TEAM_CODE"; + /** + * [班组]类型:[1]:针孔;[2]:壳体;[3]:烧结;[4]:园区; + */ + public static final String COL_TEAM_TYPE = "TEAM_TYPE"; + /** + * [班组]名称 + */ + public static final String COL_NAME = "NAME"; + /** + * 班组长[用户]id + */ + public static final String COL_LEADER_USER_ID = "LEADER_USER_ID"; + /** + * 计划员[用户]id + */ + public static final String COL_PLANNER_USER_ID = "PLANNER_USER_ID"; + /** + * 调度员[用户]id + */ + public static final String COL_DISPATCH_USER_ID = "DISPATCH_USER_ID"; + /** + * [XXXX]id + */ + public static final String COL_MY_ID4 = "MY_ID4"; + /** + * 是否特殊 + */ + public static final String COL_FLAG_SPECIAL = "FLAG_SPECIAL"; + /** + * MY_NUM2 + */ + public static final String COL_MY_NUM2 = "MY_NUM2"; + /** + * MY_NUM3 + */ + public static final String COL_MY_NUM3 = "MY_NUM3"; + /** + * MY_NUM4 + */ + public static final String COL_MY_NUM4 = "MY_NUM4"; + /** + * + */ + public static final String COL_MY_NUM5 = "MY_NUM5"; + /** + * + */ + public static final String COL_MY_NUM6 = "MY_NUM6"; + /** + * + */ + public static final String COL_MY_NUM7 = "MY_NUM7"; + /** + * + */ + public static final String COL_MY_NUM8 = "MY_NUM8"; + /** + * MY_CHA1 + */ + public static final String COL_MY_CHA1 = "MY_CHA1"; + /** + * MY_CHA2 + */ + public static final String COL_MY_CHA2 = "MY_CHA2"; + /** + * MY_CHA3 + */ + public static final String COL_MY_CHA3 = "MY_CHA3"; + /** + * MY_CHA4 + */ + public static final String COL_MY_CHA4 = "MY_CHA4"; + /** + * + */ + public static final String COL_MY_CHA5 = "MY_CHA5"; + /** + * + */ + public static final String COL_MY_CHA6 = "MY_CHA6"; + /** + * + */ + public static final String COL_MY_CHA7 = "MY_CHA7"; + /** + * + */ + public static final String COL_MY_CHA8 = "MY_CHA8"; + /** + * 排序 + */ + public static final String COL_SORT = "SORT"; + /** + * 备注 + */ + public static final String COL_REMARK = "REMARK"; + + /** + * [班组]编码 + */ + @Schema(description = "[班组]编码") + private String teamCode; + /** + * [班组]类型:[1]:针孔;[2]:壳体;[3]:烧结;[4]:园区; + */ + @Schema(description = "[班组]类型:[1]:针孔;[2]:壳体;[3]:烧结;[4]:园区;") + private Long teamType; + /** + * [班组]名称 + */ + @Schema(description = "[班组]名称") + private String name; + /** + * 班组长[用户]id + */ + @Schema(description = "班组长[用户]id") + private BigDecimal leaderUserId; + /** + * 计划员[用户]id + */ + @Schema(description = "计划员[用户]id") + private BigDecimal plannerUserId; + /** + * 调度员[用户]id + */ + @Schema(description = "调度员[用户]id") + private BigDecimal dispatchUserId; + /** + * [XXXX]id + */ + @Schema(description = "[XXXX]id") + private BigDecimal myId4; + /** + * 是否特殊 + */ + @Schema(description = "是否特殊") + private Long flagSpecial; + /** + * MY_NUM2 + */ + @Schema(description = "MY_NUM2") + private Long myNum2; + /** + * MY_NUM3 + */ + @Schema(description = "MY_NUM3") + private Long myNum3; + /** + * MY_NUM4 + */ + @Schema(description = "MY_NUM4") + private Long myNum4; + /** + * + */ + @Schema(description = "") + private Long myNum5; + /** + * + */ + @Schema(description = "") + private Long myNum6; + /** + * + */ + @Schema(description = "") + private Long myNum7; + /** + * + */ + @Schema(description = "") + private Long myNum8; + /** + * MY_CHA1 + */ + @Schema(description = "MY_CHA1") + private String myCha1; + /** + * MY_CHA2 + */ + @Schema(description = "MY_CHA2") + private String myCha2; + /** + * MY_CHA3 + */ + @Schema(description = "MY_CHA3") + private String myCha3; + /** + * MY_CHA4 + */ + @Schema(description = "MY_CHA4") + private String myCha4; + /** + * + */ + @Schema(description = "") + private String myCha5; + /** + * + */ + @Schema(description = "") + private String myCha6; + /** + * + */ + @Schema(description = "") + private String myCha7; + /** + * + */ + @Schema(description = "") + private String myCha8; + /** + * 排序 + */ + @Schema(description = "排序") + private Long sort; + /** + * 备注 + */ + @Schema(description = "备注") + private String remark; +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/Workstation.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/Workstation.java new file mode 100644 index 00000000..d6cb5ce9 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/Workstation.java @@ -0,0 +1,130 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.pojo.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.core.mp.base.BaseEntity; + +import java.io.Serial; +import java.math.BigDecimal; + +/** + * [作业中心] 实体类 + * + * @author Tom Shuo + * @since 2025-11-20 + */ +@Data +@TableName("BA_WORKSTATION") +@Schema(description = "Workstation Entity对象") +@EqualsAndHashCode(callSuper = true) +public class Workstation extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * [作业中心]编码 + */ + public static final String COL_WORKSTATION_CODE = "WORKSTATION_CODE"; + /** + * [作业中心]类型 + */ + public static final String COL_WORKSTATION_TYPE = "WORKSTATION_TYPE"; + /** + * [作业中心]名称 + */ + public static final String COL_NAME = "NAME"; + /** + * 工艺主管[用户]id + */ + public static final String COL_PROCESS_USER_ID = "PROCESS_USER_ID"; + /** + * 交付中心 + */ + public static final String COL_DELIVERY_CENTER = "DELIVERY_CENTER"; + /** + * 排序 + */ + public static final String COL_SORT = "SORT"; + /** + * 备注 + */ + public static final String COL_REMARK = "REMARK"; + /** + * 业务标识 + */ + public static final String COL_BIZ_TAG = "BIZ_TAG"; + /** + * 检验标记 + */ + public static final String COL_FLAG_TEST = "FLAG_TEST"; + /** + * 镀后标记 + */ + public static final String COL_FLAG_AFTER_PLATING = "FLAG_AFTER_PLATING"; + /** + * 是否大批量 + */ + public static final String COL_FLAG_BIG_BAT = "FLAG_BIG_BAT"; + + /** + * [作业中心]编码 + */ + @Schema(description = "[作业中心]编码") + private String workstationCode; + /** + * [作业中心]类型 + */ + @Schema(description = "[作业中心]类型") + private Long workstationType; + /** + * [作业中心]名称 + */ + @Schema(description = "[作业中心]名称") + private String name; + /** + * 工艺主管[用户]id + */ + @Schema(description = "工艺主管[用户]id") + private BigDecimal processUserId; + /** + * 交付中心 + */ + @Schema(description = "交付中心") + private String deliveryCenter; + /** + * 排序 + */ + @Schema(description = "排序") + private Long sort; + /** + * 备注 + */ + @Schema(description = "备注") + private String remark; + /** + * 业务标识 + */ + @Schema(description = "业务标识") + private String bizTag; + /** + * 检验标记 + */ + @Schema(description = "检验标记") + private Long flagTest; + /** + * 镀后标记 + */ + @Schema(description = "镀后标记") + private Long flagAfterPlating; + /** + * 是否大批量 + */ + @Schema(description = "是否大批量") + private Long flagBigBat; +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/gen/BaWorkstationGenVO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/gen/BaWorkstationGenVO.java new file mode 100644 index 00000000..b72892ba --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/gen/BaWorkstationGenVO.java @@ -0,0 +1,24 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.pojo.vo.gen; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.basic.pojo.entity.BaWorkstation; + +import java.io.Serial; + +/** + * [作业中心] 视图实体类 + * + * @author Tom Shuo + * @since 2025-11-20 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class BaWorkstationGenVO extends BaWorkstation { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/gen/ShiftGenVO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/gen/ShiftGenVO.java new file mode 100644 index 00000000..a0e1f949 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/gen/ShiftGenVO.java @@ -0,0 +1,24 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.pojo.vo.gen; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.basic.pojo.entity.Shift; + +import java.io.Serial; + +/** + * [班次] 视图实体类 + * + * @author Tom Shuo + * @since 2025-11-20 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class ShiftGenVO extends Shift { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/gen/TeamGenVO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/gen/TeamGenVO.java new file mode 100644 index 00000000..d82f6d13 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/gen/TeamGenVO.java @@ -0,0 +1,24 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.pojo.vo.gen; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.basic.pojo.entity.Team; + +import java.io.Serial; + +/** + * [班组] 视图实体类 + * + * @author Tom Shuo + * @since 2025-11-20 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class TeamGenVO extends Team { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/gen/WorkstationGenVO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/gen/WorkstationGenVO.java new file mode 100644 index 00000000..afe48cfa --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/gen/WorkstationGenVO.java @@ -0,0 +1,24 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.pojo.vo.gen; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.basic.pojo.entity.Workstation; + +import java.io.Serial; + +/** + * [作业中心] 视图实体类 + * + * @author Tom Shuo + * @since 2025-11-20 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class WorkstationGenVO extends Workstation { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/WorkTankService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/WorkTankService.java new file mode 100644 index 00000000..586fc8ae --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/WorkTankService.java @@ -0,0 +1,30 @@ +package org.springblade.desk.basic.service; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import jakarta.annotation.Resource; +import lombok.Data; +import lombok.extern.slf4j.Slf4j; +import org.springblade.core.tool.api.R; +import org.springblade.desk.basic.mapper.gen.WorkTankGenMapper; +import org.springblade.desk.basic.pojo.entity.WorkTank; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +@Data +@Slf4j +public class WorkTankService { + + @Resource + private WorkTankGenMapper genMapper; + + /** + * 所有供下拉选择。 + * + * @return + */ + public R> listForSelect() { + return R.data(genMapper.selectList(new QueryWrapper<>())); + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/WorkstationService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/WorkstationService.java new file mode 100644 index 00000000..62318529 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/WorkstationService.java @@ -0,0 +1,30 @@ +package org.springblade.desk.basic.service; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import jakarta.annotation.Resource; +import lombok.Data; +import lombok.extern.slf4j.Slf4j; +import org.springblade.core.tool.api.R; +import org.springblade.desk.basic.mapper.gen.WorkstationGenMapper; +import org.springblade.desk.basic.pojo.entity.Workstation; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +@Data +@Slf4j +public class WorkstationService { + + @Resource + private WorkstationGenMapper genMapper; + + /** + * 所有供下拉选择。 + * + * @return + */ + public R> listForSelect() { + return R.data(genMapper.selectList(new QueryWrapper<>())); + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/gen/IShiftGenService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/gen/IShiftGenService.java new file mode 100644 index 00000000..608b18b4 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/gen/IShiftGenService.java @@ -0,0 +1,38 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.service.gen; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.core.mp.base.BaseService; +import org.springblade.desk.basic.excel.gen.ShiftGenExcel; +import org.springblade.desk.basic.pojo.entity.Shift; +import org.springblade.desk.basic.pojo.vo.gen.ShiftGenVO; + +import java.util.List; + +/** + * [班次] 服务类 + * + * @author Tom Shuo + * @since 2025-11-20 + */ +public interface IShiftGenService extends BaseService { + /** + * 自定义分页 + * + * @param page 分页参数 + * @param shift 查询参数 + * @return IPage + */ + IPage selectShiftPage(IPage page, ShiftGenVO shift); + + /** + * 导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportShift(Wrapper queryWrapper); +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/gen/ITeamGenService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/gen/ITeamGenService.java new file mode 100644 index 00000000..dab25fc4 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/gen/ITeamGenService.java @@ -0,0 +1,38 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.service.gen; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.core.mp.base.BaseService; +import org.springblade.desk.basic.excel.gen.TeamGenExcel; +import org.springblade.desk.basic.pojo.entity.Team; +import org.springblade.desk.basic.pojo.vo.gen.TeamGenVO; + +import java.util.List; + +/** + * [班组] 服务类 + * + * @author Tom Shuo + * @since 2025-11-20 + */ +public interface ITeamGenService extends BaseService { + /** + * 自定义分页 + * + * @param page 分页参数 + * @param team 查询参数 + * @return IPage + */ + IPage selectTeamPage(IPage page, TeamGenVO team); + + /** + * 导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportTeam(Wrapper queryWrapper); +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/gen/IWorkstationGenService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/gen/IWorkstationGenService.java new file mode 100644 index 00000000..62d22d53 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/gen/IWorkstationGenService.java @@ -0,0 +1,38 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.service.gen; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.core.mp.base.BaseService; +import org.springblade.desk.basic.excel.gen.WorkstationGenExcel; +import org.springblade.desk.basic.pojo.entity.Workstation; +import org.springblade.desk.basic.pojo.vo.gen.WorkstationGenVO; + +import java.util.List; + +/** + * [作业中心] 服务类 + * + * @author Tom Shuo + * @since 2025-11-20 + */ +public interface IWorkstationGenService extends BaseService { + /** + * 自定义分页 + * + * @param page 分页参数 + * @param workstation 查询参数 + * @return IPage + */ + IPage selectWorkstationPage(IPage page, WorkstationGenVO workstation); + + /** + * 导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportWorkstation(Wrapper queryWrapper); +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/gen/ShiftGenServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/gen/ShiftGenServiceImpl.java new file mode 100644 index 00000000..791697a2 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/gen/ShiftGenServiceImpl.java @@ -0,0 +1,40 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.service.impl.gen; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.core.mp.base.BaseServiceImpl; +import org.springblade.desk.basic.excel.gen.ShiftGenExcel; +import org.springblade.desk.basic.mapper.gen.ShiftGenMapper; +import org.springblade.desk.basic.pojo.entity.Shift; +import org.springblade.desk.basic.pojo.vo.gen.ShiftGenVO; +import org.springblade.desk.basic.service.gen.IShiftGenService; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * [班次] 服务实现类 + * + * @author Tom Shuo + * @since 2025-11-20 + */ +@Service +public class ShiftGenServiceImpl extends BaseServiceImpl implements IShiftGenService { + + @Override + public IPage selectShiftPage(IPage page, ShiftGenVO shift) { + return page.setRecords(baseMapper.selectShiftPage(page, shift)); + } + + @Override + public List exportShift(Wrapper queryWrapper) { + List shiftList = baseMapper.exportShift(queryWrapper); + //shiftList.forEach(shift -> { + // shift.setTypeName(DictCache.getValue(DictEnum.YES_NO, Shift.getType())); + //}); + return shiftList; + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/gen/TeamGenServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/gen/TeamGenServiceImpl.java new file mode 100644 index 00000000..31e93d35 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/gen/TeamGenServiceImpl.java @@ -0,0 +1,40 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.service.impl.gen; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.core.mp.base.BaseServiceImpl; +import org.springblade.desk.basic.excel.gen.TeamGenExcel; +import org.springblade.desk.basic.mapper.gen.TeamGenMapper; +import org.springblade.desk.basic.pojo.entity.Team; +import org.springblade.desk.basic.pojo.vo.gen.TeamGenVO; +import org.springblade.desk.basic.service.gen.ITeamGenService; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * [班组] 服务实现类 + * + * @author Tom Shuo + * @since 2025-11-20 + */ +@Service +public class TeamGenServiceImpl extends BaseServiceImpl implements ITeamGenService { + + @Override + public IPage selectTeamPage(IPage page, TeamGenVO team) { + return page.setRecords(baseMapper.selectTeamPage(page, team)); + } + + @Override + public List exportTeam(Wrapper queryWrapper) { + List teamList = baseMapper.exportTeam(queryWrapper); + //teamList.forEach(team -> { + // team.setTypeName(DictCache.getValue(DictEnum.YES_NO, Team.getType())); + //}); + return teamList; + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/gen/WorkstationGenServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/gen/WorkstationGenServiceImpl.java new file mode 100644 index 00000000..45d344df --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/gen/WorkstationGenServiceImpl.java @@ -0,0 +1,40 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.service.impl.gen; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.core.mp.base.BaseServiceImpl; +import org.springblade.desk.basic.excel.gen.WorkstationGenExcel; +import org.springblade.desk.basic.mapper.gen.WorkstationGenMapper; +import org.springblade.desk.basic.pojo.entity.Workstation; +import org.springblade.desk.basic.pojo.vo.gen.WorkstationGenVO; +import org.springblade.desk.basic.service.gen.IWorkstationGenService; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * [作业中心] 服务实现类 + * + * @author Tom Shuo + * @since 2025-11-20 + */ +@Service +public class WorkstationGenServiceImpl extends BaseServiceImpl implements IWorkstationGenService { + + @Override + public IPage selectWorkstationPage(IPage page, WorkstationGenVO workstation) { + return page.setRecords(baseMapper.selectWorkstationPage(page, workstation)); + } + + @Override + public List exportWorkstation(Wrapper queryWrapper) { + List workstationList = baseMapper.exportWorkstation(queryWrapper); + //workstationList.forEach(workstation -> { + // workstation.setTypeName(DictCache.getValue(DictEnum.YES_NO, Workstation.getType())); + //}); + return workstationList; + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/wrapper/gen/BaWorkstationGenWrapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/wrapper/gen/BaWorkstationGenWrapper.java new file mode 100644 index 00000000..3c2eed87 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/wrapper/gen/BaWorkstationGenWrapper.java @@ -0,0 +1,36 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.wrapper.gen; + +import org.springblade.core.mp.support.BaseEntityWrapper; +import org.springblade.core.tool.utils.BeanUtil; +import org.springblade.desk.basic.pojo.entity.BaWorkstation; +import org.springblade.desk.basic.pojo.vo.gen.BaWorkstationGenVO; + +import java.util.Objects; + +/** + * [作业中心] 包装类,返回视图层所需的字段 + * + * @author Tom Shuo + * @since 2025-11-20 + */ +public class BaWorkstationGenWrapper extends BaseEntityWrapper { + + public static BaWorkstationGenWrapper build() { + return new BaWorkstationGenWrapper(); + } + + @Override + public BaWorkstationGenVO entityVO(BaWorkstation baWorkstation) { + BaWorkstationGenVO baWorkstationVO = Objects.requireNonNull(BeanUtil.copyProperties(baWorkstation, BaWorkstationGenVO.class)); + + //User createUser = UserCache.getUser(baWorkstation.getCreateUser()); + //User updateUser = UserCache.getUser(baWorkstation.getUpdateUser()); + //baWorkstationVO.setCreateUserName(createUser.getName()); + //baWorkstationVO.setUpdateUserName(updateUser.getName()); + + return baWorkstationVO; + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/wrapper/gen/ShiftGenWrapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/wrapper/gen/ShiftGenWrapper.java new file mode 100644 index 00000000..2c6695b9 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/wrapper/gen/ShiftGenWrapper.java @@ -0,0 +1,36 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.wrapper.gen; + +import org.springblade.core.mp.support.BaseEntityWrapper; +import org.springblade.core.tool.utils.BeanUtil; +import org.springblade.desk.basic.pojo.entity.Shift; +import org.springblade.desk.basic.pojo.vo.gen.ShiftGenVO; + +import java.util.Objects; + +/** + * [班次] 包装类,返回视图层所需的字段 + * + * @author Tom Shuo + * @since 2025-11-20 + */ +public class ShiftGenWrapper extends BaseEntityWrapper { + + public static ShiftGenWrapper build() { + return new ShiftGenWrapper(); + } + + @Override + public ShiftGenVO entityVO(Shift shift) { + ShiftGenVO shiftVO = Objects.requireNonNull(BeanUtil.copyProperties(shift, ShiftGenVO.class)); + + //User createUser = UserCache.getUser(shift.getCreateUser()); + //User updateUser = UserCache.getUser(shift.getUpdateUser()); + //shiftVO.setCreateUserName(createUser.getName()); + //shiftVO.setUpdateUserName(updateUser.getName()); + + return shiftVO; + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/wrapper/gen/TeamGenWrapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/wrapper/gen/TeamGenWrapper.java new file mode 100644 index 00000000..9a47fa97 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/wrapper/gen/TeamGenWrapper.java @@ -0,0 +1,36 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.wrapper.gen; + +import org.springblade.core.mp.support.BaseEntityWrapper; +import org.springblade.core.tool.utils.BeanUtil; +import org.springblade.desk.basic.pojo.entity.Team; +import org.springblade.desk.basic.pojo.vo.gen.TeamGenVO; + +import java.util.Objects; + +/** + * [班组] 包装类,返回视图层所需的字段 + * + * @author Tom Shuo + * @since 2025-11-20 + */ +public class TeamGenWrapper extends BaseEntityWrapper { + + public static TeamGenWrapper build() { + return new TeamGenWrapper(); + } + + @Override + public TeamGenVO entityVO(Team team) { + TeamGenVO teamVO = Objects.requireNonNull(BeanUtil.copyProperties(team, TeamGenVO.class)); + + //User createUser = UserCache.getUser(team.getCreateUser()); + //User updateUser = UserCache.getUser(team.getUpdateUser()); + //teamVO.setCreateUserName(createUser.getName()); + //teamVO.setUpdateUserName(updateUser.getName()); + + return teamVO; + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/wrapper/gen/WorkstationGenWrapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/wrapper/gen/WorkstationGenWrapper.java new file mode 100644 index 00000000..693d8924 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/wrapper/gen/WorkstationGenWrapper.java @@ -0,0 +1,36 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.wrapper.gen; + +import org.springblade.core.mp.support.BaseEntityWrapper; +import org.springblade.core.tool.utils.BeanUtil; +import org.springblade.desk.basic.pojo.entity.Workstation; +import org.springblade.desk.basic.pojo.vo.gen.WorkstationGenVO; + +import java.util.Objects; + +/** + * [作业中心] 包装类,返回视图层所需的字段 + * + * @author Tom Shuo + * @since 2025-11-20 + */ +public class WorkstationGenWrapper extends BaseEntityWrapper { + + public static WorkstationGenWrapper build() { + return new WorkstationGenWrapper(); + } + + @Override + public WorkstationGenVO entityVO(Workstation workstation) { + WorkstationGenVO workstationVO = Objects.requireNonNull(BeanUtil.copyProperties(workstation, WorkstationGenVO.class)); + + //User createUser = UserCache.getUser(workstation.getCreateUser()); + //User updateUser = UserCache.getUser(workstation.getUpdateUser()); + //workstationVO.setCreateUserName(createUser.getName()); + //workstationVO.setUpdateUserName(updateUser.getName()); + + return workstationVO; + } +}