From a0e0eca428f47c4d796f1d0917041b072b8e7aac Mon Sep 17 00:00:00 2001
From: lohir <3399054449@qq.com>
Date: 星期二, 22 十月 2024 17:33:38 +0800
Subject: [PATCH] 完成运维考核-工单白名单-列表展示
---
ycl-server/src/main/java/com/ycl/platform/mapper/WorkOrderWhiteMapper.java | 45 +++++++++++
ycl-server/src/main/java/com/ycl/platform/controller/WorkOrderController.java | 18 +++-
ycl-pojo/src/main/java/com/ycl/platform/domain/query/WorkOrderWhiteQuery.java | 20 +++++
ycl-server/src/main/resources/mapper/zgyw/WorkOrderWhiteMapper.xml | 49 ++++++++++++
ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java | 16 ++++
ycl-pojo/src/main/java/com/ycl/platform/domain/entity/WorkOrderWhite.java | 42 ++++++++++
ycl-server/src/main/java/com/ycl/platform/service/WorkOrderService.java | 16 +++-
7 files changed, 198 insertions(+), 8 deletions(-)
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/WorkOrderWhite.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/WorkOrderWhite.java
new file mode 100644
index 0000000..b9554bd
--- /dev/null
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/WorkOrderWhite.java
@@ -0,0 +1,42 @@
+package com.ycl.platform.domain.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 宸ュ崟鐢熸垚鐧藉悕鍗曞璞� t_work_order_white
+ *
+ * @author ruoyi
+ * @date 2024-10-22
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@TableName("t_work_order_white")
+public class WorkOrderWhite
+{
+ private static final long serialVersionUID = 1L;
+
+ /** $column.columnComment */
+ @TableField("id")
+ private Long id;
+
+ /** 璁惧缂栫爜 */
+ @TableField("serial_number")
+ private String serialNumber;
+
+ /** 鐐逛綅鍚嶇О */
+ @TableField("point_name")
+ private String pointName;
+
+ /** 鍒涘缓浜� */
+ @TableField("create_by")
+ private String createBy;
+
+ /** 澶囨敞 */
+ @TableField("remark")
+ private String remark;
+}
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/query/WorkOrderWhiteQuery.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/query/WorkOrderWhiteQuery.java
new file mode 100644
index 0000000..f3bc54f
--- /dev/null
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/query/WorkOrderWhiteQuery.java
@@ -0,0 +1,20 @@
+package com.ycl.platform.domain.query;
+
+import com.ycl.platform.base.AbsQuery;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * @author
+ * @Version 1.0
+ * @Date 2024/10/22
+ * @Description 宸ュ崟鐧藉悕鍗曟煡璇�
+ */
+@Data
+@Accessors(chain = true)
+@ApiModel(value = "宸ュ崟鐧藉悕鍗曟煡璇�", description = "宸ュ崟鐧藉悕鍗曟煡璇�")
+public class WorkOrderWhiteQuery extends AbsQuery {
+ private String serialNumber;
+ private String pointName;
+}
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
index 803340f..b1ab424 100644
--- a/ycl-server/src/main/java/com/ycl/platform/controller/WorkOrderController.java
+++ b/ycl-server/src/main/java/com/ycl/platform/controller/WorkOrderController.java
@@ -2,19 +2,21 @@
import annotation.Log;
import com.ycl.platform.domain.entity.WorkOrderAuditingRecord;
+import com.ycl.platform.domain.entity.WorkOrderWhite;
import com.ycl.platform.domain.form.*;
import com.ycl.platform.domain.query.DistributeWorkOrderQuery;
import com.ycl.platform.domain.query.WorkOrderExportQuery;
import com.ycl.platform.domain.query.WorkOrderQuery;
-import com.ycl.platform.domain.vo.ContractResultVO;
+import com.ycl.platform.domain.query.WorkOrderWhiteQuery;
import com.ycl.platform.domain.vo.DistributeWorkOrderVO;
import com.ycl.platform.domain.vo.WorkOrderVO;
import com.ycl.platform.domain.vo.WorkOrderYwConditionRecordVO;
import com.ycl.platform.service.WorkOrderService;
import com.ycl.system.Result;
+import com.ycl.system.controller.BaseController;
import com.ycl.system.domain.group.Add;
import com.ycl.system.domain.group.Update;
-import com.ycl.utils.PageUtils;
+import com.ycl.system.page.TableDataInfo;
import com.ycl.utils.poi.ExcelUtil;
import enumeration.BusinessType;
import io.swagger.annotations.Api;
@@ -27,7 +29,6 @@
import org.springframework.web.bind.annotation.*;
import java.util.List;
-import java.util.Map;
/**
* 宸ュ崟 鍓嶇鎺у埗鍣�
@@ -40,7 +41,7 @@
@Api(value = "宸ュ崟", tags = "宸ュ崟绠＄悊")
@RestController
@RequestMapping("/work-order")
-public class WorkOrderController {
+public class WorkOrderController extends BaseController {
private final WorkOrderService workOrderService;
@@ -182,4 +183,13 @@
List<WorkOrderAuditingRecord> data = workOrderService.selectYwAuditingListByYwId(workOrderNo);
return Result.ok().data(data);
}
+
+ /**
+ * 鏌ヨ宸ュ崟鐢熸垚鐧藉悕鍗曞垪琛�
+ */
+ @PostMapping("/white/page")
+ public Result whitePage(@RequestBody WorkOrderWhiteQuery workOrderWhiteQuery)
+ {
+ return workOrderService.selectWorkOrderWhiteList(workOrderWhiteQuery);
+ }
}
diff --git a/ycl-server/src/main/java/com/ycl/platform/mapper/WorkOrderWhiteMapper.java b/ycl-server/src/main/java/com/ycl/platform/mapper/WorkOrderWhiteMapper.java
new file mode 100644
index 0000000..b36301b
--- /dev/null
+++ b/ycl-server/src/main/java/com/ycl/platform/mapper/WorkOrderWhiteMapper.java
@@ -0,0 +1,45 @@
+package com.ycl.platform.mapper;
+
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.ycl.platform.domain.entity.WorkOrderWhite;
+import com.ycl.platform.domain.query.WorkOrderWhiteQuery;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 宸ュ崟鐢熸垚鐧藉悕鍗昅apper鎺ュ彛
+ *
+ * @author ruoyi
+ * @date 2024-10-22
+ */
+public interface WorkOrderWhiteMapper
+{
+
+ /**
+ * 鏌ヨ宸ュ崟鐢熸垚鐧藉悕鍗曞垪琛�
+ *
+ * @param page 椤甸潰
+ * @param query 鏌ヨ
+ * @return 宸ュ崟鐢熸垚鐧藉悕鍗曢泦鍚�
+ * @author
+ */
+ IPage<WorkOrderWhite> page(IPage page, @Param("query") WorkOrderWhiteQuery query);
+
+ /**
+ * 鏂板宸ュ崟鐢熸垚鐧藉悕鍗�
+ *
+ * @param workOrderWhite 宸ュ崟鐢熸垚鐧藉悕鍗�
+ * @return 缁撴灉
+ */
+ public int insertWorkOrderWhite(WorkOrderWhite workOrderWhite);
+
+ /**
+ * 鎵归噺鍒犻櫎宸ュ崟鐢熸垚鐧藉悕鍗�
+ *
+ * @param ids 闇�瑕佸垹闄ょ殑鏁版嵁涓婚敭闆嗗悎
+ * @return 缁撴灉
+ */
+ public int deleteWorkOrderWhiteByIds(Long[] ids);
+}
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
index ab3b112..6763898 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/WorkOrderService.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/WorkOrderService.java
@@ -3,15 +3,14 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.ycl.platform.domain.entity.WorkOrder;
import com.ycl.platform.domain.entity.WorkOrderAuditingRecord;
+import com.ycl.platform.domain.entity.WorkOrderWhite;
import com.ycl.platform.domain.form.*;
import com.ycl.platform.domain.query.*;
-import com.ycl.platform.domain.vo.DeviceInfoVO;
-import com.ycl.platform.domain.vo.DistributeWorkOrderVO;
-import com.ycl.platform.domain.vo.WorkOrderVO;
-import com.ycl.platform.domain.vo.WorkOrderYwConditionRecordVO;
+import com.ycl.platform.domain.vo.*;
import com.ycl.platform.domain.vo.screen.WorkOrderRegionVO;
import com.ycl.platform.domain.vo.screen.WorkOrderTotalVO;
import com.ycl.system.Result;
+import com.ycl.system.page.TableDataInfo;
import org.bytedeco.javacv.FFmpegFrameGrabber;
import java.util.Date;
@@ -236,4 +235,13 @@
Result detailByNo(String workOrderNo);
List<WorkOrderVO> export(WorkOrderExportQuery query);
+
+ /**
+ * 宸ュ崟鐧藉悕鍗曞垪琛�
+ *
+ * @param workOrderWhiteQuery 鐧借壊宸ュ崟鏌ヨ
+ * @return {@link TableDataInfo }
+ * @author
+ */
+ Result selectWorkOrderWhiteList(WorkOrderWhiteQuery workOrderWhiteQuery);
}
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
index dba4383..213bdf1 100644
--- 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
@@ -3,6 +3,7 @@
import com.alibaba.excel.annotation.format.DateTimeFormat;
import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
@@ -94,6 +95,7 @@
private final SysConfigMapper configMapper;
private final ReportMapper reportMapper;
private final WorkOrderCheckImgMapper workOrderCheckImgMapper;
+ private final WorkOrderWhiteMapper workOrderWhiteMapper;
@Value("${rtsp.server:http://127.0.0.1:7788}")
private String rtspServer;
@@ -985,4 +987,18 @@
System.out.println(export);
return export;
}
+
+ /**
+ * 宸ュ崟鐧藉悕鍗曞垪琛�
+ *
+ * @param query 鏌ヨ
+ * @return {@link List }<{@link WorkOrderWhite }>
+ * @author
+ */
+ @Override
+ public Result selectWorkOrderWhiteList(WorkOrderWhiteQuery query) {
+ IPage<WorkOrderWhite> page = PageUtil.getPage(query, WorkOrderWhite.class);
+ workOrderWhiteMapper.page(page, query);
+ return Result.ok().data(page.getRecords()).total(page.getTotal());
+ }
}
diff --git a/ycl-server/src/main/resources/mapper/zgyw/WorkOrderWhiteMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/WorkOrderWhiteMapper.xml
new file mode 100644
index 0000000..b9dc12e
--- /dev/null
+++ b/ycl-server/src/main/resources/mapper/zgyw/WorkOrderWhiteMapper.xml
@@ -0,0 +1,49 @@
+<?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.WorkOrderWhiteMapper">
+
+ <resultMap type="WorkOrderWhite" id="WorkOrderWhiteResult">
+ <result property="id" column="id" />
+ <result property="serialNumber" column="serial_number" />
+ <result property="pointName" column="point_name" />
+ <result property="createBy" column="create_by" />
+ <result property="remark" column="remark" />
+ </resultMap>
+
+ <sql id="selectWorkOrderWhiteVo">
+ select id, serial_number, point_name, create_by, remark from t_work_order_white
+ </sql>
+
+ <select id="page" parameterType="Long" resultMap="WorkOrderWhiteResult">
+ <include refid="selectWorkOrderWhiteVo"/>
+ <where>
+ <if test="query.serialNumber != null and query.serialNumber != ''"> and serial_number = #{query.serialNumber}</if>
+ <if test="query.pointName != null and query.pointName != ''"> and point_name like concat('%', #{query.pointName}, '%')</if>
+ </where>
+ </select>
+
+ <insert id="insertWorkOrderWhite" parameterType="WorkOrderWhite" useGeneratedKeys="true" keyProperty="id">
+ insert into t_work_order_white
+ <trim prefix="(" suffix=")" suffixOverrides=",">
+ <if test="serialNumber != null and serialNumber != ''">serial_number,</if>
+ <if test="pointName != null and pointName != ''">point_name,</if>
+ <if test="createBy != null">create_by,</if>
+ <if test="remark != null">remark,</if>
+ </trim>
+ <trim prefix="values (" suffix=")" suffixOverrides=",">
+ <if test="serialNumber != null and serialNumber != ''">#{serialNumber},</if>
+ <if test="pointName != null and pointName != ''">#{pointName},</if>
+ <if test="createBy != null">#{createBy},</if>
+ <if test="remark != null">#{remark},</if>
+ </trim>
+ </insert>
+
+ <delete id="deleteWorkOrderWhiteByIds" parameterType="String">
+ delete from t_work_order_white where id in
+ <foreach item="id" collection="array" open="(" separator="," close=")">
+ #{id}
+ </foreach>
+ </delete>
+</mapper>
\ No newline at end of file
--
Gitblit v1.8.0