Administrator
2023-08-07 05248ded0723bf87f6f7b815d1f0adbbfc7795c7
ard-work/src/main/java/com/ruoyi/app/patrolplan/service/impl/ArdAppPatrolplanServiceImpl.java
@@ -9,18 +9,21 @@
import com.alibaba.fastjson2.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
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.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.domain.entity.SysUserVo;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.uuid.IdUtils;
import com.ruoyi.system.mapper.SysUserMapper;
import com.ruoyi.utils.result.Results;
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;
@@ -91,12 +94,54 @@
    /**
     * 修改app巡检计划
     *
     * @param ardAppPatrolplan app巡检计划
     * @return 结果
     */
    @Override
    public int updateArdAppPatrolplan(ArdAppPatrolplan ardAppPatrolplan) {
        return ardAppPatrolplanMapper.updateArdAppPatrolplan(ardAppPatrolplan);
    public Results updateArdAppPatrolplan(Map<String,Object> para) {
        if(para.get("id").toString().isEmpty()){
            return Results.error("ID无效!");
        }
        //修改主表
        ArdAppPatrolplan ardAppPatrolplan = new ArdAppPatrolplan();
        ardAppPatrolplan.setId(para.get("id").toString());
        ardAppPatrolplan.setUserId(para.get("userId").toString());
        ardAppPatrolplan.setCycle(para.get("cycle").toString());
        ardAppPatrolplan.setPatroBeginTime(para.get("patroBeginTime").toString());
        ardAppPatrolplan.setPatroEndTime(para.get("patroEndTime").toString());
        ardAppPatrolplan.setPlanName(para.get("planName").toString());
        int num = ardAppPatrolplanMapper.updateById(ardAppPatrolplan);
        //修改兴趣点
        ardAppPatrolpointMapper.deleteArdAppPatrolpointByPlanId(para.get("id").toString());//删除巡检计划下挂点位
        List<String> alarmpointIdList = (List<String>) para.get("alarmpointIdList");
        List<ArdAppPatrolpoint> ardAppPatrolpointList = new ArrayList();
        for(String  alarmpointId : alarmpointIdList){
            String patrolpointId = IdUtils.simpleUUID();
            ArdAppPatrolpoint ardAppPatrolpoint = new ArdAppPatrolpoint();
            ardAppPatrolpoint.setId(patrolpointId);
            ardAppPatrolpoint.setPatrolplanId(para.get("id").toString());
            ardAppPatrolpoint.setAlarmpointsId(alarmpointId);
            ardAppPatrolpoint.setType((String) para.get("type"));
            ardAppPatrolpointList.add(ardAppPatrolpoint);
        }
        ardAppPatrolpointMapper.insertArdAppPatrolpointList(ardAppPatrolpointList);//新增关联兴趣点
        //修改用户
        ardAppPatroluserMapper.deleteArdAppPatroluserByPlanId(para.get("id").toString());//删除巡检计划下挂用户
        List<String> appUserIdList = (List<String>) para.get("appUserIdList");
        List<ArdAppPatroluser> ardAppPatroluserList = new ArrayList();
        for(String appUserId : appUserIdList){
            String patroluserId = IdUtils.simpleUUID();
            ArdAppPatroluser ardAppPatroluser = new ArdAppPatroluser();
            ardAppPatroluser.setId(patroluserId);
            ardAppPatroluser.setPatrolplanId(para.get("id").toString());
            ardAppPatroluser.setAppUserId(appUserId);
            ardAppPatroluserList.add(ardAppPatroluser);
        }
        ardAppPatroluserMapper.insertArdAppPatroluserList(ardAppPatroluserList);//新增关联人员
        if(num>0){
            return Results.succeed("修改成功!");
        }else {
            return Results.error("修改失败!");
        }
    }
@@ -167,12 +212,29 @@
    @Override
    public Results oneById(String id) {
        JSONObject jsonObject = new JSONObject();
        ArdAppPatrolplan ardAppPatrolplan = ardAppPatrolplanMapper.selectById(id);
        jsonObject.put("plan",ardAppPatrolplan);
        List<ArdAlarmpointsWell> ardAlarmpointsWellList = ardAlarmpointsWellMapper.wellByPlanId(id);
        List<ArdAlarmpointsWellVo> wellVos = new ArrayList<>();
        for (ArdAlarmpointsWell ardAlarmpointsWell : ardAlarmpointsWellList) {
            ArdAlarmpointsWellVo wellVo = new ArdAlarmpointsWellVo();
            wellVo.setId(ardAlarmpointsWell.getId());
            wellVo.setType(ardAlarmpointsWell.getType());
            wellVo.setWellId(ardAlarmpointsWell.getWellId());
            wellVos.add(wellVo);
        }
        jsonObject.put("well",wellVos);
        List<SysUser> sysUserList = sysUserMapper.userByPlanId(id);
        ardAppPatrolplan.setUserList(sysUserList);
        ardAppPatrolplan.setWellList(ardAlarmpointsWellList);
        return Results.succeed(ardAppPatrolplan);
        List<SysUserVo> sysUserVos = new ArrayList<>();
        for (int i = 0; i < sysUserList.size(); i++) {
            SysUserVo sysUserVo = new SysUserVo();
            sysUserVo.setUserId(sysUserList.get(i).getUserId());
            sysUserVo.setNickName(sysUserList.get(i).getNickName());
            sysUserVos.add(sysUserVo);
        }
        jsonObject.put("user",sysUserVos);
        return Results.succeed(jsonObject);
    }
    @Override