diff --git a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/service/impl/CustomerMainServiceImpl.java b/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/service/impl/CustomerMainServiceImpl.java index 94c1e49d..9e3dce3a 100644 --- a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/service/impl/CustomerMainServiceImpl.java +++ b/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/service/impl/CustomerMainServiceImpl.java @@ -108,6 +108,7 @@ public class CustomerMainServiceImpl extends ServiceImpl createWorker(@Valid @RequestBody RepairWorkerSaveReqVO createReqVO) { + return success(workerService.createWorker(createReqVO)); + } + + @PutMapping("/update") + @Operation(summary = "更新维修工人") + public CommonResult updateWorker(@Valid @RequestBody RepairWorkerSaveReqVO updateReqVO) { + workerService.updateWorker(updateReqVO); + return success(true); + } + + @DeleteMapping("/delete") + @Operation(summary = "删除维修工人") + @Parameter(name = "id", description = "编号", required = true) + public CommonResult deleteWorker(@RequestParam("id") String id) { + workerService.deleteWorker(id); + return success(true); + } + + @GetMapping("/get") + @Operation(summary = "获得维修工人") + @Parameter(name = "id", description = "编号", required = true, example = "1024") + public CommonResult getWorker(@RequestParam("id") String id) { + RepairWorker worker = workerService.getWorker(id); + return success(BeanUtils.toBean(worker, RepairWorkerRespVO.class)); + } + + /** + * 分页查询维修工人 + * @author PQZ + * @date 14:10 2024/10/9 + * @param pageReqVO RepairWorkerPageReqVO实体 + * @return cn.iocoder.yudao.framework.common.pojo.CommonResult> + **/ + @GetMapping("/page") + @Operation(summary = "获得维修工人分页") + public CommonResult> getWorkerPage(RepairWorkerPageReqVO pageReqVO, + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) { + Page page = new Page<>(pageNo,pageSize); + return success(workerService.queryListPage(pageReqVO,page)); + } + + +} \ No newline at end of file diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/base/entity/RepairWorker.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/base/entity/RepairWorker.java new file mode 100644 index 00000000..2bf5c02a --- /dev/null +++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/base/entity/RepairWorker.java @@ -0,0 +1,49 @@ +package cn.iocoder.yudao.module.base.entity; + +import cn.iocoder.yudao.framework.tenant.core.db.TenantBaseDO; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.*; + +/** + * 维修工人 DO + * + * @author pqz + */ +@TableName("dl_repair_worker") +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class RepairWorker extends TenantBaseDO { + + /** + * 主键标识 + */ + @TableId(type = IdType.ASSIGN_UUID) + private String id; + /** + * 用户id + */ + private String userId; + /** + * 维修工人名称 + */ + private String userName; + /** + * 工种 + */ + private String workType; + /** + * 是否为组长(0代表不是 1代表是) + */ + private String isLeads; + /** + * 备注 + */ + private String remark; + +} \ No newline at end of file diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/base/mapper/RepairWorkerMapper.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/base/mapper/RepairWorkerMapper.java new file mode 100644 index 00000000..9ab4ea7a --- /dev/null +++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/base/mapper/RepairWorkerMapper.java @@ -0,0 +1,29 @@ +package cn.iocoder.yudao.module.base.mapper; + +import cn.iocoder.yudao.module.base.entity.RepairWorker; +import cn.iocoder.yudao.module.base.vo.RepairWorkerPageReqVO; +import cn.iocoder.yudao.module.base.vo.RepairWorkerRespVO; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +/** + * 维修工人 Mapper + * + * @author pqz + */ +@Mapper +public interface RepairWorkerMapper extends BaseMapper { + + /** + * @param entity RepairWorkerPageReqVO实体 + * @param page 分页参数 + * @return com.baomidou.mybatisplus.core.metadata.IPage + * @author PQZ + * @date 14:13 2024/10/9 + **/ + IPage queryListPage(@Param("entity") RepairWorkerPageReqVO entity, Page page); + +} \ No newline at end of file diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/base/service/RepairWorkerService.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/base/service/RepairWorkerService.java new file mode 100644 index 00000000..fc2966df --- /dev/null +++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/base/service/RepairWorkerService.java @@ -0,0 +1,63 @@ +package cn.iocoder.yudao.module.base.service; + +import cn.iocoder.yudao.framework.common.pojo.PageResult; +import cn.iocoder.yudao.module.base.entity.RepairWorker; +import cn.iocoder.yudao.module.base.vo.RepairWorkerPageReqVO; +import cn.iocoder.yudao.module.base.vo.RepairWorkerRespVO; +import cn.iocoder.yudao.module.base.vo.RepairWorkerSaveReqVO; +import cn.iocoder.yudao.module.project.vo.RepairProjectPageReqVO; +import cn.iocoder.yudao.module.project.vo.RepairProjectRespVO; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; + +import javax.validation.Valid; + +/** + * 维修工人 Service 接口 + * + * @author pqz + */ +public interface RepairWorkerService extends IService { + + /** + * 创建维修工人 + * + * @param createReqVO 创建信息 + * @return 编号 + */ + String createWorker(@Valid RepairWorkerSaveReqVO createReqVO); + + /** + * 更新维修工人 + * + * @param updateReqVO 更新信息 + */ + void updateWorker(@Valid RepairWorkerSaveReqVO updateReqVO); + + /** + * 删除维修工人 + * + * @param id 编号 + */ + void deleteWorker(String id); + + /** + * 获得维修工人 + * + * @param id 编号 + * @return 维修工人 + */ + RepairWorker getWorker(String id); + + + /** + * @param pageReqVO RepairWorkerPageReqVO实体 + * @param page 分页参数 + * @return com.baomidou.mybatisplus.core.metadata.IPage + * @author PQZ + * @date 14:12 2024/10/9 + **/ + IPage queryListPage(RepairWorkerPageReqVO pageReqVO, Page page); + +} \ No newline at end of file diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/base/service/impl/RepairWorkerServiceImpl.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/base/service/impl/RepairWorkerServiceImpl.java new file mode 100644 index 00000000..809aefd9 --- /dev/null +++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/base/service/impl/RepairWorkerServiceImpl.java @@ -0,0 +1,70 @@ +package cn.iocoder.yudao.module.base.service.impl; + +import cn.iocoder.yudao.framework.common.util.object.BeanUtils; +import cn.iocoder.yudao.module.base.entity.RepairWorker; +import cn.iocoder.yudao.module.base.mapper.RepairWorkerMapper; +import cn.iocoder.yudao.module.base.service.RepairWorkerService; +import cn.iocoder.yudao.module.base.vo.RepairWorkerPageReqVO; +import cn.iocoder.yudao.module.base.vo.RepairWorkerRespVO; +import cn.iocoder.yudao.module.base.vo.RepairWorkerSaveReqVO; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; +import org.springframework.validation.annotation.Validated; + +import javax.annotation.Resource; + +/** + * 维修工人 Service 实现类 + * + * @author pqz + */ +@Service +@Validated +public class RepairWorkerServiceImpl extends ServiceImpl implements RepairWorkerService { + + @Resource + private RepairWorkerMapper workerMapper; + + @Override + public String createWorker(RepairWorkerSaveReqVO createReqVO) { + // 插入 + RepairWorker worker = BeanUtils.toBean(createReqVO, RepairWorker.class); + workerMapper.insert(worker); + // 返回 + return worker.getId(); + } + + @Override + public void updateWorker(RepairWorkerSaveReqVO updateReqVO) { + // 更新 + RepairWorker updateObj = BeanUtils.toBean(updateReqVO, RepairWorker.class); + workerMapper.updateById(updateObj); + } + + @Override + public void deleteWorker(String id) { + // 删除 + workerMapper.deleteById(id); + } + + + @Override + public RepairWorker getWorker(String id) { + return workerMapper.selectById(id); + } + + /** + * @param pageReqVO RepairWorkerPageReqVO实体 + * @param page 分页参数 + * @return com.baomidou.mybatisplus.core.metadata.IPage + * @author PQZ + * @date 14:12 2024/10/9 + **/ + @Override + public IPage queryListPage(RepairWorkerPageReqVO pageReqVO, Page page) { + return workerMapper.queryListPage(pageReqVO,page); + } + +} \ No newline at end of file diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/base/vo/RepairWorkerPageReqVO.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/base/vo/RepairWorkerPageReqVO.java new file mode 100644 index 00000000..7c851264 --- /dev/null +++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/base/vo/RepairWorkerPageReqVO.java @@ -0,0 +1,16 @@ +package cn.iocoder.yudao.module.base.vo; + +import cn.iocoder.yudao.module.base.entity.RepairWorker; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; + +@Schema(description = "接受分页查询参数") +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class RepairWorkerPageReqVO extends RepairWorker { + + +} \ No newline at end of file diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/base/vo/RepairWorkerRespVO.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/base/vo/RepairWorkerRespVO.java new file mode 100644 index 00000000..fc5bcb42 --- /dev/null +++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/base/vo/RepairWorkerRespVO.java @@ -0,0 +1,16 @@ +package cn.iocoder.yudao.module.base.vo; + +import cn.iocoder.yudao.module.base.entity.RepairWorker; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.*; +import java.util.*; +import com.alibaba.excel.annotation.*; + +@Schema(description = "管理后台 - 维修工人 Response VO") +@Data +@ExcelIgnoreUnannotated +public class RepairWorkerRespVO extends RepairWorker { + + + +} \ No newline at end of file diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/base/vo/RepairWorkerSaveReqVO.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/base/vo/RepairWorkerSaveReqVO.java new file mode 100644 index 00000000..a929ad15 --- /dev/null +++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/base/vo/RepairWorkerSaveReqVO.java @@ -0,0 +1,15 @@ +package cn.iocoder.yudao.module.base.vo; + +import cn.iocoder.yudao.module.base.entity.RepairWorker; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.*; +import java.util.*; +import javax.validation.constraints.*; + +@Schema(description = "管理后台 - 维修工人新增/修改 Request VO") +@Data +public class RepairWorkerSaveReqVO extends RepairWorker { + + + +} \ No newline at end of file diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/project/controller/admin/RepairProjectController.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/project/controller/admin/RepairProjectController.java index 07dc3013..c2874b70 100644 --- a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/project/controller/admin/RepairProjectController.java +++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/project/controller/admin/RepairProjectController.java @@ -44,7 +44,6 @@ public class RepairProjectController { **/ @PostMapping("/create") @Operation(summary = "创建维修项目") -// @PreAuthorize("@ss.hasPermission('repair:project:create')") public CommonResult createRepairProject(@Valid @RequestBody RepairProjectSaveReqVO createReqVO) { RepairProject repairProject = repairProjectService.saveRepairProject(createReqVO); return success(repairProject); @@ -60,7 +59,6 @@ public class RepairProjectController { **/ @PutMapping("/update") @Operation(summary = "更新维修项目") -// @PreAuthorize("@ss.hasPermission('repair:project:update')") public CommonResult updateRepairProject(@Valid @RequestBody RepairProjectSaveReqVO updateReqVO) { repairProjectService.saveRepairProject(updateReqVO); return success(true); @@ -77,7 +75,6 @@ public class RepairProjectController { @DeleteMapping("/delete") @Operation(summary = "删除维修项目") @Parameter(name = "id", description = "编号", required = true) -// @PreAuthorize("@ss.hasPermission('repair:project:delete')") public CommonResult deleteRepairProject(@RequestParam("id") String id) { repairProjectService.deleteRepairProject(id); return success(true); @@ -94,7 +91,6 @@ public class RepairProjectController { @GetMapping("/get") @Operation(summary = "获得维修项目") @Parameter(name = "id", description = "编号", required = true, example = "1024") -// @PreAuthorize("@ss.hasPermission('repair:project:query')") public CommonResult getRepairProject(@RequestParam("id") String id) { RepairProject repairProject = repairProjectService.getRepairProject(id); return success(BeanUtils.toBean(repairProject, RepairProjectRespVO.class)); @@ -113,7 +109,6 @@ public class RepairProjectController { **/ @GetMapping("/page") @Operation(summary = "获得维修项目分页") -// @PreAuthorize("@ss.hasPermission('repair:project:query')") public CommonResult> getRepairProjectPage(RepairProjectPageReqVO pageReqVO, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) { diff --git a/dl-module-repair/src/main/resources/mapper/base/RepairWorkerMapper.xml b/dl-module-repair/src/main/resources/mapper/base/RepairWorkerMapper.xml new file mode 100644 index 00000000..9deb9ab3 --- /dev/null +++ b/dl-module-repair/src/main/resources/mapper/base/RepairWorkerMapper.xml @@ -0,0 +1,27 @@ + + + + + + + + \ No newline at end of file