import
This commit is contained in:
@ -1,7 +1,5 @@
|
||||
package com.sipai.activiti;
|
||||
|
||||
import com.sipai.tools.CommUtil;
|
||||
|
||||
public class Test {
|
||||
public static void main(String[] args) {
|
||||
int a = 3;
|
||||
|
||||
@ -1,6 +1,5 @@
|
||||
package com.sipai.activiti.util;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Date;
|
||||
|
||||
/**
|
||||
|
||||
@ -1,7 +1,6 @@
|
||||
package com.sipai.activiti.util;
|
||||
|
||||
import jodd.util.StringUtil;
|
||||
|
||||
import org.apache.commons.beanutils.ConvertUtils;
|
||||
|
||||
import java.util.ArrayList;
|
||||
|
||||
@ -1,7 +1,6 @@
|
||||
package com.sipai.controller;
|
||||
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.sipai.entity.base.Result;
|
||||
import com.sipai.tools.CommUtil;
|
||||
import org.springframework.ui.Model;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
|
||||
@ -1,20 +1,14 @@
|
||||
package com.sipai.controller.Listener;
|
||||
|
||||
import com.github.pagehelper.PageHelper;
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import com.sipai.entity.Listener.ListenerMessage;
|
||||
import com.sipai.entity.equipment.EquipmentCard;
|
||||
import com.sipai.entity.user.User;
|
||||
import com.sipai.entity.workorder.Overhaul;
|
||||
import com.sipai.service.Listener.ListenerMessageService;
|
||||
import com.sipai.service.equipment.EquipmentCardService;
|
||||
import com.sipai.service.workorder.OverhaulService;
|
||||
import com.sipai.tools.CommUtil;
|
||||
import net.sf.json.JSONArray;
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.Model;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
import org.springframework.web.servlet.ModelAndView;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
|
||||
@ -1,12 +1,17 @@
|
||||
package com.sipai.controller.accident;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
|
||||
import com.github.pagehelper.PageHelper;
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import com.sipai.entity.accident.Accident;
|
||||
import com.sipai.entity.accident.AccidentType;
|
||||
import com.sipai.entity.base.Result;
|
||||
import com.sipai.entity.user.Unit;
|
||||
import com.sipai.entity.user.User;
|
||||
import com.sipai.service.accident.AccidentService;
|
||||
import com.sipai.service.accident.AccidentTypeService;
|
||||
import com.sipai.service.user.UnitService;
|
||||
import com.sipai.tools.CommUtil;
|
||||
import net.sf.json.JSONArray;
|
||||
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.Model;
|
||||
import org.springframework.web.bind.annotation.ModelAttribute;
|
||||
@ -14,18 +19,9 @@ import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
import org.springframework.web.servlet.ModelAndView;
|
||||
|
||||
import com.github.pagehelper.PageHelper;
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import com.sipai.entity.accident.Accident;
|
||||
import com.sipai.entity.accident.AccidentType;
|
||||
import com.sipai.entity.base.Result;
|
||||
import com.sipai.entity.maintenance.Abnormity;
|
||||
import com.sipai.entity.user.Unit;
|
||||
import com.sipai.entity.user.User;
|
||||
import com.sipai.service.accident.AccidentService;
|
||||
import com.sipai.service.accident.AccidentTypeService;
|
||||
import com.sipai.service.user.UnitService;
|
||||
import com.sipai.tools.CommUtil;
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import java.util.List;
|
||||
|
||||
@Controller
|
||||
@RequestMapping("/accident/accident")
|
||||
|
||||
@ -1,10 +1,10 @@
|
||||
package com.sipai.controller.accident;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
|
||||
import com.sipai.entity.accident.AccidentType;
|
||||
import com.sipai.entity.base.Result;
|
||||
import com.sipai.entity.user.User;
|
||||
import com.sipai.service.accident.AccidentTypeService;
|
||||
import com.sipai.tools.CommUtil;
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.Model;
|
||||
import org.springframework.web.bind.annotation.ModelAttribute;
|
||||
@ -12,11 +12,9 @@ import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
import org.springframework.web.servlet.ModelAndView;
|
||||
|
||||
import com.sipai.entity.accident.AccidentType;
|
||||
import com.sipai.entity.base.Result;
|
||||
import com.sipai.entity.user.User;
|
||||
import com.sipai.service.accident.AccidentTypeService;
|
||||
import com.sipai.tools.CommUtil;
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import java.util.List;
|
||||
|
||||
@Controller
|
||||
@RequestMapping("/accident/accidentType")
|
||||
|
||||
@ -1,36 +1,5 @@
|
||||
package com.sipai.controller.accident;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collections;
|
||||
import java.util.Comparator;
|
||||
import java.util.Date;
|
||||
import java.util.HashMap;
|
||||
import java.util.HashSet;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
|
||||
import net.sf.json.JSONArray;
|
||||
|
||||
import org.activiti.engine.RuntimeService;
|
||||
import org.activiti.engine.TaskService;
|
||||
import org.activiti.engine.history.HistoricTaskInstance;
|
||||
import org.activiti.engine.impl.pvm.process.ActivityImpl;
|
||||
import org.activiti.engine.runtime.ProcessInstance;
|
||||
import org.activiti.engine.task.Task;
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.Model;
|
||||
import org.springframework.web.bind.annotation.ModelAttribute;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
import org.springframework.web.servlet.ModelAndView;
|
||||
|
||||
import com.github.pagehelper.PageHelper;
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import com.sipai.entity.accident.ReasonableAdvice;
|
||||
@ -52,6 +21,26 @@ import com.sipai.service.user.UserService;
|
||||
import com.sipai.tools.ActivitiUtil;
|
||||
import com.sipai.tools.CommString;
|
||||
import com.sipai.tools.CommUtil;
|
||||
import net.sf.json.JSONArray;
|
||||
import org.activiti.engine.RuntimeService;
|
||||
import org.activiti.engine.TaskService;
|
||||
import org.activiti.engine.history.HistoricTaskInstance;
|
||||
import org.activiti.engine.impl.pvm.process.ActivityImpl;
|
||||
import org.activiti.engine.runtime.ProcessInstance;
|
||||
import org.activiti.engine.task.Task;
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.Model;
|
||||
import org.springframework.web.bind.annotation.ModelAttribute;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
import org.springframework.web.servlet.ModelAndView;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
import java.io.IOException;
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.util.*;
|
||||
|
||||
@Controller
|
||||
@RequestMapping("/accident/reasonableAdvice")
|
||||
|
||||
@ -5,7 +5,6 @@ import com.sipai.entity.maintenance.Abnormity;
|
||||
import com.sipai.entity.scada.MPoint;
|
||||
import com.sipai.entity.scada.MPointHistory;
|
||||
import com.sipai.entity.user.Company;
|
||||
import com.sipai.entity.user.User;
|
||||
import com.sipai.entity.workorder.WorkorderDetail;
|
||||
import com.sipai.service.company.CompanyService;
|
||||
import com.sipai.service.equipment.EquipmentCardService;
|
||||
@ -14,7 +13,6 @@ import com.sipai.service.scada.MPointHistoryService;
|
||||
import com.sipai.service.scada.MPointService;
|
||||
import com.sipai.service.workorder.WorkorderDetailService;
|
||||
import com.sipai.tools.CommUtil;
|
||||
import com.sipai.tools.SpringContextUtil;
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.Model;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
|
||||
@ -1,21 +1,21 @@
|
||||
package com.sipai.controller.achievement;
|
||||
|
||||
import java.awt.Robot;
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.util.Date;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
|
||||
import net.sf.json.JSONArray;
|
||||
import com.jacob.activeX.ActiveXComponent;
|
||||
import com.jacob.com.ComThread;
|
||||
import com.jacob.com.Dispatch;
|
||||
import com.jacob.com.Variant;
|
||||
import com.sipai.entity.achievement.AcceptanceModel;
|
||||
import com.sipai.entity.base.CommonFile;
|
||||
import com.sipai.entity.base.Result;
|
||||
import com.sipai.entity.user.Company;
|
||||
import com.sipai.entity.user.User;
|
||||
import com.sipai.service.achievement.AcceptanceModelMPointService;
|
||||
import com.sipai.service.achievement.AcceptanceModelService;
|
||||
import com.sipai.service.base.CommonFileService;
|
||||
import com.sipai.service.company.CompanyService;
|
||||
import com.sipai.service.user.UserService;
|
||||
import com.sipai.tools.CommUtil;
|
||||
import net.sf.json.JSONObject;
|
||||
|
||||
import org.apache.commons.fileupload.servlet.ServletFileUpload;
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.Model;
|
||||
@ -26,26 +26,15 @@ import org.springframework.web.multipart.MultipartFile;
|
||||
import org.springframework.web.multipart.MultipartHttpServletRequest;
|
||||
import org.springframework.web.servlet.ModelAndView;
|
||||
|
||||
import com.jacob.activeX.ActiveXComponent;
|
||||
import com.jacob.com.ComThread;
|
||||
import com.jacob.com.Dispatch;
|
||||
import com.jacob.com.Variant;
|
||||
import com.sipai.entity.achievement.AcceptanceModel;
|
||||
import com.sipai.entity.achievement.AcceptanceModelMPoint;
|
||||
import com.sipai.entity.base.CommonFile;
|
||||
import com.sipai.entity.base.Result;
|
||||
import com.sipai.entity.data.CurveMpoint;
|
||||
import com.sipai.entity.data.DataCurve;
|
||||
import com.sipai.entity.scada.MPoint;
|
||||
import com.sipai.entity.scada.MPointHistory;
|
||||
import com.sipai.entity.user.Company;
|
||||
import com.sipai.entity.user.User;
|
||||
import com.sipai.service.achievement.AcceptanceModelMPointService;
|
||||
import com.sipai.service.achievement.AcceptanceModelService;
|
||||
import com.sipai.service.base.CommonFileService;
|
||||
import com.sipai.service.company.CompanyService;
|
||||
import com.sipai.service.user.UserService;
|
||||
import com.sipai.tools.CommUtil;
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
import java.io.File;
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.util.Date;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
@Controller
|
||||
@RequestMapping("/achievement/acceptanceModel")
|
||||
|
||||
@ -1,89 +1,52 @@
|
||||
package com.sipai.controller.achievement;
|
||||
|
||||
import static org.apache.poi.ss.usermodel.CellType.*;
|
||||
import static org.apache.poi.ss.usermodel.CellType.BOOLEAN;
|
||||
import static org.apache.poi.ss.usermodel.CellType.FORMULA;
|
||||
import static org.hamcrest.CoreMatchers.nullValue;
|
||||
|
||||
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.math.BigDecimal;
|
||||
import java.net.URLEncoder;
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Date;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.script.ScriptEngine;
|
||||
import javax.script.ScriptEngineManager;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
|
||||
import net.sf.json.JSONArray;
|
||||
import net.sf.json.JSONObject;
|
||||
|
||||
import org.apache.poi.hssf.usermodel.HSSFCell;
|
||||
import org.apache.poi.hssf.usermodel.HSSFCellStyle;
|
||||
import org.apache.poi.hssf.usermodel.HSSFRow;
|
||||
import org.apache.poi.hssf.usermodel.HSSFSheet;
|
||||
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
|
||||
import org.apache.poi.ss.usermodel.*;
|
||||
import org.apache.poi.xssf.usermodel.XSSFCell;
|
||||
import org.apache.poi.xssf.usermodel.XSSFCellStyle;
|
||||
import org.apache.poi.xssf.usermodel.XSSFRow;
|
||||
import org.apache.poi.xssf.usermodel.XSSFSheet;
|
||||
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.Model;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
import org.springframework.web.multipart.MultipartFile;
|
||||
import org.springframework.web.multipart.MultipartRequest;
|
||||
import org.springframework.web.servlet.ModelAndView;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
|
||||
import com.github.pagehelper.PageHelper;
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import com.jacob.activeX.ActiveXComponent;
|
||||
import com.jacob.com.ComThread;
|
||||
import com.jacob.com.Dispatch;
|
||||
import com.jacob.com.Variant;
|
||||
import com.sipai.entity.achievement.AcceptanceModelData;
|
||||
import com.sipai.entity.achievement.AcceptanceModelMPoint;
|
||||
import com.sipai.entity.achievement.AcceptanceModelOutput;
|
||||
import com.sipai.entity.achievement.AcceptanceModelOutputData;
|
||||
import com.sipai.entity.achievement.AcceptanceModelRecord;
|
||||
import com.sipai.entity.achievement.AcceptanceModelText;
|
||||
import com.sipai.entity.achievement.AcceptanceModelTextData;
|
||||
import com.sipai.entity.achievement.ModelLibrary;
|
||||
import com.sipai.entity.achievement.*;
|
||||
import com.sipai.entity.base.CommonFile;
|
||||
import com.sipai.entity.base.Result;
|
||||
import com.sipai.entity.equipment.EquipmentClass;
|
||||
import com.sipai.entity.report.RptCollectMode;
|
||||
import com.sipai.entity.scada.MPoint;
|
||||
import com.sipai.entity.scada.MPointHistory;
|
||||
import com.sipai.entity.user.User;
|
||||
import com.sipai.service.achievement.AcceptanceModelDataService;
|
||||
import com.sipai.service.achievement.AcceptanceModelMPointService;
|
||||
import com.sipai.service.achievement.AcceptanceModelOutputDataService;
|
||||
import com.sipai.service.achievement.AcceptanceModelOutputService;
|
||||
import com.sipai.service.achievement.AcceptanceModelRecordService;
|
||||
import com.sipai.service.achievement.AcceptanceModelService;
|
||||
import com.sipai.service.achievement.AcceptanceModelTextDataService;
|
||||
import com.sipai.service.achievement.AcceptanceModelTextService;
|
||||
import com.sipai.service.achievement.ModelLibraryService;
|
||||
import com.sipai.service.achievement.*;
|
||||
import com.sipai.service.base.CommonFileService;
|
||||
import com.sipai.service.report.RptCollectModeService;
|
||||
import com.sipai.service.scada.MPointHistoryService;
|
||||
import com.sipai.service.scada.MPointService;
|
||||
import com.sipai.tools.CommUtil;
|
||||
import net.sf.json.JSONArray;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
import org.apache.poi.hssf.usermodel.*;
|
||||
import org.apache.poi.ss.usermodel.*;
|
||||
import org.apache.poi.xssf.usermodel.*;
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.Model;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
import org.springframework.web.servlet.ModelAndView;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.script.ScriptEngine;
|
||||
import javax.script.ScriptEngineManager;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
import java.io.File;
|
||||
import java.io.FileInputStream;
|
||||
import java.io.FileOutputStream;
|
||||
import java.io.IOException;
|
||||
import java.math.BigDecimal;
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
|
||||
import static org.apache.poi.ss.usermodel.CellType.FORMULA;
|
||||
import static org.apache.poi.ss.usermodel.CellType.STRING;
|
||||
|
||||
@Controller
|
||||
@RequestMapping("/achievement/acceptanceModelCreate")
|
||||
|
||||
@ -1,23 +1,7 @@
|
||||
package com.sipai.controller.achievement;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.jws.soap.SOAPBinding.Use;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
|
||||
import net.sf.json.JSONArray;
|
||||
import net.sf.json.JSONObject;
|
||||
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.Model;
|
||||
import org.springframework.web.bind.annotation.ModelAttribute;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
|
||||
import com.github.pagehelper.PageHelper;
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import com.sipai.entity.achievement.AcceptanceModel;
|
||||
import com.sipai.entity.achievement.AcceptanceModelMPoint;
|
||||
import com.sipai.entity.base.Result;
|
||||
import com.sipai.entity.report.RptCollectMode;
|
||||
@ -27,6 +11,17 @@ import com.sipai.service.achievement.AcceptanceModelMPointService;
|
||||
import com.sipai.service.report.RptCollectModeService;
|
||||
import com.sipai.service.scada.MPointService;
|
||||
import com.sipai.tools.CommUtil;
|
||||
import net.sf.json.JSONArray;
|
||||
import net.sf.json.JSONObject;
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.Model;
|
||||
import org.springframework.web.bind.annotation.ModelAttribute;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import java.util.List;
|
||||
|
||||
@Controller
|
||||
@RequestMapping("/achievement/acceptanceModelMPoint")
|
||||
|
||||
@ -1,34 +1,26 @@
|
||||
package com.sipai.controller.achievement;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
|
||||
import com.github.pagehelper.PageHelper;
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import com.sipai.entity.achievement.AcceptanceModelOutput;
|
||||
import com.sipai.entity.achievement.ModelLibrary;
|
||||
import com.sipai.entity.base.Result;
|
||||
import com.sipai.entity.user.User;
|
||||
import com.sipai.service.achievement.AcceptanceModelOutputService;
|
||||
import com.sipai.service.achievement.ModelLibraryService;
|
||||
import com.sipai.service.report.RptCollectModeService;
|
||||
import com.sipai.service.scada.MPointService;
|
||||
import com.sipai.tools.CommUtil;
|
||||
import net.sf.json.JSONArray;
|
||||
import net.sf.json.JSONObject;
|
||||
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.Model;
|
||||
import org.springframework.web.bind.annotation.ModelAttribute;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
|
||||
import com.github.pagehelper.PageHelper;
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import com.sipai.entity.achievement.AcceptanceModelMPoint;
|
||||
import com.sipai.entity.achievement.AcceptanceModelOutput;
|
||||
import com.sipai.entity.achievement.ModelLibrary;
|
||||
import com.sipai.entity.base.Result;
|
||||
import com.sipai.entity.report.RptCollectMode;
|
||||
import com.sipai.entity.scada.MPoint;
|
||||
import com.sipai.entity.user.User;
|
||||
import com.sipai.service.achievement.AcceptanceModelMPointService;
|
||||
import com.sipai.service.achievement.AcceptanceModelOutputService;
|
||||
import com.sipai.service.achievement.ModelLibraryService;
|
||||
import com.sipai.service.report.RptCollectModeService;
|
||||
import com.sipai.service.scada.MPointService;
|
||||
import com.sipai.tools.CommUtil;
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import java.util.List;
|
||||
|
||||
@Controller
|
||||
@RequestMapping("/achievement/acceptanceModelOutput")
|
||||
|
||||
@ -1,20 +1,7 @@
|
||||
package com.sipai.controller.achievement;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
|
||||
import net.sf.json.JSONArray;
|
||||
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.Model;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
|
||||
import com.github.pagehelper.PageHelper;
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import com.sipai.entity.achievement.AcceptanceModelOutput;
|
||||
import com.sipai.entity.achievement.AcceptanceModelOutputData;
|
||||
import com.sipai.entity.achievement.AcceptanceModelRecord;
|
||||
import com.sipai.service.achievement.AcceptanceModelOutputDataService;
|
||||
@ -23,6 +10,15 @@ import com.sipai.service.achievement.AcceptanceModelRecordService;
|
||||
import com.sipai.service.achievement.ModelLibraryService;
|
||||
import com.sipai.service.report.RptCollectModeService;
|
||||
import com.sipai.service.scada.MPointService;
|
||||
import net.sf.json.JSONArray;
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.Model;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import java.util.List;
|
||||
|
||||
@Controller
|
||||
@RequestMapping("/achievement/acceptanceModelOutputData")
|
||||
|
||||
@ -1,18 +1,5 @@
|
||||
package com.sipai.controller.achievement;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
|
||||
import net.sf.json.JSONArray;
|
||||
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.Model;
|
||||
import org.springframework.web.bind.annotation.ModelAttribute;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
|
||||
import com.github.pagehelper.PageHelper;
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import com.sipai.entity.achievement.AcceptanceModelText;
|
||||
@ -22,6 +9,16 @@ import com.sipai.service.achievement.AcceptanceModelTextService;
|
||||
import com.sipai.service.report.RptCollectModeService;
|
||||
import com.sipai.service.scada.MPointService;
|
||||
import com.sipai.tools.CommUtil;
|
||||
import net.sf.json.JSONArray;
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.Model;
|
||||
import org.springframework.web.bind.annotation.ModelAttribute;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import java.util.List;
|
||||
|
||||
@Controller
|
||||
@RequestMapping("/achievement/acceptanceModelText")
|
||||
|
||||
@ -2,12 +2,9 @@ package com.sipai.controller.achievement;
|
||||
|
||||
import com.sipai.entity.achievement.ModelLibrary;
|
||||
import com.sipai.entity.base.Result;
|
||||
import com.sipai.entity.equipment.AssetClass;
|
||||
import com.sipai.entity.equipment.EquipmentClass;
|
||||
import com.sipai.entity.user.User;
|
||||
import com.sipai.service.achievement.ModelLibraryService;
|
||||
import com.sipai.tools.CommUtil;
|
||||
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.Model;
|
||||
import org.springframework.web.bind.annotation.ModelAttribute;
|
||||
@ -16,7 +13,6 @@ import org.springframework.web.bind.annotation.RequestParam;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Controller
|
||||
|
||||
@ -1,33 +1,63 @@
|
||||
package com.sipai.controller.activiti;
|
||||
|
||||
|
||||
import com.alibaba.fastjson.JSONException;
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import com.sipai.activiti.cmd.JumpActivityCmd;
|
||||
import com.sipai.activiti.util.Page;
|
||||
import com.sipai.activiti.util.PageUtil;
|
||||
import com.sipai.activiti.util.WorkflowUtils;
|
||||
import com.sipai.entity.accident.ReasonableAdvice;
|
||||
import com.sipai.entity.activiti.*;
|
||||
import com.sipai.entity.administration.IndexWork;
|
||||
import com.sipai.entity.administration.Organization;
|
||||
import com.sipai.entity.administration.Temporary;
|
||||
import com.sipai.entity.business.BusinessUnitAudit;
|
||||
import com.sipai.entity.equipment.*;
|
||||
import com.sipai.entity.maintenance.*;
|
||||
import com.sipai.entity.process.ProcessAdjustment;
|
||||
import com.sipai.entity.process.RoutineWork;
|
||||
import com.sipai.entity.process.WaterTest;
|
||||
import com.sipai.entity.report.RptCreate;
|
||||
import com.sipai.entity.sparepart.*;
|
||||
import com.sipai.entity.user.Company;
|
||||
import com.sipai.entity.user.Job;
|
||||
import com.sipai.entity.user.User;
|
||||
import com.sipai.entity.workorder.Overhaul;
|
||||
import com.sipai.entity.workorder.OverhaulItemProject;
|
||||
import com.sipai.entity.workorder.WorkorderDetail;
|
||||
import com.sipai.service.accident.ReasonableAdviceService;
|
||||
import com.sipai.service.activiti.WorkflowProcessDefinitionService;
|
||||
import com.sipai.service.activiti.WorkflowService;
|
||||
import com.sipai.service.activiti.WorkflowTraceService;
|
||||
import com.sipai.service.administration.IndexWorkService;
|
||||
import com.sipai.service.administration.OrganizationService;
|
||||
import com.sipai.service.administration.TemporaryService;
|
||||
import com.sipai.service.business.BusinessUnitAuditService;
|
||||
import com.sipai.service.business.BusinessUnitHandleService;
|
||||
import com.sipai.service.business.BusinessUnitService;
|
||||
import com.sipai.service.equipment.*;
|
||||
import com.sipai.service.maintenance.*;
|
||||
import com.sipai.service.process.ProcessAdjustmentService;
|
||||
import com.sipai.service.process.RoutineWorkService;
|
||||
import com.sipai.service.process.WaterTestService;
|
||||
import com.sipai.service.report.RptCreateService;
|
||||
|
||||
import com.sipai.service.sparepart.*;
|
||||
import com.sipai.service.user.JobService;
|
||||
import com.sipai.service.user.UnitService;
|
||||
import com.sipai.service.user.UserJobService;
|
||||
import com.sipai.service.workorder.OverhaulItemProjectService;
|
||||
import com.sipai.service.workorder.OverhaulService;
|
||||
import com.sipai.service.workorder.WorkorderDetailService;
|
||||
import com.sipai.tools.ActivitiUtil;
|
||||
import com.sipai.tools.CommString;
|
||||
import net.sf.json.JSONArray;
|
||||
import net.sf.json.JSONObject;
|
||||
|
||||
import org.activiti.bpmn.converter.BpmnXMLConverter;
|
||||
import org.activiti.bpmn.model.BpmnModel;
|
||||
import org.activiti.editor.constants.ModelDataJsonConstants;
|
||||
import org.activiti.editor.language.json.converter.BpmnJsonConverter;
|
||||
import org.activiti.engine.IdentityService;
|
||||
import org.activiti.engine.ManagementService;
|
||||
import org.activiti.engine.ProcessEngineConfiguration;
|
||||
import org.activiti.engine.RepositoryService;
|
||||
import org.activiti.engine.RuntimeService;
|
||||
import org.activiti.engine.TaskService;
|
||||
import org.activiti.engine.*;
|
||||
import org.activiti.engine.impl.RepositoryServiceImpl;
|
||||
import org.activiti.engine.impl.cfg.ProcessEngineConfigurationImpl;
|
||||
import org.activiti.engine.impl.context.Context;
|
||||
@ -59,77 +89,18 @@ import org.springframework.web.bind.annotation.ResponseBody;
|
||||
import org.springframework.web.multipart.MultipartFile;
|
||||
import org.springframework.web.servlet.ModelAndView;
|
||||
|
||||
import com.alibaba.fastjson.JSONException;
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import com.sipai.activiti.cmd.JumpActivityCmd;
|
||||
import com.sipai.activiti.util.Page;
|
||||
import com.sipai.activiti.util.PageUtil;
|
||||
import com.sipai.activiti.util.WorkflowUtils;
|
||||
import com.sipai.entity.accident.ReasonableAdvice;
|
||||
import com.sipai.entity.activiti.Leave;
|
||||
import com.sipai.entity.activiti.ModelNodeJob;
|
||||
import com.sipai.entity.activiti.ProcessType;
|
||||
import com.sipai.entity.activiti.TodoTask;
|
||||
import com.sipai.entity.activiti.WorkTask;
|
||||
import com.sipai.entity.administration.IndexWork;
|
||||
import com.sipai.entity.administration.Organization;
|
||||
import com.sipai.entity.administration.Temporary;
|
||||
import com.sipai.entity.business.BusinessUnitAudit;
|
||||
import com.sipai.entity.sparepart.Contract;
|
||||
import com.sipai.entity.sparepart.InStockRecord;
|
||||
import com.sipai.entity.sparepart.OutStockRecord;
|
||||
import com.sipai.entity.sparepart.RawMaterial;
|
||||
import com.sipai.entity.sparepart.StockCheck;
|
||||
import com.sipai.entity.sparepart.Subscribe;
|
||||
import com.sipai.entity.user.Company;
|
||||
import com.sipai.entity.user.Job;
|
||||
import com.sipai.entity.user.User;
|
||||
import com.sipai.entity.workorder.OverhaulItemProject;
|
||||
import com.sipai.entity.workorder.WorkorderDetail;
|
||||
import com.sipai.entity.process.ProcessAdjustment;
|
||||
import com.sipai.service.activiti.WorkflowService;
|
||||
import com.sipai.service.accident.ReasonableAdviceService;
|
||||
import com.sipai.service.activiti.WorkflowProcessDefinitionService;
|
||||
import com.sipai.service.activiti.WorkflowTraceService;
|
||||
import com.sipai.service.administration.IndexWorkService;
|
||||
import com.sipai.service.administration.OrganizationService;
|
||||
import com.sipai.service.administration.TemporaryService;
|
||||
import com.sipai.service.business.BusinessUnitAuditService;
|
||||
import com.sipai.service.business.BusinessUnitHandleService;
|
||||
import com.sipai.service.business.BusinessUnitService;
|
||||
import com.sipai.service.sparepart.ContractService;
|
||||
import com.sipai.service.sparepart.InStockRecordService;
|
||||
import com.sipai.service.sparepart.OutStockRecordService;
|
||||
import com.sipai.service.sparepart.RawMaterialService;
|
||||
import com.sipai.service.sparepart.StockCheckService;
|
||||
import com.sipai.service.sparepart.SubscribeService;
|
||||
import com.sipai.service.user.JobService;
|
||||
import com.sipai.service.user.UnitService;
|
||||
import com.sipai.service.user.UserJobService;
|
||||
import com.sipai.service.workorder.OverhaulItemProjectService;
|
||||
import com.sipai.service.process.ProcessAdjustmentService;
|
||||
import com.sipai.tools.ActivitiUtil;
|
||||
import com.sipai.tools.CommString;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
import javax.xml.stream.XMLInputFactory;
|
||||
import javax.xml.stream.XMLStreamException;
|
||||
import javax.xml.stream.XMLStreamReader;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
import java.io.InputStreamReader;
|
||||
import java.io.UnsupportedEncodingException;
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collections;
|
||||
import java.util.Comparator;
|
||||
import java.util.HashMap;
|
||||
import java.util.Iterator;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.*;
|
||||
import java.util.zip.ZipInputStream;
|
||||
|
||||
/**
|
||||
|
||||
@ -1,43 +1,27 @@
|
||||
package com.sipai.controller.activiti;
|
||||
|
||||
|
||||
|
||||
|
||||
import java.io.File;
|
||||
import java.io.FileInputStream;
|
||||
import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
import java.io.InputStreamReader;
|
||||
import java.io.UnsupportedEncodingException;
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.zip.ZipInputStream;
|
||||
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
import javax.xml.stream.XMLInputFactory;
|
||||
import javax.xml.stream.XMLStreamException;
|
||||
import javax.xml.stream.XMLStreamReader;
|
||||
|
||||
import com.github.pagehelper.PageHelper;
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import com.sipai.activiti.cmd.JumpActivityCmd;
|
||||
import com.sipai.activiti.util.Page;
|
||||
import com.sipai.activiti.util.PageUtil;
|
||||
import com.sipai.activiti.util.WorkflowUtils;
|
||||
import com.sipai.entity.activiti.TaskModel;
|
||||
import com.sipai.entity.user.User;
|
||||
import com.sipai.service.activiti.WorkflowProcessDefinitionService;
|
||||
import com.sipai.service.activiti.WorkflowTraceService;
|
||||
import com.sipai.tools.CommUtil;
|
||||
import com.sipai.tools.FileUtil;
|
||||
import net.sf.json.JSONArray;
|
||||
import net.sf.json.JSONObject;
|
||||
import org.activiti.bpmn.BpmnAutoLayout;
|
||||
import org.activiti.bpmn.converter.BpmnXMLConverter;
|
||||
import org.activiti.bpmn.model.BpmnModel;
|
||||
import org.activiti.bpmn.model.EndEvent;
|
||||
import org.activiti.bpmn.model.ExclusiveGateway;
|
||||
import org.activiti.bpmn.model.*;
|
||||
import org.activiti.bpmn.model.Process;
|
||||
import org.activiti.bpmn.model.SequenceFlow;
|
||||
import org.activiti.bpmn.model.StartEvent;
|
||||
import org.activiti.bpmn.model.UserTask;
|
||||
import org.activiti.editor.constants.ModelDataJsonConstants;
|
||||
import org.activiti.editor.language.json.converter.BpmnJsonConverter;
|
||||
import org.activiti.engine.ManagementService;
|
||||
import org.activiti.engine.ProcessEngineConfiguration;
|
||||
import org.activiti.engine.RepositoryService;
|
||||
import org.activiti.engine.RuntimeService;
|
||||
import org.activiti.engine.TaskService;
|
||||
import org.activiti.engine.*;
|
||||
import org.activiti.engine.impl.Condition;
|
||||
import org.activiti.engine.impl.RepositoryServiceImpl;
|
||||
import org.activiti.engine.impl.cfg.ProcessEngineConfigurationImpl;
|
||||
@ -77,21 +61,18 @@ import org.springframework.web.bind.annotation.ResponseBody;
|
||||
import org.springframework.web.multipart.MultipartFile;
|
||||
import org.springframework.web.servlet.ModelAndView;
|
||||
|
||||
import com.github.pagehelper.PageHelper;
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import com.sipai.activiti.cmd.JumpActivityCmd;
|
||||
import com.sipai.activiti.util.Page;
|
||||
import com.sipai.activiti.util.PageUtil;
|
||||
import com.sipai.activiti.util.WorkflowUtils;
|
||||
import com.sipai.entity.activiti.TaskModel;
|
||||
import com.sipai.entity.user.User;
|
||||
import com.sipai.service.activiti.WorkflowProcessDefinitionService;
|
||||
import com.sipai.service.activiti.WorkflowTraceService;
|
||||
import com.sipai.tools.CommUtil;
|
||||
import com.sipai.tools.FileUtil;
|
||||
|
||||
import net.sf.json.JSONArray;
|
||||
import net.sf.json.JSONObject;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
import javax.xml.stream.XMLInputFactory;
|
||||
import javax.xml.stream.XMLStreamException;
|
||||
import javax.xml.stream.XMLStreamReader;
|
||||
import java.io.*;
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.zip.ZipInputStream;
|
||||
/**
|
||||
* 流程管理控制器
|
||||
*
|
||||
|
||||
@ -18,8 +18,8 @@ import com.sipai.tools.CommString;
|
||||
import net.sf.json.JSONArray;
|
||||
import net.sf.json.JSONObject;
|
||||
import org.activiti.bpmn.converter.BpmnXMLConverter;
|
||||
import org.activiti.bpmn.model.Process;
|
||||
import org.activiti.bpmn.model.*;
|
||||
import org.activiti.bpmn.model.Process;
|
||||
import org.activiti.editor.constants.ModelDataJsonConstants;
|
||||
import org.activiti.editor.language.json.converter.BpmnJsonConverter;
|
||||
import org.activiti.engine.RepositoryService;
|
||||
|
||||
@ -1,62 +1,39 @@
|
||||
package com.sipai.controller.activiti;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
import javax.servlet.http.HttpSession;
|
||||
|
||||
import com.sipai.entity.activiti.ProcessType;
|
||||
import com.sipai.entity.activiti.TodoTask;
|
||||
import com.sipai.entity.equipment.*;
|
||||
import com.sipai.entity.maintenance.Maintenance;
|
||||
import com.sipai.entity.maintenance.MaintenanceDetail;
|
||||
import com.sipai.entity.process.ProcessAdjustment;
|
||||
import com.sipai.entity.sparepart.*;
|
||||
import com.sipai.entity.user.Company;
|
||||
import com.sipai.entity.user.User;
|
||||
import com.sipai.entity.user.UserDetail;
|
||||
import com.sipai.service.activiti.WorkflowService;
|
||||
import com.sipai.service.base.LoginService;
|
||||
import com.sipai.service.equipment.*;
|
||||
import com.sipai.service.maintenance.MaintenanceDetailService;
|
||||
import com.sipai.service.maintenance.MaintenanceService;
|
||||
import com.sipai.service.process.ProcessAdjustmentService;
|
||||
import com.sipai.service.sparepart.*;
|
||||
import com.sipai.service.user.UnitService;
|
||||
import com.sipai.service.user.UserDetailService;
|
||||
import com.sipai.service.user.UserService;
|
||||
import com.sipai.tools.CommString;
|
||||
import com.sipai.tools.CommUtil;
|
||||
import net.sf.json.JSONArray;
|
||||
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.Model;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.servlet.ModelAndView;
|
||||
|
||||
import com.sipai.entity.activiti.ProcessType;
|
||||
import com.sipai.entity.activiti.TodoTask;
|
||||
import com.sipai.entity.equipment.EquipmentAcceptanceApply;
|
||||
import com.sipai.entity.equipment.EquipmentLoseApply;
|
||||
import com.sipai.entity.equipment.EquipmentSaleApply;
|
||||
import com.sipai.entity.equipment.EquipmentScrapApply;
|
||||
import com.sipai.entity.equipment.EquipmentStopRecord;
|
||||
import com.sipai.entity.equipment.EquipmentTransfersApply;
|
||||
import com.sipai.entity.equipment.MaintenancePlan;
|
||||
import com.sipai.entity.maintenance.Maintenance;
|
||||
import com.sipai.entity.maintenance.MaintenanceDetail;
|
||||
import com.sipai.entity.sparepart.Contract;
|
||||
import com.sipai.entity.sparepart.InStockRecord;
|
||||
import com.sipai.entity.sparepart.OutStockRecord;
|
||||
import com.sipai.entity.sparepart.StockCheck;
|
||||
import com.sipai.entity.sparepart.Subscribe;
|
||||
import com.sipai.entity.user.Company;
|
||||
import com.sipai.entity.user.User;
|
||||
import com.sipai.entity.user.UserDetail;
|
||||
import com.sipai.entity.process.ProcessAdjustment;
|
||||
import com.sipai.service.activiti.WorkflowService;
|
||||
import com.sipai.service.base.LoginService;
|
||||
import com.sipai.service.equipment.EquipmentAcceptanceApplyService;
|
||||
import com.sipai.service.equipment.EquipmentLoseApplyService;
|
||||
import com.sipai.service.equipment.EquipmentSaleApplyService;
|
||||
import com.sipai.service.equipment.EquipmentScrapApplyService;
|
||||
import com.sipai.service.equipment.EquipmentStopRecordService;
|
||||
import com.sipai.service.equipment.EquipmentTransfersApplyService;
|
||||
import com.sipai.service.equipment.MaintenancePlanService;
|
||||
import com.sipai.service.maintenance.MaintenanceDetailService;
|
||||
import com.sipai.service.maintenance.MaintenanceService;
|
||||
import com.sipai.service.sparepart.ContractService;
|
||||
import com.sipai.service.sparepart.InStockRecordService;
|
||||
import com.sipai.service.sparepart.OutStockRecordService;
|
||||
import com.sipai.service.sparepart.StockCheckService;
|
||||
import com.sipai.service.sparepart.SubscribeService;
|
||||
import com.sipai.service.user.UnitService;
|
||||
import com.sipai.service.user.UserDetailService;
|
||||
import com.sipai.service.user.UserService;
|
||||
import com.sipai.service.process.ProcessAdjustmentService;
|
||||
import com.sipai.tools.CommString;
|
||||
import com.sipai.tools.CommUtil;
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
import javax.servlet.http.HttpSession;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
|
||||
@Controller
|
||||
|
||||
@ -1,13 +1,13 @@
|
||||
package com.sipai.controller.administration;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
|
||||
import com.github.pagehelper.PageHelper;
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import com.sipai.entity.administration.IndexClass;
|
||||
import com.sipai.entity.user.User;
|
||||
import com.sipai.service.administration.IndexClassService;
|
||||
import com.sipai.tools.CommUtil;
|
||||
import net.sf.json.JSONArray;
|
||||
import net.sf.json.JSONObject;
|
||||
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.Model;
|
||||
import org.springframework.web.bind.annotation.ModelAttribute;
|
||||
@ -15,14 +15,9 @@ import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
import org.springframework.web.servlet.ModelAndView;
|
||||
|
||||
import com.github.pagehelper.PageHelper;
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import com.sipai.entity.administration.IndexClass;
|
||||
import com.sipai.entity.administration.IndexClass;
|
||||
import com.sipai.entity.user.Company;
|
||||
import com.sipai.entity.user.User;
|
||||
import com.sipai.service.administration.IndexClassService;
|
||||
import com.sipai.tools.CommUtil;
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import java.util.List;
|
||||
|
||||
@Controller
|
||||
@RequestMapping("/administration/indexClass")
|
||||
|
||||
@ -1,19 +1,14 @@
|
||||
package com.sipai.controller.administration;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashSet;
|
||||
import java.util.Iterator;
|
||||
import java.util.List;
|
||||
import java.util.Random;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
|
||||
import com.github.pagehelper.PageHelper;
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import com.sipai.entity.administration.Index;
|
||||
import com.sipai.entity.administration.IndexCycle;
|
||||
import com.sipai.entity.user.User;
|
||||
import com.sipai.service.administration.IndexCycleService;
|
||||
import com.sipai.service.administration.IndexService;
|
||||
import com.sipai.tools.CommUtil;
|
||||
import net.sf.json.JSONArray;
|
||||
import net.sf.json.JSONObject;
|
||||
|
||||
import org.apache.batik.ext.awt.geom.Cubic;
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.Model;
|
||||
import org.springframework.web.bind.annotation.ModelAttribute;
|
||||
@ -21,22 +16,10 @@ import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
import org.springframework.web.servlet.ModelAndView;
|
||||
|
||||
import com.github.pagehelper.PageHelper;
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import com.sipai.entity.administration.Index;
|
||||
import com.sipai.entity.administration.IndexCycle;
|
||||
import com.sipai.entity.base.CommonFile;
|
||||
import com.sipai.entity.sparepart.SubscribeDetail;
|
||||
import com.sipai.entity.user.Company;
|
||||
import com.sipai.entity.user.Unit;
|
||||
import com.sipai.entity.user.User;
|
||||
import com.sipai.service.administration.IndexCycleService;
|
||||
import com.sipai.service.administration.IndexService;
|
||||
import com.sipai.service.base.CommonFileService;
|
||||
import com.sipai.service.user.UnitService;
|
||||
import com.sipai.service.user.UserService;
|
||||
import com.sipai.tools.CommString;
|
||||
import com.sipai.tools.CommUtil;
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import java.math.BigDecimal;
|
||||
import java.util.List;
|
||||
|
||||
@Controller
|
||||
@RequestMapping("/administration/index")
|
||||
|
||||
@ -1,14 +1,13 @@
|
||||
package com.sipai.controller.administration;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.util.List;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
|
||||
import com.github.pagehelper.PageHelper;
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import com.sipai.entity.administration.IndexCycle;
|
||||
import com.sipai.entity.user.User;
|
||||
import com.sipai.service.administration.IndexCycleService;
|
||||
import com.sipai.tools.CommUtil;
|
||||
import net.sf.json.JSONArray;
|
||||
import net.sf.json.JSONObject;
|
||||
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.Model;
|
||||
import org.springframework.web.bind.annotation.ModelAttribute;
|
||||
@ -16,14 +15,10 @@ import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
import org.springframework.web.servlet.ModelAndView;
|
||||
|
||||
import com.github.pagehelper.PageHelper;
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import com.sipai.entity.administration.IndexCycle;
|
||||
import com.sipai.entity.administration.IndexCycle;
|
||||
import com.sipai.entity.user.Company;
|
||||
import com.sipai.entity.user.User;
|
||||
import com.sipai.service.administration.IndexCycleService;
|
||||
import com.sipai.tools.CommUtil;
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import java.math.BigDecimal;
|
||||
import java.util.List;
|
||||
|
||||
@Controller
|
||||
@RequestMapping("/administration/indexCycle")
|
||||
|
||||
@ -1,34 +1,5 @@
|
||||
package com.sipai.controller.administration;
|
||||
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collections;
|
||||
import java.util.Comparator;
|
||||
import java.util.Date;
|
||||
import java.util.HashMap;
|
||||
import java.util.HashSet;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
|
||||
import net.sf.json.JSONArray;
|
||||
|
||||
import org.activiti.engine.RuntimeService;
|
||||
import org.activiti.engine.TaskService;
|
||||
import org.activiti.engine.history.HistoricTaskInstance;
|
||||
import org.activiti.engine.impl.pvm.process.ActivityImpl;
|
||||
import org.activiti.engine.runtime.ProcessInstance;
|
||||
import org.activiti.engine.task.Task;
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.Model;
|
||||
import org.springframework.web.bind.annotation.ModelAttribute;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
import org.springframework.web.servlet.ModelAndView;
|
||||
|
||||
import com.github.pagehelper.PageHelper;
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import com.sipai.entity.activiti.WorkTask;
|
||||
@ -49,6 +20,24 @@ import com.sipai.service.user.UserService;
|
||||
import com.sipai.tools.ActivitiUtil;
|
||||
import com.sipai.tools.CommString;
|
||||
import com.sipai.tools.CommUtil;
|
||||
import net.sf.json.JSONArray;
|
||||
import org.activiti.engine.RuntimeService;
|
||||
import org.activiti.engine.TaskService;
|
||||
import org.activiti.engine.history.HistoricTaskInstance;
|
||||
import org.activiti.engine.impl.pvm.process.ActivityImpl;
|
||||
import org.activiti.engine.runtime.ProcessInstance;
|
||||
import org.activiti.engine.task.Task;
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.Model;
|
||||
import org.springframework.web.bind.annotation.ModelAttribute;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
import org.springframework.web.servlet.ModelAndView;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.util.*;
|
||||
|
||||
@Controller
|
||||
@RequestMapping("/administration/indexWork")
|
||||
|
||||
@ -1,15 +1,13 @@
|
||||
package com.sipai.controller.administration;
|
||||
|
||||
import static org.hamcrest.CoreMatchers.nullValue;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
|
||||
import com.github.pagehelper.PageHelper;
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import com.sipai.entity.administration.OrganizationClass;
|
||||
import com.sipai.entity.user.User;
|
||||
import com.sipai.service.administration.OrganizationClassService;
|
||||
import com.sipai.tools.CommUtil;
|
||||
import net.sf.json.JSONArray;
|
||||
import net.sf.json.JSONObject;
|
||||
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.Model;
|
||||
import org.springframework.web.bind.annotation.ModelAttribute;
|
||||
@ -17,14 +15,9 @@ import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
import org.springframework.web.servlet.ModelAndView;
|
||||
|
||||
import com.github.pagehelper.PageHelper;
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import com.sipai.entity.administration.OrganizationClass;
|
||||
import com.sipai.entity.administration.OrganizationClass;
|
||||
import com.sipai.entity.user.Company;
|
||||
import com.sipai.entity.user.User;
|
||||
import com.sipai.service.administration.OrganizationClassService;
|
||||
import com.sipai.tools.CommUtil;
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import java.util.List;
|
||||
|
||||
@Controller
|
||||
@RequestMapping("/administration/organizationClass")
|
||||
|
||||
@ -1,34 +1,5 @@
|
||||
package com.sipai.controller.administration;
|
||||
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collections;
|
||||
import java.util.Comparator;
|
||||
import java.util.Date;
|
||||
import java.util.HashMap;
|
||||
import java.util.HashSet;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
|
||||
import net.sf.json.JSONArray;
|
||||
|
||||
import org.activiti.engine.RuntimeService;
|
||||
import org.activiti.engine.TaskService;
|
||||
import org.activiti.engine.history.HistoricTaskInstance;
|
||||
import org.activiti.engine.impl.pvm.process.ActivityImpl;
|
||||
import org.activiti.engine.runtime.ProcessInstance;
|
||||
import org.activiti.engine.task.Task;
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.Model;
|
||||
import org.springframework.web.bind.annotation.ModelAttribute;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
import org.springframework.web.servlet.ModelAndView;
|
||||
|
||||
import com.github.pagehelper.PageHelper;
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import com.sipai.entity.activiti.WorkTask;
|
||||
@ -50,6 +21,24 @@ import com.sipai.service.user.UserService;
|
||||
import com.sipai.tools.ActivitiUtil;
|
||||
import com.sipai.tools.CommString;
|
||||
import com.sipai.tools.CommUtil;
|
||||
import net.sf.json.JSONArray;
|
||||
import org.activiti.engine.RuntimeService;
|
||||
import org.activiti.engine.TaskService;
|
||||
import org.activiti.engine.history.HistoricTaskInstance;
|
||||
import org.activiti.engine.impl.pvm.process.ActivityImpl;
|
||||
import org.activiti.engine.runtime.ProcessInstance;
|
||||
import org.activiti.engine.task.Task;
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.Model;
|
||||
import org.springframework.web.bind.annotation.ModelAttribute;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
import org.springframework.web.servlet.ModelAndView;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.util.*;
|
||||
|
||||
@Controller
|
||||
@RequestMapping("/administration/organization")
|
||||
|
||||
@ -1,34 +1,5 @@
|
||||
package com.sipai.controller.administration;
|
||||
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collections;
|
||||
import java.util.Comparator;
|
||||
import java.util.Date;
|
||||
import java.util.HashMap;
|
||||
import java.util.HashSet;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
|
||||
import net.sf.json.JSONArray;
|
||||
|
||||
import org.activiti.engine.RuntimeService;
|
||||
import org.activiti.engine.TaskService;
|
||||
import org.activiti.engine.history.HistoricTaskInstance;
|
||||
import org.activiti.engine.impl.pvm.process.ActivityImpl;
|
||||
import org.activiti.engine.runtime.ProcessInstance;
|
||||
import org.activiti.engine.task.Task;
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.Model;
|
||||
import org.springframework.web.bind.annotation.ModelAttribute;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
import org.springframework.web.servlet.ModelAndView;
|
||||
|
||||
import com.github.pagehelper.PageHelper;
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import com.sipai.entity.activiti.WorkTask;
|
||||
@ -49,6 +20,24 @@ import com.sipai.service.user.UserService;
|
||||
import com.sipai.tools.ActivitiUtil;
|
||||
import com.sipai.tools.CommString;
|
||||
import com.sipai.tools.CommUtil;
|
||||
import net.sf.json.JSONArray;
|
||||
import org.activiti.engine.RuntimeService;
|
||||
import org.activiti.engine.TaskService;
|
||||
import org.activiti.engine.history.HistoricTaskInstance;
|
||||
import org.activiti.engine.impl.pvm.process.ActivityImpl;
|
||||
import org.activiti.engine.runtime.ProcessInstance;
|
||||
import org.activiti.engine.task.Task;
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.Model;
|
||||
import org.springframework.web.bind.annotation.ModelAttribute;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
import org.springframework.web.servlet.ModelAndView;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.util.*;
|
||||
|
||||
@Controller
|
||||
@RequestMapping("/administration/temporary")
|
||||
|
||||
@ -1,22 +1,19 @@
|
||||
package com.sipai.controller.alarm;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
|
||||
import net.sf.json.JSONArray;
|
||||
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.Model;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
|
||||
import com.github.pagehelper.PageHelper;
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import com.sipai.entity.alarm.AlarmCondition;
|
||||
import com.sipai.service.alarm.AlarmConditionService;
|
||||
import com.sipai.tools.CommUtil;
|
||||
import net.sf.json.JSONArray;
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.Model;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import java.util.List;
|
||||
|
||||
@Controller
|
||||
@RequestMapping("/alarm/alarmCondition")
|
||||
|
||||
@ -1,15 +1,15 @@
|
||||
package com.sipai.controller.alarm;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
|
||||
import com.alibaba.fastjson.JSON;
|
||||
import com.github.pagehelper.PageHelper;
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import com.sipai.entity.alarm.*;
|
||||
import com.sipai.entity.base.Result;
|
||||
import com.sipai.entity.user.User;
|
||||
import com.sipai.service.alarm.*;
|
||||
import com.sipai.tools.CommUtil;
|
||||
import net.sf.json.JSONArray;
|
||||
import net.sf.json.JSONObject;
|
||||
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.Model;
|
||||
import org.springframework.web.bind.annotation.ModelAttribute;
|
||||
@ -17,12 +17,9 @@ import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
import org.springframework.web.servlet.ModelAndView;
|
||||
|
||||
import com.alibaba.fastjson.JSON;
|
||||
import com.github.pagehelper.PageHelper;
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import com.sipai.entity.base.Result;
|
||||
import com.sipai.entity.user.User;
|
||||
import com.sipai.tools.CommUtil;
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import java.util.List;
|
||||
|
||||
@Controller
|
||||
@RequestMapping("/alarm/alarmInformation")
|
||||
|
||||
@ -1,10 +1,7 @@
|
||||
package com.sipai.controller.alarm;
|
||||
|
||||
import com.github.pagehelper.PageHelper;
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import com.sipai.entity.alarm.AlarmLevelsConfig;
|
||||
import com.sipai.entity.base.Result;
|
||||
import com.sipai.entity.hqconfig.RiskLevel;
|
||||
import com.sipai.entity.user.User;
|
||||
import com.sipai.service.alarm.AlarmLevesConfigService;
|
||||
import com.sipai.tools.CommUtil;
|
||||
|
||||
@ -1,20 +1,5 @@
|
||||
package com.sipai.controller.alarm;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
|
||||
import net.sf.json.JSONArray;
|
||||
import net.sf.json.JSONObject;
|
||||
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.Model;
|
||||
import org.springframework.web.bind.annotation.ModelAttribute;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
import org.springframework.web.servlet.ModelAndView;
|
||||
import com.github.pagehelper.PageHelper;
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import com.sipai.entity.alarm.AlarmLevels;
|
||||
@ -24,6 +9,17 @@ import com.sipai.entity.user.User;
|
||||
import com.sipai.service.alarm.AlarmLevelsService;
|
||||
import com.sipai.service.user.UnitService;
|
||||
import com.sipai.tools.CommUtil;
|
||||
import net.sf.json.JSONArray;
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.Model;
|
||||
import org.springframework.web.bind.annotation.ModelAttribute;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
import org.springframework.web.servlet.ModelAndView;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import java.util.List;
|
||||
|
||||
@Controller
|
||||
@RequestMapping("/alarm/alarmLevels")
|
||||
|
||||
@ -1,20 +1,5 @@
|
||||
package com.sipai.controller.alarm;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
|
||||
import net.sf.json.JSONArray;
|
||||
import net.sf.json.JSONObject;
|
||||
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.Model;
|
||||
import org.springframework.web.bind.annotation.ModelAttribute;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
import org.springframework.web.servlet.ModelAndView;
|
||||
import com.github.pagehelper.PageHelper;
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import com.sipai.entity.alarm.AlarmMold;
|
||||
@ -24,6 +9,17 @@ import com.sipai.entity.user.User;
|
||||
import com.sipai.service.alarm.AlarmMoldService;
|
||||
import com.sipai.service.user.UnitService;
|
||||
import com.sipai.tools.CommUtil;
|
||||
import net.sf.json.JSONArray;
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.Model;
|
||||
import org.springframework.web.bind.annotation.ModelAttribute;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
import org.springframework.web.servlet.ModelAndView;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import java.util.List;
|
||||
|
||||
@Controller
|
||||
@RequestMapping("/alarm/alarmMold")
|
||||
|
||||
@ -1,43 +1,37 @@
|
||||
package com.sipai.controller.alarm;
|
||||
|
||||
import static org.hamcrest.CoreMatchers.nullValue;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.math.BigDecimal;
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
|
||||
import com.github.pagehelper.PageHelper;
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import com.sipai.entity.alarm.AlarmInformation;
|
||||
import com.sipai.entity.alarm.AlarmMoldCodeEnum;
|
||||
import com.sipai.entity.alarm.AlarmPoint;
|
||||
import com.sipai.entity.alarm.AlarmSubscribe;
|
||||
import com.sipai.entity.base.Result;
|
||||
import com.sipai.entity.scada.MPoint;
|
||||
import com.sipai.entity.user.ProcessSection;
|
||||
import com.sipai.entity.user.User;
|
||||
import com.sipai.service.alarm.AlarmInformationService;
|
||||
import com.sipai.service.alarm.AlarmPointService;
|
||||
import com.sipai.service.alarm.AlarmSubscribeService;
|
||||
import com.sipai.service.scada.MPointService;
|
||||
import com.sipai.service.scada.ProAlarmService;
|
||||
import com.sipai.service.user.ProcessSectionService;
|
||||
import com.sipai.tools.CommUtil;
|
||||
import net.sf.json.JSONArray;
|
||||
import net.sf.json.JSONObject;
|
||||
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.Model;
|
||||
import org.springframework.web.bind.annotation.ModelAttribute;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
import org.springframework.web.servlet.ModelAndView;
|
||||
import com.github.pagehelper.PageHelper;
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import com.sipai.entity.alarm.AlarmInformation;
|
||||
import com.sipai.entity.alarm.AlarmPoint;
|
||||
import com.sipai.entity.base.Result;
|
||||
import com.sipai.entity.user.User;
|
||||
import com.sipai.service.alarm.AlarmInformationService;
|
||||
import com.sipai.service.alarm.AlarmPointService;
|
||||
import com.sipai.service.user.UnitService;
|
||||
import com.sipai.tools.CommUtil;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import java.io.IOException;
|
||||
import java.math.BigDecimal;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
@Controller
|
||||
@RequestMapping("/alarm/alarmPoint")
|
||||
|
||||
@ -2,12 +2,9 @@ package com.sipai.controller.alarm;
|
||||
|
||||
import com.github.pagehelper.PageHelper;
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import com.sipai.entity.alarm.AlarmLevelsConfig;
|
||||
import com.sipai.entity.alarm.AlarmPointRiskLevel;
|
||||
import com.sipai.entity.base.Result;
|
||||
import com.sipai.entity.hqconfig.RiskLevel;
|
||||
import com.sipai.entity.user.User;
|
||||
import com.sipai.service.alarm.AlarmLevesConfigService;
|
||||
import com.sipai.service.alarm.AlarmPointRiskLevelService;
|
||||
import com.sipai.service.hqconfig.RiskLevelService;
|
||||
import com.sipai.tools.CommUtil;
|
||||
@ -21,7 +18,6 @@ import org.springframework.web.servlet.ModelAndView;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
@Controller
|
||||
|
||||
@ -1,20 +1,5 @@
|
||||
package com.sipai.controller.alarm;
|
||||
|
||||
import java.text.ParseException;
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.util.Calendar;
|
||||
import java.util.List;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
|
||||
import net.sf.json.JSONArray;
|
||||
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.Model;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
|
||||
import com.github.pagehelper.PageHelper;
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import com.sipai.entity.alarm.AlarmRecord;
|
||||
@ -27,6 +12,18 @@ import com.sipai.service.alarm.AlarmRecordService;
|
||||
import com.sipai.service.alarm.AlarmSolutionService;
|
||||
import com.sipai.service.timeefficiency.PatrolRecordService;
|
||||
import com.sipai.tools.CommUtil;
|
||||
import net.sf.json.JSONArray;
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.Model;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import java.text.ParseException;
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.util.Calendar;
|
||||
import java.util.List;
|
||||
|
||||
@Controller
|
||||
@RequestMapping("/alarm/alarmRecord")
|
||||
|
||||
@ -1,27 +1,23 @@
|
||||
package com.sipai.controller.alarm;
|
||||
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
|
||||
import com.github.pagehelper.PageHelper;
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import com.sipai.entity.alarm.AlarmSolution;
|
||||
import com.sipai.entity.alarm.OrderType;
|
||||
import com.sipai.service.alarm.AlarmSolutionService;
|
||||
import com.sipai.tools.CommUtil;
|
||||
import net.sf.json.JSONArray;
|
||||
import net.sf.json.JSONObject;
|
||||
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.Model;
|
||||
import org.springframework.web.bind.annotation.ModelAttribute;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
|
||||
import com.github.pagehelper.PageHelper;
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import com.sipai.entity.alarm.AlarmCondition;
|
||||
import com.sipai.entity.alarm.AlarmSolution;
|
||||
import com.sipai.entity.alarm.OrderType;
|
||||
import com.sipai.service.alarm.AlarmSolutionService;
|
||||
import com.sipai.tools.CommUtil;
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
|
||||
@Controller
|
||||
@RequestMapping("/alarm/alarmSolution")
|
||||
|
||||
@ -1,30 +1,28 @@
|
||||
package com.sipai.controller.alarm;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.github.pagehelper.PageHelper;
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import com.sipai.entity.alarm.AlarmLevels;
|
||||
import com.sipai.entity.alarm.AlarmMold;
|
||||
import com.sipai.entity.alarm.AlarmSubscribe;
|
||||
import com.sipai.entity.base.Result;
|
||||
import com.sipai.entity.user.User;
|
||||
import com.sipai.service.alarm.AlarmLevelsService;
|
||||
import com.sipai.service.alarm.AlarmMoldService;
|
||||
import com.sipai.service.alarm.AlarmSubscribeService;
|
||||
import com.sipai.tools.CommUtil;
|
||||
import net.sf.json.JSONArray;
|
||||
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.Model;
|
||||
import org.springframework.web.bind.annotation.ModelAttribute;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
import org.springframework.web.servlet.ModelAndView;
|
||||
import com.github.pagehelper.PageHelper;
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import com.sipai.entity.alarm.AlarmSubscribe;
|
||||
import com.sipai.entity.base.Result;
|
||||
import com.sipai.entity.user.User;
|
||||
import com.sipai.service.alarm.AlarmSubscribeService;
|
||||
import com.sipai.tools.CommUtil;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import java.util.List;
|
||||
|
||||
@Controller
|
||||
@RequestMapping("/alarm/alarmSubscribe")
|
||||
|
||||
@ -1,22 +1,19 @@
|
||||
package com.sipai.controller.alarm;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
|
||||
import com.sipai.entity.alarm.AlarmType;
|
||||
import com.sipai.entity.msg.MsgType;
|
||||
import com.sipai.service.alarm.AlarmTypeService;
|
||||
import com.sipai.service.msg.MsgTypeService;
|
||||
import com.sipai.tools.CommUtil;
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.Model;
|
||||
import org.springframework.web.bind.annotation.ModelAttribute;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
|
||||
import com.sipai.entity.alarm.AlarmType;
|
||||
import com.sipai.entity.msg.MsgType;
|
||||
import com.sipai.entity.user.Menu;
|
||||
import com.sipai.service.alarm.AlarmTypeService;
|
||||
import com.sipai.service.msg.MsgTypeService;
|
||||
import com.sipai.tools.CommUtil;
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import java.util.List;
|
||||
|
||||
@Controller
|
||||
@RequestMapping("/alarm")
|
||||
|
||||
@ -1,52 +1,39 @@
|
||||
package com.sipai.controller.alarm;
|
||||
|
||||
|
||||
import java.util.Iterator;
|
||||
import java.util.List;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
|
||||
import com.sipai.entity.alarm.*;
|
||||
import com.sipai.entity.base.Result;
|
||||
import com.sipai.entity.data.XServer;
|
||||
import com.sipai.entity.scada.MPoint;
|
||||
import com.sipai.entity.user.Unit;
|
||||
import com.sipai.entity.work.CameraFile;
|
||||
import com.sipai.service.alarm.AlarmPointService;
|
||||
import com.sipai.service.alarm.AlarmSubscribeService;
|
||||
import com.sipai.service.data.XServerService;
|
||||
import com.sipai.service.scada.MPointService;
|
||||
import com.sipai.service.user.UserService;
|
||||
import com.sipai.service.work.CameraFileService;
|
||||
import com.sipai.tools.MinioProp;
|
||||
import net.sf.json.JSONArray;
|
||||
import net.sf.json.JSONObject;
|
||||
|
||||
import org.eclipse.paho.client.mqttv3.MqttClient;
|
||||
import org.eclipse.paho.client.mqttv3.MqttException;
|
||||
import org.eclipse.paho.client.mqttv3.MqttMessage;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.Model;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
import org.springframework.web.servlet.ModelAndView;
|
||||
|
||||
import com.github.pagehelper.PageHelper;
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import com.sipai.entity.scada.ProAlarm;
|
||||
import com.sipai.entity.user.Company;
|
||||
import com.sipai.entity.user.ProcessSection;
|
||||
import com.sipai.entity.user.User;
|
||||
import com.sipai.entity.work.CameraFile;
|
||||
import com.sipai.service.alarm.AlarmInformationService;
|
||||
import com.sipai.service.alarm.AlarmPointService;
|
||||
import com.sipai.service.alarm.AlarmSubscribeService;
|
||||
import com.sipai.service.company.CompanyService;
|
||||
import com.sipai.service.data.XServerService;
|
||||
import com.sipai.service.msg.MsgService;
|
||||
import com.sipai.service.scada.MPointService;
|
||||
import com.sipai.service.scada.ProAlarmService;
|
||||
import com.sipai.service.user.ProcessSectionService;
|
||||
import com.sipai.service.user.UserService;
|
||||
import com.sipai.service.work.CameraFileService;
|
||||
import com.sipai.tools.CommUtil;
|
||||
import com.sipai.tools.Mqtt;
|
||||
import com.sipai.tools.MqttUtil;
|
||||
import net.sf.json.JSONArray;
|
||||
import net.sf.json.JSONObject;
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.Model;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.servlet.ModelAndView;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import java.util.Iterator;
|
||||
import java.util.List;
|
||||
|
||||
@Controller
|
||||
@RequestMapping("/alarm/proAlarm")
|
||||
|
||||
@ -1,10 +1,5 @@
|
||||
package com.sipai.controller.alarm;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
|
||||
import com.github.pagehelper.PageHelper;
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import com.sipai.entity.scada.ProAlarmDataStopHisPoint;
|
||||
@ -16,6 +11,10 @@ import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
import org.springframework.web.servlet.ModelAndView;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import java.util.List;
|
||||
|
||||
@Controller
|
||||
@RequestMapping("/alarm/proAlarmDataStopHisPoint")
|
||||
public class ProAlarmDataStopHisPointController {
|
||||
|
||||
@ -1,11 +1,8 @@
|
||||
package com.sipai.controller.alarm;
|
||||
|
||||
import com.sipai.entity.alarm.AlarmLevelsConfig;
|
||||
import com.sipai.entity.alarm.RiskP;
|
||||
import com.sipai.entity.base.Result;
|
||||
import com.sipai.entity.hqconfig.RiskLevel;
|
||||
import com.sipai.entity.user.User;
|
||||
import com.sipai.service.alarm.AlarmLevesConfigService;
|
||||
import com.sipai.service.alarm.RiskPService;
|
||||
import com.sipai.service.hqconfig.RiskLevelService;
|
||||
import com.sipai.tools.CommUtil;
|
||||
@ -18,7 +15,6 @@ import org.springframework.web.bind.annotation.RequestParam;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
@Controller
|
||||
|
||||
@ -1,26 +1,21 @@
|
||||
package com.sipai.controller.app;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.util.List;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
|
||||
import net.sf.json.JSONArray;
|
||||
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.Model;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
|
||||
import com.sipai.entity.app.AppDataConfigure;
|
||||
import com.sipai.entity.scada.MPoint;
|
||||
import com.sipai.entity.scada.MPointHistory;
|
||||
import com.sipai.entity.visual.CacheData;
|
||||
import com.sipai.service.app.AppDataConfigureService;
|
||||
import com.sipai.service.scada.MPointHistoryService;
|
||||
import com.sipai.service.scada.MPointService;
|
||||
import com.sipai.service.visual.CacheDataService;
|
||||
import com.sipai.webservice.server.work.getSSOldOPMDataServer;
|
||||
import net.sf.json.JSONArray;
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.Model;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import java.math.BigDecimal;
|
||||
import java.util.List;
|
||||
|
||||
@Controller
|
||||
@RequestMapping("/app/appEquipmentData")
|
||||
|
||||
@ -1,28 +1,10 @@
|
||||
package com.sipai.controller.app;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.text.DecimalFormat;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
|
||||
import net.sf.json.JSONArray;
|
||||
import net.sf.json.JSONObject;
|
||||
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.Model;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
|
||||
import com.sipai.entity.app.AppDataConfigure;
|
||||
import com.sipai.entity.app.AppHomePageData;
|
||||
import com.sipai.entity.data.CurveMpoint;
|
||||
import com.sipai.entity.scada.MPoint;
|
||||
import com.sipai.entity.scada.MPointHistory;
|
||||
import com.sipai.entity.user.Company;
|
||||
import com.sipai.entity.user.Unit;
|
||||
import com.sipai.entity.visual.CacheData;
|
||||
import com.sipai.service.app.AppDataConfigureService;
|
||||
import com.sipai.service.app.AppHomePageDataService;
|
||||
@ -31,7 +13,16 @@ import com.sipai.service.scada.MPointService;
|
||||
import com.sipai.service.user.UnitService;
|
||||
import com.sipai.service.visual.CacheDataService;
|
||||
import com.sipai.tools.CommUtil;
|
||||
import com.sipai.webservice.server.work.getSSOldOPMDataServer;
|
||||
import net.sf.json.JSONArray;
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.Model;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import java.math.BigDecimal;
|
||||
import java.text.DecimalFormat;
|
||||
import java.util.List;
|
||||
|
||||
@Controller
|
||||
@RequestMapping("/app/appHomePageData")
|
||||
|
||||
@ -1,28 +1,20 @@
|
||||
package com.sipai.controller.app;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.text.DecimalFormat;
|
||||
import java.util.List;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
|
||||
import net.sf.json.JSONArray;
|
||||
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.Model;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
|
||||
import com.sipai.entity.app.AppDataConfigure;
|
||||
import com.sipai.entity.scada.MPoint;
|
||||
import com.sipai.entity.scada.MPointHistory;
|
||||
import com.sipai.entity.visual.CacheData;
|
||||
import com.sipai.service.app.AppDataConfigureService;
|
||||
import com.sipai.service.scada.MPointHistoryService;
|
||||
import com.sipai.service.scada.MPointService;
|
||||
import com.sipai.service.visual.CacheDataService;
|
||||
import com.sipai.tools.CommUtil;
|
||||
import com.sipai.webservice.server.work.getSSOldOPMDataServer;
|
||||
import net.sf.json.JSONArray;
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.Model;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import java.text.DecimalFormat;
|
||||
import java.util.List;
|
||||
|
||||
@Controller
|
||||
@RequestMapping("/app/appMPointData")
|
||||
|
||||
@ -1,26 +1,20 @@
|
||||
package com.sipai.controller.app;
|
||||
|
||||
import java.io.File;
|
||||
import java.math.BigDecimal;
|
||||
import java.util.List;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.script.ScriptEngine;
|
||||
import javax.script.ScriptEngineManager;
|
||||
import javax.script.ScriptException;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
|
||||
import com.github.pagehelper.PageHelper;
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import com.sipai.entity.app.AppMenuitem;
|
||||
import com.sipai.entity.app.AppRoleMenu;
|
||||
import com.sipai.entity.base.Result;
|
||||
import com.sipai.entity.user.Role;
|
||||
import com.sipai.entity.user.Unit;
|
||||
import com.sipai.entity.user.User;
|
||||
import com.sipai.entity.user.UserRole;
|
||||
import com.sipai.service.app.AppMenuitemService;
|
||||
import com.sipai.service.app.AppRoleMenuService;
|
||||
import com.sipai.service.user.RoleService;
|
||||
import com.sipai.service.user.UnitService;
|
||||
import com.sipai.service.user.UserRoleService;
|
||||
import com.sipai.tools.CommString;
|
||||
import com.sipai.tools.CommUtil;
|
||||
import net.sf.json.JSONArray;
|
||||
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.Model;
|
||||
import org.springframework.web.bind.annotation.ModelAttribute;
|
||||
@ -28,15 +22,10 @@ import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
import org.springframework.web.servlet.ModelAndView;
|
||||
|
||||
import com.github.pagehelper.PageHelper;
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import com.sipai.entity.app.AppMenuitem;
|
||||
import com.sipai.entity.base.Result;
|
||||
import com.sipai.entity.scada.MPointHistory;
|
||||
import com.sipai.entity.user.User;
|
||||
import com.sipai.service.scada.MPointHistoryService;
|
||||
import com.sipai.service.app.AppMenuitemService;
|
||||
import com.sipai.tools.CommUtil;
|
||||
import javax.annotation.Resource;
|
||||
import javax.script.ScriptException;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import java.util.List;
|
||||
|
||||
@Controller
|
||||
@RequestMapping("/app/appMenuitem")
|
||||
|
||||
@ -1,32 +1,22 @@
|
||||
package com.sipai.controller.app;
|
||||
|
||||
import java.util.Comparator;
|
||||
import java.util.List;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
|
||||
import com.sipai.entity.scada.MPoint;
|
||||
import net.sf.json.JSONArray;
|
||||
import net.sf.json.JSONObject;
|
||||
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.Model;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
import org.springframework.web.servlet.ModelAndView;
|
||||
|
||||
import com.github.pagehelper.PageHelper;
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import com.sipai.entity.app.AppProductMonitor;
|
||||
import com.sipai.entity.app.AppProductMonitorMp;
|
||||
import com.sipai.entity.base.Result;
|
||||
import com.sipai.entity.report.RptDayValSet;
|
||||
import com.sipai.entity.user.User;
|
||||
import com.sipai.service.app.AppProductMonitorMpService;
|
||||
import com.sipai.service.app.AppProductMonitorService;
|
||||
import com.sipai.tools.CommUtil;
|
||||
import net.sf.json.JSONArray;
|
||||
import net.sf.json.JSONObject;
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.Model;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import java.util.List;
|
||||
|
||||
@Controller
|
||||
@RequestMapping("/app/appProductMonitor")
|
||||
|
||||
@ -1,23 +1,16 @@
|
||||
package com.sipai.controller.app;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
|
||||
import net.sf.json.JSONArray;
|
||||
import net.sf.json.JSONObject;
|
||||
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.Model;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
|
||||
import com.sipai.entity.user.Unit;
|
||||
import com.sipai.service.user.UnitService;
|
||||
import com.sipai.service.visual.CacheDataService;
|
||||
import com.sipai.tools.CommString;
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.Model;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import java.util.List;
|
||||
|
||||
@Controller
|
||||
@RequestMapping("/app/appYesterdayMainData")
|
||||
|
||||
@ -1,40 +1,32 @@
|
||||
package com.sipai.controller.app;
|
||||
|
||||
import com.sipai.entity.command.EmergencyRecordsDetail;
|
||||
import com.sipai.entity.equipment.EquipmentCard;
|
||||
import com.sipai.entity.equipment.EquipmentCardProp;
|
||||
import com.sipai.entity.scada.MPoint;
|
||||
import com.sipai.entity.structure.StructureCardPicture;
|
||||
import com.sipai.entity.structure.StructureCardPictureRoute;
|
||||
import com.sipai.service.command.EmergencyRecordsDetailService;
|
||||
import com.sipai.service.equipment.EquipmentCardPropService;
|
||||
import com.sipai.service.equipment.EquipmentCardService;
|
||||
import com.sipai.service.scada.MPointService;
|
||||
import com.sipai.service.structure.StructureCardPictureRouteService;
|
||||
import com.sipai.service.structure.StructureCardPictureService;
|
||||
import com.sipai.tools.CommUtil;
|
||||
import net.sf.json.JSONArray;
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.Model;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.ResponseBody;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import java.io.IOException;
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
|
||||
import com.sipai.entity.scada.MPoint;
|
||||
import com.sipai.service.scada.MPointService;
|
||||
import net.sf.json.JSONArray;
|
||||
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.Model;
|
||||
import org.springframework.web.bind.annotation.RequestBody;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.ResponseBody;
|
||||
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.itextpdf.text.pdf.PdfStructTreeController.returnType;
|
||||
import com.lowagie.tools.concat_pdf;
|
||||
import com.sipai.entity.command.EmergencyRecordsDetail;
|
||||
import com.sipai.entity.equipment.EquipmentCard;
|
||||
import com.sipai.entity.equipment.EquipmentCardProp;
|
||||
import com.sipai.entity.structure.StructureCardPicture;
|
||||
import com.sipai.entity.structure.StructureCardPictureRoute;
|
||||
import com.sipai.entity.timeefficiency.PatrolPoint;
|
||||
import com.sipai.service.command.EmergencyRecordsDetailService;
|
||||
import com.sipai.service.equipment.EquipmentCardPropService;
|
||||
import com.sipai.service.equipment.EquipmentCardService;
|
||||
import com.sipai.service.structure.StructureCardPictureRouteService;
|
||||
import com.sipai.service.structure.StructureCardPictureService;
|
||||
import com.sipai.tools.CommUtil;
|
||||
|
||||
@Controller
|
||||
@RequestMapping(value = "equBIM")
|
||||
public class EquBIMController {
|
||||
|
||||
@ -1,33 +1,23 @@
|
||||
package com.sipai.controller.app;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
import javax.servlet.http.HttpSession;
|
||||
|
||||
import net.sf.json.JSONArray;
|
||||
import net.sf.json.JSONObject;
|
||||
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.Model;
|
||||
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.servlet.ModelAndView;
|
||||
|
||||
import com.github.pagehelper.PageHelper;
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import com.sipai.entity.msg.Msg;
|
||||
import com.sipai.entity.user.User;
|
||||
import com.sipai.service.base.LoginService;
|
||||
import com.sipai.service.msg.MsgRecvService;
|
||||
import com.sipai.service.msg.MsgRecvServiceImpl;
|
||||
import com.sipai.service.msg.MsgServiceImpl;
|
||||
import com.sipai.service.msg.MsgTypeService;
|
||||
import com.sipai.tools.CommUtil;
|
||||
import net.sf.json.JSONArray;
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.Model;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.servlet.ModelAndView;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import java.util.List;
|
||||
|
||||
@Controller
|
||||
@RequestMapping(value = "msgapp")
|
||||
|
||||
@ -1,41 +1,16 @@
|
||||
package com.sipai.controller.app;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import com.sipai.entity.user.User;
|
||||
import com.sipai.service.base.LoginService;
|
||||
import com.sipai.service.maintenance.MaintainerService;
|
||||
import net.sf.json.JSONArray;
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.Model;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
import javax.servlet.http.HttpSession;
|
||||
|
||||
import net.sf.json.JSONArray;
|
||||
import net.sf.json.JSONObject;
|
||||
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.Model;
|
||||
import org.springframework.web.bind.annotation.ModelAttribute;
|
||||
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.servlet.ModelAndView;
|
||||
|
||||
import com.github.pagehelper.PageHelper;
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import com.google.gson.Gson;
|
||||
import com.sipai.entity.document.Data;
|
||||
import com.sipai.entity.msg.Msg;
|
||||
import com.sipai.entity.timeefficiency.PatrolType;
|
||||
import com.sipai.entity.user.User;
|
||||
import com.sipai.entity.work.Group;
|
||||
import com.sipai.entity.work.GroupMember;
|
||||
import com.sipai.service.base.LoginService;
|
||||
import com.sipai.service.maintenance.MaintainerService;
|
||||
import com.sipai.service.msg.MsgRecvService;
|
||||
import com.sipai.service.msg.MsgServiceImpl;
|
||||
import com.sipai.service.user.UnitService;
|
||||
import com.sipai.service.work.GroupManageService;
|
||||
import com.sipai.tools.CommUtil;
|
||||
import java.util.List;
|
||||
|
||||
@Controller
|
||||
@RequestMapping(value = "proapp")
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
package com.sipai.controller.base;
|
||||
|
||||
import java.io.IOException;
|
||||
|
||||
|
||||
import com.lowagie.text.BadElementException;
|
||||
import com.lowagie.text.Image;
|
||||
import com.lowagie.text.pdf.codec.Base64;
|
||||
import org.w3c.dom.Element;
|
||||
import org.xhtmlrenderer.extend.FSImage;
|
||||
import org.xhtmlrenderer.extend.ReplacedElement;
|
||||
@ -14,10 +14,7 @@ import org.xhtmlrenderer.pdf.ITextImageElement;
|
||||
import org.xhtmlrenderer.render.BlockBox;
|
||||
import org.xhtmlrenderer.simple.extend.FormSubmissionListener;
|
||||
|
||||
|
||||
import com.lowagie.text.BadElementException;
|
||||
import com.lowagie.text.Image;
|
||||
import com.lowagie.text.pdf.codec.Base64;
|
||||
import java.io.IOException;
|
||||
/**
|
||||
* 图片base64支持,把图片转换为itext自己的图片对象
|
||||
* @author Administrator
|
||||
|
||||
@ -1,12 +1,13 @@
|
||||
package com.sipai.controller.base;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
|
||||
import com.github.pagehelper.PageHelper;
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import com.sipai.entity.base.BasicComponents;
|
||||
import com.sipai.entity.user.User;
|
||||
import com.sipai.service.base.BasicComponentsService;
|
||||
import com.sipai.service.user.UnitService;
|
||||
import com.sipai.tools.CommUtil;
|
||||
import net.sf.json.JSONArray;
|
||||
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.Model;
|
||||
import org.springframework.web.bind.annotation.ModelAttribute;
|
||||
@ -14,17 +15,9 @@ import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
import org.springframework.web.servlet.ModelAndView;
|
||||
|
||||
import com.github.pagehelper.PageHelper;
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import com.sipai.entity.base.BasicComponents;
|
||||
import com.sipai.entity.scada.MPoint4APP;
|
||||
import com.sipai.entity.user.Company;
|
||||
import com.sipai.entity.user.Unit;
|
||||
import com.sipai.entity.user.User;
|
||||
import com.sipai.service.base.BasicComponentsService;
|
||||
import com.sipai.service.user.UnitService;
|
||||
import com.sipai.tools.CommString;
|
||||
import com.sipai.tools.CommUtil;
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import java.util.List;
|
||||
|
||||
|
||||
@Controller
|
||||
|
||||
@ -1,12 +1,14 @@
|
||||
package com.sipai.controller.base;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
|
||||
import com.github.pagehelper.PageHelper;
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import com.sipai.entity.base.BasicConfigure;
|
||||
import com.sipai.entity.user.Company;
|
||||
import com.sipai.entity.user.User;
|
||||
import com.sipai.service.base.BasicConfigureService;
|
||||
import com.sipai.service.user.UnitService;
|
||||
import com.sipai.tools.CommUtil;
|
||||
import net.sf.json.JSONArray;
|
||||
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.Model;
|
||||
import org.springframework.web.bind.annotation.ModelAttribute;
|
||||
@ -14,16 +16,9 @@ import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
import org.springframework.web.servlet.ModelAndView;
|
||||
|
||||
import com.github.pagehelper.PageHelper;
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import com.sipai.entity.base.BasicConfigure;
|
||||
import com.sipai.entity.scada.MPoint4APP;
|
||||
import com.sipai.entity.user.Company;
|
||||
import com.sipai.entity.user.User;
|
||||
import com.sipai.service.base.BasicConfigureService;
|
||||
import com.sipai.service.user.UnitService;
|
||||
import com.sipai.tools.CommString;
|
||||
import com.sipai.tools.CommUtil;
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import java.util.List;
|
||||
|
||||
|
||||
@Controller
|
||||
|
||||
@ -1,16 +1,16 @@
|
||||
package com.sipai.controller.base;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
|
||||
import com.github.pagehelper.PageHelper;
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import com.sipai.entity.base.BasicHomePage;
|
||||
import com.sipai.entity.base.Result;
|
||||
import com.sipai.entity.user.Unit;
|
||||
import com.sipai.service.company.CompanyService;
|
||||
import com.sipai.entity.user.User;
|
||||
import com.sipai.service.base.BasicHomePageService;
|
||||
import com.sipai.service.user.UnitService;
|
||||
import com.sipai.tools.CommString;
|
||||
import com.sipai.tools.CommUtil;
|
||||
import net.sf.json.JSONArray;
|
||||
|
||||
import net.sf.json.JSONObject;
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.Model;
|
||||
@ -19,14 +19,9 @@ import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
import org.springframework.web.servlet.ModelAndView;
|
||||
|
||||
import com.github.pagehelper.PageHelper;
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import com.sipai.entity.base.BasicHomePage;
|
||||
import com.sipai.entity.user.Company;
|
||||
import com.sipai.entity.user.User;
|
||||
import com.sipai.service.base.BasicHomePageService;
|
||||
import com.sipai.service.user.UnitService;
|
||||
import com.sipai.tools.CommUtil;
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import java.util.List;
|
||||
|
||||
|
||||
@Controller
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
package com.sipai.controller.base;
|
||||
|
||||
import java.io.BufferedReader;
|
||||
import java.io.FileInputStream;
|
||||
import java.io.BufferedReader;
|
||||
import java.io.FileInputStream;
|
||||
import java.io.IOException;
|
||||
import java.io.InputStreamReader;
|
||||
import java.io.InputStreamReader;
|
||||
import java.util.ArrayList;
|
||||
|
||||
public class CSVFileUtil {
|
||||
|
||||
@ -1,29 +1,23 @@
|
||||
package com.sipai.controller.base;
|
||||
|
||||
import java.io.*;
|
||||
import java.security.InvalidKeyException;
|
||||
import java.security.NoSuchAlgorithmException;
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.util.Date;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
|
||||
import com.github.pagehelper.PageHelper;
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import com.sipai.entity.base.CommonFile;
|
||||
import com.sipai.entity.base.Result;
|
||||
import com.sipai.entity.enums.FileNameSpaceEnum;
|
||||
import com.sipai.entity.report.RptCreate;
|
||||
import com.sipai.entity.report.RptInfoSet;
|
||||
import com.sipai.entity.user.User;
|
||||
import com.sipai.service.base.CommonFileService;
|
||||
import com.sipai.service.report.RptCreateService;
|
||||
import com.sipai.service.report.RptInfoSetService;
|
||||
import com.sipai.tools.CommUtil;
|
||||
import com.sipai.tools.FileUtil;
|
||||
import com.sipai.tools.MinioProp;
|
||||
import io.minio.MinioClient;
|
||||
import io.minio.errors.*;
|
||||
import net.sf.json.JSONArray;
|
||||
import net.sf.json.JSONObject;
|
||||
|
||||
import org.apache.axis.encoding.Base64;
|
||||
import org.apache.commons.fileupload.servlet.ServletFileUpload;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
@ -35,18 +29,21 @@ import org.springframework.web.bind.annotation.RequestParam;
|
||||
import org.springframework.web.multipart.MultipartFile;
|
||||
import org.springframework.web.multipart.MultipartHttpServletRequest;
|
||||
import org.springframework.web.servlet.ModelAndView;
|
||||
|
||||
import com.github.pagehelper.PageHelper;
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import com.sipai.entity.achievement.AcceptanceModelMPoint;
|
||||
import com.sipai.entity.base.CommonFile;
|
||||
import com.sipai.entity.base.Result;
|
||||
import com.sipai.entity.user.User;
|
||||
import com.sipai.service.base.CommonFileService;
|
||||
import com.sipai.tools.CommUtil;
|
||||
import com.sipai.tools.FileUtil;
|
||||
import org.xmlpull.v1.XmlPullParserException;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
import java.security.InvalidKeyException;
|
||||
import java.security.NoSuchAlgorithmException;
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.util.Date;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
@Controller
|
||||
@RequestMapping(value = "/base")
|
||||
public class FileUploadHelper {
|
||||
|
||||
@ -1,13 +1,13 @@
|
||||
package com.sipai.controller.base;
|
||||
|
||||
import freemarker.template.Configuration;
|
||||
import freemarker.template.Template;
|
||||
|
||||
import java.io.BufferedWriter;
|
||||
import java.io.File;
|
||||
import java.io.StringWriter;
|
||||
import java.util.Map;
|
||||
|
||||
import freemarker.template.Configuration;
|
||||
import freemarker.template.Template;
|
||||
|
||||
public class HtmlGenerator {
|
||||
/**
|
||||
* Generate html string.
|
||||
|
||||
@ -1,23 +1,8 @@
|
||||
package com.sipai.controller.base;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
|
||||
import net.sf.json.JSONArray;
|
||||
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.Model;
|
||||
import org.springframework.web.bind.annotation.ModelAttribute;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
import org.springframework.web.servlet.ModelAndView;
|
||||
|
||||
import com.github.pagehelper.PageHelper;
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import com.sipai.entity.base.MainPage;
|
||||
import com.sipai.entity.base.MainPageType;
|
||||
import com.sipai.entity.scada.MPoint4APP;
|
||||
import com.sipai.entity.user.Company;
|
||||
import com.sipai.entity.user.User;
|
||||
@ -26,6 +11,17 @@ import com.sipai.service.base.MainPageTypeService;
|
||||
import com.sipai.service.user.UnitService;
|
||||
import com.sipai.tools.CommString;
|
||||
import com.sipai.tools.CommUtil;
|
||||
import net.sf.json.JSONArray;
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.Model;
|
||||
import org.springframework.web.bind.annotation.ModelAttribute;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
import org.springframework.web.servlet.ModelAndView;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import java.util.List;
|
||||
|
||||
|
||||
@Controller
|
||||
|
||||
@ -1,14 +1,16 @@
|
||||
package com.sipai.controller.base;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import javax.servlet.http.HttpSession;
|
||||
|
||||
import com.github.pagehelper.PageHelper;
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import com.sipai.entity.base.MainPageType;
|
||||
import com.sipai.entity.user.Company;
|
||||
import com.sipai.entity.user.User;
|
||||
import com.sipai.service.base.MainPageService;
|
||||
import com.sipai.service.base.MainPageTypeService;
|
||||
import com.sipai.service.user.UnitService;
|
||||
import com.sipai.tools.CommUtil;
|
||||
import net.sf.json.JSONArray;
|
||||
import net.sf.json.JSONObject;
|
||||
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.Model;
|
||||
import org.springframework.web.bind.annotation.ModelAttribute;
|
||||
@ -16,24 +18,9 @@ import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
import org.springframework.web.servlet.ModelAndView;
|
||||
|
||||
import com.github.pagehelper.PageHelper;
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import com.sipai.entity.base.MainPage;
|
||||
import com.sipai.entity.base.MainPageType;
|
||||
import com.sipai.entity.user.Company;
|
||||
import com.sipai.entity.user.Unit;
|
||||
import com.sipai.entity.user.User;
|
||||
import com.sipai.entity.work.Group;
|
||||
import com.sipai.entity.work.GroupMember;
|
||||
import com.sipai.entity.work.UserWorkStation;
|
||||
import com.sipai.service.base.LoginService;
|
||||
import com.sipai.service.base.MainPageService;
|
||||
import com.sipai.service.base.MainPageTypeService;
|
||||
import com.sipai.service.user.UnitService;
|
||||
import com.sipai.service.work.GroupMemberService;
|
||||
import com.sipai.service.work.GroupService;
|
||||
import com.sipai.tools.CommString;
|
||||
import com.sipai.tools.CommUtil;
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import java.util.List;
|
||||
|
||||
|
||||
@Controller
|
||||
|
||||
@ -1,14 +1,14 @@
|
||||
package com.sipai.controller.base;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import javax.servlet.http.HttpSession;
|
||||
|
||||
import com.github.pagehelper.PageHelper;
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import com.sipai.entity.base.MainPageTypeUser;
|
||||
import com.sipai.entity.user.Company;
|
||||
import com.sipai.entity.user.User;
|
||||
import com.sipai.service.base.MainPageTypeUserService;
|
||||
import com.sipai.service.user.UnitService;
|
||||
import com.sipai.tools.CommUtil;
|
||||
import net.sf.json.JSONArray;
|
||||
import net.sf.json.JSONObject;
|
||||
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.Model;
|
||||
import org.springframework.web.bind.annotation.ModelAttribute;
|
||||
@ -16,26 +16,9 @@ import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
import org.springframework.web.servlet.ModelAndView;
|
||||
|
||||
import com.github.pagehelper.PageHelper;
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import com.sipai.entity.base.MainPage;
|
||||
import com.sipai.entity.base.MainPageType;
|
||||
import com.sipai.entity.base.MainPageTypeUser;
|
||||
import com.sipai.entity.user.Company;
|
||||
import com.sipai.entity.user.Unit;
|
||||
import com.sipai.entity.user.User;
|
||||
import com.sipai.entity.work.Group;
|
||||
import com.sipai.entity.work.GroupMember;
|
||||
import com.sipai.entity.work.UserWorkStation;
|
||||
import com.sipai.service.base.LoginService;
|
||||
import com.sipai.service.base.MainPageService;
|
||||
import com.sipai.service.base.MainPageTypeService;
|
||||
import com.sipai.service.base.MainPageTypeUserService;
|
||||
import com.sipai.service.user.UnitService;
|
||||
import com.sipai.service.work.GroupMemberService;
|
||||
import com.sipai.service.work.GroupService;
|
||||
import com.sipai.tools.CommString;
|
||||
import com.sipai.tools.CommUtil;
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import java.util.List;
|
||||
|
||||
|
||||
@Controller
|
||||
|
||||
@ -14,7 +14,6 @@ import org.springframework.web.multipart.MultipartFile;
|
||||
import org.springframework.web.multipart.MultipartHttpServletRequest;
|
||||
import org.springframework.web.servlet.ModelAndView;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
import java.util.HashMap;
|
||||
|
||||
@ -1,48 +1,22 @@
|
||||
package com.sipai.controller.base;
|
||||
|
||||
import java.io.BufferedReader;
|
||||
import java.io.ByteArrayOutputStream;
|
||||
import java.io.File;
|
||||
import java.io.FileInputStream;
|
||||
import java.io.FileNotFoundException;
|
||||
import java.io.FileOutputStream;
|
||||
import java.io.IOException;
|
||||
import java.io.InputStreamReader;
|
||||
import java.io.OutputStream;
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
|
||||
import com.itextpdf.text.BaseColor;
|
||||
import com.itextpdf.text.Document;
|
||||
import com.itextpdf.text.DocumentException;
|
||||
import com.itextpdf.text.Element;
|
||||
import com.itextpdf.text.Font;
|
||||
import com.itextpdf.text.FontProvider;
|
||||
import com.itextpdf.text.PageSize;
|
||||
import com.itextpdf.text.Paragraph;
|
||||
import com.itextpdf.text.Phrase;
|
||||
import com.itextpdf.text.Rectangle;
|
||||
import com.itextpdf.text.*;
|
||||
import com.itextpdf.text.pdf.BaseFont;
|
||||
import com.itextpdf.text.pdf.PdfPCell;
|
||||
import com.itextpdf.text.pdf.PdfPTable;
|
||||
import com.itextpdf.text.pdf.PdfWriter;
|
||||
import com.itextpdf.tool.xml.XMLWorkerHelper;
|
||||
import com.sipai.tools.CommUtil;
|
||||
|
||||
import java.io.ByteArrayInputStream;
|
||||
import java.net.MalformedURLException;
|
||||
import java.nio.charset.Charset;
|
||||
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import javax.xml.parsers.DocumentBuilder;
|
||||
import javax.xml.parsers.DocumentBuilderFactory;
|
||||
|
||||
import org.springframework.ui.Model;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.servlet.ModelAndView;
|
||||
import org.xhtmlrenderer.pdf.ITextFontResolver;
|
||||
import org.xhtmlrenderer.pdf.ITextRenderer;
|
||||
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import java.io.*;
|
||||
import java.nio.charset.Charset;
|
||||
|
||||
|
||||
public class PDFFileUtil {
|
||||
Document document = null;// 建立一个Document对象
|
||||
|
||||
@ -1,9 +1,7 @@
|
||||
package com.sipai.controller.base;
|
||||
|
||||
import com.google.common.base.Strings;
|
||||
|
||||
import org.apache.poi.xwpf.usermodel.*;
|
||||
import org.openxmlformats.schemas.wordprocessingml.x2006.main.*;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
import java.beans.BeanInfo;
|
||||
import java.beans.IntrospectionException;
|
||||
|
||||
@ -1,16 +1,11 @@
|
||||
package com.sipai.controller.bim;
|
||||
|
||||
import com.github.pagehelper.PageHelper;
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import com.sipai.entity.bim.BIMCamera;
|
||||
import com.sipai.entity.process.LibraryProcessAdjustment;
|
||||
import com.sipai.entity.user.User;
|
||||
import com.sipai.service.bim.BIMCameraService;
|
||||
import net.sf.json.JSONArray;
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.Model;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
import org.springframework.web.servlet.ModelAndView;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
|
||||
@ -1,25 +1,20 @@
|
||||
package com.sipai.controller.bim;
|
||||
|
||||
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.forwardedUrl;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.util.List;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.Model;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
|
||||
import com.sipai.entity.app.AppDataConfigure;
|
||||
import com.alibaba.fastjson.JSONArray;
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.sipai.entity.bim.BIMCurrency;
|
||||
import com.sipai.entity.scada.MPoint;
|
||||
import com.sipai.service.bim.BIMCurrencyService;
|
||||
import com.sipai.service.scada.MPointService;
|
||||
import com.sipai.tools.CommUtil;
|
||||
import com.alibaba.fastjson.JSONArray;
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.Model;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import java.math.BigDecimal;
|
||||
import java.util.List;
|
||||
|
||||
|
||||
|
||||
|
||||
@ -1,22 +1,15 @@
|
||||
package com.sipai.controller.bim;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.util.List;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
|
||||
import com.sipai.entity.equipment.EquipmentCard;
|
||||
import com.sipai.service.equipment.EquipmentCardService;
|
||||
import com.sipai.service.scada.MPointService;
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.Model;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
|
||||
import com.sipai.entity.scada.MPoint;
|
||||
import com.sipai.service.scada.MPointService;
|
||||
import com.sipai.tools.CommUtil;
|
||||
import com.alibaba.fastjson.JSONArray;
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import java.util.List;
|
||||
|
||||
|
||||
@Controller
|
||||
|
||||
@ -1,21 +1,18 @@
|
||||
package com.sipai.controller.bim;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
|
||||
import com.sipai.entity.bim.BimRouteData;
|
||||
import com.sipai.entity.bim.BimRouteEqData;
|
||||
import com.sipai.entity.scada.ProAlarm;
|
||||
import com.sipai.service.bim.BimRouteDataService;
|
||||
import com.sipai.service.bim.BimRouteEqDataService;
|
||||
import com.sipai.service.scada.ProAlarmService;
|
||||
import com.sipai.tools.CommUtil;
|
||||
import net.sf.json.JSONArray;
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.Model;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.servlet.ModelAndView;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import java.util.List;
|
||||
|
||||
|
||||
|
||||
@ -1,25 +1,14 @@
|
||||
package com.sipai.controller.bim;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
|
||||
import com.sipai.entity.bim.BIMCDHomePageTree;
|
||||
import com.sipai.service.bim.BIMCDHomePageTreeService;
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.Model;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
|
||||
import com.sipai.entity.bim.BIMCDHomePageTree;
|
||||
import com.sipai.entity.data.CurveMpoint;
|
||||
import com.sipai.entity.data.DataCurve;
|
||||
import com.sipai.entity.user.User;
|
||||
import com.sipai.service.bim.BIMCDHomePageTreeService;
|
||||
import com.sipai.service.work.GroupManageService;
|
||||
|
||||
import net.sf.json.JSONArray;
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import java.util.List;
|
||||
|
||||
@Controller
|
||||
@RequestMapping("/bim/CDBIM")
|
||||
|
||||
@ -4,14 +4,9 @@ package com.sipai.controller.bim;
|
||||
import com.github.pagehelper.PageHelper;
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import com.sipai.entity.bim.YsAlarmRecord;
|
||||
import com.sipai.entity.user.Unit;
|
||||
import com.sipai.entity.user.User;
|
||||
import com.sipai.entity.workorder.WorkorderDetail;
|
||||
import com.sipai.service.bim.YsAlarmRecordService;
|
||||
import com.sipai.tools.CommString;
|
||||
import com.sipai.tools.CommUtil;
|
||||
import net.sf.json.JSONArray;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.Model;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
|
||||
@ -1,25 +1,5 @@
|
||||
package com.sipai.controller.bot;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashSet;
|
||||
import java.util.Iterator;
|
||||
import java.util.List;
|
||||
import java.util.Random;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
|
||||
import net.sf.json.JSONArray;
|
||||
import net.sf.json.JSONObject;
|
||||
|
||||
import org.apache.batik.ext.awt.geom.Cubic;
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.Model;
|
||||
import org.springframework.web.bind.annotation.ModelAttribute;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
import org.springframework.web.servlet.ModelAndView;
|
||||
|
||||
import com.sipai.entity.base.CommonFile;
|
||||
import com.sipai.entity.bot.Bot;
|
||||
import com.sipai.entity.user.Company;
|
||||
@ -29,9 +9,19 @@ import com.sipai.service.base.CommonFileService;
|
||||
import com.sipai.service.bot.Botservice;
|
||||
import com.sipai.service.company.CompanyService;
|
||||
import com.sipai.service.user.UnitService;
|
||||
import com.sipai.service.user.UserService;
|
||||
import com.sipai.tools.CommString;
|
||||
import com.sipai.tools.CommUtil;
|
||||
import net.sf.json.JSONArray;
|
||||
import net.sf.json.JSONObject;
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.Model;
|
||||
import org.springframework.web.bind.annotation.ModelAttribute;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
import org.springframework.web.servlet.ModelAndView;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import java.util.*;
|
||||
|
||||
@Controller
|
||||
@RequestMapping("/bot/bot")
|
||||
|
||||
@ -1,15 +1,14 @@
|
||||
package com.sipai.controller.business;
|
||||
|
||||
import java.io.UnsupportedEncodingException;
|
||||
import java.util.List;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import javax.servlet.http.HttpSession;
|
||||
|
||||
import com.github.pagehelper.PageHelper;
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import com.sipai.entity.business.BusinessUnit;
|
||||
import com.sipai.entity.user.User;
|
||||
import com.sipai.service.business.BusinessUnitService;
|
||||
import com.sipai.tools.CommString;
|
||||
import com.sipai.tools.CommUtil;
|
||||
import net.sf.json.JSONArray;
|
||||
import net.sf.json.JSONObject;
|
||||
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.Model;
|
||||
import org.springframework.web.bind.annotation.ModelAttribute;
|
||||
@ -17,22 +16,10 @@ import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
import org.springframework.web.servlet.ModelAndView;
|
||||
|
||||
import com.github.pagehelper.PageHelper;
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import com.sipai.entity.business.BusinessUnit;
|
||||
import com.sipai.entity.business.BusinessUnit;
|
||||
import com.sipai.entity.user.Unit;
|
||||
import com.sipai.entity.user.User;
|
||||
import com.sipai.entity.work.Group;
|
||||
import com.sipai.entity.work.GroupMember;
|
||||
import com.sipai.entity.work.UserWorkStation;
|
||||
import com.sipai.service.base.LoginService;
|
||||
import com.sipai.service.business.BusinessUnitService;
|
||||
import com.sipai.service.user.UnitService;
|
||||
import com.sipai.service.work.GroupMemberService;
|
||||
import com.sipai.service.work.GroupService;
|
||||
import com.sipai.tools.CommString;
|
||||
import com.sipai.tools.CommUtil;
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import javax.servlet.http.HttpSession;
|
||||
import java.util.List;
|
||||
|
||||
|
||||
@Controller
|
||||
|
||||
@ -1,6 +1,5 @@
|
||||
package com.sipai.controller.cmd;
|
||||
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.sipai.entity.Listener.ListenerMessage;
|
||||
import com.sipai.entity.alarm.AlarmLevelsCodeEnum;
|
||||
import com.sipai.entity.alarm.AlarmMoldCodeEnum;
|
||||
@ -11,33 +10,24 @@ import com.sipai.entity.equipment.EquipmentCardCamera;
|
||||
import com.sipai.entity.scada.MPoint;
|
||||
import com.sipai.entity.scada.ProAlarm;
|
||||
import com.sipai.entity.schedule.ScheduleJob;
|
||||
import com.sipai.entity.user.Company;
|
||||
import com.sipai.entity.user.ProcessSection;
|
||||
import com.sipai.entity.work.Camera;
|
||||
import com.sipai.quartz.job.*;
|
||||
import com.sipai.quartz.job.ModelJob_FSSK_BZNH_1;
|
||||
import com.sipai.quartz.job.ModelJob_FSSK_BZNH_2;
|
||||
import com.sipai.quartz.job.ModelJob_FSSK_JY1;
|
||||
import com.sipai.service.Listener.ListenerMessageService;
|
||||
import com.sipai.service.alarm.AlarmPointService;
|
||||
import com.sipai.service.base.BasicConfigureService;
|
||||
import com.sipai.service.cmd.CmdService;
|
||||
import com.sipai.service.company.CompanyService;
|
||||
import com.sipai.service.equipment.EquipmentCardCameraService;
|
||||
import com.sipai.service.equipment.EquipmentCardService;
|
||||
import com.sipai.service.scada.MPointService;
|
||||
import com.sipai.service.scada.ProAlarmService;
|
||||
import com.sipai.service.user.ProcessSectionService;
|
||||
import com.sipai.service.user.UserService;
|
||||
import com.sipai.service.work.CameraService;
|
||||
import com.sipai.tools.CommString;
|
||||
import com.sipai.tools.CommUtil;
|
||||
import com.sipai.tools.MessageEnum;
|
||||
import com.sipai.tools.WebSocketCmdUtil;
|
||||
import com.sun.scenario.effect.impl.sw.sse.SSEBlend_SRC_OUTPeer;
|
||||
import io.swagger.annotations.*;
|
||||
import org.redisson.api.RBatch;
|
||||
import org.redisson.api.RMap;
|
||||
import org.redisson.api.RMapCache;
|
||||
import org.redisson.api.RedissonClient;
|
||||
import org.springframework.security.access.method.P;
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.Model;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
@ -47,7 +37,6 @@ import org.springframework.web.bind.annotation.ResponseBody;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import java.math.BigDecimal;
|
||||
import java.util.List;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
|
||||
|
||||
@ -1,22 +1,18 @@
|
||||
package com.sipai.controller.command;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
|
||||
import com.sipai.entity.command.EmergencyConfigureDetail;
|
||||
import com.sipai.service.command.EmergencyConfigureDetailService;
|
||||
import com.sipai.tools.CommUtil;
|
||||
import net.sf.json.JSONArray;
|
||||
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.Model;
|
||||
import org.springframework.web.bind.annotation.ModelAttribute;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
|
||||
import com.sipai.entity.command.EmergencyConfigureDetail;
|
||||
import com.sipai.entity.command.EmergencyConfigureInfo;
|
||||
import com.sipai.service.command.EmergencyConfigureDetailService;
|
||||
import com.sipai.tools.CommUtil;
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import java.util.List;
|
||||
|
||||
|
||||
@Controller
|
||||
|
||||
@ -1,12 +1,10 @@
|
||||
package com.sipai.controller.command;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
|
||||
import com.sipai.entity.command.EmergencyConfigureWorkOrder;
|
||||
import com.sipai.entity.user.User;
|
||||
import com.sipai.service.command.EmergencyConfigureWorkOrderService;
|
||||
import com.sipai.tools.CommUtil;
|
||||
import net.sf.json.JSONArray;
|
||||
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.Model;
|
||||
import org.springframework.web.bind.annotation.ModelAttribute;
|
||||
@ -14,15 +12,9 @@ import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
import org.springframework.web.servlet.ModelAndView;
|
||||
|
||||
import com.sipai.entity.command.EmergencyConfigure;
|
||||
import com.sipai.entity.command.EmergencyConfigureInfo;
|
||||
import com.sipai.entity.command.EmergencyConfigureWorkOrder;
|
||||
import com.sipai.entity.command.EmergencyRecords;
|
||||
import com.sipai.entity.command.EmergencyRecordsWorkOrder;
|
||||
import com.sipai.entity.user.User;
|
||||
import com.sipai.service.command.EmergencyConfigureWorkOrderService;
|
||||
import com.sipai.service.command.EmergencyRecordsWorkOrderService;
|
||||
import com.sipai.tools.CommUtil;
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import java.util.List;
|
||||
|
||||
|
||||
@Controller
|
||||
|
||||
@ -1,18 +1,14 @@
|
||||
package com.sipai.controller.cqbyt;
|
||||
|
||||
import java.text.DateFormat;
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Calendar;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
import java.util.Random;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
|
||||
import com.github.pagehelper.PageHelper;
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import com.sipai.entity.base.Result;
|
||||
import com.sipai.entity.cqbyt.CqbytSampleValue;
|
||||
import com.sipai.entity.user.User;
|
||||
import com.sipai.service.cqbyt.CqbytSampleValueService;
|
||||
import com.sipai.service.user.UnitService;
|
||||
import com.sipai.tools.CommUtil;
|
||||
import net.sf.json.JSONArray;
|
||||
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.Model;
|
||||
import org.springframework.web.bind.annotation.ModelAttribute;
|
||||
@ -20,15 +16,11 @@ import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
import org.springframework.web.servlet.ModelAndView;
|
||||
|
||||
import com.github.pagehelper.PageHelper;
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import com.sipai.entity.base.Result;
|
||||
import com.sipai.entity.cqbyt.CqbytSampleValue;
|
||||
import com.sipai.entity.user.Unit;
|
||||
import com.sipai.entity.user.User;
|
||||
import com.sipai.service.cqbyt.CqbytSampleValueService;
|
||||
import com.sipai.service.user.UnitService;
|
||||
import com.sipai.tools.CommUtil;
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import java.text.DateFormat;
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.util.*;
|
||||
|
||||
@Controller
|
||||
@RequestMapping("/cqbyt/cqbytSampleValue")
|
||||
|
||||
@ -1,19 +1,5 @@
|
||||
package com.sipai.controller.cqbyt;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
|
||||
import net.sf.json.JSONArray;
|
||||
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.Model;
|
||||
import org.springframework.web.bind.annotation.ModelAttribute;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
import org.springframework.web.servlet.ModelAndView;
|
||||
|
||||
import com.github.pagehelper.PageHelper;
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import com.sipai.entity.base.Result;
|
||||
@ -22,6 +8,17 @@ import com.sipai.entity.user.User;
|
||||
import com.sipai.service.cqbyt.CqbytVISITOUTINDATAService;
|
||||
import com.sipai.service.user.UnitService;
|
||||
import com.sipai.tools.CommUtil;
|
||||
import net.sf.json.JSONArray;
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.Model;
|
||||
import org.springframework.web.bind.annotation.ModelAttribute;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
import org.springframework.web.servlet.ModelAndView;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import java.util.List;
|
||||
|
||||
@Controller
|
||||
@RequestMapping("/cqbyt/cqbytVISITOUTINDATA")
|
||||
|
||||
@ -2,20 +2,20 @@ package com.sipai.controller.cqbyt;
|
||||
|
||||
import com.github.pagehelper.PageHelper;
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import com.sipai.dao.cqbyt.TestReportDao;
|
||||
import com.sipai.entity.cqbyt.TestReport;
|
||||
import com.sipai.entity.user.User;
|
||||
import com.sipai.service.cqbyt.TestReportService;
|
||||
import net.sf.json.JSONArray;
|
||||
import java.util.List;
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.Model;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
import org.springframework.web.servlet.ModelAndView;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import java.util.List;
|
||||
|
||||
@Controller
|
||||
@RequestMapping({"/cqbyt/testReport"})
|
||||
public class TestReportController {
|
||||
|
||||
@ -4,15 +4,16 @@ import com.sipai.dao.cqbyt.YtsjDao;
|
||||
import com.sipai.entity.cqbyt.Ytsj;
|
||||
import com.sipai.service.cqbyt.YtsjService;
|
||||
import com.sipai.service.user.UnitService;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.Model;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
@Controller
|
||||
@RequestMapping({"/cqbyt/ytsj"})
|
||||
public class YtsjController {
|
||||
|
||||
@ -1,45 +1,36 @@
|
||||
package com.sipai.controller.data;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.FileNotFoundException;
|
||||
import java.io.FileOutputStream;
|
||||
import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
import java.io.OutputStream;
|
||||
import java.io.PrintWriter;
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
|
||||
import com.baidu.aip.speech.AipSpeech;
|
||||
import com.sipai.entity.Listener.ListenerMessage;
|
||||
import com.sipai.entity.base.Result;
|
||||
import com.sipai.entity.equipment.EquipmentCard;
|
||||
import com.sipai.entity.equipment.EquipmentCardCamera;
|
||||
import com.sipai.entity.user.ExtSystem;
|
||||
import com.sipai.entity.work.Camera;
|
||||
import com.sipai.service.Listener.ListenerMessageService;
|
||||
import com.sipai.service.equipment.EquipmentCardCameraService;
|
||||
import com.sipai.service.equipment.EquipmentCardService;
|
||||
import com.sipai.service.user.ExtSystemService;
|
||||
import com.sipai.service.work.CameraService;
|
||||
import com.sipai.tools.*;
|
||||
import com.sipai.tools.AudioUtils;
|
||||
import com.sipai.tools.CommUtil;
|
||||
import com.sipai.tools.HttpUtil;
|
||||
import com.sipai.tools.MessageEnum;
|
||||
import com.sipai.websocket.MsgWebSocket2;
|
||||
import net.sf.json.JSON;
|
||||
import net.sf.json.JSONArray;
|
||||
import sun.misc.BASE64Decoder;
|
||||
|
||||
import org.json.JSONObject;
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.Model;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.servlet.ModelAndView;
|
||||
import sun.misc.BASE64Decoder;
|
||||
|
||||
import com.baidu.aip.speech.AipSpeech;
|
||||
import com.sipai.entity.base.Result;
|
||||
import com.sipai.entity.user.ExtSystem;
|
||||
import com.sipai.service.user.ExtSystemService;
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import java.io.File;
|
||||
import java.io.FileOutputStream;
|
||||
import java.io.OutputStream;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
|
||||
|
||||
@Controller
|
||||
|
||||
@ -1,19 +1,5 @@
|
||||
package com.sipai.controller.data;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
|
||||
import net.sf.json.JSONArray;
|
||||
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.Model;
|
||||
import org.springframework.web.bind.annotation.ModelAttribute;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
import org.springframework.web.servlet.ModelAndView;
|
||||
|
||||
import com.github.pagehelper.PageHelper;
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import com.sipai.entity.base.Result;
|
||||
@ -21,6 +7,17 @@ import com.sipai.entity.data.DataCleaningCondition;
|
||||
import com.sipai.entity.user.User;
|
||||
import com.sipai.service.data.DataCleaningConditionService;
|
||||
import com.sipai.tools.CommUtil;
|
||||
import net.sf.json.JSONArray;
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.Model;
|
||||
import org.springframework.web.bind.annotation.ModelAttribute;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
import org.springframework.web.servlet.ModelAndView;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import java.util.List;
|
||||
|
||||
@Controller
|
||||
@RequestMapping("/data/dataCleaningCondition")
|
||||
|
||||
@ -1,19 +1,5 @@
|
||||
package com.sipai.controller.data;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
|
||||
import net.sf.json.JSONArray;
|
||||
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.Model;
|
||||
import org.springframework.web.bind.annotation.ModelAttribute;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
import org.springframework.web.servlet.ModelAndView;
|
||||
|
||||
import com.github.pagehelper.PageHelper;
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import com.sipai.entity.base.Result;
|
||||
@ -21,6 +7,17 @@ import com.sipai.entity.data.DataCleaningConfigure;
|
||||
import com.sipai.entity.user.User;
|
||||
import com.sipai.service.data.DataCleaningConfigureService;
|
||||
import com.sipai.tools.CommUtil;
|
||||
import net.sf.json.JSONArray;
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.Model;
|
||||
import org.springframework.web.bind.annotation.ModelAttribute;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
import org.springframework.web.servlet.ModelAndView;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import java.util.List;
|
||||
|
||||
@Controller
|
||||
@RequestMapping("/data/dataCleaningConfigure")
|
||||
|
||||
@ -1,19 +1,5 @@
|
||||
package com.sipai.controller.data;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
|
||||
import net.sf.json.JSONArray;
|
||||
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.Model;
|
||||
import org.springframework.web.bind.annotation.ModelAttribute;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
import org.springframework.web.servlet.ModelAndView;
|
||||
|
||||
import com.github.pagehelper.PageHelper;
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import com.sipai.entity.base.Result;
|
||||
@ -21,6 +7,17 @@ import com.sipai.entity.data.DataCleaningHistory;
|
||||
import com.sipai.entity.user.User;
|
||||
import com.sipai.service.data.DataCleaningHistoryService;
|
||||
import com.sipai.tools.CommUtil;
|
||||
import net.sf.json.JSONArray;
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.Model;
|
||||
import org.springframework.web.bind.annotation.ModelAttribute;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
import org.springframework.web.servlet.ModelAndView;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import java.util.List;
|
||||
|
||||
@Controller
|
||||
@RequestMapping("/data/dataCleaningHistory")
|
||||
|
||||
@ -1,14 +1,15 @@
|
||||
package com.sipai.controller.data;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
|
||||
import com.github.pagehelper.PageHelper;
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import com.sipai.entity.base.Result;
|
||||
import com.sipai.entity.data.DataCleaningConfigure;
|
||||
import com.sipai.entity.data.DataCleaningPoint;
|
||||
import com.sipai.entity.user.User;
|
||||
import com.sipai.service.data.DataCleaningConfigureService;
|
||||
import com.sipai.service.data.DataCleaningPointService;
|
||||
import com.sipai.tools.CommUtil;
|
||||
import net.sf.json.JSONArray;
|
||||
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.Model;
|
||||
import org.springframework.web.bind.annotation.ModelAttribute;
|
||||
@ -16,13 +17,9 @@ import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
import org.springframework.web.servlet.ModelAndView;
|
||||
|
||||
import com.github.pagehelper.PageHelper;
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import com.sipai.entity.base.Result;
|
||||
import com.sipai.entity.data.DataCleaningPoint;
|
||||
import com.sipai.entity.user.User;
|
||||
import com.sipai.service.data.DataCleaningPointService;
|
||||
import com.sipai.tools.CommUtil;
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import java.util.List;
|
||||
|
||||
@Controller
|
||||
@RequestMapping("/data/dataCleaningPoint")
|
||||
|
||||
@ -1,43 +1,11 @@
|
||||
package com.sipai.controller.data;
|
||||
|
||||
import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.log;
|
||||
|
||||
import java.io.ByteArrayInputStream;
|
||||
import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
import java.io.OutputStream;
|
||||
import java.math.BigDecimal;
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
import javax.servlet.http.HttpSession;
|
||||
|
||||
import com.sipai.entity.data.CurveRemarkFile;
|
||||
import com.sipai.service.base.CommonFileService;
|
||||
import com.sipai.service.data.CurveRemarkFileService;
|
||||
import net.sf.json.JSON;
|
||||
import net.sf.json.JSONArray;
|
||||
import net.sf.json.JSONObject;
|
||||
|
||||
import org.springframework.beans.BeanUtils;
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.Model;
|
||||
import org.springframework.web.bind.annotation.ModelAttribute;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
import org.springframework.web.servlet.ModelAndView;
|
||||
|
||||
import com.github.pagehelper.PageHelper;
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import com.lowagie.tools.split_pdf;
|
||||
import com.sipai.entity.base.Result;
|
||||
import com.sipai.entity.data.CurveMpoint;
|
||||
import com.sipai.entity.data.CurveRemark;
|
||||
import com.sipai.entity.data.CurveRemarkFile;
|
||||
import com.sipai.entity.data.DataCurve;
|
||||
import com.sipai.entity.scada.MPoint;
|
||||
import com.sipai.entity.scada.MPointHistory;
|
||||
@ -45,8 +13,9 @@ import com.sipai.entity.scada.MPointProgramme;
|
||||
import com.sipai.entity.scada.MPointProgrammeDetail;
|
||||
import com.sipai.entity.user.Company;
|
||||
import com.sipai.entity.user.User;
|
||||
import com.sipai.entity.user.UserDetail;
|
||||
import com.sipai.service.base.CommonFileService;
|
||||
import com.sipai.service.data.CurveMpointService;
|
||||
import com.sipai.service.data.CurveRemarkFileService;
|
||||
import com.sipai.service.data.CurveRemarkService;
|
||||
import com.sipai.service.data.DataCurveService;
|
||||
import com.sipai.service.scada.MPointHistoryService;
|
||||
@ -56,8 +25,29 @@ import com.sipai.service.scada.MPointService;
|
||||
import com.sipai.service.user.UnitService;
|
||||
import com.sipai.service.user.UserDetailService;
|
||||
import com.sipai.service.user.UserService;
|
||||
import com.sipai.tools.CommString;
|
||||
import com.sipai.tools.CommUtil;
|
||||
import net.sf.json.JSONArray;
|
||||
import net.sf.json.JSONObject;
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.Model;
|
||||
import org.springframework.web.bind.annotation.ModelAttribute;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
import org.springframework.web.servlet.ModelAndView;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
import javax.servlet.http.HttpSession;
|
||||
import java.io.ByteArrayInputStream;
|
||||
import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
import java.io.OutputStream;
|
||||
import java.math.BigDecimal;
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
|
||||
@Controller
|
||||
|
||||
@ -1,19 +1,13 @@
|
||||
package com.sipai.controller.data;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import javax.servlet.http.HttpSession;
|
||||
|
||||
import net.sf.json.JSON;
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import com.sipai.entity.data.CurveMpoint;
|
||||
import com.sipai.entity.data.DataCurve;
|
||||
import com.sipai.entity.user.User;
|
||||
import com.sipai.service.data.CurveMpointService;
|
||||
import com.sipai.service.data.DataCurveService;
|
||||
import com.sipai.tools.CommUtil;
|
||||
import net.sf.json.JSONArray;
|
||||
|
||||
import org.activiti.engine.impl.util.json.JSONObject;
|
||||
import org.springframework.beans.BeanUtils;
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.Model;
|
||||
import org.springframework.web.bind.annotation.ModelAttribute;
|
||||
@ -21,21 +15,9 @@ import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
import org.springframework.web.servlet.ModelAndView;
|
||||
|
||||
import com.github.pagehelper.PageHelper;
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import com.sipai.entity.base.Tree;
|
||||
import com.sipai.entity.data.CurveMpoint;
|
||||
import com.sipai.entity.data.DataCurve;
|
||||
import com.sipai.entity.user.ExtSystem;
|
||||
import com.sipai.entity.user.Menu;
|
||||
import com.sipai.entity.user.User;
|
||||
import com.sipai.entity.work.ScadaPic_MPoint;
|
||||
import com.sipai.entity.work.ScadaPic_MPoint_Expression;
|
||||
import com.sipai.service.data.CurveMpointService;
|
||||
import com.sipai.service.data.DataCurveService;
|
||||
import com.sipai.service.user.MenuService;
|
||||
import com.sipai.service.user.RoleService;
|
||||
import com.sipai.tools.CommUtil;
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import java.util.List;
|
||||
|
||||
|
||||
@Controller
|
||||
|
||||
@ -1,9 +1,8 @@
|
||||
package com.sipai.controller.data;
|
||||
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.sipai.tools.CommUtil;
|
||||
import org.springframework.ui.Model;
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.Model;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
|
||||
@ -2,8 +2,8 @@ package com.sipai.controller.data;
|
||||
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.sipai.tools.CommUtil;
|
||||
import org.springframework.ui.Model;
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.Model;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
|
||||
@ -1,19 +1,5 @@
|
||||
package com.sipai.controller.data;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
|
||||
import net.sf.json.JSONArray;
|
||||
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.Model;
|
||||
import org.springframework.web.bind.annotation.ModelAttribute;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
import org.springframework.web.servlet.ModelAndView;
|
||||
|
||||
import com.github.pagehelper.PageHelper;
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import com.sipai.entity.base.Result;
|
||||
@ -23,6 +9,17 @@ import com.sipai.entity.user.User;
|
||||
import com.sipai.service.data.XServerService;
|
||||
import com.sipai.service.user.UnitService;
|
||||
import com.sipai.tools.CommUtil;
|
||||
import net.sf.json.JSONArray;
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.Model;
|
||||
import org.springframework.web.bind.annotation.ModelAttribute;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
import org.springframework.web.servlet.ModelAndView;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import java.util.List;
|
||||
|
||||
@Controller
|
||||
@RequestMapping("/xServer/xServer")
|
||||
|
||||
@ -4,9 +4,10 @@ import com.alibaba.fastjson.JSONArray;
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.github.pagehelper.PageHelper;
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import com.sipai.entity.alarm.AlarmMoldCodeEnum;
|
||||
import com.sipai.entity.digitalProcess.DispatchSheetEntry;
|
||||
import com.sipai.entity.scada.*;
|
||||
import com.sipai.entity.scada.MPoint;
|
||||
import com.sipai.entity.scada.MPointFormula;
|
||||
import com.sipai.entity.scada.MPointHistory;
|
||||
import com.sipai.entity.user.User;
|
||||
import com.sipai.entity.visual.JspElement;
|
||||
import com.sipai.entity.visual.VisualCacheData;
|
||||
|
||||
@ -1,32 +1,23 @@
|
||||
package com.sipai.controller.document;
|
||||
|
||||
|
||||
import java.io.File;
|
||||
import java.util.List;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
|
||||
import net.sf.json.JSONArray;
|
||||
import net.sf.json.JSONObject;
|
||||
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.Model;
|
||||
import org.springframework.web.bind.annotation.ModelAttribute;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
import org.springframework.web.servlet.ModelAndView;
|
||||
|
||||
import com.github.pagehelper.PageHelper;
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import com.sipai.entity.achievement.AcceptanceModelRecord;
|
||||
import com.sipai.entity.base.CommonFile;
|
||||
import com.sipai.entity.base.Result;
|
||||
import com.sipai.entity.document.Data;
|
||||
import com.sipai.entity.document.DocFileRelation;
|
||||
import com.sipai.entity.user.User;
|
||||
import com.sipai.service.document.DocFileRelationService;
|
||||
import com.sipai.tools.CommUtil;
|
||||
import net.sf.json.JSONArray;
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.Model;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
import org.springframework.web.servlet.ModelAndView;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import java.util.List;
|
||||
|
||||
@Controller
|
||||
@RequestMapping("/document/docFileRelation")
|
||||
|
||||
@ -1,54 +1,29 @@
|
||||
package com.sipai.controller.efficiency;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.util.Date;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
|
||||
import com.github.pagehelper.PageHelper;
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import com.sipai.entity.base.Result;
|
||||
import com.sipai.entity.efficiency.ConstituteConfigure;
|
||||
import com.sipai.entity.efficiency.ConstituteConfigureScheme;
|
||||
import com.sipai.entity.user.User;
|
||||
import com.sipai.service.base.CommonFileService;
|
||||
import com.sipai.service.company.CompanyService;
|
||||
import com.sipai.service.efficiency.ConstituteConfigureSchemeService;
|
||||
import com.sipai.service.efficiency.ConstituteConfigureService;
|
||||
import com.sipai.service.user.UserService;
|
||||
import com.sipai.tools.CommUtil;
|
||||
import net.sf.json.JSONArray;
|
||||
import net.sf.json.JSONObject;
|
||||
|
||||
import org.apache.commons.fileupload.servlet.ServletFileUpload;
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.Model;
|
||||
import org.springframework.web.bind.annotation.ModelAttribute;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
import org.springframework.web.multipart.MultipartFile;
|
||||
import org.springframework.web.multipart.MultipartHttpServletRequest;
|
||||
import org.springframework.web.servlet.ModelAndView;
|
||||
|
||||
import com.github.pagehelper.PageHelper;
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import com.jacob.activeX.ActiveXComponent;
|
||||
import com.jacob.com.ComThread;
|
||||
import com.jacob.com.Dispatch;
|
||||
import com.jacob.com.Variant;
|
||||
import com.sipai.entity.efficiency.ConstituteConfigure;
|
||||
import com.sipai.entity.equipment.EquipmentStatusManagement;
|
||||
import com.sipai.entity.achievement.AcceptanceModel;
|
||||
import com.sipai.entity.base.CommonFile;
|
||||
import com.sipai.entity.base.Result;
|
||||
import com.sipai.entity.data.CurveMpoint;
|
||||
import com.sipai.entity.data.DataCurve;
|
||||
import com.sipai.entity.scada.MPoint;
|
||||
import com.sipai.entity.scada.MPointHistory;
|
||||
import com.sipai.entity.user.Company;
|
||||
import com.sipai.entity.user.User;
|
||||
import com.sipai.service.efficiency.ConstituteConfigureService;
|
||||
import com.sipai.service.base.CommonFileService;
|
||||
import com.sipai.service.company.CompanyService;
|
||||
import com.sipai.service.user.UserService;
|
||||
import com.sipai.tools.CommUtil;
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import java.util.List;
|
||||
|
||||
@Controller
|
||||
@RequestMapping("/efficiency/constituteConfigure")
|
||||
|
||||
@ -1,55 +1,27 @@
|
||||
package com.sipai.controller.efficiency;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.util.Date;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
|
||||
import com.sipai.entity.base.Result;
|
||||
import com.sipai.entity.efficiency.ConstituteConfigureDetail;
|
||||
import com.sipai.entity.scada.MPoint;
|
||||
import com.sipai.entity.user.User;
|
||||
import com.sipai.service.base.CommonFileService;
|
||||
import com.sipai.service.company.CompanyService;
|
||||
import com.sipai.service.efficiency.ConstituteConfigureDetailService;
|
||||
import com.sipai.service.scada.MPointService;
|
||||
import com.sipai.service.user.UserService;
|
||||
import com.sipai.tools.CommUtil;
|
||||
import net.sf.json.JSONArray;
|
||||
import net.sf.json.JSONObject;
|
||||
|
||||
import org.apache.commons.fileupload.servlet.ServletFileUpload;
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.Model;
|
||||
import org.springframework.web.bind.annotation.ModelAttribute;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
import org.springframework.web.multipart.MultipartFile;
|
||||
import org.springframework.web.multipart.MultipartHttpServletRequest;
|
||||
import org.springframework.web.servlet.ModelAndView;
|
||||
|
||||
import com.github.pagehelper.PageHelper;
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import com.jacob.activeX.ActiveXComponent;
|
||||
import com.jacob.com.ComThread;
|
||||
import com.jacob.com.Dispatch;
|
||||
import com.jacob.com.Variant;
|
||||
import com.sipai.entity.efficiency.ConstituteConfigureDetail;
|
||||
import com.sipai.entity.efficiency.ConstituteConfigureDetail;
|
||||
import com.sipai.entity.efficiency.EfficiencyOverviewMpConfigure;
|
||||
import com.sipai.entity.equipment.EquipmentStatusManagement;
|
||||
import com.sipai.entity.achievement.AcceptanceModel;
|
||||
import com.sipai.entity.base.CommonFile;
|
||||
import com.sipai.entity.base.Result;
|
||||
import com.sipai.entity.data.CurveMpoint;
|
||||
import com.sipai.entity.data.DataCurve;
|
||||
import com.sipai.entity.scada.MPoint;
|
||||
import com.sipai.entity.scada.MPointHistory;
|
||||
import com.sipai.entity.user.Company;
|
||||
import com.sipai.entity.user.User;
|
||||
import com.sipai.service.efficiency.ConstituteConfigureDetailService;
|
||||
import com.sipai.service.base.CommonFileService;
|
||||
import com.sipai.service.company.CompanyService;
|
||||
import com.sipai.service.scada.MPointService;
|
||||
import com.sipai.service.user.UserService;
|
||||
import com.sipai.tools.CommUtil;
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import java.util.List;
|
||||
|
||||
@Controller
|
||||
@RequestMapping("/efficiency/constituteConfigureDetail")
|
||||
|
||||
@ -1,9 +1,13 @@
|
||||
package com.sipai.controller.efficiency;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
|
||||
import com.sipai.entity.base.Result;
|
||||
import com.sipai.entity.efficiency.ConstituteConfigureScheme;
|
||||
import com.sipai.entity.user.User;
|
||||
import com.sipai.service.base.CommonFileService;
|
||||
import com.sipai.service.company.CompanyService;
|
||||
import com.sipai.service.efficiency.ConstituteConfigureSchemeService;
|
||||
import com.sipai.service.user.UserService;
|
||||
import com.sipai.tools.CommUtil;
|
||||
import net.sf.json.JSONArray;
|
||||
import net.sf.json.JSONObject;
|
||||
import org.springframework.stereotype.Controller;
|
||||
@ -11,14 +15,9 @@ import org.springframework.ui.Model;
|
||||
import org.springframework.web.bind.annotation.ModelAttribute;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
import com.sipai.entity.base.Result;
|
||||
import com.sipai.entity.user.User;
|
||||
import com.sipai.service.efficiency.ConstituteConfigureSchemeService;
|
||||
import com.sipai.service.base.CommonFileService;
|
||||
import com.sipai.service.company.CompanyService;
|
||||
import com.sipai.service.user.UserService;
|
||||
import com.sipai.tools.CommUtil;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import java.util.List;
|
||||
|
||||
@Controller
|
||||
|
||||
@ -1,26 +1,7 @@
|
||||
package com.sipai.controller.efficiency;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.jws.soap.SOAPBinding.Use;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
|
||||
import net.sf.json.JSONArray;
|
||||
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.Model;
|
||||
import org.springframework.web.bind.annotation.ModelAttribute;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
|
||||
import com.github.pagehelper.PageHelper;
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import com.sipai.entity.base.Result;
|
||||
import com.sipai.entity.data.DataCurve;
|
||||
import com.sipai.entity.efficiency.ConstituteConfigure;
|
||||
import com.sipai.entity.efficiency.ConstituteConfigureDetail;
|
||||
import com.sipai.entity.scada.MPoint;
|
||||
import com.sipai.entity.scada.MPointHistory;
|
||||
import com.sipai.entity.user.User;
|
||||
import com.sipai.service.efficiency.ConstituteConfigureDetailService;
|
||||
@ -28,6 +9,14 @@ import com.sipai.service.efficiency.ConstituteConfigureService;
|
||||
import com.sipai.service.scada.MPointHistoryService;
|
||||
import com.sipai.service.scada.MPointService;
|
||||
import com.sipai.tools.CommUtil;
|
||||
import net.sf.json.JSONArray;
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.Model;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import java.util.List;
|
||||
|
||||
@Controller
|
||||
@RequestMapping("/efficiency/constitute")
|
||||
|
||||
@ -1,52 +1,26 @@
|
||||
package com.sipai.controller.efficiency;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.util.Date;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
|
||||
import com.github.pagehelper.PageHelper;
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import com.sipai.entity.base.Result;
|
||||
import com.sipai.entity.efficiency.EfficiencyOverviewConfigureAssembly;
|
||||
import com.sipai.entity.user.User;
|
||||
import com.sipai.service.base.CommonFileService;
|
||||
import com.sipai.service.company.CompanyService;
|
||||
import com.sipai.service.efficiency.EfficiencyOverviewConfigureAssemblyService;
|
||||
import com.sipai.service.user.UserService;
|
||||
import com.sipai.tools.CommUtil;
|
||||
import net.sf.json.JSONArray;
|
||||
import net.sf.json.JSONObject;
|
||||
|
||||
import org.apache.commons.fileupload.servlet.ServletFileUpload;
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.Model;
|
||||
import org.springframework.web.bind.annotation.ModelAttribute;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
import org.springframework.web.multipart.MultipartFile;
|
||||
import org.springframework.web.multipart.MultipartHttpServletRequest;
|
||||
import org.springframework.web.servlet.ModelAndView;
|
||||
|
||||
import com.github.pagehelper.PageHelper;
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import com.jacob.activeX.ActiveXComponent;
|
||||
import com.jacob.com.ComThread;
|
||||
import com.jacob.com.Dispatch;
|
||||
import com.jacob.com.Variant;
|
||||
import com.sipai.entity.efficiency.EfficiencyOverviewConfigureAssembly;
|
||||
import com.sipai.entity.equipment.EquipmentStatusManagement;
|
||||
import com.sipai.entity.achievement.AcceptanceModel;
|
||||
import com.sipai.entity.base.CommonFile;
|
||||
import com.sipai.entity.base.Result;
|
||||
import com.sipai.entity.data.CurveMpoint;
|
||||
import com.sipai.entity.data.DataCurve;
|
||||
import com.sipai.entity.scada.MPoint;
|
||||
import com.sipai.entity.scada.MPointHistory;
|
||||
import com.sipai.entity.user.Company;
|
||||
import com.sipai.entity.user.User;
|
||||
import com.sipai.service.efficiency.EfficiencyOverviewConfigureAssemblyService;
|
||||
import com.sipai.service.base.CommonFileService;
|
||||
import com.sipai.service.company.CompanyService;
|
||||
import com.sipai.service.user.UserService;
|
||||
import com.sipai.tools.CommUtil;
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import java.util.List;
|
||||
|
||||
@Controller
|
||||
@RequestMapping("/efficiency/efficiencyOverviewConfigureAssembly")
|
||||
|
||||
@ -1,51 +1,26 @@
|
||||
package com.sipai.controller.efficiency;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.util.Date;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
|
||||
import com.github.pagehelper.PageHelper;
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import com.sipai.entity.base.Result;
|
||||
import com.sipai.entity.efficiency.EfficiencyOverviewConfigure;
|
||||
import com.sipai.entity.user.User;
|
||||
import com.sipai.service.base.CommonFileService;
|
||||
import com.sipai.service.company.CompanyService;
|
||||
import com.sipai.service.efficiency.EfficiencyOverviewConfigureService;
|
||||
import com.sipai.service.user.UserService;
|
||||
import com.sipai.tools.CommUtil;
|
||||
import net.sf.json.JSONArray;
|
||||
import net.sf.json.JSONObject;
|
||||
|
||||
import org.apache.commons.fileupload.servlet.ServletFileUpload;
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.Model;
|
||||
import org.springframework.web.bind.annotation.ModelAttribute;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
import org.springframework.web.multipart.MultipartFile;
|
||||
import org.springframework.web.multipart.MultipartHttpServletRequest;
|
||||
import org.springframework.web.servlet.ModelAndView;
|
||||
|
||||
import com.github.pagehelper.PageHelper;
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import com.jacob.activeX.ActiveXComponent;
|
||||
import com.jacob.com.ComThread;
|
||||
import com.jacob.com.Dispatch;
|
||||
import com.jacob.com.Variant;
|
||||
import com.sipai.entity.efficiency.EfficiencyOverviewConfigure;
|
||||
import com.sipai.entity.equipment.EquipmentStatusManagement;
|
||||
import com.sipai.entity.base.CommonFile;
|
||||
import com.sipai.entity.base.Result;
|
||||
import com.sipai.entity.data.CurveMpoint;
|
||||
import com.sipai.entity.data.DataCurve;
|
||||
import com.sipai.entity.scada.MPoint;
|
||||
import com.sipai.entity.scada.MPointHistory;
|
||||
import com.sipai.entity.user.Company;
|
||||
import com.sipai.entity.user.User;
|
||||
import com.sipai.service.efficiency.EfficiencyOverviewConfigureService;
|
||||
import com.sipai.service.base.CommonFileService;
|
||||
import com.sipai.service.company.CompanyService;
|
||||
import com.sipai.service.user.UserService;
|
||||
import com.sipai.tools.CommUtil;
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import java.util.List;
|
||||
|
||||
@Controller
|
||||
@RequestMapping("/efficiency/efficiencyOverviewConfigure")
|
||||
|
||||
@ -1,56 +1,24 @@
|
||||
package com.sipai.controller.efficiency;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
import java.text.DecimalFormat;
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.util.Date;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
|
||||
import net.sf.json.JSONArray;
|
||||
import net.sf.json.JSONObject;
|
||||
|
||||
import org.apache.commons.fileupload.servlet.ServletFileUpload;
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.Model;
|
||||
import org.springframework.web.bind.annotation.ModelAttribute;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
import org.springframework.web.multipart.MultipartFile;
|
||||
import org.springframework.web.multipart.MultipartHttpServletRequest;
|
||||
import org.springframework.web.servlet.ModelAndView;
|
||||
|
||||
import com.github.pagehelper.PageHelper;
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import com.jacob.activeX.ActiveXComponent;
|
||||
import com.jacob.com.ComThread;
|
||||
import com.jacob.com.Dispatch;
|
||||
import com.jacob.com.Variant;
|
||||
import com.sipai.entity.efficiency.EfficiencyOverviewConfigure;
|
||||
import com.sipai.entity.efficiency.EfficiencyOverviewMpConfigure;
|
||||
import com.sipai.entity.equipment.EquipmentStatusManagement;
|
||||
import com.sipai.entity.base.CommonFile;
|
||||
import com.sipai.entity.base.Result;
|
||||
import com.sipai.entity.data.CurveMpoint;
|
||||
import com.sipai.entity.data.DataCurve;
|
||||
import com.sipai.entity.scada.MPoint;
|
||||
import com.sipai.entity.scada.MPointHistory;
|
||||
import com.sipai.entity.user.Company;
|
||||
import com.sipai.entity.user.User;
|
||||
import com.sipai.service.efficiency.EfficiencyOverviewConfigureService;
|
||||
import com.sipai.service.efficiency.EfficiencyOverviewMpConfigureService;
|
||||
import com.sipai.service.base.CommonFileService;
|
||||
import com.sipai.service.company.CompanyService;
|
||||
import com.sipai.service.scada.MPointHistoryService;
|
||||
import com.sipai.service.scada.MPointService;
|
||||
import com.sipai.service.user.UserService;
|
||||
import com.sipai.tools.CommUtil;
|
||||
import net.sf.json.JSONArray;
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.Model;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
import org.springframework.web.servlet.ModelAndView;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import java.text.DecimalFormat;
|
||||
import java.util.List;
|
||||
|
||||
@Controller
|
||||
@RequestMapping("/efficiency/efficiencyOverview")
|
||||
|
||||
@ -1,20 +1,16 @@
|
||||
package com.sipai.controller.efficiency;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.util.Date;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
|
||||
import com.sipai.entity.base.Result;
|
||||
import com.sipai.entity.efficiency.EfficiencyOverviewConfigureAssembly;
|
||||
import com.sipai.entity.efficiency.EfficiencyOverviewMpConfigure;
|
||||
import com.sipai.entity.scada.MPoint;
|
||||
import com.sipai.entity.user.User;
|
||||
import com.sipai.service.efficiency.EfficiencyOverviewConfigureAssemblyService;
|
||||
import com.sipai.service.efficiency.EfficiencyOverviewMpConfigureService;
|
||||
import com.sipai.service.scada.MPointService;
|
||||
import com.sipai.tools.CommUtil;
|
||||
import net.sf.json.JSONArray;
|
||||
import net.sf.json.JSONObject;
|
||||
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.Model;
|
||||
import org.springframework.web.bind.annotation.ModelAttribute;
|
||||
@ -22,21 +18,9 @@ import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
import org.springframework.web.servlet.ModelAndView;
|
||||
|
||||
import com.github.pagehelper.PageHelper;
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import com.sipai.entity.base.Result;
|
||||
import com.sipai.entity.efficiency.EfficiencyOverviewConfigureAssembly;
|
||||
import com.sipai.entity.efficiency.EfficiencyOverviewMpConfigure;
|
||||
import com.sipai.entity.efficiency.EfficiencyOverviewMpConfigure;
|
||||
import com.sipai.entity.efficiency.EfficiencyOverviewMpConfigure;
|
||||
import com.sipai.entity.efficiency.EfficiencyOverviewMpConfigure;
|
||||
import com.sipai.entity.scada.MPoint;
|
||||
import com.sipai.entity.user.User;
|
||||
import com.sipai.service.base.CommonFileService;
|
||||
import com.sipai.service.efficiency.EfficiencyOverviewConfigureAssemblyService;
|
||||
import com.sipai.service.efficiency.EfficiencyOverviewMpConfigureService;
|
||||
import com.sipai.service.scada.MPointService;
|
||||
import com.sipai.tools.CommUtil;
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import java.util.List;
|
||||
|
||||
|
||||
@Controller
|
||||
|
||||
@ -1,28 +1,24 @@
|
||||
package com.sipai.controller.efficiency;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
|
||||
import com.sipai.entity.base.Result;
|
||||
import com.sipai.entity.efficiency.EfficiencyStatistics;
|
||||
import com.sipai.entity.user.User;
|
||||
import com.sipai.service.efficiency.EfficiencyStatisticsService;
|
||||
import com.sipai.service.scada.MPointHistoryService;
|
||||
import com.sipai.tools.CommUtil;
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.Model;
|
||||
import org.springframework.web.bind.annotation.ModelAttribute;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
|
||||
import com.sipai.entity.base.Result;
|
||||
import com.sipai.entity.efficiency.EfficiencyStatistics;
|
||||
import com.sipai.entity.scada.MPointHistory;
|
||||
import com.sipai.entity.user.User;
|
||||
import com.sipai.service.efficiency.EfficiencyStatisticsService;
|
||||
import com.sipai.service.scada.MPointHistoryService;
|
||||
import com.sipai.tools.CommUtil;
|
||||
import org.springframework.web.servlet.ModelAndView;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
|
||||
@Controller
|
||||
@RequestMapping("/efficiency/efficiencyStatistics")
|
||||
public class EfficiencyStatisticsController {
|
||||
|
||||
@ -1,54 +1,21 @@
|
||||
package com.sipai.controller.efficiency;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.util.Date;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
|
||||
import com.sipai.entity.efficiency.WaterSpreadDataConfigure;
|
||||
import com.sipai.entity.scada.MPointHistory;
|
||||
import com.sipai.entity.visual.PlanInteraction;
|
||||
import com.sipai.service.efficiency.WaterSpreadDataConfigureService;
|
||||
import com.sipai.service.scada.MPointHistoryService;
|
||||
import net.sf.json.JSONArray;
|
||||
import net.sf.json.JSONObject;
|
||||
|
||||
import org.apache.commons.fileupload.servlet.ServletFileUpload;
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.Model;
|
||||
import org.springframework.web.bind.annotation.ModelAttribute;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
import org.springframework.web.multipart.MultipartFile;
|
||||
import org.springframework.web.multipart.MultipartHttpServletRequest;
|
||||
import org.springframework.web.servlet.ModelAndView;
|
||||
|
||||
import com.github.pagehelper.PageHelper;
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import com.jacob.activeX.ActiveXComponent;
|
||||
import com.jacob.com.ComThread;
|
||||
import com.jacob.com.Dispatch;
|
||||
import com.jacob.com.Variant;
|
||||
import com.sipai.entity.efficiency.WaterSpreadDataConfigure;
|
||||
import com.sipai.entity.equipment.EquipmentStatusManagement;
|
||||
import com.sipai.entity.base.CommonFile;
|
||||
import com.sipai.entity.base.Result;
|
||||
import com.sipai.entity.data.CurveMpoint;
|
||||
import com.sipai.entity.data.DataCurve;
|
||||
import com.sipai.entity.scada.MPoint;
|
||||
import com.sipai.entity.scada.MPointHistory;
|
||||
import com.sipai.entity.user.Company;
|
||||
import com.sipai.entity.user.User;
|
||||
import com.sipai.entity.visual.DataType;
|
||||
import com.sipai.entity.visual.PlanInteraction;
|
||||
import com.sipai.service.efficiency.WaterSpreadDataConfigureService;
|
||||
import com.sipai.service.base.CommonFileService;
|
||||
import com.sipai.service.company.CompanyService;
|
||||
import com.sipai.service.scada.MPointHistoryService;
|
||||
import com.sipai.service.user.UserService;
|
||||
import com.sipai.tools.CommUtil;
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import java.util.List;
|
||||
|
||||
@Controller
|
||||
@RequestMapping("/efficiency/waterSpreadData")
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user