ycl-server/src/main/java/com/ycl/platform/controller/WorkOrderController.java
@@ -185,11 +185,38 @@ } /** * 查询工单生成白名单列表 * 工单白名单列表 */ @PostMapping("/white/page") @ApiOperation(value = "工单白名单列表", notes = "工单白名单列表") public Result whitePage(@RequestBody WorkOrderWhiteQuery workOrderWhiteQuery) { return workOrderService.selectWorkOrderWhiteList(workOrderWhiteQuery); } /** * 添加工单白名单 * * @param workOrderWhite 白色工单 * @return {@link Result } * @author */ @PostMapping("/white/add") @ApiOperation(value = "新增工单白名单", notes = "新增工单白名单") public Result addWorkOrderWhite(@RequestBody WorkOrderWhite workOrderWhite) { return workOrderService.addWorkOrderWhite(workOrderWhite); } /** * 批量删除工单白名单 * * @param ids ids * @return {@link Result } * @author */ @DeleteMapping("/white/batchDelete") @ApiOperation(value = "批量删除工单白名单", notes = "批量删除工单白名单") public Result batchDeleteWorkOrderWhite(@RequestBody List<String> ids) { return workOrderService.batchDeleteWorkOrderWhite(ids); } } ycl-server/src/main/java/com/ycl/platform/mapper/WorkOrderWhiteMapper.java
@@ -33,7 +33,7 @@ * @param workOrderWhite 工单生成白名单 * @return 结果 */ public int insertWorkOrderWhite(WorkOrderWhite workOrderWhite); public int insert(WorkOrderWhite workOrderWhite); /** * 批量删除工单生成白名单 @@ -42,4 +42,14 @@ * @return 结果 */ public int deleteWorkOrderWhiteByIds(Long[] ids); /** * 批量删除 * * @param ids ids * @author */ void batchDelete(@Param("ids") List<String> ids); WorkOrderWhite selectBySerialNumber(String serialNumber); } ycl-server/src/main/java/com/ycl/platform/service/WorkOrderService.java
@@ -244,4 +244,21 @@ * @author */ Result selectWorkOrderWhiteList(WorkOrderWhiteQuery workOrderWhiteQuery); /** * 添加工单白名单 * * @param workOrderWhite 白色工单 * @return {@link Result } * @author */ Result addWorkOrderWhite(WorkOrderWhite workOrderWhite); /** * 批量删除工单白名单 * * @param ids ids * @author */ Result batchDeleteWorkOrderWhite(List<String> ids); } ycl-server/src/main/java/com/ycl/platform/service/YwPointService.java
@@ -155,4 +155,13 @@ void updatePoint(List<PointExport> dataList, Integer unitId, Date startTime, Date endTime, Boolean needUpdateUnit) throws ExecutionException, InterruptedException; void updateDynamic(List<PointExport> dataList); /** * 根据设备编码查询点位信息 * * @param serialNumber 序列号 * @return {@link YwPoint } * @author */ YwPoint selectBySerialNumber(String serialNumber); } 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.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -1001,4 +1002,43 @@ workOrderWhiteMapper.page(page, query); return Result.ok().data(page.getRecords()).total(page.getTotal()); } /** * 添加工单白名单 * * @param workOrderWhite 白色工单 * @return {@link Result } * @author */ @Override public Result addWorkOrderWhite(WorkOrderWhite workOrderWhite) { // 通过设备编码查询设备信息 YwPoint ywPoint = ywPointService.selectBySerialNumber(workOrderWhite.getSerialNumber()); // 新增白名单设备记录 if (ywPoint == null){ return Result.error("设备不存在"); } // 检查是否已经存在该白名单 WorkOrderWhite flag = workOrderWhiteMapper.selectBySerialNumber(workOrderWhite.getSerialNumber()); if (flag != null) { return Result.error("该设备已存在白名单"); } else { workOrderWhite.setPointName(ywPoint.getPointName()); workOrderWhite.setCreateBy(SecurityUtils.getUsername()); workOrderWhiteMapper.insert(workOrderWhite); return Result.ok(); } } /** * 批量删除工单白名单 * * @param ids ids * @author */ @Override public Result batchDeleteWorkOrderWhite(List<String> ids) { workOrderWhiteMapper.batchDelete(ids); return Result.ok(); } } ycl-server/src/main/java/com/ycl/platform/service/impl/YwPointServiceImpl.java
@@ -3,6 +3,7 @@ import com.alibaba.excel.EasyExcel; import com.alibaba.excel.ExcelWriter; import com.alibaba.excel.write.metadata.WriteSheet; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper; import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper; @@ -461,6 +462,18 @@ if(!CollectionUtils.isEmpty(deleteList)) dynamicColumnMapper.deleteBatch(deleteList); } /** * 根据设备编码查询点位信息 * * @param serialNumber 序列号 * @return {@link YwPoint } * @author */ @Override public YwPoint selectBySerialNumber(String serialNumber) { return baseMapper.selectOne(new LambdaQueryWrapper<>(YwPoint.class).eq(YwPoint::getSerialNumber, serialNumber).eq(YwPoint::getDeleted, "0")); } public void waitAllFinishAndGetResult(List<YwPoint> dataList) { Date startTime = new Date(); this.baseMapper.updatePoint(dataList); ycl-server/src/main/resources/mapper/zgyw/WorkOrderWhiteMapper.xml
@@ -23,8 +23,12 @@ <if test="query.pointName != null and query.pointName != ''"> and point_name like concat('%', #{query.pointName}, '%')</if> </where> </select> <select id="selectBySerialNumber" resultType="com.ycl.platform.domain.entity.WorkOrderWhite"> <include refid="selectWorkOrderWhiteVo"/> where serial_number = #{serialNumber} </select> <insert id="insertWorkOrderWhite" parameterType="WorkOrderWhite" useGeneratedKeys="true" keyProperty="id"> <insert id="insert" 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> @@ -46,4 +50,10 @@ #{id} </foreach> </delete> <delete id="batchDelete"> delete from t_work_order_white where id in <foreach item="id" collection="ids" open="(" separator="," close=")"> #{id} </foreach> </delete> </mapper>
