巡检计划从表查询及删除导出

Administrator

2023-08-03 babddaa73918a054346b9af3f3926831c4667c1b

巡检计划从表查询及删除导出

 ard-work/src/main/java/com/ruoyi/alarmpoints/well/mapper/ArdAlarmpointsWellMapper.java

@@ -2,6 +2,7 @@

import java.util.List;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.alarmpoints.well.domain.ArdAlarmpointsWell;
import com.ruoyi.common.annotation.DataScope;

@@ -12,7 +13,7 @@
 * @author 刘苏义
 * @date 2023-03-07
 */
public interface ArdAlarmpointsWellMapper {
public interface ArdAlarmpointsWellMapper extends BaseMapper<ArdAlarmpointsWell> {
    /**
     * 查询井管理
     *
@@ -86,4 +87,6 @@

    public boolean checkWellIdExists(String wellId);

    List<ArdAlarmpointsWell> wellByPlanId(String id);

}

 ard-work/src/main/java/com/ruoyi/app/patrolplan/controller/ArdAppPatrolplanController.java

@@ -1,13 +1,19 @@
package com.ruoyi.app.patrolplan.controller;

import java.util.List;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.ruoyi.app.patrolplan.domain.ArdAppPatrolpoint;
import com.ruoyi.app.patrolplan.service.IArdAppPatrolpointService;
import com.ruoyi.app.patrolplan.service.IArdAppPatroluserService;
import com.ruoyi.utils.result.Results;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import jdk.nashorn.internal.ir.annotations.Reference;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@@ -41,6 +47,12 @@
    @Autowired
    private IArdAppPatrolplanService ardAppPatrolplanService;

    @Resource
    IArdAppPatrolpointService ardAppPatrolpointService;

    @Resource
    IArdAppPatroluserService ardAppPatroluserService;

    /**
     * 查询app巡检计划列表
     */
@@ -69,14 +81,39 @@
    }

    /**
     * 获取app巡检计划详细信息
     * 根据巡检ID查询兴趣点
     */
    @PreAuthorize("@ss.hasPermi('app:appPatrolplan:query')")
    @GetMapping(value = "/{patroEndTime}")
    public AjaxResult getInfo(@PathVariable("patroEndTime") String patroEndTime)
    @PreAuthorize("@ss.hasPermi('app:appPatrolplan:wellByPlanId')")
    @GetMapping(value = "wellByPlanId/{id}")
    @ApiOperation("根据巡检ID查询兴趣点")
    public Results wellByPlanId(@PathVariable String id)
    {
        return success(ardAppPatrolplanService.selectArdAppPatrolplanByPatroEndTime(patroEndTime));
        return ardAppPatrolpointService.wellByPlanId(id);
    }

    /**
     * 根据巡检ID查询巡检人
     */
    @PreAuthorize("@ss.hasPermi('app:appPatrolplan:userByPlanId')")
    @GetMapping(value = "userByPlanId/{id}")
    @ApiOperation("根据巡检ID查询巡检人")
    public Results userByPlanId(@PathVariable String id)
    {
        return ardAppPatroluserService.userByPlanId(id);
    }

    /**
     * 删除app巡检计划
     */
    @PreAuthorize("@ss.hasPermi('app:appPatrolplan:remove')")
    @Log(title = "app巡检计划", businessType = BusinessType.DELETE)
    @DeleteMapping("/{id}")
    @ApiOperation("删除app巡检计划")
    public Results remove(@PathVariable String id)
    {
        return ardAppPatrolplanService.deleteArdApp(id);
    }


    /**
     * 新增app巡检计划
@@ -100,14 +137,4 @@
        return toAjax(ardAppPatrolplanService.updateArdAppPatrolplan(ardAppPatrolplan));
    }

    /**
     * 删除app巡检计划
     */
    @PreAuthorize("@ss.hasPermi('app:appPatrolplan:remove')")
    @Log(title = "app巡检计划", businessType = BusinessType.DELETE)
    @DeleteMapping("/{patroEndTimes}")
    public AjaxResult remove(@PathVariable String[] patroEndTimes)
    {
        return toAjax(ardAppPatrolplanService.deleteArdAppPatrolplanByPatroEndTimes(patroEndTimes));
    }
}

 ard-work/src/main/java/com/ruoyi/app/patrolplan/controller/ArdAppPatrolpointController.java

@@ -91,14 +91,4 @@
        return toAjax(ardAppPatrolpointService.updateArdAppPatrolpoint(ardAppPatrolpoint));
    }

    /**
     * 删除app巡检计划点位
     */
    @PreAuthorize("@ss.hasPermi('app:patrolpoint:remove')")
    @Log(title = "app巡检计划点位", businessType = BusinessType.DELETE)
    @DeleteMapping("/{ids}")
    public AjaxResult remove(@PathVariable String[] ids)
    {
        return toAjax(ardAppPatrolpointService.deleteArdAppPatrolpointByIds(ids));
    }
}

 ard-work/src/main/java/com/ruoyi/app/patrolplan/controller/ArdAppPatroluserController.java

@@ -91,14 +91,4 @@
        return toAjax(ardAppPatroluserService.updateArdAppPatroluser(ardAppPatroluser));
    }

    /**
     * 删除app巡检计划人员
     */
    @PreAuthorize("@ss.hasPermi('app:patroluser:remove')")
    @Log(title = "app巡检计划人员", businessType = BusinessType.DELETE)
    @DeleteMapping("/{reserved1s}")
    public AjaxResult remove(@PathVariable String[] reserved1s)
    {
        return toAjax(ardAppPatroluserService.deleteArdAppPatroluserByReserved1s(reserved1s));
    }
}

 ard-work/src/main/java/com/ruoyi/app/patrolplan/mapper/ArdAppPatrolplanMapper.java

@@ -51,11 +51,4 @@
     */
    public int deleteArdAppPatrolplanByPatroEndTime(String patroEndTime);

    /**
     * 批量删除app巡检计划
     * 
     * @param patroEndTimes 需要删除的数据主键集合
     * @return 结果
     */
    public int deleteArdAppPatrolplanByPatroEndTimes(String[] patroEndTimes);
}

 ard-work/src/main/java/com/ruoyi/app/patrolplan/mapper/ArdAppPatrolpointMapper.java

@@ -1,6 +1,8 @@
package com.ruoyi.app.patrolplan.mapper;

import java.util.List;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.app.patrolplan.domain.ArdAppPatrolpoint;

/**
@@ -9,7 +11,7 @@
 * @author ard
 * @date 2023-08-02
 */
public interface ArdAppPatrolpointMapper 
public interface ArdAppPatrolpointMapper extends BaseMapper<ArdAppPatrolpoint>
{
    /**
     * 查询app巡检计划点位
@@ -44,18 +46,12 @@
    public int updateArdAppPatrolpoint(ArdAppPatrolpoint ardAppPatrolpoint);

    /**
     * 删除app巡检计划点位
     * 级联删除app巡检计划点位
     * 
     * @param id app巡检计划点位主键
     * @return 结果
     */
    public int deleteArdAppPatrolpointById(String id);

    /**
     * 批量删除app巡检计划点位
     * 
     * @param ids 需要删除的数据主键集合
     * @return 结果
     */
    public int deleteArdAppPatrolpointByIds(String[] ids);

}

 ard-work/src/main/java/com/ruoyi/app/patrolplan/mapper/ArdAppPatroluserMapper.java

@@ -51,11 +51,4 @@
     */
    public int deleteArdAppPatroluserByReserved1(String reserved1);

    /**
     * 批量删除app巡检计划人员
     * 
     * @param reserved1s 需要删除的数据主键集合
     * @return 结果
     */
    public int deleteArdAppPatroluserByReserved1s(String[] reserved1s);
}

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

@@ -2,6 +2,7 @@

import java.util.List;
import com.ruoyi.app.patrolplan.domain.ArdAppPatrolplan;
import com.ruoyi.utils.result.Results;

/**
 * app巡检计划Service接口
@@ -43,19 +44,10 @@
     */
    public int updateArdAppPatrolplan(ArdAppPatrolplan ardAppPatrolplan);

    /**
     * 批量删除app巡检计划
     * 
     * @param patroEndTimes 需要删除的app巡检计划主键集合
     * @return 结果
     */
    public int deleteArdAppPatrolplanByPatroEndTimes(String[] patroEndTimes);

    /**
     * 删除app巡检计划信息
     * 
     * @param patroEndTime app巡检计划主键
     * @return 结果
     */
    public int deleteArdAppPatrolplanByPatroEndTime(String patroEndTime);
    public Results deleteArdApp(String id);
}

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

@@ -2,6 +2,8 @@

import java.util.List;
import com.ruoyi.app.patrolplan.domain.ArdAppPatrolpoint;
import com.ruoyi.utils.result.Results;
import org.springframework.stereotype.Service;

/**
 * app巡检计划点位Service接口
@@ -9,6 +11,7 @@
 * @author ard
 * @date 2023-08-02
 */
@Service
public interface IArdAppPatrolpointService 
{
    /**
@@ -43,19 +46,5 @@
     */
    public int updateArdAppPatrolpoint(ArdAppPatrolpoint ardAppPatrolpoint);

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

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

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

@@ -2,6 +2,7 @@

import java.util.List;
import com.ruoyi.app.patrolplan.domain.ArdAppPatroluser;
import com.ruoyi.utils.result.Results;

/**
 * app巡检计划人员Service接口
@@ -43,13 +44,6 @@
     */
    public int updateArdAppPatroluser(ArdAppPatroluser ardAppPatroluser);

    /**
     * 批量删除app巡检计划人员
     * 
     * @param reserved1s 需要删除的app巡检计划人员主键集合
     * @return 结果
     */
    public int deleteArdAppPatroluserByReserved1s(String[] reserved1s);

    /**
     * 删除app巡检计划人员信息
@@ -58,4 +52,6 @@
     * @return 结果
     */
    public int deleteArdAppPatroluserByReserved1(String reserved1);

    Results userByPlanId(String id);
}

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

@@ -1,9 +1,13 @@
package com.ruoyi.app.patrolplan.service.impl;

import java.util.List;
        import com.ruoyi.common.utils.DateUtils;

import com.ruoyi.app.patrolplan.mapper.ArdAppPatrolpointMapper;
import com.ruoyi.app.patrolplan.mapper.ArdAppPatroluserMapper;
import com.ruoyi.common.utils.DateUtils;

import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.utils.result.Results;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ruoyi.app.patrolplan.mapper.ArdAppPatrolplanMapper;
@@ -22,6 +26,12 @@
public class ArdAppPatrolplanServiceImpl implements IArdAppPatrolplanService {
    @Resource
    private ArdAppPatrolplanMapper ardAppPatrolplanMapper;

    @Resource
    private ArdAppPatrolpointMapper ardAppPatrolpointMapper;

    @Resource
    private ArdAppPatroluserMapper ardAppPatroluserMapper;

    /**
     * 查询app巡检计划
@@ -69,25 +79,19 @@
        return ardAppPatrolplanMapper.updateArdAppPatrolplan(ardAppPatrolplan);
    }

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

    /**
     * 删除app巡检计划信息
     *
     * @param patroEndTime app巡检计划主键
     * @return 结果
     */
    @Override
    public int deleteArdAppPatrolplanByPatroEndTime(String patroEndTime) {
        return ardAppPatrolplanMapper.deleteArdAppPatrolplanByPatroEndTime(patroEndTime);
    public Results deleteArdApp(String id) {
        ardAppPatroluserMapper.deleteArdAppPatroluserByReserved1(id);
        ardAppPatrolpointMapper.deleteArdAppPatrolpointById(id);
        if(ardAppPatrolplanMapper.deleteArdAppPatrolplanByPatroEndTime(id)>0){
            return Results.succeed("删除成功！");
        }else {
            return Results.error("删除失败！");
        }
    }
}

 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));
    }
}

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

@@ -2,6 +2,9 @@

import java.util.List;

import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.system.mapper.SysUserMapper;
import com.ruoyi.utils.result.Results;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ruoyi.app.patrolplan.mapper.ArdAppPatroluserMapper;
@@ -20,6 +23,9 @@
public class ArdAppPatroluserServiceImpl implements IArdAppPatroluserService {
    @Resource
    private ArdAppPatroluserMapper ardAppPatroluserMapper;

    @Resource
    private SysUserMapper sysUserMapper;

    /**
     * 查询app巡检计划人员
@@ -65,16 +71,6 @@
        return ardAppPatroluserMapper.updateArdAppPatroluser(ardAppPatroluser);
    }

    /**
     * 批量删除app巡检计划人员
     *
     * @param reserved1s 需要删除的app巡检计划人员主键
     * @return 结果
     */
    @Override
    public int deleteArdAppPatroluserByReserved1s(String[] reserved1s) {
        return ardAppPatroluserMapper.deleteArdAppPatroluserByReserved1s(reserved1s);
    }

    /**
     * 删除app巡检计划人员信息
@@ -86,4 +82,9 @@
    public int deleteArdAppPatroluserByReserved1(String reserved1) {
        return ardAppPatroluserMapper.deleteArdAppPatroluserByReserved1(reserved1);
    }

    @Override
    public Results userByPlanId(String id) {
        return Results.succeed(sysUserMapper.userByPlanId(id));
    }
}

 ard-work/src/main/resources/mapper/alarmpoints/ArdAlarmpointsWellMapper.xml

@@ -197,4 +197,8 @@
        FROM ard_alarmpoints_well
        WHERE well_id = #{wellId}
    </select>

    <select id="wellByPlanId" parameterType="String" resultMap="ArdAlarmpointsWellResult">
        select * from ard_alarmpoints_well where id in (select alarmpoints_id from ard_app_patrolpoint where patrolplan_id = #{id})
    </select>
</mapper>

 ard-work/src/main/resources/mapper/app/ArdAppPatrolplanMapper.xml

@@ -91,13 +91,16 @@
    </update>

    <delete id="deleteArdAppPatrolplanByPatroEndTime" parameterType="String">
        delete from ard_app_patrolplan where patro_end_time = #{patroEndTime}
        delete from ard_app_patrolplan where ard_app_patrolplan.id = #{id};
    </delete>

    <delete id="deleteArdAppPatrolplanByPatroEndTimes" parameterType="String">
        delete from ard_app_patrolplan where patro_end_time in 
        delete from ard_app_patrolplan
        left join ard_app_patrolpoint as well on ard_app_patrolplan.id = well.patrolplan_id
        left join ard_app_patroluser as users on ard_app_patrolplan.id = users.patrolplan_id
        where ard_app_patrolplan.id in
        <foreach item="patroEndTime" collection="array" open="(" separator="," close=")">
            #{patroEndTime}
            #{id}
        </foreach>
    </delete>
</mapper>

 ard-work/src/main/resources/mapper/app/ArdAppPatrolpointMapper.xml

@@ -56,7 +56,7 @@
    </update>

    <delete id="deleteArdAppPatrolpointById" parameterType="String">
        delete from ard_app_patrolpoint where id = #{id}
        delete from ard_app_patrolpoint where patrolplan_id = #{id}
    </delete>

    <delete id="deleteArdAppPatrolpointByIds" parameterType="String">

 ard-work/src/main/resources/mapper/app/ArdAppPatroluserMapper.xml

@@ -52,7 +52,7 @@
    </update>

    <delete id="deleteArdAppPatroluserByReserved1" parameterType="String">
        delete from ard_app_patroluser where reserved_1 = #{reserved1}
        delete from ard_app_patroluser where patrolplan_id = #{id}
    </delete>

    <delete id="deleteArdAppPatroluserByReserved1s" parameterType="String">

 ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java

@@ -138,4 +138,6 @@
     *
     */
    public List<SysUser> getSysUserByCarId(String carId);

    List<SysUser> userByPlanId(String id);
}

 ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -291,4 +291,8 @@
        inner join sys_dept sd on asy.dept_id = sd.dept_id
        where asy.car_id = #{carId})
    </select>

    <select id="userByPlanId" parameterType="String" resultMap="SysUserResult">
        select nick_name from sys_user where id in (select app_user_id from ard_app_patroluser where patrolplan_id = ${id})
    </select>
</mapper>