告警派单接口更新

whyczh

2022-05-21 e6d10ba2aec2c3db2996605e5a1bfb8687fa53fc

告警派单接口更新

 src/main/java/com/whyc/controller/UserController.java

@@ -222,4 +222,18 @@
        return new Response().set(1,list);
    }

    /**
     * 告警派单中，查询站点人员信息
     * @param stationId
     * @return
     */
    @ApiOperation(value = "根据站点查询相关人员")
    @GetMapping("getUserInfoByStationId")
    public Response getUserInfoByStationId(@RequestParam String stationId){
        List<UserInf> list = userService.getUserInfoByStationId(stationId);
        return new Response().set(1,list);
    }



}

 src/main/java/com/whyc/controller/UserWorkController.java

@@ -15,6 +15,8 @@
import org.springframework.web.multipart.MultipartFile;

import javax.annotation.Resource;
import java.util.List;

@RestController
@RequestMapping("userwork")
@Api(tags = "告警派单")
@@ -66,6 +68,12 @@
        return workAlarmService.getTaskListWithFlag(userInf.getUId().intValue(),note,pageNum,pageSize);
    }

    @PostMapping("/dispatchTask")
    @ApiOperation("确认指派任务订单")
    public Response dispatchTask(@RequestBody List<WorkAlarm> alarmList){
        return workAlarmService.dispatchTask(alarmList);
    }





 src/main/java/com/whyc/mapper/UserMapper.java

@@ -13,4 +13,6 @@

    List<UserInf> searchCS_All2();

    List<UserInf> getUserInfoByStationId(@Param("stationId") String stationId);

}

 src/main/java/com/whyc/mapper/WorkAlarmMapper.java

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

import com.whyc.pojo.BattDevAlarmData;
import com.whyc.pojo.BattalarmData;
import com.whyc.pojo.UserWork;
import com.whyc.pojo.WorkAlarm;
import org.apache.ibatis.annotations.Param;

@@ -18,4 +17,6 @@
    int updateStatus(@Param("id")int id,@Param("status")int status);

    List<WorkAlarm> getTaskListWithFlag(@Param("uId") Integer uId,@Param("status") Integer status,@Param("checkStatus") Integer checkStatus);

    int dispatchTask(@Param("alarm")WorkAlarm alarm);
}

 src/main/java/com/whyc/pojo/WorkAlarm.java

@@ -5,9 +5,6 @@
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.apache.ibatis.type.Alias;

import java.util.Date;
import java.util.List;

 src/main/java/com/whyc/service/UserService.java

@@ -274,4 +274,9 @@
    public List<UserInf> searchCS_All2() {
        return userMapper.searchCS_All2();
    }

    public List<UserInf> getUserInfoByStationId(String stationId){
        List<UserInf> list = userMapper.getUserInfoByStationId(stationId);
        return list;
    }
}

 src/main/java/com/whyc/service/WorkAlarmService.java

@@ -1,16 +1,13 @@
package com.whyc.service;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.api.R;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.whyc.dto.Response;
import com.whyc.mapper.UserInfMapper;
import com.whyc.mapper.UserWorkMapper;
import com.whyc.mapper.WorkAlarmMapper;
import com.whyc.mapper.WorkflowAlarmMapper;
import com.whyc.pojo.*;
import com.whyc.util.RSAUtil;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
@@ -120,9 +117,11 @@
    }


    public Response dispatchTask(){

        return null;
    public Response dispatchTask(List<WorkAlarm> alarmList){
        for (WorkAlarm alarm: alarmList) {
            mapper.dispatchTask(alarm);
        }
        return new Response().set(1,true,"更新完成");
    }



 src/main/resources/mapper/UserMapper.xml

@@ -15,4 +15,14 @@
        SELECT uId,uName FROM db_user.tb_user_inf  where uId not in (select distinct uId from db_user.tb_user_permitgroup_data) and uId!=0
        order by uId
    </select>
    <select id="getUserInfoByStationId" resultType="com.whyc.pojo.UserInf">
        select distinct u.uId,u.uName from
        db_user.tb_user_battgroup_baojigroup_battgroup group1,
        db_user.tb_user_battgroup_baojigroup_usr groupUser,
        db_user.tb_user_inf u
        where group1.baoji_group_id = groupUser.baoji_group_id
        and groupUser.uId = u.uId
        and u.uRole != 0
        and group1.StationId = #{stationId}
    </select>
</mapper>

 src/main/resources/mapper/WorkAlarmMapper.xml

@@ -4,6 +4,9 @@
    <update id="updateStatus">
        UPDATE `db_user`.`tb_work_alarm` SET `status` = #{status} WHERE `id` = #{id}
    </update>
    <update id="dispatchTask" parameterType="com.whyc.pojo.WorkAlarm">
        update db_user.tb_work_alarm set userId = #{alarm.userId},status =1,dispatchTime = now() where id = #{alarm.id}
    </update>


    <select id="searchByUserIdAndStatus" resultType="com.whyc.pojo.WorkAlarm">