ycl-pojo/src/main/java/com/ycl/platform/domain/entity/WorkOrderWhite.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
ycl-pojo/src/main/java/com/ycl/platform/domain/query/WorkOrderWhiteQuery.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
ycl-server/src/main/java/com/ycl/platform/controller/WorkOrderController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
ycl-server/src/main/java/com/ycl/platform/mapper/WorkOrderWhiteMapper.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
ycl-server/src/main/java/com/ycl/platform/service/WorkOrderService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
ycl-server/src/main/resources/mapper/zgyw/WorkOrderWhiteMapper.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
ycl-pojo/src/main/java/com/ycl/platform/domain/entity/WorkOrderWhite.java
New file @@ -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; } ycl-pojo/src/main/java/com/ycl/platform/domain/query/WorkOrderWhiteQuery.java
New file @@ -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; } 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); } } ycl-server/src/main/java/com/ycl/platform/mapper/WorkOrderWhiteMapper.java
New file @@ -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; /** * 工单生成白名单Mapper接口 * * @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); } 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); } 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()); } } ycl-server/src/main/resources/mapper/zgyw/WorkOrderWhiteMapper.xml
New file @@ -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>