diff --git a/pqs-event/event-boot/src/main/java/com/njcn/event/service/Impl/ReportController.java b/pqs-event/event-boot/src/main/java/com/njcn/event/service/Impl/ReportController.java
deleted file mode 100644
index a2b73ad75..000000000
--- a/pqs-event/event-boot/src/main/java/com/njcn/event/service/Impl/ReportController.java
+++ /dev/null
@@ -1,1939 +0,0 @@
-package com.njcn.event.service.Impl;//package com.njcn.event.service.Impl;
-//
-//import java.io.ByteArrayInputStream;
-//import java.io.File;
-//import java.io.FileInputStream;
-//import java.io.FileOutputStream;
-//import java.io.IOException;
-//import java.io.InputStream;
-//import java.io.OutputStream;
-//import java.io.UnsupportedEncodingException;
-//import java.math.BigInteger;
-//import java.net.URLEncoder;
-//import java.text.DecimalFormat;
-//import java.text.SimpleDateFormat;
-//import java.util.ArrayList;
-//import java.util.Collections;
-//import java.util.Comparator;
-//import java.util.Date;
-//import java.util.List;
-//import java.util.Properties;
-//
-//import javax.annotation.Resource;
-//import javax.servlet.http.HttpServletRequest;
-//import javax.servlet.http.HttpServletResponse;
-//import javax.servlet.http.HttpSession;
-//
-//import com.njcn.pojo.data.WaveSvg;
-//import org.apache.commons.lang3.StringUtils;
-//import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
-//import org.apache.poi.util.Units;
-//import org.apache.poi.xwpf.usermodel.XWPFDocument;
-//import org.apache.poi.xwpf.usermodel.XWPFParagraph;
-//import org.apache.poi.xwpf.usermodel.XWPFRun;
-//import org.apache.poi.xwpf.usermodel.XWPFTable;
-//import org.apache.poi.xwpf.usermodel.XWPFTableRow;
-//import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTTblWidth;
-//import org.openxmlformats.schemas.wordprocessingml.x2006.main.STTblWidth;
-//import org.slf4j.Logger;
-//import org.slf4j.LoggerFactory;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.stereotype.Controller;
-//import org.springframework.util.CollectionUtils;
-//import org.springframework.web.bind.annotation.GetMapping;
-//import org.springframework.web.bind.annotation.PostMapping;
-//import org.springframework.web.bind.annotation.RequestMapping;
-//import org.springframework.web.bind.annotation.RequestMethod;
-//import org.springframework.web.bind.annotation.RequestParam;
-//import org.springframework.web.bind.annotation.ResponseBody;
-//
-//import com.njcn.enums.LogTypeEnum;
-//import com.njcn.mapper.advanced.RangeMapper;
-//import com.njcn.mapper.configuration.RptAssMapper;
-//import com.njcn.mapper.configuration.RptDataMapper;
-//import com.njcn.mapper.configuration.RptPloyMapper;
-//import com.njcn.pojo.advanced.EventAssObj;
-//import com.njcn.pojo.commons.DatePojo;
-//import com.njcn.pojo.commons.EventEigDetail;
-//import com.njcn.pojo.commons.EventInfoDetail;
-//import com.njcn.pojo.commons.HttpResult;
-//import com.njcn.pojo.commons.RedisDB;
-//import com.njcn.pojo.commons.ReportAreaPojo;
-//import com.njcn.pojo.commons.ReportMonitorPojo;
-//import com.njcn.pojo.commons.WaveData;
-//import com.njcn.pojo.commons.area.Area;
-//import com.njcn.pojo.commons.area.AreaGeneral;
-//import com.njcn.pojo.commons.area.Iec28;
-//import com.njcn.pojo.commons.area.Interval;
-//import com.njcn.pojo.commons.area.Voltage;
-//import com.njcn.pojo.commons.device.AnalyzeInfo;
-//import com.njcn.pojo.commons.device.DeviceValue;
-//import com.njcn.pojo.commons.device.EventCause;
-//import com.njcn.pojo.commons.device.EventChance;
-//import com.njcn.pojo.commons.device.EventDataList;
-//import com.njcn.pojo.commons.device.EventDensity;
-//import com.njcn.pojo.commons.device.EventTypeList;
-//import com.njcn.pojo.commons.device.LineInfo;
-//import com.njcn.pojo.configuration.RptPloy;
-//import com.njcn.pojo.data.EventDetail;
-//import com.njcn.pojo.data.LineMaps;
-//import com.njcn.pojo.user.Depts;
-//import com.njcn.pojo.wave.WaveDataDetail;
-//import com.njcn.service.advanced.RangeService;
-//import com.njcn.service.commons.IWaveService;
-//import com.njcn.service.configuration.DeviceService;
-//import com.njcn.service.configuration.ReportService;
-//import com.njcn.service.data.EventDetailService;
-//import com.njcn.service.log.UserLogDetailService;
-//import com.njcn.shiro.token.TokenManager;
-//import com.njcn.utils.AppConfig;
-//import com.njcn.utils.ClearPathUtil;
-//import com.njcn.utils.InstantiateUtil;
-//import com.njcn.utils.PubUtils;
-//import com.njcn.utils.UserUtil;
-//import com.njcn.utils.redis.JedisManager;
-//import com.pqs9200.pojo.commons.device.DevMapInfo;
-//import com.pqs9200.service.area.IAreaService;
-//import com.pqs9200.service.data.IOverviewServer;
-//import com.pqs9200.utils.WordUtil;
-//import com.pqs9200.utils.WordUtils;
-//
-//import net.sf.json.JSONArray;
-//import net.sf.json.JSONObject;
-//import sun.misc.BASE64Decoder;
-//
-//@Controller
-//@RequestMapping("report")
-//public class ReportController {
-// @Resource
-// private RptDataMapper rptDataMapper;
-//
-// @Resource
-// private RptPloyMapper rptPloyMapper;
-//
-// @Resource
-// private RptAssMapper rptAssMapper;
-//
-// @Resource
-// private ReportService getreportInfo;
-//
-// @Autowired
-// private ReportService reportService;
-//
-// @Autowired
-// private IAreaService areaService;
-//
-// @Autowired
-// private IOverviewServer iOverviewServer;
-//
-// @Resource
-// UserLogDetailService userLog;
-//
-// @Autowired
-// private RangeMapper rangeMapper;
-//
-// @Autowired
-// private RangeService rangeService;
-//
-// @Autowired
-// private EventDetailService eventDetailService;
-//
-// @Autowired
-// private IWaveService waveService;
-// @Autowired
-// private AppConfig appConfig;
-// // 日志记录
-// private static final Logger logger = LoggerFactory.getLogger(DeviceController.class);
-// /**
-// * 缓存每个方法查询的结果,缓存时间为半小时
-// *
-// * key:方法名+参数值(参数为对象时,约定某个属性值)
-// */
-// @Autowired
-// private JedisManager jedisManager;
-//
-// @Autowired
-// private DeviceService deviceInfo;
-//
-// @Resource
-// private UserUtil userUtil;
-//
-// @Autowired
-// private UserLogDetailService userLogDetailService;
-//
-// private InstantiateUtil instantiateUtil;
-// private InstantiateUtil jsonArrayInstantiateUtil;
-// private InstantiateUtil stringInstantiateUtil;
-//
-// public ReportController() {
-// instantiateUtil = new InstantiateUtil<>();
-// jsonArrayInstantiateUtil = new InstantiateUtil<>();
-// stringInstantiateUtil = new InstantiateUtil<>();
-// }
-//
-// /**
-// * 获取模板引擎
-// *
-// * @return
-// */
-// @PostMapping("monitorTemplate")
-// @ResponseBody
-// public HttpResult monitorTemplate() {
-// HttpResult result;
-// List datas;
-// datas = reportService.getTemplate(Integer.valueOf(0));
-// if (CollectionUtils.isEmpty(datas)) {
-// result = PubUtils.assignmentResult(null, 500, "沒有对应的模板");
-// } else {
-// result = PubUtils.assignmentResult(datas, 200, "获取模板成功");
-// }
-// return result;
-// }
-//
-// @PostMapping("monitor")
-// @ResponseBody
-// public HttpResult monitor(HttpServletRequest request, String startTime, String endTime, String lineIndex, String lineName, boolean jcdxq,
-// boolean zjsjlb, boolean zjsjssbx, boolean zjmdbg, boolean zjmdtx, boolean zjsjditic, boolean zjsjdf47, boolean glfbzjfz,
-// boolean glfbcxsj, boolean yftjbg, boolean yftjtx, boolean zjyybg, boolean zjyytx, boolean zjlxbg, boolean zjlxtx) throws Exception {
-// HttpResult result;
-// List