告警工单修改

lxw

2022-06-14 b7abdf9e6a3ddb71c8ce2ebcf6d26c4414dbb614

告警工单修改

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

@@ -228,7 +228,7 @@
     * @param stationId
     * @return
     */
    @ApiOperation(value = "根据站点查询相关人员")
    @ApiOperation(tags = "告警派单", value = "根据站点查询相关人员", notes = "User_infAction!getUserInfoByStationId")
    @GetMapping("getUserInfoByStationId")
    public Response getUserInfoByStationId(@RequestParam String stationId){
        List<UserInf> list = userService.getUserInfoByStationId(stationId);

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

@@ -30,51 +30,60 @@
    private WorkAlarmService workAlarmService;

    @GetMapping("/searchAllByUserIdAndStatus")
    @ApiOperation(value = "查询维护员告警列表")
    @ApiOperation(value = "查询维护员告警列表", notes = "旧:UserWorkAction!searchAllByUserIdAndStatus")
    public Response searchAllByUserIdAndStatus(int pageNum,int pageSize,@RequestParam(required = false) Integer note){
        UserInf user = ActionUtil.getUser();
        return workAlarmService.searchByUserIdAndStatus(pageNum,pageSize,user.getUId().intValue(),note);
    }

    @PostMapping("/updateWorkAlarm")
    @ApiOperation(value = "更新工单告警")
    @ApiOperation(value = "更新工单告警", notes = " 旧:UserWorkAction!updateWorkAlarm")
    public Response updateWorkAlarm(@RequestBody WorkAlarm workAlarm){
        return workAlarmService.updateWorkAlarm(workAlarm);
    }

    @GetMapping("/searchStatusById")
    @ApiOperation("通过id获取告警状态数据")
    @ApiOperation(value = "通过id获取告警状态数据(开始处理更新状态)", notes = "旧 UserWorkAction!searchStatusById")
    public Response searchStatusById(int id){
        return workAlarmService.searchById(id);
    }

    @PostMapping("/uploadAlarmFile")
    @ApiOperation("上传图片")
    @ApiImplicitParam(name = "file", value = "上传的文件", dataTypeClass = MultipartFile.class, required = true,paramType = "form")
    public Response uploadAlarmFile(@RequestPart("file") List<MultipartFile> file, @RequestParam String json){
    @ApiOperation(value = "上传图片", notes = " 旧:MyFileAction!uploadAlarmFile")
    @ApiImplicitParam(name = "file", value = "上传的文件", dataTypeClass = MultipartFile.class, required = true, paramType = "form")
    public Response uploadAlarmFile(@RequestPart("file") List<MultipartFile> file, @RequestParam String json) {
        Gson gson = new Gson();
        UserWorkAlarmParam alarmParam = gson.fromJson(json,UserWorkAlarmParam.class);
        return userWorkService.uploadAlarmFile(file,alarmParam);
        UserWorkAlarmParam alarmParam = gson.fromJson(json, UserWorkAlarmParam.class);
        return userWorkService.uploadAlarmFile(file, alarmParam);
    }

    @GetMapping("/deleteAlarmFile")
    @ApiOperation(value = "删除图片", notes = " 旧:MyFileAction!deleteAlarmFile")
    public Response deleteAlarmFile(@RequestParam String fileNames, @RequestParam int stationId, @RequestParam String afterOrBefore) {
        return userWorkService.deleteAlarmFile(fileNames, stationId, afterOrBefore);
    }

    @PostMapping("/updateUserWork")
    @ApiOperation("更新告警处理")
    public Response updateUserWork(@RequestBody UserWork userWork){
    @ApiOperation(value = "更新告警处理", notes = "旧:UserWorkAction!updateUserWork")
    public Response updateUserWork(@RequestBody UserWork userWork) {
        return userWorkService.addOrUpdate(userWork);
    }

    @PostMapping("/serchByCondition")
    @ApiOperation("查询告警处理详情")
    public Response serchByCondition(@RequestBody UserWork userWork){
    @ApiOperation(value = "查询告警处理详情", notes = "旧:UserWorkAction!serchByCondition")
    public Response serchByCondition(@RequestBody UserWork userWork) {
        return userWorkService.searchByCondition(userWork);
    }

    @GetMapping("getTaskListWithFlag")
    @ApiOperation("查询管理员告警列表")
    @ApiOperation(value = "查询管理员告警列表", notes = "旧:WorkAlarmAction!getTaskListWithFlag")
    public Response getTaskListWithFlag(@RequestParam Integer note,@RequestParam int pageNum,@RequestParam int pageSize){
        UserInf userInf = ActionUtil.getUser();
        return workAlarmService.getTaskListWithFlag(userInf.getUId().intValue(),note,pageNum,pageSize);
    }

    @PostMapping("/dispatchTask")
    @ApiOperation("确认指派任务订单")
    @ApiOperation(value = "确认指派任务订单", notes = "旧:WorkAlarmAction!dispatchTask")
    public Response dispatchTask(@RequestBody List<WorkAlarm> alarmList){
        return workAlarmService.dispatchTask(alarmList);
    }

 src/main/java/com/whyc/dto/Response.java

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

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.annotations.ApiResponse;
import springfox.documentation.annotations.ApiIgnore;

import java.io.Serializable;


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

@@ -7,7 +7,6 @@
import com.whyc.util.ActionUtil;
import com.whyc.util.ExcelUtil;
import com.whyc.util.ServletUtils;
import org.apache.ibatis.annotations.Mapper;
import org.apache.poi.hssf.usermodel.*;
import org.apache.poi.ss.util.CellRangeAddress;
import org.springframework.beans.factory.annotation.Autowired;
@@ -115,21 +114,23 @@
     * @param resp
     */
    private void ExportA059(HttpServletRequest req, HttpServletResponse resp) {
        String ltop_echart = req.getParameter("ltop_echart");            //总电压折线图
        String rtop_echart = req.getParameter("rtop_echart");            //单体电压柱状图
        String lbottom_echart = req.getParameter("lbottom_echart");        //电池电流折线图
        String rbottom_echart = req.getParameter("rbottom_echart");        //单体电压折现图
        bytes=new ArrayList<byte[]>();
        String ltop_echart = req.getParameter("ltop_echart");            //总电压折线图
        String rtop_echart = req.getParameter("rtop_echart");            //单体电压柱状图
        String lbottom_echart = req.getParameter("lbottom_echart");        //电池电流折线图
        String rbottom_echart = req.getParameter("rbottom_echart");        //单体电压折现图
        bytes = new ArrayList<byte[]>();

        int battGroupId =Integer.valueOf(req.getParameter("battGroupId"));  //电池组编号
        int testRecordCount =Integer.valueOf(req.getParameter("testRecordCount"));  //测试编号
        int battGroupId = Integer.valueOf(req.getParameter("battGroupId"));  //电池组编号
        int testRecordCount = Integer.valueOf(req.getParameter("testRecordCount"));  //测试编号
        //String stateFlag = req.getParameter("stateFlag");//第几次放电

        List<FBOTestData> list=fboservice.getList(battGroupId,testRecordCount);  //查询4059充放电数据

        List<FBOTestData> list = fboservice.getList(battGroupId, testRecordCount);  //查询4059充放电数据

        //取出电池组信息构建excel文件的名称
        String excelName =binfservice.serchExcelName(battGroupId);
        String excelName = binfservice.serchExcelName(battGroupId);

        int monCount= fboservice.getMonCuntBytestRecordCount(battGroupId,testRecordCount); //查询具体一次充放电单体个数
        int monCount = fboservice.getMonCuntBytestRecordCount(battGroupId, testRecordCount); //查询具体一次充放电单体个数
        //处理图片
        try {
            if (ServletUtils.isNotNull(ltop_echart)) {

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

@@ -125,14 +125,14 @@
        } catch (IOException e) {
            e.printStackTrace();
        } finally {
            if(in != null){
            if (in != null) {
                try {
                    in.close();
                } catch (IOException e) {
                    e.printStackTrace();
                }
            }
            if(out != null){
            if (out != null) {
                try {
                    out.close();
                } catch (IOException e) {
@@ -141,31 +141,37 @@
            }
        }
    }
    public void createFilefolderIFNotExist(String filePath){

    public void createFilefolderIFNotExist(String filePath) {
        File f = new File(filePath);
        if(!f.exists()){
            if(!f.getParentFile().exists()){
        if (!f.exists()) {
            if (!f.getParentFile().exists()) {
                f.getParentFile().mkdirs();
            }
        }
    }


    public void deleteAlarmFile(){
    public Response deleteAlarmFile(String fileNames, int stationId, String afterOrBefore) {
        String names[] = fileNames.split(",");
        String fileDirName = "";
        int configType = Integer.parseInt(environment.getProperty("configFile.type"));
        ApplicationHome applicationHome = new ApplicationHome(getClass());
        File jarFile = applicationHome.getDir();
        //测试版
        if(configType==1){
        if (configType == 1) {
            fileDirName = jarFile.getParentFile().toString();
        }else{
        } else {
            //打包版
            fileDirName = jarFile.toString();
        }
//        String root=fileDirName+"/stationsrc/alarm"+ param.getStationId() + "/" + param.getAfterOrBefore() + "/";

        String root = fileDirName + "/stationsrc/alarm/" + stationId + File.separator + afterOrBefore + File.separator;
        for (String name : names) {
            String targetFilePath = root + name;
            File file = new File(targetFilePath);
            file.delete();
        }
        return new Response().set(1, "删除成功");
    }


}