From 7fe002810d3d6081699a4c0eb8958d9952bd64d0 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期二, 05 三月 2024 11:29:27 +0800
Subject: [PATCH] 工单管理
---
ycl-pojo/src/main/java/com/ycl/platform/domain/entity/WorkOrder.java | 57 ++++++
ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml | 18 ++
ycl-pojo/src/main/java/com/ycl/platform/domain/form/WorkOrderForm.java | 65 +++++++
ycl-server/src/main/java/com/ycl/platform/controller/WorkOrderController.java | 75 ++++++++
ycl-pojo/src/main/java/com/ycl/platform/domain/vo/WorkOrderVO.java | 54 ++++++
ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java | 145 ++++++++++++++++
ycl-server/src/main/java/com/ycl/platform/mapper/WorkOrderMapper.java | 19 ++
ycl-pojo/src/main/java/com/ycl/platform/domain/query/WorkOrderQuery.java | 23 ++
ycl-server/src/main/java/com/ycl/platform/service/WorkOrderService.java | 65 +++++++
9 files changed, 521 insertions(+), 0 deletions(-)
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/WorkOrder.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/WorkOrder.java
new file mode 100644
index 0000000..b2f51d8
--- /dev/null
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/WorkOrder.java
@@ -0,0 +1,57 @@
+package com.ycl.platform.domain.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+import com.ycl.platform.base.AbsEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 宸ュ崟
+ *
+ * @author xp
+ * @since 2024-03-05
+ */
+@Data
+@Accessors(chain = true)
+@TableName("t_work_order")
+@ApiModel(value = "WorkOrder瀵硅薄", description = "宸ュ崟")
+public class WorkOrder extends AbsEntity {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty("宸ュ崟鍙�")
+ @TableField("work_order_no")
+ private String workOrderNo;
+
+ @ApiModelProperty("杩愮淮鍗曚綅")
+ @TableField("unit_id")
+ private Integer unitId;
+
+ @ApiModelProperty("杩愮淮浜哄憳")
+ @TableField("yw_people_id")
+ private Integer ywPeopleId;
+
+ @ApiModelProperty("杩愮淮澶勭悊鏃堕棿")
+ @TableField("yw_handle_time")
+ private LocalDateTime ywHandleTime;
+
+ @ApiModelProperty("杩愮淮缁撴灉")
+ @TableField("yw_result")
+ private String ywResult;
+
+ @ApiModelProperty("杩愮淮鎯呭喌")
+ @TableField("yw_condition")
+ private String ywCondition;
+
+ @ApiModelProperty("杩愮淮妫�娴嬬粨鏋�")
+ @TableField("yw_check_result")
+ private String ywCheckResult;
+
+
+}
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/form/WorkOrderForm.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/form/WorkOrderForm.java
new file mode 100644
index 0000000..95a5a34
--- /dev/null
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/form/WorkOrderForm.java
@@ -0,0 +1,65 @@
+package com.ycl.platform.domain.form;
+
+import com.ycl.system.domain.group.Update;
+import com.ycl.system.domain.group.Add;
+import com.ycl.platform.base.AbsForm;
+import com.ycl.platform.domain.entity.WorkOrder;
+import org.springframework.beans.BeanUtils;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import org.springframework.lang.NonNull;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.time.LocalDateTime;
+
+/**
+ * 宸ュ崟琛ㄥ崟
+ *
+ * @author xp
+ * @since 2024-03-05
+ */
+@Data
+@Accessors(chain = true)
+@ApiModel(value = "WorkOrder琛ㄥ崟", description = "宸ュ崟琛ㄥ崟")
+public class WorkOrderForm extends AbsForm {
+
+ @NotBlank(message = "宸ュ崟鍙蜂笉鑳戒负绌�", groups = {Add.class, Update.class})
+ @ApiModelProperty("宸ュ崟鍙�")
+ private String workOrderNo;
+
+ @NotNull(message = "杩愮淮鍗曚綅涓嶈兘涓虹┖", groups = {Add.class, Update.class})
+ @ApiModelProperty("杩愮淮鍗曚綅")
+ private Integer unitId;
+
+ @NotNull(message = "杩愮淮浜哄憳涓嶈兘涓虹┖", groups = {Add.class, Update.class})
+ @ApiModelProperty("杩愮淮浜哄憳")
+ private Integer ywPeopleId;
+
+ @NotNull(message = "杩愮淮澶勭悊鏃堕棿涓嶈兘涓虹┖", groups = {Add.class, Update.class})
+ @ApiModelProperty("杩愮淮澶勭悊鏃堕棿")
+ private LocalDateTime ywHandleTime;
+
+ @NotBlank(message = "杩愮淮缁撴灉涓嶈兘涓虹┖", groups = {Add.class, Update.class})
+ @ApiModelProperty("杩愮淮缁撴灉")
+ private String ywResult;
+
+ @NotBlank(message = "杩愮淮鎯呭喌涓嶈兘涓虹┖", groups = {Add.class, Update.class})
+ @ApiModelProperty("杩愮淮鎯呭喌")
+ private String ywCondition;
+
+ @NotBlank(message = "杩愮淮妫�娴嬬粨鏋滀笉鑳戒负绌�", groups = {Add.class, Update.class})
+ @ApiModelProperty("杩愮淮妫�娴嬬粨鏋�")
+ private String ywCheckResult;
+
+ public static WorkOrder getEntityByForm(@NonNull WorkOrderForm form, WorkOrder entity) {
+ if(entity == null) {
+ entity = new WorkOrder();
+ }
+ BeanUtils.copyProperties(form, entity);
+ return entity;
+ }
+
+}
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/query/WorkOrderQuery.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/query/WorkOrderQuery.java
new file mode 100644
index 0000000..13d3d68
--- /dev/null
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/query/WorkOrderQuery.java
@@ -0,0 +1,23 @@
+package com.ycl.platform.domain.query;
+
+import com.ycl.platform.base.AbsQuery;
+import java.util.List;
+import org.springframework.lang.NonNull;
+import jakarta.validation.constraints.NotBlank;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 宸ュ崟鏌ヨ
+ *
+ * @author xp
+ * @since 2024-03-05
+ */
+@Data
+@Accessors(chain = true)
+@ApiModel(value = "WorkOrder鏌ヨ", description = "宸ュ崟鏌ヨ")
+public class WorkOrderQuery extends AbsQuery {
+}
+
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/WorkOrderVO.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/WorkOrderVO.java
new file mode 100644
index 0000000..0c3f2a5
--- /dev/null
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/WorkOrderVO.java
@@ -0,0 +1,54 @@
+package com.ycl.platform.domain.vo;
+
+import com.ycl.platform.base.AbsVo;
+import com.ycl.platform.domain.entity.WorkOrder;
+
+import java.time.LocalDateTime;
+import java.util.List;
+import org.springframework.lang.NonNull;
+import org.springframework.beans.BeanUtils;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 宸ュ崟灞曠ず
+ *
+ * @author xp
+ * @since 2024-03-05
+ */
+@Data
+@Accessors(chain = true)
+public class WorkOrderVO extends AbsVo {
+
+ /** 宸ュ崟鍙� */
+ private String workOrderNo;
+
+ /** 杩愮淮鍗曚綅 */
+ private Integer unitId;
+
+ /** 杩愮淮浜哄憳 */
+ private Integer ywPeopleId;
+
+ /** 杩愮淮澶勭悊鏃堕棿 */
+ private LocalDateTime ywHandleTime;
+
+ /** 杩愮淮缁撴灉 */
+ private String ywResult;
+
+ /** 杩愮淮鎯呭喌 */
+ private String ywCondition;
+
+ /** 杩愮淮妫�娴嬬粨鏋� */
+ private String ywCheckResult;
+
+ public static WorkOrderVO getVoByEntity(@NonNull WorkOrder entity, WorkOrderVO vo) {
+ if(vo == null) {
+ vo = new WorkOrderVO();
+ }
+ BeanUtils.copyProperties(entity, vo);
+ return vo;
+ }
+
+}
diff --git a/ycl-server/src/main/java/com/ycl/platform/controller/WorkOrderController.java b/ycl-server/src/main/java/com/ycl/platform/controller/WorkOrderController.java
new file mode 100644
index 0000000..4c57917
--- /dev/null
+++ b/ycl-server/src/main/java/com/ycl/platform/controller/WorkOrderController.java
@@ -0,0 +1,75 @@
+package com.ycl.platform.controller;
+
+import com.ycl.system.domain.group.Update;
+import com.ycl.system.domain.group.Add;
+import org.springframework.validation.annotation.Validated;
+import lombok.RequiredArgsConstructor;
+import java.util.List;
+import org.springframework.validation.annotation.Validated;
+import jakarta.validation.constraints.NotEmpty;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import com.ycl.platform.service.WorkOrderService;
+import com.ycl.system.Result;
+import com.ycl.platform.domain.form.WorkOrderForm;
+import com.ycl.platform.domain.query.WorkOrderQuery;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * 宸ュ崟 鍓嶇鎺у埗鍣�
+ *
+ * @author xp
+ * @since 2024-03-05
+ */
+@Validated
+@RequiredArgsConstructor
+@Api(value = "宸ュ崟", tags = "宸ュ崟绠＄悊")
+@RestController
+@RequestMapping("/work-order")
+public class WorkOrderController {
+
+ private final WorkOrderService workOrderService;
+
+ @PostMapping
+ @ApiOperation(value = "娣诲姞", notes = "娣诲姞")
+ public Result add(@RequestBody @Validated(Add.class) WorkOrderForm form) {
+ return workOrderService.add(form);
+ }
+
+ @PutMapping
+ @ApiOperation(value = "淇敼", notes = "淇敼")
+ public Result update(@RequestBody @Validated(Update.class) WorkOrderForm form) {
+ return workOrderService.update(form);
+ }
+
+ @DeleteMapping("/{id}")
+ @ApiOperation(value = "ID鍒犻櫎", notes = "ID鍒犻櫎")
+ public Result removeById(@PathVariable("id") String id) {
+ return workOrderService.removeById(id);
+ }
+
+ @DeleteMapping("/batch")
+ @ApiOperation(value = "鎵归噺鍒犻櫎", notes = "鎵归噺鍒犻櫎")
+ public Result remove(@RequestBody @NotEmpty(message = "璇烽�夋嫨鏁版嵁") List<String> ids) {
+ return workOrderService.remove(ids);
+ }
+
+ @GetMapping("/page")
+ @ApiOperation(value = "鍒嗛〉", notes = "鍒嗛〉")
+ public Result page(WorkOrderQuery query) {
+ return workOrderService.page(query);
+ }
+
+ @GetMapping("/{id}")
+ @ApiOperation(value = "璇︽儏", notes = "璇︽儏")
+ public Result detail(@PathVariable("id") String id) {
+ return workOrderService.detail(id);
+ }
+
+ @GetMapping("/list")
+ @ApiOperation(value = "鍒楄〃", notes = "鍒楄〃")
+ public Result list() {
+ return workOrderService.all();
+ }
+}
diff --git a/ycl-server/src/main/java/com/ycl/platform/mapper/WorkOrderMapper.java b/ycl-server/src/main/java/com/ycl/platform/mapper/WorkOrderMapper.java
new file mode 100644
index 0000000..b9a996c
--- /dev/null
+++ b/ycl-server/src/main/java/com/ycl/platform/mapper/WorkOrderMapper.java
@@ -0,0 +1,19 @@
+package com.ycl.platform.mapper;
+
+import com.ycl.platform.domain.entity.WorkOrder;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ycl.platform.domain.vo.WorkOrderVO;
+import com.ycl.platform.domain.form.WorkOrderForm;
+import java.util.List;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 宸ュ崟 Mapper 鎺ュ彛
+ *
+ * @author xp
+ * @since 2024-03-05
+ */
+@Mapper
+public interface WorkOrderMapper extends BaseMapper<WorkOrder> {
+
+}
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/WorkOrderService.java b/ycl-server/src/main/java/com/ycl/platform/service/WorkOrderService.java
new file mode 100644
index 0000000..363b852
--- /dev/null
+++ b/ycl-server/src/main/java/com/ycl/platform/service/WorkOrderService.java
@@ -0,0 +1,65 @@
+package com.ycl.platform.service;
+
+import com.ycl.platform.domain.entity.WorkOrder;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ycl.system.Result;
+import com.ycl.platform.domain.form.WorkOrderForm;
+import com.ycl.platform.domain.query.WorkOrderQuery;
+import java.util.List;
+
+/**
+ * 宸ュ崟 鏈嶅姟绫�
+ *
+ * @author xp
+ * @since 2024-03-05
+ */
+public interface WorkOrderService extends IService<WorkOrder> {
+
+ /**
+ * 娣诲姞
+ * @param form
+ * @return
+ */
+ Result add(WorkOrderForm form);
+
+ /**
+ * 淇敼
+ * @param form
+ * @return
+ */
+ Result update(WorkOrderForm form);
+
+ /**
+ * 鎵归噺鍒犻櫎
+ * @param ids
+ * @return
+ */
+ Result remove(List<String> ids);
+
+ /**
+ * id鍒犻櫎
+ * @param id
+ * @return
+ */
+ Result removeById(String id);
+
+ /**
+ * 鍒嗛〉鏌ヨ
+ * @param query
+ * @return
+ */
+ Result page(WorkOrderQuery query);
+
+ /**
+ * 鏍规嵁id鏌ユ壘
+ * @param id
+ * @return
+ */
+ Result detail(String id);
+
+ /**
+ * 鍒楄〃
+ * @return
+ */
+ Result all();
+}
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java
new file mode 100644
index 0000000..b0ef736
--- /dev/null
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java
@@ -0,0 +1,145 @@
+package com.ycl.platform.service.impl;
+
+import com.ycl.platform.domain.entity.WorkOrder;
+import com.ycl.platform.mapper.WorkOrderMapper;
+import com.ycl.platform.service.WorkOrderService;
+import com.ycl.system.Result;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ycl.platform.domain.form.WorkOrderForm;
+import com.ycl.platform.domain.vo.WorkOrderVO;
+import com.ycl.platform.domain.query.WorkOrderQuery;
+import java.util.List;
+import org.apache.commons.lang3.StringUtils;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.ycl.system.page.PageUtil;
+import org.springframework.stereotype.Service;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.beans.BeanUtils;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.Assert;
+import java.util.ArrayList;
+import java.util.stream.Collectors;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
+import lombok.RequiredArgsConstructor;
+
+/**
+ * 宸ュ崟 鏈嶅姟瀹炵幇绫�
+ *
+ * @author xp
+ * @since 2024-03-05
+ */
+@Service
+@RequiredArgsConstructor
+public class WorkOrderServiceImpl extends ServiceImpl<WorkOrderMapper, WorkOrder> implements WorkOrderService {
+
+ private final WorkOrderMapper workOrderMapper;
+
+ /**
+ * 娣诲姞
+ * @param form
+ * @return
+ */
+ @Override
+ public Result add(WorkOrderForm form) {
+ WorkOrder entity = WorkOrderForm.getEntityByForm(form, null);
+ if(baseMapper.insert(entity) > 0) {
+ return Result.ok("娣诲姞鎴愬姛");
+ }
+ return Result.error("娣诲姞澶辫触");
+ }
+
+ /**
+ * 淇敼
+ * @param form
+ * @return
+ */
+ @Override
+ public Result update(WorkOrderForm form) {
+
+ WorkOrder entity = baseMapper.selectById(form.getId());
+
+ // 涓虹┖鎶汭llegalArgumentException锛屽仛鍏ㄥ眬寮傚父澶勭悊
+ Assert.notNull(entity, "璁板綍涓嶅瓨鍦�");
+ BeanUtils.copyProperties(form, entity);
+ if (baseMapper.updateById(entity) > 0) {
+ return Result.ok("淇敼鎴愬姛");
+ }
+ return Result.error("淇敼澶辫触");
+ }
+
+ /**
+ * 鎵归噺鍒犻櫎
+ * @param ids
+ * @return
+ */
+ @Override
+ public Result remove(List<String> ids) {
+ if(baseMapper.deleteBatchIds(ids) > 0) {
+ return Result.ok("鍒犻櫎鎴愬姛");
+ }
+ return Result.error("鍒犻櫎澶辫触");
+ }
+
+ /**
+ * id鍒犻櫎
+ * @param id
+ * @return
+ */
+ @Override
+ public Result removeById(String id) {
+ if(baseMapper.deleteById(id) > 0) {
+ return Result.ok("鍒犻櫎鎴愬姛");
+ }
+ return Result.error("鍒犻櫎澶辫触");
+ }
+
+ /**
+ * 鍒嗛〉鏌ヨ
+ * @param query
+ * @return
+ */
+ @Override
+ public Result page(WorkOrderQuery query) {
+
+ IPage<WorkOrder> page = new LambdaQueryChainWrapper<>(baseMapper)
+ .orderByDesc(WorkOrder::getCreateTime)
+ .page(PageUtil.getPage(query, WorkOrder.class));
+
+ List<WorkOrderVO> vos = page.getRecords().stream()
+ .map(
+ entity -> WorkOrderVO.getVoByEntity(entity, null)
+ )
+ .collect(Collectors.toList());
+ return Result.ok().data(vos).total(page.getTotal());
+ }
+
+ /**
+ * 鏍规嵁id鏌ユ壘
+ * @param id
+ * @return
+ */
+ @Override
+ public Result detail(String id) {
+
+ WorkOrder entity = baseMapper.selectById(id);
+ Assert.notNull(entity, "璁板綍涓嶅瓨鍦�");
+ WorkOrderVO vo = WorkOrderVO.getVoByEntity(entity, null);
+ return Result.ok().data(vo);
+ }
+
+ /**
+ * 鍒楄〃
+ * @return
+ */
+ @Override
+ public Result all() {
+ List<WorkOrder> entities = baseMapper.selectList(null);
+ List<WorkOrderVO> vos = entities.stream()
+ .map(
+ entity -> WorkOrderVO.getVoByEntity(entity, null)
+ )
+ .collect(Collectors.toList());
+ return Result.ok().data(vos);
+ }
+}
diff --git a/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
new file mode 100644
index 0000000..2c73866
--- /dev/null
+++ b/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ycl.platform.mapper.WorkOrderMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.ycl.platform.domain.vo.WorkOrderVO">
+ <result column="id" property="id" />
+ <result column="create_time" property="createTime" />
+ <result column="work_order_no" property="workOrderNo" />
+ <result column="unit_id" property="unitId" />
+ <result column="yw_people_id" property="ywPeopleId" />
+ <result column="yw_handle_time" property="ywHandleTime" />
+ <result column="yw_result" property="ywResult" />
+ <result column="yw_condition" property="ywCondition" />
+ <result column="yw_check_result" property="ywCheckResult" />
+ </resultMap>
+
+</mapper>
--
Gitblit v1.8.0