Merge remote-tracking branch 'origin/master'

aijinhui

2023-11-24 457e566525d57ce0904e00aab9298ab0693ad5a1

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

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

import java.io.Serializable;
import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -11,10 +14,8 @@
import com.ruoyi.alarmpoints.well.domain.ArdAlarmpointsWell;
import com.ruoyi.alarmpoints.well.domain.ArdAlarmpointsWellVo;
import com.ruoyi.alarmpoints.well.mapper.ArdAlarmpointsWellMapper;
import com.ruoyi.app.patrolplan.domain.ArdAppPatrolpoint;
import com.ruoyi.app.patrolplan.domain.ArdAppPatroluser;
import com.ruoyi.app.patrolplan.mapper.ArdAppPatrolpointMapper;
import com.ruoyi.app.patrolplan.mapper.ArdAppPatroluserMapper;
import com.ruoyi.app.patrolplan.domain.*;
import com.ruoyi.app.patrolplan.mapper.*;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.domain.entity.SysUserVo;
import com.ruoyi.common.utils.DateUtils;
@@ -26,8 +27,6 @@
import org.apache.logging.log4j.util.Strings;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ruoyi.app.patrolplan.mapper.ArdAppPatrolplanMapper;
import com.ruoyi.app.patrolplan.domain.ArdAppPatrolplan;
import com.ruoyi.app.patrolplan.service.IArdAppPatrolplanService;
import org.springframework.transaction.annotation.Transactional;

@@ -55,6 +54,12 @@

    @Resource
    private SysUserMapper sysUserMapper;

    @Resource
    private ArdAppPatrolpointRecordMapper recordMapper;

    @Resource
    private ArdAppPatrolpointRecordImgMapper recordImgMapper;

    /**
     * 查询app巡检计划
@@ -87,7 +92,9 @@
    @Override
    public int insertArdAppPatrolplan(ArdAppPatrolplan ardAppPatrolplan) {
                ardAppPatrolplan.setUserId(SecurityUtils.getUserId());
                ardAppPatrolplan.setCreateTime(DateUtils.getNowDate());
                Date date = new Date();
                SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
                ardAppPatrolplan.setCreateTime(sdf.format(date));
            return ardAppPatrolplanMapper.insertArdAppPatrolplan(ardAppPatrolplan);
    }

@@ -97,7 +104,7 @@
     * @return 结果
     */
    @Override
    public Results updateArdAppPatrolplan(Map<String,Object> para) {
    public Results BeforeUpdateArdAppPatrolplan(Map<String,Object> para) {
        if(para.get("id").toString().isEmpty()){
            return Results.error("ID无效！");
        }
@@ -152,18 +159,46 @@
    @Override
    @Transactional
    public int deleteArdApp(String id) {
        //ardAppPatroluserMapper.deleteArdAppPatroluserByReserved1(id);
        /*ardAppPatrolpointMapper.deleteArdAppPatrolpointById(id);
        if(ardAppPatrolplanMapper.deleteArdAppPatrolplanByPatroEndTime(id)>0){
            return Results.succeed("删除成功！");
        }else {
            return Results.error("删除失败！");
        }*/
        try {
            int result = ardAppPatrolplanMapper.deleteArdAppPatrolplanById(id);//删除巡检计划
            ardAppPatrolpointMapper.deleteArdAppPatrolpointByPlanId(id);//删除巡检计划下挂点位
            ardAppPatroluserMapper.deleteArdAppPatroluserByPlanId(id);//删除巡检计划下挂用户
            return result;
            Boolean del = false;
            //查询计划时间是否结束
            ArdAppPatrolplan planList = ardAppPatrolplanMapper.selectById(id);
            String cycle = planList.getCycle();
            String end = planList.getPatroEndTime();
            if(cycle.equals("day")){
                SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
                String date = dateFormat.format(new Date());
                end = date +" "+end;
            }
            SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
            String toDay = dateFormat.format(new Date());
            int once = toDay.compareTo(end);
            if(once<0){
                del = true;
            }
            if(!del){
                //查询是否有打卡记录
                QueryWrapper<ArdAppPatrolpointRecord> recordQueryWrapper = new QueryWrapper<>();
                recordQueryWrapper.eq("plan_id",id);
                List<ArdAppPatrolpointRecord> recordList = recordMapper.selectList(recordQueryWrapper);
                if(recordList.size()>0){
                    del = true;
                }
            }
            if(del){
                int result = ardAppPatrolplanMapper.deleteArdAppPatrolplanById(id);//删除巡检计划
                ardAppPatrolpointMapper.deleteArdAppPatrolpointByPlanId(id);//删除巡检计划下挂点位
                ardAppPatroluserMapper.deleteArdAppPatroluserByPlanId(id);//删除巡检计划下挂用户
                return result;
            }else {
                String userId = SecurityUtils.getUserId();
                SysUser sysUser = sysUserMapper.selectUserById(userId);
                String userName = sysUser.getNickName();
                planList.setDelName(userName);
                planList.setDelTime(dateFormat.format(new Date()));
                int result = ardAppPatrolplanMapper.updateById(planList);
                return result;
            }
        } catch (Exception e){
            e.printStackTrace();
            return 0;
@@ -182,7 +217,9 @@
        String userId = SecurityUtils.getUserId();
        ardAppPatrolplan.setUserId(userId);
        ardAppPatrolplan.setCycle((String) para.get("cycle"));
        ardAppPatrolplan.setCreateTime(new Date());
        Date date = new Date();
        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
        ardAppPatrolplan.setCreateTime(sdf.format(date));
        int result = ardAppPatrolplanMapper.insertArdAppPatrolplan(ardAppPatrolplan);//新增主表
        List<String> alarmpointIdList = (List<String>) para.get("alarmpointIdList");
        List<ArdAppPatrolpoint> ardAppPatrolpointList = new ArrayList();
@@ -237,4 +274,50 @@
        return Results.succeed(jsonObject);
    }

    @Override
    public Results updateArdAppPatrolplan(Map<String,Object> para){
        if(para.get("id").toString().isEmpty()){
            return Results.error("ID无效！");
        }
        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
        //查询该条记录
        ArdAppPatrolplan planList = ardAppPatrolplanMapper.selectById(para.get("id").toString());
        String userId = SecurityUtils.getUserId();
        SysUser sysUser = sysUserMapper.selectUserById(userId);
        String userName = sysUser.getNickName();
        planList.setDelName(userName);
        planList.setDelTime(dateFormat.format(new Date()));
        int result = ardAppPatrolplanMapper.updateById(planList);
        if(result<1){
            return Results.error("修改失败，原数据停用出错！");
        }
        String planId = planList.getId();
        QueryWrapper<ArdAppPatrolpointRecord> patrolpointRecordQueryWrapper = new QueryWrapper<>();
        patrolpointRecordQueryWrapper.eq("plan_id",planId);
        List<ArdAppPatrolpointRecord> records = recordMapper.selectList(patrolpointRecordQueryWrapper);
        if(records.size()>0){
            for (int i = 0; i < records.size(); i++) {
                ArdAppPatrolpointRecord record = records.get(i);
                record.setDel(1);
                recordMapper.updateById(record);
            }
        }
        int num = insertArdAppPatrolplan(para);
        if(num==1){
            return Results.succeed("修改成功，已重新部署任务！");
        }else {
            return Results.error("修改失败，重新部署任务失败！");
        }
    }

    @Override
    public List<ArdAppPatrolplan> executeList(ArdAppPatrolplan ardAppPatrolplan) {
        return ardAppPatrolplanMapper.executeList(ardAppPatrolplan);
    }

    @Override
    public Results executeOneById(String id) {
        return Results.succeed(ardAppPatrolplanMapper.selectById(id));
    }

}