Merge remote-tracking branch 'origin/master'

aijinhui

2023-11-24 457e566525d57ce0904e00aab9298ab0693ad5a1

 ard-work/src/main/java/com/ruoyi/app/patrolplan/service/impl/ArdAppPatrolpointServiceImpl.java

@@ -1,7 +1,12 @@
package com.ruoyi.app.patrolplan.service.impl;

import java.util.ArrayList;
import java.util.List;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.ruoyi.alarmpoints.well.domain.ArdAlarmpointsWell;
import com.ruoyi.alarmpoints.well.mapper.ArdAlarmpointsWellMapper;
import com.ruoyi.utils.result.Results;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ruoyi.app.patrolplan.mapper.ArdAppPatrolpointMapper;
@@ -20,6 +25,9 @@
public class ArdAppPatrolpointServiceImpl implements IArdAppPatrolpointService {
    @Resource
    private ArdAppPatrolpointMapper ardAppPatrolpointMapper;

    @Resource
    private ArdAlarmpointsWellMapper ardAlarmpointsWellMapper;

    /**
     * 查询app巡检计划点位
@@ -65,25 +73,8 @@
        return ardAppPatrolpointMapper.updateArdAppPatrolpoint(ardAppPatrolpoint);
    }

    /**
     * 批量删除app巡检计划点位
     *
     * @param ids 需要删除的app巡检计划点位主键
     * @return 结果
     */
    @Override
    public int deleteArdAppPatrolpointByIds(String[] ids) {
        return ardAppPatrolpointMapper.deleteArdAppPatrolpointByIds(ids);
    }

    /**
     * 删除app巡检计划点位信息
     *
     * @param id app巡检计划点位主键
     * @return 结果
     */
    @Override
    public int deleteArdAppPatrolpointById(String id) {
        return ardAppPatrolpointMapper.deleteArdAppPatrolpointById(id);
    public Results wellByPlanId(String id) {
        return Results.succeed(ardAlarmpointsWellMapper.wellByPlanId(id));
    }
}