diff --git a/src/main/java/com/sipai/activiti/Test.java b/src/main/java/com/sipai/activiti/Test.java index 26fcb867..006e2819 100644 --- a/src/main/java/com/sipai/activiti/Test.java +++ b/src/main/java/com/sipai/activiti/Test.java @@ -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; diff --git a/src/main/java/com/sipai/activiti/util/PropertyType.java b/src/main/java/com/sipai/activiti/util/PropertyType.java index bd6d3c83..031bf97d 100644 --- a/src/main/java/com/sipai/activiti/util/PropertyType.java +++ b/src/main/java/com/sipai/activiti/util/PropertyType.java @@ -1,6 +1,5 @@ package com.sipai.activiti.util; -import java.util.ArrayList; import java.util.Date; /** diff --git a/src/main/java/com/sipai/activiti/util/Variable.java b/src/main/java/com/sipai/activiti/util/Variable.java index 26444698..641ccd69 100644 --- a/src/main/java/com/sipai/activiti/util/Variable.java +++ b/src/main/java/com/sipai/activiti/util/Variable.java @@ -1,7 +1,6 @@ package com.sipai.activiti.util; import jodd.util.StringUtil; - import org.apache.commons.beanutils.ConvertUtils; import java.util.ArrayList; diff --git a/src/main/java/com/sipai/controller/DBController.java b/src/main/java/com/sipai/controller/DBController.java index 2a312ba6..ea14b74f 100644 --- a/src/main/java/com/sipai/controller/DBController.java +++ b/src/main/java/com/sipai/controller/DBController.java @@ -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; diff --git a/src/main/java/com/sipai/controller/Listener/ListenerMessageController.java b/src/main/java/com/sipai/controller/Listener/ListenerMessageController.java index 4977e8da..f30b8b28 100644 --- a/src/main/java/com/sipai/controller/Listener/ListenerMessageController.java +++ b/src/main/java/com/sipai/controller/Listener/ListenerMessageController.java @@ -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; diff --git a/src/main/java/com/sipai/controller/accident/AccidentController.java b/src/main/java/com/sipai/controller/accident/AccidentController.java index 87986ea0..ecd8ba3f 100644 --- a/src/main/java/com/sipai/controller/accident/AccidentController.java +++ b/src/main/java/com/sipai/controller/accident/AccidentController.java @@ -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") diff --git a/src/main/java/com/sipai/controller/accident/AccidentTypeController.java b/src/main/java/com/sipai/controller/accident/AccidentTypeController.java index f04487b1..c8379c7b 100644 --- a/src/main/java/com/sipai/controller/accident/AccidentTypeController.java +++ b/src/main/java/com/sipai/controller/accident/AccidentTypeController.java @@ -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") diff --git a/src/main/java/com/sipai/controller/accident/ReasonableAdviceController.java b/src/main/java/com/sipai/controller/accident/ReasonableAdviceController.java index 91ffa53d..9cbb8d6d 100644 --- a/src/main/java/com/sipai/controller/accident/ReasonableAdviceController.java +++ b/src/main/java/com/sipai/controller/accident/ReasonableAdviceController.java @@ -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") diff --git a/src/main/java/com/sipai/controller/accident/TestKpiController.java b/src/main/java/com/sipai/controller/accident/TestKpiController.java index 88704d0c..6fcf8d3e 100644 --- a/src/main/java/com/sipai/controller/accident/TestKpiController.java +++ b/src/main/java/com/sipai/controller/accident/TestKpiController.java @@ -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; diff --git a/src/main/java/com/sipai/controller/achievement/AcceptanceModelController.java b/src/main/java/com/sipai/controller/achievement/AcceptanceModelController.java index 13c02de0..559c76f8 100644 --- a/src/main/java/com/sipai/controller/achievement/AcceptanceModelController.java +++ b/src/main/java/com/sipai/controller/achievement/AcceptanceModelController.java @@ -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") diff --git a/src/main/java/com/sipai/controller/achievement/AcceptanceModelCreateController.java b/src/main/java/com/sipai/controller/achievement/AcceptanceModelCreateController.java index 1a3e72e0..9f925a42 100644 --- a/src/main/java/com/sipai/controller/achievement/AcceptanceModelCreateController.java +++ b/src/main/java/com/sipai/controller/achievement/AcceptanceModelCreateController.java @@ -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") diff --git a/src/main/java/com/sipai/controller/achievement/AcceptanceModelMPointController.java b/src/main/java/com/sipai/controller/achievement/AcceptanceModelMPointController.java index 36969a45..7b2d340c 100644 --- a/src/main/java/com/sipai/controller/achievement/AcceptanceModelMPointController.java +++ b/src/main/java/com/sipai/controller/achievement/AcceptanceModelMPointController.java @@ -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") diff --git a/src/main/java/com/sipai/controller/achievement/AcceptanceModelOutputController.java b/src/main/java/com/sipai/controller/achievement/AcceptanceModelOutputController.java index e2108936..afdf73f8 100644 --- a/src/main/java/com/sipai/controller/achievement/AcceptanceModelOutputController.java +++ b/src/main/java/com/sipai/controller/achievement/AcceptanceModelOutputController.java @@ -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") diff --git a/src/main/java/com/sipai/controller/achievement/AcceptanceModelOutputDataController.java b/src/main/java/com/sipai/controller/achievement/AcceptanceModelOutputDataController.java index ffb7fd0d..385ced98 100644 --- a/src/main/java/com/sipai/controller/achievement/AcceptanceModelOutputDataController.java +++ b/src/main/java/com/sipai/controller/achievement/AcceptanceModelOutputDataController.java @@ -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") diff --git a/src/main/java/com/sipai/controller/achievement/AcceptanceModelTextController.java b/src/main/java/com/sipai/controller/achievement/AcceptanceModelTextController.java index cef0a9b6..2c516952 100644 --- a/src/main/java/com/sipai/controller/achievement/AcceptanceModelTextController.java +++ b/src/main/java/com/sipai/controller/achievement/AcceptanceModelTextController.java @@ -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") diff --git a/src/main/java/com/sipai/controller/achievement/ModelLibraryController.java b/src/main/java/com/sipai/controller/achievement/ModelLibraryController.java index 5a5e1080..4b88fc15 100644 --- a/src/main/java/com/sipai/controller/achievement/ModelLibraryController.java +++ b/src/main/java/com/sipai/controller/achievement/ModelLibraryController.java @@ -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 diff --git a/src/main/java/com/sipai/controller/activiti/ActivitiController.java b/src/main/java/com/sipai/controller/activiti/ActivitiController.java index 37bd524e..c897ac3d 100644 --- a/src/main/java/com/sipai/controller/activiti/ActivitiController.java +++ b/src/main/java/com/sipai/controller/activiti/ActivitiController.java @@ -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; /** diff --git a/src/main/java/com/sipai/controller/activiti/AutoActivitiController.java b/src/main/java/com/sipai/controller/activiti/AutoActivitiController.java index 3df4ba4c..7718d751 100644 --- a/src/main/java/com/sipai/controller/activiti/AutoActivitiController.java +++ b/src/main/java/com/sipai/controller/activiti/AutoActivitiController.java @@ -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; /** * 流程管理控制器 * diff --git a/src/main/java/com/sipai/controller/activiti/ModelController.java b/src/main/java/com/sipai/controller/activiti/ModelController.java index 736be1b3..c3e6320d 100644 --- a/src/main/java/com/sipai/controller/activiti/ModelController.java +++ b/src/main/java/com/sipai/controller/activiti/ModelController.java @@ -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; diff --git a/src/main/java/com/sipai/controller/activiti/OEProcessController.java b/src/main/java/com/sipai/controller/activiti/OEProcessController.java index 632975a9..b1f97cc1 100644 --- a/src/main/java/com/sipai/controller/activiti/OEProcessController.java +++ b/src/main/java/com/sipai/controller/activiti/OEProcessController.java @@ -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 diff --git a/src/main/java/com/sipai/controller/administration/IndexClassController.java b/src/main/java/com/sipai/controller/administration/IndexClassController.java index 4ec8cadc..03b707bd 100644 --- a/src/main/java/com/sipai/controller/administration/IndexClassController.java +++ b/src/main/java/com/sipai/controller/administration/IndexClassController.java @@ -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") diff --git a/src/main/java/com/sipai/controller/administration/IndexController.java b/src/main/java/com/sipai/controller/administration/IndexController.java index 0edd74c3..7fb2980d 100644 --- a/src/main/java/com/sipai/controller/administration/IndexController.java +++ b/src/main/java/com/sipai/controller/administration/IndexController.java @@ -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") diff --git a/src/main/java/com/sipai/controller/administration/IndexCycleController.java b/src/main/java/com/sipai/controller/administration/IndexCycleController.java index fd20eca1..17dcd440 100644 --- a/src/main/java/com/sipai/controller/administration/IndexCycleController.java +++ b/src/main/java/com/sipai/controller/administration/IndexCycleController.java @@ -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") diff --git a/src/main/java/com/sipai/controller/administration/IndexWorkController.java b/src/main/java/com/sipai/controller/administration/IndexWorkController.java index 48bd8fca..39b77d73 100644 --- a/src/main/java/com/sipai/controller/administration/IndexWorkController.java +++ b/src/main/java/com/sipai/controller/administration/IndexWorkController.java @@ -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") diff --git a/src/main/java/com/sipai/controller/administration/OrganizationClassController.java b/src/main/java/com/sipai/controller/administration/OrganizationClassController.java index e434475a..7ffc3e61 100644 --- a/src/main/java/com/sipai/controller/administration/OrganizationClassController.java +++ b/src/main/java/com/sipai/controller/administration/OrganizationClassController.java @@ -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") diff --git a/src/main/java/com/sipai/controller/administration/OrganizationController.java b/src/main/java/com/sipai/controller/administration/OrganizationController.java index b3a3f67b..8397ac08 100644 --- a/src/main/java/com/sipai/controller/administration/OrganizationController.java +++ b/src/main/java/com/sipai/controller/administration/OrganizationController.java @@ -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") diff --git a/src/main/java/com/sipai/controller/administration/TemporaryController.java b/src/main/java/com/sipai/controller/administration/TemporaryController.java index e294d68f..b541b34c 100644 --- a/src/main/java/com/sipai/controller/administration/TemporaryController.java +++ b/src/main/java/com/sipai/controller/administration/TemporaryController.java @@ -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") diff --git a/src/main/java/com/sipai/controller/alarm/AlarmConditionController.java b/src/main/java/com/sipai/controller/alarm/AlarmConditionController.java index eb5cbe36..c35404df 100644 --- a/src/main/java/com/sipai/controller/alarm/AlarmConditionController.java +++ b/src/main/java/com/sipai/controller/alarm/AlarmConditionController.java @@ -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") diff --git a/src/main/java/com/sipai/controller/alarm/AlarmInformationController.java b/src/main/java/com/sipai/controller/alarm/AlarmInformationController.java index aef7160e..1fe09209 100644 --- a/src/main/java/com/sipai/controller/alarm/AlarmInformationController.java +++ b/src/main/java/com/sipai/controller/alarm/AlarmInformationController.java @@ -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") diff --git a/src/main/java/com/sipai/controller/alarm/AlarmLevelsConfigController.java b/src/main/java/com/sipai/controller/alarm/AlarmLevelsConfigController.java index 0e6e649a..dbd8b20a 100644 --- a/src/main/java/com/sipai/controller/alarm/AlarmLevelsConfigController.java +++ b/src/main/java/com/sipai/controller/alarm/AlarmLevelsConfigController.java @@ -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; diff --git a/src/main/java/com/sipai/controller/alarm/AlarmLevelsController.java b/src/main/java/com/sipai/controller/alarm/AlarmLevelsController.java index 0f78d3ed..0a75efac 100644 --- a/src/main/java/com/sipai/controller/alarm/AlarmLevelsController.java +++ b/src/main/java/com/sipai/controller/alarm/AlarmLevelsController.java @@ -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") diff --git a/src/main/java/com/sipai/controller/alarm/AlarmMoldController.java b/src/main/java/com/sipai/controller/alarm/AlarmMoldController.java index e00e4a7b..ee8194f5 100644 --- a/src/main/java/com/sipai/controller/alarm/AlarmMoldController.java +++ b/src/main/java/com/sipai/controller/alarm/AlarmMoldController.java @@ -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") diff --git a/src/main/java/com/sipai/controller/alarm/AlarmPointController.java b/src/main/java/com/sipai/controller/alarm/AlarmPointController.java index de43d296..f50d1f13 100644 --- a/src/main/java/com/sipai/controller/alarm/AlarmPointController.java +++ b/src/main/java/com/sipai/controller/alarm/AlarmPointController.java @@ -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") diff --git a/src/main/java/com/sipai/controller/alarm/AlarmPointRiskLevelController.java b/src/main/java/com/sipai/controller/alarm/AlarmPointRiskLevelController.java index fc15ebe5..fa8280e0 100644 --- a/src/main/java/com/sipai/controller/alarm/AlarmPointRiskLevelController.java +++ b/src/main/java/com/sipai/controller/alarm/AlarmPointRiskLevelController.java @@ -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 diff --git a/src/main/java/com/sipai/controller/alarm/AlarmRecordController.java b/src/main/java/com/sipai/controller/alarm/AlarmRecordController.java index 52d3ea0b..0702a1f5 100644 --- a/src/main/java/com/sipai/controller/alarm/AlarmRecordController.java +++ b/src/main/java/com/sipai/controller/alarm/AlarmRecordController.java @@ -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") diff --git a/src/main/java/com/sipai/controller/alarm/AlarmSolutionController.java b/src/main/java/com/sipai/controller/alarm/AlarmSolutionController.java index b719d52c..f4082a57 100644 --- a/src/main/java/com/sipai/controller/alarm/AlarmSolutionController.java +++ b/src/main/java/com/sipai/controller/alarm/AlarmSolutionController.java @@ -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") diff --git a/src/main/java/com/sipai/controller/alarm/AlarmSubscribeController.java b/src/main/java/com/sipai/controller/alarm/AlarmSubscribeController.java index afe9e4e1..b622404d 100644 --- a/src/main/java/com/sipai/controller/alarm/AlarmSubscribeController.java +++ b/src/main/java/com/sipai/controller/alarm/AlarmSubscribeController.java @@ -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") diff --git a/src/main/java/com/sipai/controller/alarm/AlarmTypeController.java b/src/main/java/com/sipai/controller/alarm/AlarmTypeController.java index f8b453d5..aa3bcd21 100644 --- a/src/main/java/com/sipai/controller/alarm/AlarmTypeController.java +++ b/src/main/java/com/sipai/controller/alarm/AlarmTypeController.java @@ -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") diff --git a/src/main/java/com/sipai/controller/alarm/ProAlarmController.java b/src/main/java/com/sipai/controller/alarm/ProAlarmController.java index 399bcb29..7ae19cca 100644 --- a/src/main/java/com/sipai/controller/alarm/ProAlarmController.java +++ b/src/main/java/com/sipai/controller/alarm/ProAlarmController.java @@ -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") diff --git a/src/main/java/com/sipai/controller/alarm/ProAlarmDataStopHisPointController.java b/src/main/java/com/sipai/controller/alarm/ProAlarmDataStopHisPointController.java index 5b0dbb5a..a58c16b2 100644 --- a/src/main/java/com/sipai/controller/alarm/ProAlarmDataStopHisPointController.java +++ b/src/main/java/com/sipai/controller/alarm/ProAlarmDataStopHisPointController.java @@ -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 { diff --git a/src/main/java/com/sipai/controller/alarm/RiskPController.java b/src/main/java/com/sipai/controller/alarm/RiskPController.java index 20190313..38f31af2 100644 --- a/src/main/java/com/sipai/controller/alarm/RiskPController.java +++ b/src/main/java/com/sipai/controller/alarm/RiskPController.java @@ -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 diff --git a/src/main/java/com/sipai/controller/app/AppEquipmentDataController.java b/src/main/java/com/sipai/controller/app/AppEquipmentDataController.java index 397a34c2..fa86676b 100644 --- a/src/main/java/com/sipai/controller/app/AppEquipmentDataController.java +++ b/src/main/java/com/sipai/controller/app/AppEquipmentDataController.java @@ -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") diff --git a/src/main/java/com/sipai/controller/app/AppHomePageDataController.java b/src/main/java/com/sipai/controller/app/AppHomePageDataController.java index 06417fc9..7fc86f98 100644 --- a/src/main/java/com/sipai/controller/app/AppHomePageDataController.java +++ b/src/main/java/com/sipai/controller/app/AppHomePageDataController.java @@ -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") diff --git a/src/main/java/com/sipai/controller/app/AppMPointDataController.java b/src/main/java/com/sipai/controller/app/AppMPointDataController.java index 1ace014b..83d75834 100644 --- a/src/main/java/com/sipai/controller/app/AppMPointDataController.java +++ b/src/main/java/com/sipai/controller/app/AppMPointDataController.java @@ -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") diff --git a/src/main/java/com/sipai/controller/app/AppMenuitemController.java b/src/main/java/com/sipai/controller/app/AppMenuitemController.java index be653dc4..feba9ce7 100644 --- a/src/main/java/com/sipai/controller/app/AppMenuitemController.java +++ b/src/main/java/com/sipai/controller/app/AppMenuitemController.java @@ -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") diff --git a/src/main/java/com/sipai/controller/app/AppProductMonitorController.java b/src/main/java/com/sipai/controller/app/AppProductMonitorController.java index 452a9bfc..e107d149 100644 --- a/src/main/java/com/sipai/controller/app/AppProductMonitorController.java +++ b/src/main/java/com/sipai/controller/app/AppProductMonitorController.java @@ -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") diff --git a/src/main/java/com/sipai/controller/app/AppYesterdayMainDataController.java b/src/main/java/com/sipai/controller/app/AppYesterdayMainDataController.java index dd0db88f..e9008926 100644 --- a/src/main/java/com/sipai/controller/app/AppYesterdayMainDataController.java +++ b/src/main/java/com/sipai/controller/app/AppYesterdayMainDataController.java @@ -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") diff --git a/src/main/java/com/sipai/controller/app/EquBIMController.java b/src/main/java/com/sipai/controller/app/EquBIMController.java index 1abd6ffc..7019ee3e 100644 --- a/src/main/java/com/sipai/controller/app/EquBIMController.java +++ b/src/main/java/com/sipai/controller/app/EquBIMController.java @@ -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 { diff --git a/src/main/java/com/sipai/controller/app/MsgAppController.java b/src/main/java/com/sipai/controller/app/MsgAppController.java index a757ca0c..3fa50ceb 100644 --- a/src/main/java/com/sipai/controller/app/MsgAppController.java +++ b/src/main/java/com/sipai/controller/app/MsgAppController.java @@ -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") diff --git a/src/main/java/com/sipai/controller/app/ProAppController.java b/src/main/java/com/sipai/controller/app/ProAppController.java index 17b94c1c..58a604b6 100644 --- a/src/main/java/com/sipai/controller/app/ProAppController.java +++ b/src/main/java/com/sipai/controller/app/ProAppController.java @@ -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") diff --git a/src/main/java/com/sipai/controller/base/Base64ImgReplacedElementFactory.java b/src/main/java/com/sipai/controller/base/Base64ImgReplacedElementFactory.java index 24788fd8..9b8f7eb9 100644 --- a/src/main/java/com/sipai/controller/base/Base64ImgReplacedElementFactory.java +++ b/src/main/java/com/sipai/controller/base/Base64ImgReplacedElementFactory.java @@ -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 diff --git a/src/main/java/com/sipai/controller/base/BasicComponentsController.java b/src/main/java/com/sipai/controller/base/BasicComponentsController.java index 5d3b55ec..5e9b7241 100644 --- a/src/main/java/com/sipai/controller/base/BasicComponentsController.java +++ b/src/main/java/com/sipai/controller/base/BasicComponentsController.java @@ -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 diff --git a/src/main/java/com/sipai/controller/base/BasicConfigureController.java b/src/main/java/com/sipai/controller/base/BasicConfigureController.java index bd529bd1..b59e0266 100644 --- a/src/main/java/com/sipai/controller/base/BasicConfigureController.java +++ b/src/main/java/com/sipai/controller/base/BasicConfigureController.java @@ -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 diff --git a/src/main/java/com/sipai/controller/base/BasicHomePageController.java b/src/main/java/com/sipai/controller/base/BasicHomePageController.java index a9d0fbc5..7de8718c 100644 --- a/src/main/java/com/sipai/controller/base/BasicHomePageController.java +++ b/src/main/java/com/sipai/controller/base/BasicHomePageController.java @@ -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 diff --git a/src/main/java/com/sipai/controller/base/CSVFileUtil.java b/src/main/java/com/sipai/controller/base/CSVFileUtil.java index dd9572f0..d13054b6 100644 --- a/src/main/java/com/sipai/controller/base/CSVFileUtil.java +++ b/src/main/java/com/sipai/controller/base/CSVFileUtil.java @@ -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 { diff --git a/src/main/java/com/sipai/controller/base/FileUploadHelper.java b/src/main/java/com/sipai/controller/base/FileUploadHelper.java index 0c672ae2..c964e611 100644 --- a/src/main/java/com/sipai/controller/base/FileUploadHelper.java +++ b/src/main/java/com/sipai/controller/base/FileUploadHelper.java @@ -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 { diff --git a/src/main/java/com/sipai/controller/base/HtmlGenerator.java b/src/main/java/com/sipai/controller/base/HtmlGenerator.java index 084ecc3e..2feb2ac2 100644 --- a/src/main/java/com/sipai/controller/base/HtmlGenerator.java +++ b/src/main/java/com/sipai/controller/base/HtmlGenerator.java @@ -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. diff --git a/src/main/java/com/sipai/controller/base/MainPageController.java b/src/main/java/com/sipai/controller/base/MainPageController.java index 928b1d34..47a0a4eb 100644 --- a/src/main/java/com/sipai/controller/base/MainPageController.java +++ b/src/main/java/com/sipai/controller/base/MainPageController.java @@ -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 diff --git a/src/main/java/com/sipai/controller/base/MainPageTypeController.java b/src/main/java/com/sipai/controller/base/MainPageTypeController.java index 84615c6d..bcf36fd9 100644 --- a/src/main/java/com/sipai/controller/base/MainPageTypeController.java +++ b/src/main/java/com/sipai/controller/base/MainPageTypeController.java @@ -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 diff --git a/src/main/java/com/sipai/controller/base/MainPageTypeUserController.java b/src/main/java/com/sipai/controller/base/MainPageTypeUserController.java index f4e3074f..671a3a43 100644 --- a/src/main/java/com/sipai/controller/base/MainPageTypeUserController.java +++ b/src/main/java/com/sipai/controller/base/MainPageTypeUserController.java @@ -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 diff --git a/src/main/java/com/sipai/controller/base/MinioController.java b/src/main/java/com/sipai/controller/base/MinioController.java index 872f4eb7..8a285039 100644 --- a/src/main/java/com/sipai/controller/base/MinioController.java +++ b/src/main/java/com/sipai/controller/base/MinioController.java @@ -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; diff --git a/src/main/java/com/sipai/controller/base/PDFFileUtil.java b/src/main/java/com/sipai/controller/base/PDFFileUtil.java index afcaaa8c..9605c27a 100644 --- a/src/main/java/com/sipai/controller/base/PDFFileUtil.java +++ b/src/main/java/com/sipai/controller/base/PDFFileUtil.java @@ -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对象 diff --git a/src/main/java/com/sipai/controller/base/PoiUtils.java b/src/main/java/com/sipai/controller/base/PoiUtils.java index bdd42b9c..881fdbe2 100644 --- a/src/main/java/com/sipai/controller/base/PoiUtils.java +++ b/src/main/java/com/sipai/controller/base/PoiUtils.java @@ -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; diff --git a/src/main/java/com/sipai/controller/bim/BIMCameraController.java b/src/main/java/com/sipai/controller/bim/BIMCameraController.java index 3770fb42..8ec00c19 100644 --- a/src/main/java/com/sipai/controller/bim/BIMCameraController.java +++ b/src/main/java/com/sipai/controller/bim/BIMCameraController.java @@ -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; diff --git a/src/main/java/com/sipai/controller/bim/BIMCurrencyController.java b/src/main/java/com/sipai/controller/bim/BIMCurrencyController.java index da636e5a..7b37db5f 100644 --- a/src/main/java/com/sipai/controller/bim/BIMCurrencyController.java +++ b/src/main/java/com/sipai/controller/bim/BIMCurrencyController.java @@ -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; diff --git a/src/main/java/com/sipai/controller/bim/BimFrameController.java b/src/main/java/com/sipai/controller/bim/BimFrameController.java index 51e25a69..580f1dd7 100644 --- a/src/main/java/com/sipai/controller/bim/BimFrameController.java +++ b/src/main/java/com/sipai/controller/bim/BimFrameController.java @@ -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 diff --git a/src/main/java/com/sipai/controller/bim/BimPageController.java b/src/main/java/com/sipai/controller/bim/BimPageController.java index 0b3dcf86..cfd3ac55 100644 --- a/src/main/java/com/sipai/controller/bim/BimPageController.java +++ b/src/main/java/com/sipai/controller/bim/BimPageController.java @@ -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; diff --git a/src/main/java/com/sipai/controller/bim/CDBIMController.java b/src/main/java/com/sipai/controller/bim/CDBIMController.java index c6640145..bffb5b59 100644 --- a/src/main/java/com/sipai/controller/bim/CDBIMController.java +++ b/src/main/java/com/sipai/controller/bim/CDBIMController.java @@ -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") diff --git a/src/main/java/com/sipai/controller/bim/YsAlarmRecordController.java b/src/main/java/com/sipai/controller/bim/YsAlarmRecordController.java index d0e3f0c5..dbbec45c 100644 --- a/src/main/java/com/sipai/controller/bim/YsAlarmRecordController.java +++ b/src/main/java/com/sipai/controller/bim/YsAlarmRecordController.java @@ -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; diff --git a/src/main/java/com/sipai/controller/bot/BotController.java b/src/main/java/com/sipai/controller/bot/BotController.java index f9fd144c..2c05325e 100644 --- a/src/main/java/com/sipai/controller/bot/BotController.java +++ b/src/main/java/com/sipai/controller/bot/BotController.java @@ -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") diff --git a/src/main/java/com/sipai/controller/business/BusinessUnitController.java b/src/main/java/com/sipai/controller/business/BusinessUnitController.java index d1e26cf1..b5299a78 100644 --- a/src/main/java/com/sipai/controller/business/BusinessUnitController.java +++ b/src/main/java/com/sipai/controller/business/BusinessUnitController.java @@ -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 diff --git a/src/main/java/com/sipai/controller/cmd/CmdController.java b/src/main/java/com/sipai/controller/cmd/CmdController.java index cdbbc9af..4cd456ad 100644 --- a/src/main/java/com/sipai/controller/cmd/CmdController.java +++ b/src/main/java/com/sipai/controller/cmd/CmdController.java @@ -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; diff --git a/src/main/java/com/sipai/controller/command/EmergencyConfigureDetailController.java b/src/main/java/com/sipai/controller/command/EmergencyConfigureDetailController.java index b268729c..8b9835c9 100644 --- a/src/main/java/com/sipai/controller/command/EmergencyConfigureDetailController.java +++ b/src/main/java/com/sipai/controller/command/EmergencyConfigureDetailController.java @@ -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 diff --git a/src/main/java/com/sipai/controller/command/EmergencyConfigureWorkOrderController.java b/src/main/java/com/sipai/controller/command/EmergencyConfigureWorkOrderController.java index 5a437c21..fbe2f619 100644 --- a/src/main/java/com/sipai/controller/command/EmergencyConfigureWorkOrderController.java +++ b/src/main/java/com/sipai/controller/command/EmergencyConfigureWorkOrderController.java @@ -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 diff --git a/src/main/java/com/sipai/controller/cqbyt/CqbytSampleValueController.java b/src/main/java/com/sipai/controller/cqbyt/CqbytSampleValueController.java index c2b414a0..4bb6071f 100644 --- a/src/main/java/com/sipai/controller/cqbyt/CqbytSampleValueController.java +++ b/src/main/java/com/sipai/controller/cqbyt/CqbytSampleValueController.java @@ -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") diff --git a/src/main/java/com/sipai/controller/cqbyt/CqbytVISITOUTINDATAController.java b/src/main/java/com/sipai/controller/cqbyt/CqbytVISITOUTINDATAController.java index d4d3d36a..2a3b35b7 100644 --- a/src/main/java/com/sipai/controller/cqbyt/CqbytVISITOUTINDATAController.java +++ b/src/main/java/com/sipai/controller/cqbyt/CqbytVISITOUTINDATAController.java @@ -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") diff --git a/src/main/java/com/sipai/controller/cqbyt/TestReportController.java b/src/main/java/com/sipai/controller/cqbyt/TestReportController.java index 252ba3e6..e0305807 100644 --- a/src/main/java/com/sipai/controller/cqbyt/TestReportController.java +++ b/src/main/java/com/sipai/controller/cqbyt/TestReportController.java @@ -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 { diff --git a/src/main/java/com/sipai/controller/cqbyt/YtsjController.java b/src/main/java/com/sipai/controller/cqbyt/YtsjController.java index 8068b82f..4e9460c0 100644 --- a/src/main/java/com/sipai/controller/cqbyt/YtsjController.java +++ b/src/main/java/com/sipai/controller/cqbyt/YtsjController.java @@ -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 { diff --git a/src/main/java/com/sipai/controller/data/BaiDuAipSpeechController.java b/src/main/java/com/sipai/controller/data/BaiDuAipSpeechController.java index 096d27d2..32c4fb20 100644 --- a/src/main/java/com/sipai/controller/data/BaiDuAipSpeechController.java +++ b/src/main/java/com/sipai/controller/data/BaiDuAipSpeechController.java @@ -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 diff --git a/src/main/java/com/sipai/controller/data/DataCleaningConditionController.java b/src/main/java/com/sipai/controller/data/DataCleaningConditionController.java index c14d4771..72923b32 100644 --- a/src/main/java/com/sipai/controller/data/DataCleaningConditionController.java +++ b/src/main/java/com/sipai/controller/data/DataCleaningConditionController.java @@ -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") diff --git a/src/main/java/com/sipai/controller/data/DataCleaningConfigureController.java b/src/main/java/com/sipai/controller/data/DataCleaningConfigureController.java index 2cbd4f55..8807feee 100644 --- a/src/main/java/com/sipai/controller/data/DataCleaningConfigureController.java +++ b/src/main/java/com/sipai/controller/data/DataCleaningConfigureController.java @@ -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") diff --git a/src/main/java/com/sipai/controller/data/DataCleaningHistoryController.java b/src/main/java/com/sipai/controller/data/DataCleaningHistoryController.java index d24b6514..5647af31 100644 --- a/src/main/java/com/sipai/controller/data/DataCleaningHistoryController.java +++ b/src/main/java/com/sipai/controller/data/DataCleaningHistoryController.java @@ -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") diff --git a/src/main/java/com/sipai/controller/data/DataCleaningPointController.java b/src/main/java/com/sipai/controller/data/DataCleaningPointController.java index fd6db725..1d3ff66e 100644 --- a/src/main/java/com/sipai/controller/data/DataCleaningPointController.java +++ b/src/main/java/com/sipai/controller/data/DataCleaningPointController.java @@ -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") diff --git a/src/main/java/com/sipai/controller/data/DataCurveController.java b/src/main/java/com/sipai/controller/data/DataCurveController.java index ba1e34e2..116e6c71 100644 --- a/src/main/java/com/sipai/controller/data/DataCurveController.java +++ b/src/main/java/com/sipai/controller/data/DataCurveController.java @@ -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 diff --git a/src/main/java/com/sipai/controller/data/EnergyAnalysisController.java b/src/main/java/com/sipai/controller/data/EnergyAnalysisController.java index 4b2c7ff8..a0aa2d67 100644 --- a/src/main/java/com/sipai/controller/data/EnergyAnalysisController.java +++ b/src/main/java/com/sipai/controller/data/EnergyAnalysisController.java @@ -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 diff --git a/src/main/java/com/sipai/controller/data/HQFrameDataController.java b/src/main/java/com/sipai/controller/data/HQFrameDataController.java index 7e350cda..24d76076 100644 --- a/src/main/java/com/sipai/controller/data/HQFrameDataController.java +++ b/src/main/java/com/sipai/controller/data/HQFrameDataController.java @@ -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; diff --git a/src/main/java/com/sipai/controller/data/HealthDiagnosisController.java b/src/main/java/com/sipai/controller/data/HealthDiagnosisController.java index e234d764..074bfd5d 100644 --- a/src/main/java/com/sipai/controller/data/HealthDiagnosisController.java +++ b/src/main/java/com/sipai/controller/data/HealthDiagnosisController.java @@ -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; diff --git a/src/main/java/com/sipai/controller/data/XServerController.java b/src/main/java/com/sipai/controller/data/XServerController.java index 6dce2813..2f332fb6 100644 --- a/src/main/java/com/sipai/controller/data/XServerController.java +++ b/src/main/java/com/sipai/controller/data/XServerController.java @@ -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") diff --git a/src/main/java/com/sipai/controller/digitalProcess/DigitalTechnologistController.java b/src/main/java/com/sipai/controller/digitalProcess/DigitalTechnologistController.java index a01f19a0..567af7fc 100644 --- a/src/main/java/com/sipai/controller/digitalProcess/DigitalTechnologistController.java +++ b/src/main/java/com/sipai/controller/digitalProcess/DigitalTechnologistController.java @@ -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; diff --git a/src/main/java/com/sipai/controller/document/DocFileRelationController.java b/src/main/java/com/sipai/controller/document/DocFileRelationController.java index be9bd09c..9c3609d9 100644 --- a/src/main/java/com/sipai/controller/document/DocFileRelationController.java +++ b/src/main/java/com/sipai/controller/document/DocFileRelationController.java @@ -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") diff --git a/src/main/java/com/sipai/controller/efficiency/ConstituteConfigureController.java b/src/main/java/com/sipai/controller/efficiency/ConstituteConfigureController.java index 4b59441b..fd882929 100644 --- a/src/main/java/com/sipai/controller/efficiency/ConstituteConfigureController.java +++ b/src/main/java/com/sipai/controller/efficiency/ConstituteConfigureController.java @@ -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") diff --git a/src/main/java/com/sipai/controller/efficiency/ConstituteConfigureDetailController.java b/src/main/java/com/sipai/controller/efficiency/ConstituteConfigureDetailController.java index d0542982..fdfb33c6 100644 --- a/src/main/java/com/sipai/controller/efficiency/ConstituteConfigureDetailController.java +++ b/src/main/java/com/sipai/controller/efficiency/ConstituteConfigureDetailController.java @@ -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") diff --git a/src/main/java/com/sipai/controller/efficiency/ConstituteConfigureSchemeController.java b/src/main/java/com/sipai/controller/efficiency/ConstituteConfigureSchemeController.java index e94c0d03..74b12e6b 100644 --- a/src/main/java/com/sipai/controller/efficiency/ConstituteConfigureSchemeController.java +++ b/src/main/java/com/sipai/controller/efficiency/ConstituteConfigureSchemeController.java @@ -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 diff --git a/src/main/java/com/sipai/controller/efficiency/ConstituteController.java b/src/main/java/com/sipai/controller/efficiency/ConstituteController.java index d97b6061..64d65d4a 100644 --- a/src/main/java/com/sipai/controller/efficiency/ConstituteController.java +++ b/src/main/java/com/sipai/controller/efficiency/ConstituteController.java @@ -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") diff --git a/src/main/java/com/sipai/controller/efficiency/EfficiencyOverviewConfigureAssemblyController.java b/src/main/java/com/sipai/controller/efficiency/EfficiencyOverviewConfigureAssemblyController.java index 0421c982..d96108dd 100644 --- a/src/main/java/com/sipai/controller/efficiency/EfficiencyOverviewConfigureAssemblyController.java +++ b/src/main/java/com/sipai/controller/efficiency/EfficiencyOverviewConfigureAssemblyController.java @@ -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") diff --git a/src/main/java/com/sipai/controller/efficiency/EfficiencyOverviewConfigureController.java b/src/main/java/com/sipai/controller/efficiency/EfficiencyOverviewConfigureController.java index a25e046c..5927f931 100644 --- a/src/main/java/com/sipai/controller/efficiency/EfficiencyOverviewConfigureController.java +++ b/src/main/java/com/sipai/controller/efficiency/EfficiencyOverviewConfigureController.java @@ -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") diff --git a/src/main/java/com/sipai/controller/efficiency/EfficiencyOverviewController.java b/src/main/java/com/sipai/controller/efficiency/EfficiencyOverviewController.java index 363f15fd..34cfd718 100644 --- a/src/main/java/com/sipai/controller/efficiency/EfficiencyOverviewController.java +++ b/src/main/java/com/sipai/controller/efficiency/EfficiencyOverviewController.java @@ -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") diff --git a/src/main/java/com/sipai/controller/efficiency/EfficiencyOverviewMpConfigureController.java b/src/main/java/com/sipai/controller/efficiency/EfficiencyOverviewMpConfigureController.java index 1cd4c33b..f9af23de 100644 --- a/src/main/java/com/sipai/controller/efficiency/EfficiencyOverviewMpConfigureController.java +++ b/src/main/java/com/sipai/controller/efficiency/EfficiencyOverviewMpConfigureController.java @@ -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 diff --git a/src/main/java/com/sipai/controller/efficiency/EfficiencyStatisticsController.java b/src/main/java/com/sipai/controller/efficiency/EfficiencyStatisticsController.java index 246aff3f..23c14efe 100644 --- a/src/main/java/com/sipai/controller/efficiency/EfficiencyStatisticsController.java +++ b/src/main/java/com/sipai/controller/efficiency/EfficiencyStatisticsController.java @@ -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 { diff --git a/src/main/java/com/sipai/controller/efficiency/WaterSpreadDataController.java b/src/main/java/com/sipai/controller/efficiency/WaterSpreadDataController.java index 09905a8a..436bd84d 100644 --- a/src/main/java/com/sipai/controller/efficiency/WaterSpreadDataController.java +++ b/src/main/java/com/sipai/controller/efficiency/WaterSpreadDataController.java @@ -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") diff --git a/src/main/java/com/sipai/controller/enums/EnumsController.java b/src/main/java/com/sipai/controller/enums/EnumsController.java index 0bb39880..25c480d8 100644 --- a/src/main/java/com/sipai/controller/enums/EnumsController.java +++ b/src/main/java/com/sipai/controller/enums/EnumsController.java @@ -1,8 +1,6 @@ package com.sipai.controller.enums; import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; -import com.sipai.tools.SpringContextUtil; import io.swagger.annotations.*; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; diff --git a/src/main/java/com/sipai/controller/equipment/AccountOverviewController.java b/src/main/java/com/sipai/controller/equipment/AccountOverviewController.java index 100cefa8..218c74e3 100644 --- a/src/main/java/com/sipai/controller/equipment/AccountOverviewController.java +++ b/src/main/java/com/sipai/controller/equipment/AccountOverviewController.java @@ -1,17 +1,10 @@ package com.sipai.controller.equipment; -import java.util.List; - -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.tools.CommUtil; +import javax.servlet.http.HttpServletRequest; @Controller @RequestMapping("/equipment/TZOverview") diff --git a/src/main/java/com/sipai/controller/equipment/AssetClassController.java b/src/main/java/com/sipai/controller/equipment/AssetClassController.java index a3a0e110..4a5e54ec 100644 --- a/src/main/java/com/sipai/controller/equipment/AssetClassController.java +++ b/src/main/java/com/sipai/controller/equipment/AssetClassController.java @@ -1,14 +1,15 @@ package com.sipai.controller.equipment; -import java.util.ArrayList; -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.equipment.AssetClass; +import com.sipai.entity.user.User; +import com.sipai.service.equipment.AssetClassService; +import com.sipai.service.equipment.EquipmentClassService; +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,17 +17,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.base.Result; -import com.sipai.entity.equipment.AssetClass; -import com.sipai.entity.equipment.EquipmentClass; -import com.sipai.entity.equipment.EquipmentLevel; -import com.sipai.entity.user.Unit; -import com.sipai.entity.user.User; -import com.sipai.service.equipment.AssetClassService; -import com.sipai.service.equipment.EquipmentClassService; -import com.sipai.tools.CommUtil; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import java.util.ArrayList; +import java.util.List; @Controller @RequestMapping("/equipment/assetClass") diff --git a/src/main/java/com/sipai/controller/equipment/EquipmentAcceptanceApplyController.java b/src/main/java/com/sipai/controller/equipment/EquipmentAcceptanceApplyController.java index ab07a695..896acab4 100644 --- a/src/main/java/com/sipai/controller/equipment/EquipmentAcceptanceApplyController.java +++ b/src/main/java/com/sipai/controller/equipment/EquipmentAcceptanceApplyController.java @@ -1,40 +1,7 @@ package com.sipai.controller.equipment; -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 net.sf.json.JSONArray; -import net.sf.json.JSONObject; - -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.validation.BindingResult; -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.dao.equipment.EquipmentAcceptanceApplyDao; import com.sipai.entity.activiti.WorkTask; import com.sipai.entity.base.CommonFile; import com.sipai.entity.business.BusinessUnit; @@ -43,16 +10,7 @@ import com.sipai.entity.business.BusinessUnitHandle; import com.sipai.entity.business.BusinessUnitRecord; import com.sipai.entity.equipment.EquipmentAcceptanceApply; import com.sipai.entity.equipment.EquipmentAcceptanceApplyDetail; -import com.sipai.entity.equipment.EquipmentLoseApply; -import com.sipai.entity.sparepart.Goods; -import com.sipai.entity.sparepart.GoodsAcceptanceApplyDetail; -import com.sipai.entity.sparepart.InStockRecord; -import com.sipai.entity.sparepart.InStockRecordDetail; -import com.sipai.entity.sparepart.PurchaseRecord; -import com.sipai.entity.sparepart.PurchaseRecordDetail; -import com.sipai.entity.sparepart.SparePartCommString; -import com.sipai.entity.sparepart.Subscribe; -import com.sipai.entity.sparepart.SubscribeDetail; +import com.sipai.entity.sparepart.*; import com.sipai.entity.user.Company; import com.sipai.entity.user.User; import com.sipai.service.activiti.WorkflowProcessDefinitionService; @@ -62,19 +20,33 @@ import com.sipai.service.business.BusinessUnitAuditService; import com.sipai.service.business.BusinessUnitHandleService; import com.sipai.service.equipment.EquipmentAcceptanceApplyDetailService; import com.sipai.service.equipment.EquipmentAcceptanceApplyService; -import com.sipai.service.sparepart.GoodsAcceptanceApplyDetailService; -import com.sipai.service.sparepart.GoodsService; -import com.sipai.service.sparepart.InStockRecordDetailService; -import com.sipai.service.sparepart.InStockRecordService; -import com.sipai.service.sparepart.PurchaseRecordDetailService; -import com.sipai.service.sparepart.PurchaseRecordService; -import com.sipai.service.sparepart.SubscribeDetailService; +import com.sipai.service.sparepart.*; import com.sipai.service.user.UnitService; import com.sipai.service.user.UserService; import com.sipai.tools.ActivitiUtil; import com.sipai.tools.CommString; import com.sipai.tools.CommUtil; import com.sipai.tools.FileUtil; +import net.sf.json.JSONArray; +import net.sf.json.JSONObject; +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.io.IOException; +import java.text.SimpleDateFormat; +import java.util.*; @Controller @RequestMapping("/equipment/equipmentAcceptanceApply") diff --git a/src/main/java/com/sipai/controller/equipment/EquipmentAccidentController.java b/src/main/java/com/sipai/controller/equipment/EquipmentAccidentController.java index b2b4f82c..120c0b40 100644 --- a/src/main/java/com/sipai/controller/equipment/EquipmentAccidentController.java +++ b/src/main/java/com/sipai/controller/equipment/EquipmentAccidentController.java @@ -1,31 +1,11 @@ package com.sipai.controller.equipment; -import java.io.IOException; -import java.math.BigDecimal; -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.controller.base.FileUploadHelper; import com.sipai.entity.base.CommonFile; import com.sipai.entity.equipment.EquipmentAccident; import com.sipai.entity.equipment.EquipmentAccidentDetail; import com.sipai.entity.equipment.EquipmentCard; -import com.sipai.entity.equipment.EquipmentLoseApply; -import com.sipai.entity.equipment.EquipmentLoseApplyDetail; import com.sipai.entity.user.Company; import com.sipai.entity.user.User; import com.sipai.service.base.CommonFileService; @@ -35,6 +15,19 @@ import com.sipai.service.equipment.EquipmentCardService; import com.sipai.service.user.UnitService; import com.sipai.tools.CommUtil; import com.sipai.tools.FileUtil; +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.io.IOException; +import java.util.List; @Controller @RequestMapping("equipment/equipmentAccident") diff --git a/src/main/java/com/sipai/controller/equipment/EquipmentBelongController.java b/src/main/java/com/sipai/controller/equipment/EquipmentBelongController.java index 3cd532d1..c9243738 100644 --- a/src/main/java/com/sipai/controller/equipment/EquipmentBelongController.java +++ b/src/main/java/com/sipai/controller/equipment/EquipmentBelongController.java @@ -1,36 +1,25 @@ package com.sipai.controller.equipment; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; - +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import com.sipai.entity.equipment.EquipmentBelong; +import com.sipai.entity.user.User; +import com.sipai.service.equipment.EquipmentBelongService; +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.bind.annotation.ResponseBody; import org.springframework.web.servlet.ModelAndView; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; -import com.sipai.entity.equipment.EquipmentBelong; -import com.sipai.entity.equipment.EquipmentClass; -import com.sipai.entity.equipment.EquipmentClassProp; -import com.sipai.entity.equipment.EquipmentCode; -import com.sipai.entity.equipment.EquipmentLevel; -import com.sipai.entity.user.User; -import com.sipai.service.equipment.EquipmentBelongService; -import com.sipai.service.equipment.EquipmentClassPropService; -import com.sipai.service.equipment.EquipmentClassService; -import com.sipai.service.equipment.EquipmentCodeService; -import com.sipai.tools.CommUtil; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import java.util.HashMap; +import java.util.List; +import java.util.Map; @Controller @RequestMapping("/equipment/equipmentBelong") diff --git a/src/main/java/com/sipai/controller/equipment/EquipmentCardCameraController.java b/src/main/java/com/sipai/controller/equipment/EquipmentCardCameraController.java index ceff34ec..75a2bfa8 100644 --- a/src/main/java/com/sipai/controller/equipment/EquipmentCardCameraController.java +++ b/src/main/java/com/sipai/controller/equipment/EquipmentCardCameraController.java @@ -1,15 +1,14 @@ package com.sipai.controller.equipment; -import java.util.List; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; - -import com.sipai.entity.equipment.EquipmentCard; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import com.sipai.entity.equipment.EquipmentCardCamera; +import com.sipai.entity.user.User; +import com.sipai.service.equipment.EquipmentCardCameraService; import com.sipai.service.equipment.EquipmentCardService; +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,13 +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.equipment.EquipmentCardCamera; -import com.sipai.entity.process.DataVisualRadarChartAxis; -import com.sipai.entity.user.User; -import com.sipai.service.equipment.EquipmentCardCameraService; -import com.sipai.tools.CommUtil; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import java.util.List; @Controller @RequestMapping("/equipment/equipmentCardCamera") diff --git a/src/main/java/com/sipai/controller/equipment/EquipmentCardController.java b/src/main/java/com/sipai/controller/equipment/EquipmentCardController.java index 9b31bffe..01318511 100644 --- a/src/main/java/com/sipai/controller/equipment/EquipmentCardController.java +++ b/src/main/java/com/sipai/controller/equipment/EquipmentCardController.java @@ -43,7 +43,6 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.util.CollectionUtils; -import org.springframework.util.SocketUtils; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartRequest; diff --git a/src/main/java/com/sipai/controller/equipment/EquipmentCardLinksController.java b/src/main/java/com/sipai/controller/equipment/EquipmentCardLinksController.java index 23f5602b..dc596fca 100644 --- a/src/main/java/com/sipai/controller/equipment/EquipmentCardLinksController.java +++ b/src/main/java/com/sipai/controller/equipment/EquipmentCardLinksController.java @@ -1,19 +1,5 @@ package com.sipai.controller.equipment; -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.equipment.EquipmentCard; @@ -26,6 +12,17 @@ import com.sipai.service.user.ProcessSectionService; 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 @RequestMapping("/equipment/equipmentCardLinks") diff --git a/src/main/java/com/sipai/controller/equipment/EquipmentCardLinksParameterController.java b/src/main/java/com/sipai/controller/equipment/EquipmentCardLinksParameterController.java index 1e9cc322..66ac99ba 100644 --- a/src/main/java/com/sipai/controller/equipment/EquipmentCardLinksParameterController.java +++ b/src/main/java/com/sipai/controller/equipment/EquipmentCardLinksParameterController.java @@ -1,12 +1,12 @@ package com.sipai.controller.equipment; -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.equipment.EquipmentCardLinksParameter; +import com.sipai.entity.user.User; +import com.sipai.service.equipment.EquipmentCardLinksParameterService; +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,13 +14,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.equipment.EquipmentCardLinksParameter; -import com.sipai.entity.user.User; -import com.sipai.service.equipment.EquipmentCardLinksParameterService; -import com.sipai.tools.CommString; -import com.sipai.tools.CommUtil; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import java.util.List; @Controller @RequestMapping("/equipment/equipmentCardLinksParameter") diff --git a/src/main/java/com/sipai/controller/equipment/EquipmentCardPropController.java b/src/main/java/com/sipai/controller/equipment/EquipmentCardPropController.java index 17130f98..4c354a59 100644 --- a/src/main/java/com/sipai/controller/equipment/EquipmentCardPropController.java +++ b/src/main/java/com/sipai/controller/equipment/EquipmentCardPropController.java @@ -1,30 +1,25 @@ package com.sipai.controller.equipment; -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.validation.BindingResult; -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.equipment.EquipmentCard; import com.sipai.entity.equipment.EquipmentCardProp; import com.sipai.entity.user.Company; import com.sipai.entity.user.User; import com.sipai.service.equipment.EquipmentCardPropService; 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.math.BigDecimal; +import java.util.List; @Controller @RequestMapping("/equipment/equipmentCardProp") diff --git a/src/main/java/com/sipai/controller/equipment/EquipmentCardRemarkController.java b/src/main/java/com/sipai/controller/equipment/EquipmentCardRemarkController.java index 296137ab..dcb27375 100644 --- a/src/main/java/com/sipai/controller/equipment/EquipmentCardRemarkController.java +++ b/src/main/java/com/sipai/controller/equipment/EquipmentCardRemarkController.java @@ -13,14 +13,12 @@ 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.Date; import java.util.List; @Controller diff --git a/src/main/java/com/sipai/controller/equipment/EquipmentClassController.java b/src/main/java/com/sipai/controller/equipment/EquipmentClassController.java index e4ee7cec..98dc3bc0 100644 --- a/src/main/java/com/sipai/controller/equipment/EquipmentClassController.java +++ b/src/main/java/com/sipai/controller/equipment/EquipmentClassController.java @@ -1,36 +1,6 @@ package com.sipai.controller.equipment; -import java.io.IOException; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; -import java.util.List; -import java.util.ListIterator; -import java.util.Map; -import java.util.TreeSet; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import com.sipai.entity.user.ProcessSection; -import com.sipai.tools.LibraryTool; -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.bind.annotation.ResponseBody; -import org.springframework.web.multipart.MultipartFile; -import org.springframework.web.multipart.MultipartRequest; -import org.springframework.web.servlet.ModelAndView; - import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.sipai.entity.base.Result; @@ -48,6 +18,24 @@ import com.sipai.service.equipment.EquipmentClassService; import com.sipai.service.user.UnitService; import com.sipai.tools.CommString; import com.sipai.tools.CommUtil; +import com.sipai.tools.LibraryTool; +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.bind.annotation.ResponseBody; +import org.springframework.web.multipart.MultipartFile; +import org.springframework.web.multipart.MultipartRequest; +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.util.*; @Controller @RequestMapping("/equipment/equipmentClass") diff --git a/src/main/java/com/sipai/controller/equipment/EquipmentCodeController.java b/src/main/java/com/sipai/controller/equipment/EquipmentCodeController.java index cf357f3d..3668dc75 100644 --- a/src/main/java/com/sipai/controller/equipment/EquipmentCodeController.java +++ b/src/main/java/com/sipai/controller/equipment/EquipmentCodeController.java @@ -1,23 +1,5 @@ package com.sipai.controller.equipment; -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.ModelAttribute; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.servlet.ModelAndView; - import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.sipai.entity.equipment.EquipmentClass; @@ -28,6 +10,21 @@ import com.sipai.service.equipment.EquipmentClassPropService; import com.sipai.service.equipment.EquipmentClassService; import com.sipai.service.equipment.EquipmentCodeService; 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.bind.annotation.ResponseBody; +import org.springframework.web.servlet.ModelAndView; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import java.util.HashMap; +import java.util.List; +import java.util.Map; @Controller @RequestMapping("/equipment/equipmentCode") diff --git a/src/main/java/com/sipai/controller/equipment/EquipmentCodeLibraryController.java b/src/main/java/com/sipai/controller/equipment/EquipmentCodeLibraryController.java index b527dfaa..6a22aa6c 100644 --- a/src/main/java/com/sipai/controller/equipment/EquipmentCodeLibraryController.java +++ b/src/main/java/com/sipai/controller/equipment/EquipmentCodeLibraryController.java @@ -1,23 +1,19 @@ package com.sipai.controller.equipment; -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.equipment.EquipmentCodeLibrary; +import com.sipai.service.equipment.EquipmentCodeLibraryService; 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 com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; -import com.sipai.entity.equipment.EquipmentCodeLibrary; -import com.sipai.entity.equipment.EquipmentCodeRule; -import com.sipai.service.equipment.EquipmentCodeLibraryService; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import java.util.List; @Controller @RequestMapping("/equipment/equipmentCodeLibrary") diff --git a/src/main/java/com/sipai/controller/equipment/EquipmentCodeRuleController.java b/src/main/java/com/sipai/controller/equipment/EquipmentCodeRuleController.java index f550daf3..7e4e2726 100644 --- a/src/main/java/com/sipai/controller/equipment/EquipmentCodeRuleController.java +++ b/src/main/java/com/sipai/controller/equipment/EquipmentCodeRuleController.java @@ -1,16 +1,12 @@ package com.sipai.controller.equipment; -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 com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import com.sipai.entity.equipment.EquipmentCodeRule; +import com.sipai.entity.user.User; +import com.sipai.service.equipment.EquipmentCodeRuleService; +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; @@ -18,13 +14,13 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.servlet.ModelAndView; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; -import com.sipai.entity.equipment.EquipmentCode; -import com.sipai.entity.equipment.EquipmentCodeRule; -import com.sipai.entity.user.User; -import com.sipai.service.equipment.EquipmentCodeRuleService; -import com.sipai.tools.CommUtil; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; @Controller @RequestMapping("/equipment/equipmentCodeRule") diff --git a/src/main/java/com/sipai/controller/equipment/EquipmentDialinController.java b/src/main/java/com/sipai/controller/equipment/EquipmentDialinController.java index 59d9b80a..c46a7257 100644 --- a/src/main/java/com/sipai/controller/equipment/EquipmentDialinController.java +++ b/src/main/java/com/sipai/controller/equipment/EquipmentDialinController.java @@ -1,34 +1,10 @@ package com.sipai.controller.equipment; -import java.io.IOException; -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 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.bind.annotation.ResponseBody; -import org.springframework.web.multipart.MultipartFile; -import org.springframework.web.multipart.MultipartRequest; -import org.springframework.web.servlet.ModelAndView; - import com.alibaba.fastjson.JSONObject; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.sipai.entity.equipment.EquipmentCard; import com.sipai.entity.equipment.EquipmentDialin; -import com.sipai.entity.equipment.EquipmentLoseApplyDetail; -import com.sipai.entity.equipment.MaintenancePlan; import com.sipai.entity.sparepart.Warehouse; import com.sipai.entity.user.Company; import com.sipai.entity.user.Unit; @@ -40,6 +16,24 @@ import com.sipai.service.sparepart.WarehouseService; import com.sipai.service.user.UnitService; 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.ModelAttribute; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.multipart.MultipartFile; +import org.springframework.web.multipart.MultipartRequest; +import org.springframework.web.servlet.ModelAndView; + +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; @Controller @RequestMapping("/equipment/equipmentDialin") diff --git a/src/main/java/com/sipai/controller/equipment/EquipmentFittingsController.java b/src/main/java/com/sipai/controller/equipment/EquipmentFittingsController.java index 6c0ac213..b431393c 100644 --- a/src/main/java/com/sipai/controller/equipment/EquipmentFittingsController.java +++ b/src/main/java/com/sipai/controller/equipment/EquipmentFittingsController.java @@ -1,32 +1,26 @@ package com.sipai.controller.equipment; -import java.util.Iterator; -import java.util.List; -import java.util.TreeSet; - -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.base.Result; -import com.sipai.entity.equipment.EquipmentClass; import com.sipai.entity.equipment.EquipmentFittings; import com.sipai.entity.user.User; import com.sipai.service.equipment.EquipmentClassService; import com.sipai.service.equipment.EquipmentFittingsService; import com.sipai.service.equipment.FacilitiesClassService; 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.Iterator; +import java.util.List; +import java.util.TreeSet; @Controller @RequestMapping("/equipment/equipmentFittings") diff --git a/src/main/java/com/sipai/controller/equipment/EquipmentIncreaseValueController.java b/src/main/java/com/sipai/controller/equipment/EquipmentIncreaseValueController.java index dc1646b4..90146d21 100644 --- a/src/main/java/com/sipai/controller/equipment/EquipmentIncreaseValueController.java +++ b/src/main/java/com/sipai/controller/equipment/EquipmentIncreaseValueController.java @@ -1,13 +1,12 @@ package com.sipai.controller.equipment; -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.equipment.EquipmentIncreaseValue; +import com.sipai.entity.user.User; +import com.sipai.service.equipment.EquipmentIncreaseValueService; +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 +14,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.equipment.EquipmentIncreaseValue; -//import com.sipai.entity.maintenance.FaultLibrary; -import com.sipai.entity.user.User; -import com.sipai.service.equipment.EquipmentIncreaseValueService; -import com.sipai.tools.CommString; -import com.sipai.tools.CommUtil; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import java.util.List; @Controller @RequestMapping("/equipment/equipmentIncreaseValue") diff --git a/src/main/java/com/sipai/controller/equipment/EquipmentLevelController.java b/src/main/java/com/sipai/controller/equipment/EquipmentLevelController.java index babe5751..6d048bfc 100644 --- a/src/main/java/com/sipai/controller/equipment/EquipmentLevelController.java +++ b/src/main/java/com/sipai/controller/equipment/EquipmentLevelController.java @@ -1,13 +1,14 @@ package com.sipai.controller.equipment; -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.equipment.EquipmentLevel; +import com.sipai.entity.user.User; +import com.sipai.service.equipment.EquipmentLevelService; +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; @@ -15,15 +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.equipment.EquipmentClass; -import com.sipai.entity.equipment.EquipmentLevel; -import com.sipai.entity.user.ProcessSection; -import com.sipai.entity.user.User; -import com.sipai.service.equipment.EquipmentLevelService; -import com.sipai.tools.CommString; -import com.sipai.tools.CommUtil; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import java.util.List; @Controller @RequestMapping("/equipment/equipmentLevel") diff --git a/src/main/java/com/sipai/controller/equipment/EquipmentLoseApplyController.java b/src/main/java/com/sipai/controller/equipment/EquipmentLoseApplyController.java index 4e7e4925..3583955e 100644 --- a/src/main/java/com/sipai/controller/equipment/EquipmentLoseApplyController.java +++ b/src/main/java/com/sipai/controller/equipment/EquipmentLoseApplyController.java @@ -1,37 +1,5 @@ package com.sipai.controller.equipment; -import java.math.BigDecimal; -import java.text.DecimalFormat; -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Comparator; -import java.util.Date; -import java.util.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 net.sf.json.JSONObject; - -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; @@ -56,6 +24,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 net.sf.json.JSONObject; +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.math.BigDecimal; +import java.text.SimpleDateFormat; +import java.util.*; @Controller @RequestMapping("/equipment/EquipmentLoseApply") diff --git a/src/main/java/com/sipai/controller/equipment/EquipmentMaintainController.java b/src/main/java/com/sipai/controller/equipment/EquipmentMaintainController.java index 9d48abe6..ea71d0db 100644 --- a/src/main/java/com/sipai/controller/equipment/EquipmentMaintainController.java +++ b/src/main/java/com/sipai/controller/equipment/EquipmentMaintainController.java @@ -1,34 +1,12 @@ package com.sipai.controller.equipment; -import java.io.IOException; -import java.util.ArrayList; -import java.util.List; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -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.equipment.EquipmentCard; import com.sipai.entity.equipment.EquipmentClass; import com.sipai.entity.equipment.EquipmentMaintain; import com.sipai.entity.equipment.GeographyArea; import com.sipai.entity.maintenance.MaintenanceCommString; import com.sipai.entity.maintenance.MaintenanceDetail; -import com.sipai.entity.sparepart.Contract; -import com.sipai.entity.timeefficiency.PatrolRecord; -import com.sipai.entity.user.Unit; import com.sipai.entity.user.User; import com.sipai.service.equipment.EquipmentCardService; import com.sipai.service.equipment.EquipmentClassService; @@ -38,6 +16,18 @@ import com.sipai.service.maintenance.MaintenanceDetailService; import com.sipai.service.user.UnitService; 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.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.ArrayList; +import java.util.List; @Controller diff --git a/src/main/java/com/sipai/controller/equipment/EquipmentParamSetController.java b/src/main/java/com/sipai/controller/equipment/EquipmentParamSetController.java index 67f6390b..ee95fe5c 100644 --- a/src/main/java/com/sipai/controller/equipment/EquipmentParamSetController.java +++ b/src/main/java/com/sipai/controller/equipment/EquipmentParamSetController.java @@ -1,50 +1,35 @@ package com.sipai.controller.equipment; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; - -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.equipment.*; +import com.sipai.entity.maintenance.LibraryFaultBloc; +import com.sipai.entity.maintenance.LibraryRepairBloc; +import com.sipai.entity.user.Company; +import com.sipai.entity.user.User; +import com.sipai.service.company.CompanyService; +import com.sipai.service.equipment.*; +import com.sipai.service.maintenance.LibraryFaultBlocService; +import com.sipai.service.maintenance.LibraryRepairBlocService; +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.validation.BindingResult; 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.bind.annotation.ResponseBody; 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.equipment.EquipmentCard; -import com.sipai.entity.equipment.EquipmentClass; -import com.sipai.entity.equipment.EquipmentParamSetVO; -import com.sipai.entity.equipment.EquipmentParamset; -import com.sipai.entity.equipment.EquipmentParamsetDetail; -import com.sipai.entity.equipment.EquipmentParamsetStatusEvaluation; -import com.sipai.entity.equipment.EquipmentParamsetValue; -import com.sipai.entity.maintenance.LibraryFaultBloc; -import com.sipai.entity.maintenance.LibraryRepairBloc; -import com.sipai.entity.user.Company; -import com.sipai.entity.user.User; -import com.sipai.service.company.CompanyService; -import com.sipai.service.equipment.EquipmentCardService; -import com.sipai.service.equipment.EquipmentClassService; -import com.sipai.service.equipment.EquipmentParamsetDetailService; -import com.sipai.service.equipment.EquipmentParamsetService; -import com.sipai.service.equipment.EquipmentParamsetStatusEvaluationService; -import com.sipai.service.equipment.EquipmentParamsetValueService; -import com.sipai.service.maintenance.LibraryFaultBlocService; -import com.sipai.service.maintenance.LibraryRepairBlocService; -import com.sipai.tools.CommString; -import com.sipai.tools.CommUtil; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; /** * 设定设备运行参数标准(集团级) diff --git a/src/main/java/com/sipai/controller/equipment/EquipmentRepairPlanController.java b/src/main/java/com/sipai/controller/equipment/EquipmentRepairPlanController.java index 2f92e712..c7344726 100644 --- a/src/main/java/com/sipai/controller/equipment/EquipmentRepairPlanController.java +++ b/src/main/java/com/sipai/controller/equipment/EquipmentRepairPlanController.java @@ -1,23 +1,29 @@ package com.sipai.controller.equipment; -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.HttpSession; - +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import com.sipai.entity.activiti.WorkTask; +import com.sipai.entity.business.BusinessUnit; +import com.sipai.entity.business.BusinessUnitAudit; +import com.sipai.entity.business.BusinessUnitHandle; +import com.sipai.entity.business.BusinessUnitRecord; +import com.sipai.entity.equipment.EquipmentRepairPlan; +import com.sipai.entity.user.Company; +import com.sipai.entity.user.Unit; +import com.sipai.entity.user.User; +import com.sipai.service.activiti.WorkflowProcessDefinitionService; +import com.sipai.service.activiti.WorkflowService; +import com.sipai.service.business.BusinessUnitAuditService; +import com.sipai.service.business.BusinessUnitHandleService; +import com.sipai.service.equipment.EquipmentCardService; +import com.sipai.service.equipment.EquipmentRepairPlanService; +import com.sipai.service.user.ProcessSectionService; +import com.sipai.service.user.UnitService; +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 net.sf.json.JSONObject; - import org.activiti.engine.RuntimeService; import org.activiti.engine.TaskService; import org.activiti.engine.history.HistoricTaskInstance; @@ -27,56 +33,15 @@ import org.activiti.engine.task.Task; import org.springframework.stereotype.Controller; import org.springframework.transaction.annotation.Transactional; import org.springframework.ui.Model; -import org.springframework.validation.BindingResult; -import org.springframework.validation.Errors; 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; -import com.sipai.entity.business.BusinessUnit; -import com.sipai.entity.business.BusinessUnitAudit; -import com.sipai.entity.business.BusinessUnitDeptApply; -import com.sipai.entity.business.BusinessUnitHandle; -import com.sipai.entity.business.BusinessUnitRecord; -import com.sipai.entity.equipment.EquipmentCard; -import com.sipai.entity.equipment.EquipmentRepairPlan; -import com.sipai.entity.equipment.MaintenancePlan; -import com.sipai.entity.maintenance.Maintainer; -import com.sipai.entity.maintenance.MaintainerType; -import com.sipai.entity.maintenance.Maintenance; -import com.sipai.entity.maintenance.MaintenanceDetail; -import com.sipai.entity.sparepart.OutStockRecord; -import com.sipai.entity.sparepart.Subscribe; -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.activiti.WorkflowProcessDefinitionService; -import com.sipai.service.activiti.WorkflowService; -import com.sipai.service.base.LoginService; -import com.sipai.service.business.BusinessUnitAuditService; -import com.sipai.service.business.BusinessUnitHandleService; -import com.sipai.service.equipment.EquipmentCardService; -import com.sipai.service.equipment.EquipmentRepairPlanService; -import com.sipai.service.equipment.MaintenancePlanService; -import com.sipai.service.maintenance.MaintainerService; -import com.sipai.service.maintenance.MaintainerTypeService; -import com.sipai.service.maintenance.MaintenanceDetailService; -import com.sipai.service.maintenance.MaintenanceService; -import com.sipai.service.user.ProcessSectionService; -import com.sipai.service.user.UnitService; -import com.sipai.service.user.UserService; -import com.sipai.service.work.GroupMemberService; -import com.sipai.service.work.GroupService; -import com.sipai.tools.ActivitiUtil; -import com.sipai.tools.CommString; -import com.sipai.tools.CommUtil; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import java.text.SimpleDateFormat; +import java.util.*; @Controller diff --git a/src/main/java/com/sipai/controller/equipment/EquipmentSaleApplyController.java b/src/main/java/com/sipai/controller/equipment/EquipmentSaleApplyController.java index d0b19503..f37efbd3 100644 --- a/src/main/java/com/sipai/controller/equipment/EquipmentSaleApplyController.java +++ b/src/main/java/com/sipai/controller/equipment/EquipmentSaleApplyController.java @@ -1,38 +1,5 @@ package com.sipai.controller.equipment; -import java.math.BigDecimal; -import java.text.DecimalFormat; -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Comparator; -import java.util.Date; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; - -import javax.annotation.Resource; -import javax.mail.Session; -import javax.servlet.http.HttpServletRequest; - -import net.sf.json.JSONArray; -import net.sf.json.JSONObject; - -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; @@ -57,6 +24,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 net.sf.json.JSONObject; +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.math.BigDecimal; +import java.text.SimpleDateFormat; +import java.util.*; @Controller @RequestMapping("/equipment/EquipmentSaleApply") diff --git a/src/main/java/com/sipai/controller/equipment/EquipmentScrapApplyCollectController.java b/src/main/java/com/sipai/controller/equipment/EquipmentScrapApplyCollectController.java index c4a7d836..56acfbad 100644 --- a/src/main/java/com/sipai/controller/equipment/EquipmentScrapApplyCollectController.java +++ b/src/main/java/com/sipai/controller/equipment/EquipmentScrapApplyCollectController.java @@ -1,16 +1,15 @@ package com.sipai.controller.equipment; -import java.io.IOException; -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.equipment.EquipmentCard; +import com.sipai.entity.equipment.EquipmentScrapApplyCollect; +import com.sipai.entity.sparepart.Goods; +import com.sipai.service.equipment.EquipmentCardService; +import com.sipai.service.equipment.EquipmentScrapApplyService; +import com.sipai.service.sparepart.GoodsService; import net.sf.json.JSONArray; import net.sf.json.JSONObject; - import org.apache.commons.collections.map.HashedMap; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; @@ -19,15 +18,12 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.servlet.ModelAndView; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; -import com.sipai.entity.equipment.EquipmentCard; -import com.sipai.entity.equipment.EquipmentScrapApplyCollect; -import com.sipai.entity.sparepart.Goods; -import com.sipai.service.equipment.EquipmentCardService; -import com.sipai.service.equipment.EquipmentClassService; -import com.sipai.service.equipment.EquipmentScrapApplyService; -import com.sipai.service.sparepart.GoodsService; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.List; +import java.util.Map; @Controller @RequestMapping("/equipment/equipmentScrapApplyCollect") diff --git a/src/main/java/com/sipai/controller/equipment/EquipmentScrapApplyController.java b/src/main/java/com/sipai/controller/equipment/EquipmentScrapApplyController.java index 13d8cda2..09472bf2 100644 --- a/src/main/java/com/sipai/controller/equipment/EquipmentScrapApplyController.java +++ b/src/main/java/com/sipai/controller/equipment/EquipmentScrapApplyController.java @@ -1,29 +1,35 @@ package com.sipai.controller.equipment; -import java.math.BigDecimal; -import java.text.DecimalFormat; -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Calendar; -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 com.sipai.entity.sparepart.OutStockRecord; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import com.sipai.entity.activiti.WorkTask; +import com.sipai.entity.business.BusinessUnit; +import com.sipai.entity.business.BusinessUnitAudit; +import com.sipai.entity.business.BusinessUnitHandle; +import com.sipai.entity.business.BusinessUnitRecord; +import com.sipai.entity.equipment.EquipmentCard; +import com.sipai.entity.equipment.EquipmentScrapApply; +import com.sipai.entity.equipment.EquipmentScrapApplyDetail; +import com.sipai.entity.equipment.EquipmentTypeNumber; import com.sipai.entity.sparepart.SparePartCommString; -import com.sipai.entity.workorder.WorkorderDetail; +import com.sipai.entity.user.Company; +import com.sipai.entity.user.User; +import com.sipai.service.activiti.WorkflowProcessDefinitionService; +import com.sipai.service.activiti.WorkflowService; +import com.sipai.service.business.BusinessUnitAuditService; +import com.sipai.service.business.BusinessUnitHandleService; import com.sipai.service.company.CompanyService; +import com.sipai.service.equipment.EquipmentCardService; +import com.sipai.service.equipment.EquipmentScrapApplyDetailService; +import com.sipai.service.equipment.EquipmentScrapApplyService; +import com.sipai.service.equipment.EquipmentTypeNumberService; +import com.sipai.service.user.UnitService; +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 net.sf.json.JSONObject; - import org.activiti.engine.RuntimeService; import org.activiti.engine.TaskService; import org.activiti.engine.history.HistoricTaskInstance; @@ -38,32 +44,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.activiti.WorkTask; -import com.sipai.entity.business.BusinessUnit; -import com.sipai.entity.business.BusinessUnitAudit; -import com.sipai.entity.business.BusinessUnitHandle; -import com.sipai.entity.business.BusinessUnitRecord; -import com.sipai.entity.equipment.EquipmentCard; -import com.sipai.entity.equipment.EquipmentScrapApply; -import com.sipai.entity.equipment.EquipmentScrapApplyDetail; -import com.sipai.entity.equipment.EquipmentTypeNumber; -import com.sipai.entity.user.Company; -import com.sipai.entity.user.User; -import com.sipai.service.activiti.WorkflowProcessDefinitionService; -import com.sipai.service.activiti.WorkflowService; -import com.sipai.service.business.BusinessUnitAuditService; -import com.sipai.service.business.BusinessUnitHandleService; -import com.sipai.service.equipment.EquipmentCardService; -import com.sipai.service.equipment.EquipmentScrapApplyDetailService; -import com.sipai.service.equipment.EquipmentScrapApplyService; -import com.sipai.service.equipment.EquipmentTypeNumberService; -import com.sipai.service.user.UnitService; -import com.sipai.service.user.UserService; -import com.sipai.tools.ActivitiUtil; -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.text.SimpleDateFormat; +import java.util.*; @Controller @RequestMapping("/equipment/EquipmentScrapApply") diff --git a/src/main/java/com/sipai/controller/equipment/EquipmentSpecificationController.java b/src/main/java/com/sipai/controller/equipment/EquipmentSpecificationController.java index 124eb725..024b7323 100644 --- a/src/main/java/com/sipai/controller/equipment/EquipmentSpecificationController.java +++ b/src/main/java/com/sipai/controller/equipment/EquipmentSpecificationController.java @@ -1,13 +1,14 @@ package com.sipai.controller.equipment; -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.equipment.EquipmentSpecification; +import com.sipai.entity.user.User; +import com.sipai.service.equipment.EquipmentSpecificationService; +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; @@ -15,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.equipment.AssetClass; -import com.sipai.entity.equipment.EquipmentClass; -import com.sipai.entity.equipment.EquipmentSpecification; -import com.sipai.entity.user.User; -import com.sipai.service.equipment.AssetClassService; -import com.sipai.service.equipment.EquipmentSpecificationService; -import com.sipai.tools.CommString; -import com.sipai.tools.CommUtil; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import java.util.List; @Controller @RequestMapping("/equipment/equipmentSpecification") diff --git a/src/main/java/com/sipai/controller/equipment/EquipmentStatusManagementController.java b/src/main/java/com/sipai/controller/equipment/EquipmentStatusManagementController.java index 49b6efc1..20faadc9 100644 --- a/src/main/java/com/sipai/controller/equipment/EquipmentStatusManagementController.java +++ b/src/main/java/com/sipai/controller/equipment/EquipmentStatusManagementController.java @@ -1,13 +1,14 @@ package com.sipai.controller.equipment; -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.equipment.EquipmentStatusManagement; +import com.sipai.entity.user.User; +import com.sipai.service.equipment.EquipmentStatusManagementService; +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; @@ -15,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.equipment.AssetClass; -import com.sipai.entity.equipment.EquipmentClass; -import com.sipai.entity.equipment.EquipmentStatusManagement; -import com.sipai.entity.user.User; -import com.sipai.service.equipment.AssetClassService; -import com.sipai.service.equipment.EquipmentStatusManagementService; -import com.sipai.tools.CommString; -import com.sipai.tools.CommUtil; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import java.util.List; @Controller @RequestMapping("/equipment/equipmentStatusManagement") diff --git a/src/main/java/com/sipai/controller/equipment/EquipmentStopRecordController.java b/src/main/java/com/sipai/controller/equipment/EquipmentStopRecordController.java index b434ae2a..8a41a02a 100644 --- a/src/main/java/com/sipai/controller/equipment/EquipmentStopRecordController.java +++ b/src/main/java/com/sipai/controller/equipment/EquipmentStopRecordController.java @@ -1,35 +1,5 @@ package com.sipai.controller.equipment; -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 net.sf.json.JSONObject; - -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; @@ -39,7 +9,6 @@ import com.sipai.entity.business.BusinessUnitHandle; import com.sipai.entity.business.BusinessUnitRecord; import com.sipai.entity.equipment.EquipmentCard; import com.sipai.entity.equipment.EquipmentClass; -import com.sipai.entity.equipment.EquipmentLoseApply; import com.sipai.entity.equipment.EquipmentStopRecord; import com.sipai.entity.equipment.EquipmentStopRecordDetail; import com.sipai.entity.user.Company; @@ -57,6 +26,25 @@ 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 net.sf.json.JSONObject; +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("/equipment/equipmentStopRecord") diff --git a/src/main/java/com/sipai/controller/equipment/EquipmentTransfersApplyCollectController.java b/src/main/java/com/sipai/controller/equipment/EquipmentTransfersApplyCollectController.java index 6cbebc97..fad13485 100644 --- a/src/main/java/com/sipai/controller/equipment/EquipmentTransfersApplyCollectController.java +++ b/src/main/java/com/sipai/controller/equipment/EquipmentTransfersApplyCollectController.java @@ -1,27 +1,21 @@ package com.sipai.controller.equipment; -import java.util.List; -import java.util.Map; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; - +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import com.sipai.entity.equipment.EquipmentTransfersApplyCollect; +import com.sipai.service.equipment.EquipmentTransfersApplyService; import net.sf.json.JSONArray; - import org.apache.commons.collections.map.HashedMap; 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.bind.annotation.ResponseBody; -import org.springframework.web.servlet.ModelAndView; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; -import com.sipai.entity.equipment.AssetClass; -import com.sipai.entity.equipment.EquipmentTransfersApplyCollect; -import com.sipai.entity.user.User; -import com.sipai.service.equipment.EquipmentTransfersApplyService; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import java.util.List; +import java.util.Map; @Controller @RequestMapping("/equipment/equipmentTransfersApplyCollect") diff --git a/src/main/java/com/sipai/controller/equipment/EquipmentTransfersApplyController.java b/src/main/java/com/sipai/controller/equipment/EquipmentTransfersApplyController.java index a914b7b7..ff60989b 100644 --- a/src/main/java/com/sipai/controller/equipment/EquipmentTransfersApplyController.java +++ b/src/main/java/com/sipai/controller/equipment/EquipmentTransfersApplyController.java @@ -1,38 +1,5 @@ package com.sipai.controller.equipment; -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.math.BigDecimal; -import java.math.RoundingMode; -import java.text.DecimalFormat; -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 net.sf.json.JSONObject; - -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; @@ -41,14 +8,10 @@ import com.sipai.entity.business.BusinessUnitAudit; import com.sipai.entity.business.BusinessUnitHandle; import com.sipai.entity.business.BusinessUnitRecord; import com.sipai.entity.equipment.EquipmentCard; -import com.sipai.entity.equipment.EquipmentScrapApply; -import com.sipai.entity.equipment.EquipmentScrapApplyDetail; import com.sipai.entity.equipment.EquipmentTransfersApply; import com.sipai.entity.equipment.EquipmentTransfersApplyDetail; import com.sipai.entity.equipment.EquipmentTypeNumber; import com.sipai.entity.sparepart.Goods; -import com.sipai.entity.sparepart.OutStockRecord; -import com.sipai.entity.sparepart.OutStockRecordDetail; import com.sipai.entity.sparepart.Stock; import com.sipai.entity.sparepart.StockTransfersApplyDetail; import com.sipai.entity.user.Company; @@ -69,6 +32,27 @@ 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 net.sf.json.JSONObject; +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.math.BigDecimal; +import java.math.RoundingMode; +import java.text.SimpleDateFormat; +import java.util.*; @Controller @RequestMapping("/equipment/EquipmentTransfersApply") diff --git a/src/main/java/com/sipai/controller/equipment/EquipmentTypeNumberController.java b/src/main/java/com/sipai/controller/equipment/EquipmentTypeNumberController.java index cabd8235..13a0ec16 100644 --- a/src/main/java/com/sipai/controller/equipment/EquipmentTypeNumberController.java +++ b/src/main/java/com/sipai/controller/equipment/EquipmentTypeNumberController.java @@ -1,17 +1,14 @@ package com.sipai.controller.equipment; -import java.io.IOException; -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.equipment.EquipmentTypeNumber; +import com.sipai.entity.user.User; +import com.sipai.service.equipment.EquipmentTypeNumberService; +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; @@ -21,14 +18,13 @@ import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartRequest; import org.springframework.web.servlet.ModelAndView; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; -import com.sipai.entity.equipment.EquipmentClass; -import com.sipai.entity.equipment.EquipmentTypeNumber; -import com.sipai.entity.user.User; -import com.sipai.service.equipment.EquipmentTypeNumberService; -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 java.io.IOException; +import java.util.HashMap; +import java.util.List; +import java.util.Map; @Controller @RequestMapping("/equipment/equipmentTypeNumber") diff --git a/src/main/java/com/sipai/controller/equipment/EquipmentUseAgeController.java b/src/main/java/com/sipai/controller/equipment/EquipmentUseAgeController.java index 48feae25..04ef8d4a 100644 --- a/src/main/java/com/sipai/controller/equipment/EquipmentUseAgeController.java +++ b/src/main/java/com/sipai/controller/equipment/EquipmentUseAgeController.java @@ -1,13 +1,13 @@ package com.sipai.controller.equipment; -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.equipment.EquipmentUseAge; +import com.sipai.entity.user.User; +import com.sipai.service.equipment.EquipmentUseAgeService; +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,18 +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.equipment.AssetClass; -import com.sipai.entity.equipment.EquipmentClass; -import com.sipai.entity.equipment.EquipmentSpecification; -import com.sipai.entity.equipment.EquipmentUseAge; -import com.sipai.entity.user.User; -import com.sipai.service.equipment.AssetClassService; -import com.sipai.service.equipment.EquipmentSpecificationService; -import com.sipai.service.equipment.EquipmentUseAgeService; -import com.sipai.tools.CommString; -import com.sipai.tools.CommUtil; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import java.util.List; @Controller @RequestMapping("/equipment/equipmentUseAge") diff --git a/src/main/java/com/sipai/controller/equipment/FacilitiesCardController.java b/src/main/java/com/sipai/controller/equipment/FacilitiesCardController.java index 612ecc0f..c09900d0 100644 --- a/src/main/java/com/sipai/controller/equipment/FacilitiesCardController.java +++ b/src/main/java/com/sipai/controller/equipment/FacilitiesCardController.java @@ -1,31 +1,9 @@ package com.sipai.controller.equipment; -import java.io.IOException; -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.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.MultipartRequest; -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.equipment.AssetClass; -import com.sipai.entity.equipment.EquipmentClass; import com.sipai.entity.equipment.FacilitiesCard; import com.sipai.entity.user.Company; import com.sipai.entity.user.Unit; @@ -35,6 +13,24 @@ import com.sipai.service.equipment.AssetClassService; import com.sipai.service.equipment.FacilitiesCardService; 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; +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 javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.HashMap; +import java.util.List; +import java.util.Map; @Controller @RequestMapping("/equipment/facilitiesCard") diff --git a/src/main/java/com/sipai/controller/equipment/FacilitiesClassController.java b/src/main/java/com/sipai/controller/equipment/FacilitiesClassController.java index 306a6780..7e85244e 100644 --- a/src/main/java/com/sipai/controller/equipment/FacilitiesClassController.java +++ b/src/main/java/com/sipai/controller/equipment/FacilitiesClassController.java @@ -1,31 +1,21 @@ package com.sipai.controller.equipment; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.ListIterator; -import java.util.Map; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; - +import com.sipai.entity.base.Result; +import com.sipai.entity.equipment.FacilitiesClass; +import com.sipai.entity.user.User; +import com.sipai.service.equipment.FacilitiesClassService; +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.sipai.entity.base.Result; -import com.sipai.entity.equipment.EquipmentStatusManagement; -import com.sipai.entity.equipment.FacilitiesClass; -import com.sipai.entity.equipment.FacilitiesClass; -import com.sipai.entity.user.User; -import com.sipai.service.equipment.FacilitiesClassService; -import com.sipai.tools.CommString; -import com.sipai.tools.CommUtil; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import java.util.List; @Controller @RequestMapping("/equipment/facilitiesClass") diff --git a/src/main/java/com/sipai/controller/equipment/FinanceController.java b/src/main/java/com/sipai/controller/equipment/FinanceController.java index ba98d0a9..ecf7c900 100644 --- a/src/main/java/com/sipai/controller/equipment/FinanceController.java +++ b/src/main/java/com/sipai/controller/equipment/FinanceController.java @@ -1,85 +1,47 @@ package com.sipai.controller.equipment; -import java.io.IOException; -import java.lang.reflect.Field; -import java.math.BigDecimal; -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Calendar; -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.alibaba.fastjson.JSON; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import com.sipai.entity.equipment.*; +import com.sipai.entity.finance.FinanceEquipmentDeptInfo; +import com.sipai.entity.user.Company; +import com.sipai.entity.user.Unit; +import com.sipai.entity.user.User; +import com.sipai.entity.work.OverviewProduceBlot; +import com.sipai.service.company.CompanyService; +import com.sipai.service.equipment.*; +import com.sipai.service.finance.FinanceEquipmentDeptInfoService; +import com.sipai.service.user.UnitService; +import com.sipai.service.user.UserService; +import com.sipai.tools.CommUtil; import net.sf.json.JSONArray; import net.sf.json.JSONObject; - - - - - - -import org.activiti.engine.impl.transformer.IntegerToString; -import org.activiti.engine.impl.transformer.StringToInteger; import org.apache.commons.lang.StringEscapeUtils; import org.apache.commons.lang3.StringUtils; import org.apache.poi.hssf.usermodel.HSSFCell; 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.Cell; -import org.apache.poi.ss.usermodel.CellType; import org.apache.poi.ss.usermodel.DateUtil; 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.MultipartRequest; import org.springframework.web.servlet.ModelAndView; -import com.alibaba.fastjson.JSON; -//import com.alibaba.fastjson.JSONArray; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; -import com.sipai.entity.equipment.AssetClass; -import com.sipai.entity.equipment.EquipmentBelong; -import com.sipai.entity.equipment.EquipmentCard; -import com.sipai.entity.equipment.EquipmentCardProp; -import com.sipai.entity.equipment.EquipmentClass; -import com.sipai.entity.equipment.EquipmentCode; -import com.sipai.entity.equipment.EquipmentLevel; -import com.sipai.entity.equipment.EquipmentSpecification; -import com.sipai.entity.equipment.EquipmentTypeNumber; -import com.sipai.entity.finance.FinanceEquipmentDeptInfo; -import com.sipai.entity.sparepart.Goods; -import com.sipai.entity.sparepart.Sewage; -import com.sipai.entity.user.Company; -import com.sipai.entity.user.Unit; -import com.sipai.entity.user.User; -import com.sipai.entity.work.OverviewProduceBlot; -import com.sipai.service.company.CompanyService; -import com.sipai.service.equipment.AssetClassService; -import com.sipai.service.equipment.EquipmentBelongService; -import com.sipai.service.equipment.EquipmentCardPropService; -import com.sipai.service.equipment.EquipmentCardService; -import com.sipai.service.equipment.EquipmentClassService; -import com.sipai.service.equipment.EquipmentLevelService; -import com.sipai.service.equipment.EquipmentSpecificationService; -import com.sipai.service.equipment.EquipmentTypeNumberService; -import com.sipai.service.equipment.HomePageService; -import com.sipai.service.finance.FinanceEquipmentDeptInfoService; -import com.sipai.service.user.UnitService; -import com.sipai.service.user.UserService; -import com.sipai.tools.CommString; -import com.sipai.tools.CommUtil; -import com.sun.org.apache.bcel.internal.generic.NEW; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.lang.reflect.Field; +import java.math.BigDecimal; +import java.text.SimpleDateFormat; +import java.util.*; -import static org.apache.poi.ss.usermodel.CellType.*; +import static org.apache.poi.ss.usermodel.CellType.STRING; @Controller diff --git a/src/main/java/com/sipai/controller/equipment/GeographyAreaController.java b/src/main/java/com/sipai/controller/equipment/GeographyAreaController.java index 71c41e7a..c4de68e8 100644 --- a/src/main/java/com/sipai/controller/equipment/GeographyAreaController.java +++ b/src/main/java/com/sipai/controller/equipment/GeographyAreaController.java @@ -1,12 +1,12 @@ package com.sipai.controller.equipment; -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.equipment.GeographyArea; +import com.sipai.entity.user.User; +import com.sipai.service.equipment.GeographyAreaService; +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,14 +14,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.equipment.EquipmentClass; -import com.sipai.entity.equipment.GeographyArea; -import com.sipai.entity.user.User; -import com.sipai.service.equipment.GeographyAreaService; -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("/equipment") diff --git a/src/main/java/com/sipai/controller/equipment/MaintenancePlanController.java b/src/main/java/com/sipai/controller/equipment/MaintenancePlanController.java index 6482152f..eef91244 100644 --- a/src/main/java/com/sipai/controller/equipment/MaintenancePlanController.java +++ b/src/main/java/com/sipai/controller/equipment/MaintenancePlanController.java @@ -1,28 +1,36 @@ package com.sipai.controller.equipment; -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.HttpSession; - +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; import com.sipai.entity.activiti.ProcessType; -import com.sipai.entity.maintenance.*; +import com.sipai.entity.activiti.WorkTask; +import com.sipai.entity.business.BusinessUnit; +import com.sipai.entity.business.BusinessUnitAudit; +import com.sipai.entity.business.BusinessUnitHandle; +import com.sipai.entity.business.BusinessUnitRecord; +import com.sipai.entity.equipment.MaintenancePlan; +import com.sipai.entity.maintenance.EquipmentPlan; +import com.sipai.entity.maintenance.EquipmentPlanType; +import com.sipai.entity.user.Company; +import com.sipai.entity.user.Unit; +import com.sipai.entity.user.User; +import com.sipai.service.activiti.WorkflowProcessDefinitionService; +import com.sipai.service.activiti.WorkflowService; +import com.sipai.service.business.BusinessUnitAuditService; +import com.sipai.service.business.BusinessUnitHandleService; import com.sipai.service.company.CompanyService; -import com.sipai.service.maintenance.*; +import com.sipai.service.equipment.EquipmentCardService; +import com.sipai.service.equipment.MaintenancePlanService; +import com.sipai.service.maintenance.EquipmentPlanService; +import com.sipai.service.maintenance.EquipmentPlanTypeService; import com.sipai.service.user.JobService; +import com.sipai.service.user.ProcessSectionService; +import com.sipai.service.user.UnitService; +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 net.sf.json.JSONObject; - import org.activiti.engine.RuntimeService; import org.activiti.engine.TaskService; import org.activiti.engine.history.HistoricTaskInstance; @@ -32,47 +40,15 @@ import org.activiti.engine.task.Task; import org.springframework.stereotype.Controller; import org.springframework.transaction.annotation.Transactional; import org.springframework.ui.Model; -import org.springframework.validation.BindingResult; -import org.springframework.validation.Errors; 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; -import com.sipai.entity.business.BusinessUnit; -import com.sipai.entity.business.BusinessUnitAudit; -import com.sipai.entity.business.BusinessUnitDeptApply; -import com.sipai.entity.business.BusinessUnitHandle; -import com.sipai.entity.business.BusinessUnitRecord; -import com.sipai.entity.equipment.EquipmentCard; -import com.sipai.entity.equipment.MaintenancePlan; -import com.sipai.entity.sparepart.OutStockRecord; -import com.sipai.entity.sparepart.Subscribe; -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.activiti.WorkflowProcessDefinitionService; -import com.sipai.service.activiti.WorkflowService; -import com.sipai.service.base.LoginService; -import com.sipai.service.business.BusinessUnitAuditService; -import com.sipai.service.business.BusinessUnitHandleService; -import com.sipai.service.equipment.EquipmentCardService; -import com.sipai.service.equipment.MaintenancePlanService; -import com.sipai.service.user.ProcessSectionService; -import com.sipai.service.user.UnitService; -import com.sipai.service.user.UserService; -import com.sipai.service.work.GroupMemberService; -import com.sipai.service.work.GroupService; -import com.sipai.tools.ActivitiUtil; -import com.sipai.tools.CommString; -import com.sipai.tools.CommUtil; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import java.text.SimpleDateFormat; +import java.util.*; @Controller diff --git a/src/main/java/com/sipai/controller/equipment/SpecialEquipmentController.java b/src/main/java/com/sipai/controller/equipment/SpecialEquipmentController.java index 9d099ac9..afac1486 100644 --- a/src/main/java/com/sipai/controller/equipment/SpecialEquipmentController.java +++ b/src/main/java/com/sipai/controller/equipment/SpecialEquipmentController.java @@ -1,29 +1,9 @@ package com.sipai.controller.equipment; -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Date; -import java.util.HashSet; -import java.util.List; -import java.util.Set; - -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.alibaba.fastjson.JSONObject; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.sipai.entity.equipment.EquipmentCard; -import com.sipai.entity.equipment.EquipmentStopRecord; import com.sipai.entity.equipment.SpecialEquipment; import com.sipai.entity.user.Company; import com.sipai.entity.user.User; @@ -31,6 +11,21 @@ import com.sipai.service.equipment.EquipmentCardService; import com.sipai.service.equipment.SpecialEquipmentService; 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.text.SimpleDateFormat; +import java.util.Date; +import java.util.HashSet; +import java.util.List; +import java.util.Set; @Controller @RequestMapping("/equipment/specialEquipment") diff --git a/src/main/java/com/sipai/controller/evaluation/EvaluationCriterionController.java b/src/main/java/com/sipai/controller/evaluation/EvaluationCriterionController.java index 137ecce6..6dca8168 100644 --- a/src/main/java/com/sipai/controller/evaluation/EvaluationCriterionController.java +++ b/src/main/java/com/sipai/controller/evaluation/EvaluationCriterionController.java @@ -1,25 +1,22 @@ package com.sipai.controller.evaluation; -import java.util.List; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; - -import net.sf.json.JSONArray; -import net.sf.json.JsonConfig; -import net.sf.json.processors.DefaultValueProcessor; - -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.evaluation.EvaluationCriterion; import com.sipai.service.evaluation.EvaluationCriterionService; import com.sipai.tools.CommUtil; +import net.sf.json.JSONArray; +import net.sf.json.JsonConfig; +import net.sf.json.processors.DefaultValueProcessor; +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("/evaluation/criterion") diff --git a/src/main/java/com/sipai/controller/evaluation/EvaluationIndexController.java b/src/main/java/com/sipai/controller/evaluation/EvaluationIndexController.java index f9134986..771ac40d 100644 --- a/src/main/java/com/sipai/controller/evaluation/EvaluationIndexController.java +++ b/src/main/java/com/sipai/controller/evaluation/EvaluationIndexController.java @@ -1,24 +1,21 @@ package com.sipai.controller.evaluation; -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.evaluation.EvaluationCriterion; import com.sipai.entity.evaluation.EvaluationIndex; import com.sipai.service.evaluation.EvaluationIndexService; 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("/evaluation/Index") diff --git a/src/main/java/com/sipai/controller/evaluation/EvaluationIndexDayController.java b/src/main/java/com/sipai/controller/evaluation/EvaluationIndexDayController.java index 8aa25f2b..4a54c761 100644 --- a/src/main/java/com/sipai/controller/evaluation/EvaluationIndexDayController.java +++ b/src/main/java/com/sipai/controller/evaluation/EvaluationIndexDayController.java @@ -1,22 +1,5 @@ package com.sipai.controller.evaluation; -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 net.sf.json.JsonConfig; -import net.sf.json.processors.DefaultValueProcessor; - -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.RequestParam; - import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.sipai.entity.evaluation.EvaluationCriterion; @@ -25,6 +8,18 @@ import com.sipai.entity.evaluation.EvaluationIndexDay; import com.sipai.service.evaluation.EvaluationIndexDayService; import com.sipai.service.evaluation.EvaluationIndexService; import com.sipai.tools.CommUtil; +import net.sf.json.JSONArray; +import net.sf.json.JSONObject; +import net.sf.json.JsonConfig; +import net.sf.json.processors.DefaultValueProcessor; +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("/evaluation/indexDay") diff --git a/src/main/java/com/sipai/controller/evaluation/EvaluationIndexMController.java b/src/main/java/com/sipai/controller/evaluation/EvaluationIndexMController.java index fe339264..2ed624f0 100644 --- a/src/main/java/com/sipai/controller/evaluation/EvaluationIndexMController.java +++ b/src/main/java/com/sipai/controller/evaluation/EvaluationIndexMController.java @@ -1,25 +1,21 @@ package com.sipai.controller.evaluation; -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.evaluation.EvaluationCriterion; +import com.sipai.entity.evaluation.EvaluationIndexM; +import com.sipai.service.evaluation.EvaluationIndexMService; +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.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; -import com.sipai.entity.evaluation.EvaluationCriterion; -import com.sipai.entity.evaluation.EvaluationIndex; -import com.sipai.entity.evaluation.EvaluationIndexM; -import com.sipai.service.evaluation.EvaluationIndexMService; -import com.sipai.tools.CommUtil; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import java.util.List; @Controller @RequestMapping("/evaluation/IndexM") diff --git a/src/main/java/com/sipai/controller/evaluation/EvaluationIndexMonthController.java b/src/main/java/com/sipai/controller/evaluation/EvaluationIndexMonthController.java index a90540eb..cd6031d2 100644 --- a/src/main/java/com/sipai/controller/evaluation/EvaluationIndexMonthController.java +++ b/src/main/java/com/sipai/controller/evaluation/EvaluationIndexMonthController.java @@ -1,28 +1,23 @@ package com.sipai.controller.evaluation; -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.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; - import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.sipai.entity.evaluation.EvaluationCriterion; -import com.sipai.entity.evaluation.EvaluationIndex; -import com.sipai.entity.evaluation.EvaluationIndexDay; import com.sipai.entity.evaluation.EvaluationIndexM; import com.sipai.entity.evaluation.EvaluationIndexMonth; import com.sipai.service.evaluation.EvaluationIndexMService; import com.sipai.service.evaluation.EvaluationIndexMonthService; 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("/evaluation/indexMonth") diff --git a/src/main/java/com/sipai/controller/evaluation/EvaluationIndexYController.java b/src/main/java/com/sipai/controller/evaluation/EvaluationIndexYController.java index 18d6c710..0297a151 100644 --- a/src/main/java/com/sipai/controller/evaluation/EvaluationIndexYController.java +++ b/src/main/java/com/sipai/controller/evaluation/EvaluationIndexYController.java @@ -1,24 +1,21 @@ package com.sipai.controller.evaluation; -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.evaluation.EvaluationCriterion; import com.sipai.entity.evaluation.EvaluationIndexY; import com.sipai.service.evaluation.EvaluationIndexYService; 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("/evaluation/IndexY") diff --git a/src/main/java/com/sipai/controller/evaluation/EvaluationIndexYearController.java b/src/main/java/com/sipai/controller/evaluation/EvaluationIndexYearController.java index a2dcb120..26d0d09e 100644 --- a/src/main/java/com/sipai/controller/evaluation/EvaluationIndexYearController.java +++ b/src/main/java/com/sipai/controller/evaluation/EvaluationIndexYearController.java @@ -1,26 +1,23 @@ package com.sipai.controller.evaluation; -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.evaluation.EvaluationCriterion; +import com.sipai.entity.evaluation.EvaluationIndexY; +import com.sipai.entity.evaluation.EvaluationIndexYear; +import com.sipai.service.evaluation.EvaluationIndexYService; +import com.sipai.service.evaluation.EvaluationIndexYearService; +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 com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; -import com.sipai.entity.evaluation.EvaluationCriterion; -import com.sipai.entity.evaluation.EvaluationIndexYear; -import com.sipai.entity.evaluation.EvaluationIndexY; -import com.sipai.service.evaluation.EvaluationIndexYService; -import com.sipai.service.evaluation.EvaluationIndexYearService; -import com.sipai.tools.CommUtil; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import java.util.List; @Controller @RequestMapping("/evaluation/indexYear") diff --git a/src/main/java/com/sipai/controller/evaluation/EvaluationShowController.java b/src/main/java/com/sipai/controller/evaluation/EvaluationShowController.java index b924fc94..d16d6b39 100644 --- a/src/main/java/com/sipai/controller/evaluation/EvaluationShowController.java +++ b/src/main/java/com/sipai/controller/evaluation/EvaluationShowController.java @@ -1,22 +1,5 @@ package com.sipai.controller.evaluation; -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Calendar; -import java.util.Date; -import java.util.Iterator; -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.RequestMapping; - import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.sipai.entity.evaluation.EvaluationCriterion; @@ -27,6 +10,16 @@ import com.sipai.service.evaluation.EvaluationCriterionService; import com.sipai.service.evaluation.EvaluationIndexDayService; import com.sipai.service.evaluation.EvaluationIndexMonthService; import com.sipai.service.evaluation.EvaluationIndexYearService; +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 javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import java.text.SimpleDateFormat; +import java.util.*; @Controller @RequestMapping("/evaluation/show") diff --git a/src/main/java/com/sipai/controller/exception/GlobalExceptionHandler.java b/src/main/java/com/sipai/controller/exception/GlobalExceptionHandler.java index 5382fc22..aee5759c 100644 --- a/src/main/java/com/sipai/controller/exception/GlobalExceptionHandler.java +++ b/src/main/java/com/sipai/controller/exception/GlobalExceptionHandler.java @@ -4,7 +4,6 @@ import com.alibaba.fastjson.JSON; import com.sipai.entity.base.Result; import org.springframework.web.bind.annotation.ControllerAdvice; import org.springframework.web.bind.annotation.ExceptionHandler; -import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.servlet.HandlerExceptionResolver; import org.springframework.web.servlet.ModelAndView; diff --git a/src/main/java/com/sipai/controller/fangzhen/FangzhenController.java b/src/main/java/com/sipai/controller/fangzhen/FangzhenController.java index 1dcdb58a..41428095 100644 --- a/src/main/java/com/sipai/controller/fangzhen/FangzhenController.java +++ b/src/main/java/com/sipai/controller/fangzhen/FangzhenController.java @@ -1,17 +1,11 @@ package com.sipai.controller.fangzhen; import com.alibaba.fastjson.JSONObject; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; import com.sipai.entity.base.Result; import com.sipai.entity.fangzhen.*; -import com.sipai.entity.user.Unit; import com.sipai.entity.user.User; -import com.sipai.entity.work.Camera; -import com.sipai.entity.workorder.WorkorderDetail; import com.sipai.service.cmd.CmdService; import com.sipai.service.fangzhen.*; -import com.sipai.tools.CommString; import com.sipai.tools.CommUtil; import com.sipai.tools.MessageEnum; import com.sipai.tools.WebSocketCmdUtil; diff --git a/src/main/java/com/sipai/controller/finance/financeEquipmentDeptInfoController.java b/src/main/java/com/sipai/controller/finance/financeEquipmentDeptInfoController.java index 9eb00a95..6989ef05 100644 --- a/src/main/java/com/sipai/controller/finance/financeEquipmentDeptInfoController.java +++ b/src/main/java/com/sipai/controller/finance/financeEquipmentDeptInfoController.java @@ -1,14 +1,12 @@ package com.sipai.controller.finance; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; - +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import com.sipai.entity.finance.FinanceEquipmentDeptInfo; +import com.sipai.entity.user.User; +import com.sipai.service.finance.FinanceEquipmentDeptInfoService; +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; @@ -16,13 +14,11 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.servlet.ModelAndView; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; -import com.sipai.entity.equipment.EquipmentBelong; -import com.sipai.entity.finance.FinanceEquipmentDeptInfo; -import com.sipai.entity.user.User; -import com.sipai.service.finance.FinanceEquipmentDeptInfoService; -import com.sipai.tools.CommUtil; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import java.util.HashMap; +import java.util.List; +import java.util.Map; @Controller @RequestMapping("/finance/financeEquipmentDeptInfo") diff --git a/src/main/java/com/sipai/controller/fwk/MenunumberController.java b/src/main/java/com/sipai/controller/fwk/MenunumberController.java index 1f19ef31..3d920d7f 100644 --- a/src/main/java/com/sipai/controller/fwk/MenunumberController.java +++ b/src/main/java/com/sipai/controller/fwk/MenunumberController.java @@ -1,16 +1,11 @@ package com.sipai.controller.fwk; -import java.util.Comparator; -import java.util.Iterator; -import java.util.List; -import java.util.stream.Collectors; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; - +import com.sipai.entity.fwk.Menunumber; +import com.sipai.entity.user.User; +import com.sipai.service.fwk.MenunumberService; +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; @@ -18,12 +13,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.fwk.Menunumber; -import com.sipai.entity.user.User; -import com.sipai.service.fwk.MenunumberService; -import com.sipai.tools.CommUtil; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import java.util.Comparator; +import java.util.Iterator; +import java.util.List; import static java.util.stream.Collectors.toList; diff --git a/src/main/java/com/sipai/controller/hqconfig/HQAlarmRecordController.java b/src/main/java/com/sipai/controller/hqconfig/HQAlarmRecordController.java index fdb44b1c..50dfc8ca 100644 --- a/src/main/java/com/sipai/controller/hqconfig/HQAlarmRecordController.java +++ b/src/main/java/com/sipai/controller/hqconfig/HQAlarmRecordController.java @@ -1,29 +1,24 @@ package com.sipai.controller.hqconfig; -import java.io.IOException; -import java.text.DateFormat; -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.HashMap; -import java.util.Iterator; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; - -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.hqconfig.HQAlarmRecord; import com.sipai.entity.timeefficiency.PatrolPoint; +import com.sipai.entity.user.User; import com.sipai.entity.work.AlarmTypes; -import com.sipai.service.alarm.AlarmRecordService; +import com.sipai.entity.work.AreaManage; +import com.sipai.service.hqconfig.HQAlarmRecordService; +import com.sipai.service.hqconfig.RiskLevelService; +import com.sipai.service.process.DataVisualFrameService; import com.sipai.service.timeefficiency.PatrolPointService; import com.sipai.service.work.AlarmTypesService; +import com.sipai.service.work.AreaManageService; +import com.sipai.tools.CommUtil; import io.swagger.annotations.*; import net.sf.json.JSONArray; import net.sf.json.JSONObject; - import org.apache.commons.lang3.StringUtils; -import org.hsqldb.lib.HashSet; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.ModelAttribute; @@ -31,21 +26,10 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; 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.hqconfig.HQAlarmRecord; -import com.sipai.entity.hqconfig.RiskLevel; -import com.sipai.entity.process.DataVisualFrame; -import com.sipai.entity.user.User; -import com.sipai.entity.work.AreaManage; -import com.sipai.service.hqconfig.HQAlarmRecordService; -import com.sipai.service.hqconfig.RiskLevelService; -import com.sipai.service.process.DataVisualFrameService; -import com.sipai.service.work.AreaManageService; -import com.sipai.tools.CommUtil; -import com.sipai.websocket.AlarmWebSocket; -import com.sun.org.apache.bcel.internal.generic.NEW; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import java.io.IOException; +import java.util.List; @Controller @RequestMapping("hqconfig/hqAlarmRecord") diff --git a/src/main/java/com/sipai/controller/hqconfig/RiskLevelController.java b/src/main/java/com/sipai/controller/hqconfig/RiskLevelController.java index a1c680d4..a6bf37c9 100644 --- a/src/main/java/com/sipai/controller/hqconfig/RiskLevelController.java +++ b/src/main/java/com/sipai/controller/hqconfig/RiskLevelController.java @@ -21,9 +21,7 @@ import org.springframework.web.bind.annotation.RequestParam; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; -import java.util.HashMap; import java.util.List; -import java.util.Map; @Controller @RequestMapping("hqconfig/riskGrade") diff --git a/src/main/java/com/sipai/controller/hqconfig/WorkModelController.java b/src/main/java/com/sipai/controller/hqconfig/WorkModelController.java index b14446d7..dd9a0b2c 100644 --- a/src/main/java/com/sipai/controller/hqconfig/WorkModelController.java +++ b/src/main/java/com/sipai/controller/hqconfig/WorkModelController.java @@ -1,17 +1,5 @@ package com.sipai.controller.hqconfig; -import java.util.List; -import java.util.Objects; - -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.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; @@ -19,9 +7,17 @@ import com.sipai.entity.hqconfig.WorkModel; import com.sipai.entity.user.User; import com.sipai.service.hqconfig.WorkModelService; 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("hqconfig/workModel") diff --git a/src/main/java/com/sipai/controller/info/InfoController.java b/src/main/java/com/sipai/controller/info/InfoController.java index bcd4862d..6bdd6728 100644 --- a/src/main/java/com/sipai/controller/info/InfoController.java +++ b/src/main/java/com/sipai/controller/info/InfoController.java @@ -1,20 +1,5 @@ package com.sipai.controller.info; -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.info.Info; @@ -26,6 +11,18 @@ import com.sipai.service.info.InfoService; import com.sipai.service.user.UnitService; 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; +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("/info") diff --git a/src/main/java/com/sipai/controller/kpi/KpiDimensionController.java b/src/main/java/com/sipai/controller/kpi/KpiDimensionController.java index 74cb143d..d10c8714 100644 --- a/src/main/java/com/sipai/controller/kpi/KpiDimensionController.java +++ b/src/main/java/com/sipai/controller/kpi/KpiDimensionController.java @@ -23,7 +23,6 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import java.util.Date; import java.util.List; -import java.util.UUID; /** * 考核维度管理 diff --git a/src/main/java/com/sipai/controller/kpi/KpiPlanController.java b/src/main/java/com/sipai/controller/kpi/KpiPlanController.java index 266c95a6..c6db56fe 100644 --- a/src/main/java/com/sipai/controller/kpi/KpiPlanController.java +++ b/src/main/java/com/sipai/controller/kpi/KpiPlanController.java @@ -3,11 +3,7 @@ package com.sipai.controller.kpi; import com.alibaba.excel.EasyExcel; import com.alibaba.excel.ExcelReader; import com.alibaba.excel.ExcelWriter; -import com.alibaba.excel.context.AnalysisContext; -import com.alibaba.excel.metadata.CellExtra; -import com.alibaba.excel.metadata.data.ReadCellData; import com.alibaba.excel.read.listener.PageReadListener; -import com.alibaba.excel.read.listener.ReadListener; import com.alibaba.excel.read.metadata.ReadSheet; import com.alibaba.excel.write.metadata.WriteSheet; import com.github.pagehelper.PageHelper; @@ -15,13 +11,15 @@ import com.github.pagehelper.PageInfo; import com.sipai.entity.base.Result; import com.sipai.entity.enums.PeriodTypeEnum; import com.sipai.entity.enums.PositionTypeEnum; -import com.sipai.entity.kpi.KpiDimension; import com.sipai.entity.kpi.KpiIndicatorLib; import com.sipai.entity.kpi.KpiPlan; import com.sipai.entity.kpi.KpiPlanDetail; import com.sipai.entity.user.Job; import com.sipai.entity.user.User; -import com.sipai.service.kpi.*; +import com.sipai.service.kpi.KpiDimensionService; +import com.sipai.service.kpi.KpiIndicatorLibService; +import com.sipai.service.kpi.KpiPlanDetailService; +import com.sipai.service.kpi.KpiPlanService; import com.sipai.service.user.JobServiceImpl; import com.sipai.service.user.UserService; import com.sipai.tools.DateUtil; @@ -40,7 +38,10 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.IOException; -import java.util.*; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.UUID; /** * 考核维度管理 diff --git a/src/main/java/com/sipai/controller/kpi/KpiPlanStaffDetailController.java b/src/main/java/com/sipai/controller/kpi/KpiPlanStaffDetailController.java index d9ac1d8e..313adc0e 100644 --- a/src/main/java/com/sipai/controller/kpi/KpiPlanStaffDetailController.java +++ b/src/main/java/com/sipai/controller/kpi/KpiPlanStaffDetailController.java @@ -2,7 +2,6 @@ package com.sipai.controller.kpi; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; -import com.sipai.entity.kpi.KpiPlanStaff; import com.sipai.entity.kpi.KpiPlanStaffBo; import com.sipai.entity.kpi.KpiPlanStaffDetail; import com.sipai.service.activiti.KpiWorkflowService; diff --git a/src/main/java/com/sipai/controller/maintenance/AbnormityController.java b/src/main/java/com/sipai/controller/maintenance/AbnormityController.java index 2911cf6b..6b13d85f 100644 --- a/src/main/java/com/sipai/controller/maintenance/AbnormityController.java +++ b/src/main/java/com/sipai/controller/maintenance/AbnormityController.java @@ -1,35 +1,41 @@ package com.sipai.controller.maintenance; -import java.io.IOException; -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.*; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; - import com.alibaba.fastjson.JSONException; import com.alibaba.fastjson.JSONObject; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; import com.sipai.entity.activiti.ProcessType; +import com.sipai.entity.activiti.TodoTask; import com.sipai.entity.activiti.WorkTask; +import com.sipai.entity.base.Result; import com.sipai.entity.business.BusinessUnit; import com.sipai.entity.business.BusinessUnitHandle; import com.sipai.entity.business.BusinessUnitRecord; -import com.sipai.entity.maintenance.Maintenance; +import com.sipai.entity.equipment.EquipmentCard; +import com.sipai.entity.maintenance.*; +import com.sipai.entity.user.Company; +import com.sipai.entity.user.Unit; +import com.sipai.entity.user.User; import com.sipai.entity.workorder.WorkorderDetail; import com.sipai.service.activiti.WorkflowProcessDefinitionService; +import com.sipai.service.activiti.WorkflowService; import com.sipai.service.business.BusinessUnitAuditService; import com.sipai.service.business.BusinessUnitHandleService; +import com.sipai.service.equipment.EquipmentCardService; +import com.sipai.service.maintenance.AbnormityService; +import com.sipai.service.maintenance.EquipmentPlanService; +import com.sipai.service.maintenance.MaintenanceDetailService; +import com.sipai.service.maintenance.MaintenanceService; +import com.sipai.service.msg.MsgServiceImpl; +import com.sipai.service.user.ProcessSectionService; +import com.sipai.service.user.UnitService; import com.sipai.service.user.UserService; import com.sipai.service.work.GroupDetailService; +import com.sipai.service.work.KPIPointProfessorService; import com.sipai.service.workorder.WorkorderDetailService; import com.sipai.tools.*; - import io.swagger.annotations.*; import net.sf.json.JSONArray; - import org.activiti.engine.RuntimeService; import org.activiti.engine.TaskService; import org.activiti.engine.history.HistoricTaskInstance; @@ -39,32 +45,17 @@ 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.sipai.entity.activiti.TodoTask; -import com.sipai.entity.base.Result; -import com.sipai.entity.equipment.EquipmentCard; -import com.sipai.entity.maintenance.Abnormity; -import com.sipai.entity.maintenance.EquipmentPlan; -import com.sipai.entity.maintenance.EquipmentPlanType; -import com.sipai.entity.maintenance.MaintenanceDetail; -import com.sipai.entity.user.Company; -import com.sipai.entity.user.Unit; -import com.sipai.entity.user.User; -import com.sipai.service.activiti.WorkflowService; -import com.sipai.service.equipment.EquipmentCardService; -import com.sipai.service.maintenance.AbnormityService; -import com.sipai.service.maintenance.EquipmentPlanService; -import com.sipai.service.maintenance.MaintenanceDetailService; -import com.sipai.service.maintenance.MaintenanceService; -import com.sipai.service.msg.MsgServiceImpl; -import com.sipai.service.user.ProcessSectionService; -import com.sipai.service.user.UnitService; -import com.sipai.service.work.KPIPointProfessorService; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpSession; +import java.io.IOException; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.*; @Controller @RequestMapping("/maintenance/abnormity") diff --git a/src/main/java/com/sipai/controller/maintenance/AnticorrosiveLibraryController.java b/src/main/java/com/sipai/controller/maintenance/AnticorrosiveLibraryController.java index 92bbf9c8..e0f2b595 100644 --- a/src/main/java/com/sipai/controller/maintenance/AnticorrosiveLibraryController.java +++ b/src/main/java/com/sipai/controller/maintenance/AnticorrosiveLibraryController.java @@ -1,13 +1,13 @@ package com.sipai.controller.maintenance; -import java.util.List; - -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.maintenance.AnticorrosiveLibrary; +import com.sipai.entity.user.User; +import com.sipai.service.maintenance.AnticorrosiveLibraryService; +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; @@ -15,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.base.Result; -import com.sipai.entity.equipment.EquipmentClass; -import com.sipai.entity.maintenance.AnticorrosiveLibrary; -import com.sipai.entity.user.User; -import com.sipai.service.maintenance.AnticorrosiveLibraryService; -import com.sipai.tools.CommUtil; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.util.List; /** * 防腐库 diff --git a/src/main/java/com/sipai/controller/maintenance/AnticorrosiveLibraryEquipmentController.java b/src/main/java/com/sipai/controller/maintenance/AnticorrosiveLibraryEquipmentController.java index e0159a27..daed4c56 100644 --- a/src/main/java/com/sipai/controller/maintenance/AnticorrosiveLibraryEquipmentController.java +++ b/src/main/java/com/sipai/controller/maintenance/AnticorrosiveLibraryEquipmentController.java @@ -1,19 +1,5 @@ package com.sipai.controller.maintenance; -import java.util.List; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -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 com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.sipai.entity.base.Result; @@ -21,6 +7,17 @@ import com.sipai.entity.maintenance.AnticorrosiveLibraryEquipment; import com.sipai.entity.user.User; import com.sipai.service.maintenance.AnticorrosiveLibraryEquipmentService; 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 javax.servlet.http.HttpServletResponse; +import java.util.List; @Controller @RequestMapping("/maintenance/anticorrosiveLibraryEquipment") diff --git a/src/main/java/com/sipai/controller/maintenance/AnticorrosiveLibraryMaterialController.java b/src/main/java/com/sipai/controller/maintenance/AnticorrosiveLibraryMaterialController.java index 87725f22..561c458c 100644 --- a/src/main/java/com/sipai/controller/maintenance/AnticorrosiveLibraryMaterialController.java +++ b/src/main/java/com/sipai/controller/maintenance/AnticorrosiveLibraryMaterialController.java @@ -1,29 +1,23 @@ package com.sipai.controller.maintenance; -import java.util.List; - -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.maintenance.AnticorrosiveLibraryMaterial; +import com.sipai.entity.user.User; +import com.sipai.service.maintenance.AnticorrosiveLibraryMaterialService; +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 com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; -import com.sipai.entity.base.Result; -import com.sipai.entity.maintenance.AnticorrosiveLibrary; -import com.sipai.entity.maintenance.AnticorrosiveLibraryEquipment; -import com.sipai.entity.maintenance.AnticorrosiveLibraryMaterial; -import com.sipai.entity.user.User; -import com.sipai.service.maintenance.AnticorrosiveLibraryMaterialService; -import com.sipai.service.maintenance.AnticorrosiveLibraryService; -import com.sipai.tools.CommUtil; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.util.List; /** * 防腐库 下关联的材料 diff --git a/src/main/java/com/sipai/controller/maintenance/AnticorrosiveMaterialController.java b/src/main/java/com/sipai/controller/maintenance/AnticorrosiveMaterialController.java index aa2c0140..ebb7b431 100644 --- a/src/main/java/com/sipai/controller/maintenance/AnticorrosiveMaterialController.java +++ b/src/main/java/com/sipai/controller/maintenance/AnticorrosiveMaterialController.java @@ -1,13 +1,13 @@ package com.sipai.controller.maintenance; -import java.util.List; - -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.maintenance.AnticorrosiveMaterial; +import com.sipai.entity.user.User; +import com.sipai.service.maintenance.AnticorrosiveMaterialService; +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; @@ -15,16 +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.base.Result; -import com.sipai.entity.equipment.EquipmentCard; -import com.sipai.entity.maintenance.AnticorrosiveLibrary; -import com.sipai.entity.maintenance.AnticorrosiveLibraryEquipment; -import com.sipai.entity.maintenance.AnticorrosiveMaterial; -import com.sipai.entity.user.User; -import com.sipai.service.maintenance.AnticorrosiveMaterialService; -import com.sipai.tools.CommUtil; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.util.List; /** * 防腐库 材料库 diff --git a/src/main/java/com/sipai/controller/maintenance/EquipmentPlanController.java b/src/main/java/com/sipai/controller/maintenance/EquipmentPlanController.java index 3df5b74c..9bc49523 100644 --- a/src/main/java/com/sipai/controller/maintenance/EquipmentPlanController.java +++ b/src/main/java/com/sipai/controller/maintenance/EquipmentPlanController.java @@ -1,27 +1,33 @@ package com.sipai.controller.maintenance; -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.HashSet; -import java.util.List; -import java.util.Set; - -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.activiti.ProcessType; -import com.sipai.entity.timeefficiency.PatrolPlanDept; +import com.sipai.entity.activiti.WorkTask; +import com.sipai.entity.business.BusinessUnit; +import com.sipai.entity.business.BusinessUnitAudit; +import com.sipai.entity.business.BusinessUnitHandle; +import com.sipai.entity.business.BusinessUnitRecord; +import com.sipai.entity.maintenance.EquipmentPlan; +import com.sipai.entity.maintenance.EquipmentPlanType; +import com.sipai.entity.user.Company; +import com.sipai.entity.user.Unit; +import com.sipai.entity.user.User; import com.sipai.quartz.job.NewMonthWork; +import com.sipai.service.activiti.WorkflowProcessDefinitionService; +import com.sipai.service.activiti.WorkflowService; +import com.sipai.service.business.BusinessUnitAuditService; +import com.sipai.service.business.BusinessUnitHandleService; +import com.sipai.service.company.CompanyService; +import com.sipai.service.maintenance.EquipmentPlanService; +import com.sipai.service.maintenance.EquipmentPlanTypeService; import com.sipai.service.user.JobService; +import com.sipai.service.user.UnitService; +import com.sipai.service.user.UserService; import com.sipai.service.workorder.WorkorderDetailService; +import com.sipai.tools.CommUtil; import io.swagger.annotations.*; import net.sf.json.JSONArray; - import net.sf.json.JSONObject; import org.activiti.engine.RuntimeService; import org.activiti.engine.TaskService; @@ -37,28 +43,12 @@ 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; -import com.sipai.entity.business.BusinessUnit; -import com.sipai.entity.business.BusinessUnitAudit; -import com.sipai.entity.business.BusinessUnitHandle; -import com.sipai.entity.business.BusinessUnitRecord; -import com.sipai.entity.maintenance.EquipmentPlan; -import com.sipai.entity.maintenance.EquipmentPlanType; -import com.sipai.entity.user.Company; -import com.sipai.entity.user.Unit; -import com.sipai.entity.user.User; -import com.sipai.service.activiti.WorkflowProcessDefinitionService; -import com.sipai.service.activiti.WorkflowService; -import com.sipai.service.business.BusinessUnitAuditService; -import com.sipai.service.business.BusinessUnitHandleService; -import com.sipai.service.company.CompanyService; -import com.sipai.service.maintenance.EquipmentPlanService; -import com.sipai.service.maintenance.EquipmentPlanTypeService; -import com.sipai.service.user.UnitService; -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.IOException; +import java.text.SimpleDateFormat; +import java.util.*; @Controller @RequestMapping("/maintenance/equipmentPlan") diff --git a/src/main/java/com/sipai/controller/maintenance/EquipmentPlanEquController.java b/src/main/java/com/sipai/controller/maintenance/EquipmentPlanEquController.java index 6eedabd6..d714dabe 100644 --- a/src/main/java/com/sipai/controller/maintenance/EquipmentPlanEquController.java +++ b/src/main/java/com/sipai/controller/maintenance/EquipmentPlanEquController.java @@ -1,17 +1,20 @@ package com.sipai.controller.maintenance; -import java.util.List; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; - -import com.lowagie.text.pdf.PRIndirectReference; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; import com.sipai.entity.base.Result; +import com.sipai.entity.equipment.EquipmentCard; +import com.sipai.entity.maintenance.EquipmentPlan; +import com.sipai.entity.maintenance.EquipmentPlanEqu; import com.sipai.entity.maintenance.EquipmentPlanMainYear; +import com.sipai.entity.maintenance.MaintenanceCommString; +import com.sipai.entity.user.User; +import com.sipai.service.equipment.EquipmentCardService; +import com.sipai.service.maintenance.EquipmentPlanEquService; import com.sipai.service.maintenance.EquipmentPlanMainYearService; import com.sipai.service.maintenance.EquipmentPlanService; +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; @@ -20,19 +23,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.equipment.EquipmentCard; -import com.sipai.entity.equipment.EquipmentRepairPlan; -import com.sipai.entity.maintenance.EquipmentPlan; -import com.sipai.entity.maintenance.EquipmentPlanEqu; -import com.sipai.entity.maintenance.MaintenanceCommString; -import com.sipai.entity.user.Company; -import com.sipai.entity.user.Unit; -import com.sipai.entity.user.User; -import com.sipai.service.equipment.EquipmentCardService; -import com.sipai.service.maintenance.EquipmentPlanEquService; -import com.sipai.tools.CommUtil; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import java.util.List; @Controller @RequestMapping("/maintenance/equipmentPlanEqu") diff --git a/src/main/java/com/sipai/controller/maintenance/EquipmentPlanMainYearController.java b/src/main/java/com/sipai/controller/maintenance/EquipmentPlanMainYearController.java index 2f12b82d..6d86adb0 100644 --- a/src/main/java/com/sipai/controller/maintenance/EquipmentPlanMainYearController.java +++ b/src/main/java/com/sipai/controller/maintenance/EquipmentPlanMainYearController.java @@ -1,33 +1,19 @@ package com.sipai.controller.maintenance; -import java.io.File; -import java.io.FileInputStream; -import java.io.IOException; -import java.io.OutputStream; -import java.net.URLEncoder; -import java.util.*; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import com.sipai.entity.equipment.EquipmentCard; -import com.sipai.entity.user.Unit; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import com.sipai.entity.maintenance.EquipmentPlanMainYear; +import com.sipai.entity.maintenance.EquipmentPlanMainYearDetail; +import com.sipai.entity.maintenance.EquipmentPlanType; +import com.sipai.entity.user.User; import com.sipai.service.equipment.EquipmentCardService; +import com.sipai.service.maintenance.EquipmentPlanMainYearDetailService; +import com.sipai.service.maintenance.EquipmentPlanMainYearService; +import com.sipai.service.maintenance.EquipmentPlanTypeService; +import com.sipai.tools.CommUtil; import net.sf.json.JSONArray; import net.sf.json.JSONObject; - import org.apache.commons.lang3.StringUtils; -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.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.ModelAttribute; @@ -37,16 +23,11 @@ import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartRequest; import org.springframework.web.servlet.ModelAndView; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; -import com.sipai.entity.maintenance.EquipmentPlanMainYear; -import com.sipai.entity.maintenance.EquipmentPlanMainYearDetail; -import com.sipai.entity.maintenance.EquipmentPlanType; -import com.sipai.entity.user.User; -import com.sipai.service.maintenance.EquipmentPlanMainYearDetailService; -import com.sipai.service.maintenance.EquipmentPlanMainYearService; -import com.sipai.service.maintenance.EquipmentPlanTypeService; -import com.sipai.tools.CommUtil; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.*; @Controller @RequestMapping("/maintenance/equipmentPlanMainYear") diff --git a/src/main/java/com/sipai/controller/maintenance/EquipmentPlanTypeController.java b/src/main/java/com/sipai/controller/maintenance/EquipmentPlanTypeController.java index 3a495773..ad93cfb5 100644 --- a/src/main/java/com/sipai/controller/maintenance/EquipmentPlanTypeController.java +++ b/src/main/java/com/sipai/controller/maintenance/EquipmentPlanTypeController.java @@ -1,14 +1,13 @@ package com.sipai.controller.maintenance; -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.maintenance.EquipmentPlanType; +import com.sipai.entity.user.User; +import com.sipai.service.maintenance.EquipmentPlanTypeService; +import com.sipai.tools.CommUtil; import net.sf.json.JSONArray; import net.sf.json.JSONObject; - -import org.apache.tools.ant.taskdefs.condition.And; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.ModelAttribute; @@ -16,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.maintenance.EquipmentPlan; -import com.sipai.entity.maintenance.EquipmentPlanType; -import com.sipai.entity.user.Company; -import com.sipai.entity.user.User; -import com.sipai.service.maintenance.EquipmentPlanTypeService; -import com.sipai.tools.CommUtil; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import java.util.List; @Controller @RequestMapping("/maintenance/equipmentPlanType") diff --git a/src/main/java/com/sipai/controller/maintenance/FaultLibraryController.java b/src/main/java/com/sipai/controller/maintenance/FaultLibraryController.java index b12c5f30..47b38eb5 100644 --- a/src/main/java/com/sipai/controller/maintenance/FaultLibraryController.java +++ b/src/main/java/com/sipai/controller/maintenance/FaultLibraryController.java @@ -1,37 +1,22 @@ package com.sipai.controller.maintenance; -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 net.sf.json.JSON; +import com.sipai.entity.maintenance.FaultLibrary; +import com.sipai.entity.user.User; +import com.sipai.service.maintenance.FaultLibraryService; +import com.sipai.tools.CommString; +import com.sipai.tools.CommUtil; 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.validation.Errors; 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.Tree; -import com.sipai.entity.maintenance.FaultLibrary; -import com.sipai.entity.maintenance.MaintainerType; -import com.sipai.entity.user.Menu; -import com.sipai.entity.user.RoleMenu; -import com.sipai.entity.user.User; -import com.sipai.service.maintenance.FaultLibraryService; -import com.sipai.service.user.MenuService; -import com.sipai.service.user.RoleService; -import com.sipai.tools.CommString; -import com.sipai.tools.CommUtil; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import java.util.List; @Controller diff --git a/src/main/java/com/sipai/controller/maintenance/LibraryAddResetProjectController.java b/src/main/java/com/sipai/controller/maintenance/LibraryAddResetProjectController.java index cb759eb8..9fae74b2 100644 --- a/src/main/java/com/sipai/controller/maintenance/LibraryAddResetProjectController.java +++ b/src/main/java/com/sipai/controller/maintenance/LibraryAddResetProjectController.java @@ -1,26 +1,5 @@ package com.sipai.controller.maintenance; -import java.io.IOException; -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.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.MultipartRequest; -import org.springframework.web.servlet.ModelAndView; - import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.sipai.entity.base.Result; @@ -38,6 +17,24 @@ import com.sipai.service.maintenance.LibraryAddResetProjectService; 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; +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.MultipartRequest; +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.util.HashMap; +import java.util.List; +import java.util.Map; @Controller @RequestMapping("/maintenance/libraryAddResetProject") diff --git a/src/main/java/com/sipai/controller/maintenance/LibraryFaultBlocController.java b/src/main/java/com/sipai/controller/maintenance/LibraryFaultBlocController.java index 9d0be2b7..206e4364 100644 --- a/src/main/java/com/sipai/controller/maintenance/LibraryFaultBlocController.java +++ b/src/main/java/com/sipai/controller/maintenance/LibraryFaultBlocController.java @@ -1,32 +1,6 @@ package com.sipai.controller.maintenance; -import java.io.IOException; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.TreeSet; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import com.sipai.service.workorder.WorkorderDetailService; -import net.sf.json.JSONArray; -import net.sf.json.JSONObject; - -import org.apache.commons.lang3.StringUtils; -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.MultipartRequest; -import org.springframework.web.servlet.ModelAndView; - import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.sipai.entity.base.Result; @@ -40,8 +14,26 @@ import com.sipai.service.equipment.EquipmentCardService; import com.sipai.service.equipment.EquipmentClassService; import com.sipai.service.maintenance.LibraryFaultBlocService; import com.sipai.service.maintenance.LibraryRepairBlocService; +import com.sipai.service.workorder.WorkorderDetailService; import com.sipai.tools.CommString; import com.sipai.tools.CommUtil; +import net.sf.json.JSONArray; +import net.sf.json.JSONObject; +import org.apache.commons.lang3.StringUtils; +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.MultipartRequest; +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.util.*; /** * 故障库(标准库) diff --git a/src/main/java/com/sipai/controller/maintenance/LibraryMaintainCarController.java b/src/main/java/com/sipai/controller/maintenance/LibraryMaintainCarController.java index e1a65553..68c85b59 100644 --- a/src/main/java/com/sipai/controller/maintenance/LibraryMaintainCarController.java +++ b/src/main/java/com/sipai/controller/maintenance/LibraryMaintainCarController.java @@ -1,20 +1,5 @@ package com.sipai.controller.maintenance; -import java.math.BigDecimal; -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 com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.sipai.entity.base.Result; @@ -26,6 +11,18 @@ import com.sipai.service.maintenance.LibraryMaintainCarService; import com.sipai.service.user.UnitService; 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; +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.math.BigDecimal; +import java.util.List; @Controller @RequestMapping("/maintenance/libraryMaintainCar") diff --git a/src/main/java/com/sipai/controller/maintenance/LibraryMaintenanceCommonContentController.java b/src/main/java/com/sipai/controller/maintenance/LibraryMaintenanceCommonContentController.java index b854a13d..061018a7 100644 --- a/src/main/java/com/sipai/controller/maintenance/LibraryMaintenanceCommonContentController.java +++ b/src/main/java/com/sipai/controller/maintenance/LibraryMaintenanceCommonContentController.java @@ -1,19 +1,5 @@ package com.sipai.controller.maintenance; -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.maintenance.LibraryMaintenanceCommonContentService; import com.sipai.service.maintenance.LibraryMaintenanceCommonService; 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("/maintenance/libraryMaintenanceCommonContent") diff --git a/src/main/java/com/sipai/controller/maintenance/LibraryMaintenanceCommonController.java b/src/main/java/com/sipai/controller/maintenance/LibraryMaintenanceCommonController.java index ed184736..60d5fa20 100644 --- a/src/main/java/com/sipai/controller/maintenance/LibraryMaintenanceCommonController.java +++ b/src/main/java/com/sipai/controller/maintenance/LibraryMaintenanceCommonController.java @@ -1,20 +1,18 @@ package com.sipai.controller.maintenance; -import java.io.IOException; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.TreeSet; - -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.equipment.EquipmentCard; +import com.sipai.entity.equipment.EquipmentClass; +import com.sipai.entity.maintenance.LibraryMaintenanceCommon; +import com.sipai.entity.user.User; +import com.sipai.service.equipment.EquipmentCardService; +import com.sipai.service.equipment.EquipmentClassService; +import com.sipai.service.maintenance.LibraryMaintenanceCommonService; +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; @@ -24,18 +22,11 @@ import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartRequest; 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.equipment.EquipmentCard; -import com.sipai.entity.equipment.EquipmentClass; -import com.sipai.entity.maintenance.LibraryMaintenanceCommon; -import com.sipai.entity.user.Unit; -import com.sipai.entity.user.User; -import com.sipai.service.equipment.EquipmentCardService; -import com.sipai.service.equipment.EquipmentClassService; -import com.sipai.service.maintenance.LibraryMaintenanceCommonService; -import com.sipai.tools.CommUtil; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.*; @Controller @RequestMapping("/maintenance/libraryMaintenanceCommon") diff --git a/src/main/java/com/sipai/controller/maintenance/LibraryMaintenanceLubricationController.java b/src/main/java/com/sipai/controller/maintenance/LibraryMaintenanceLubricationController.java index 75dfef0e..27e3498b 100644 --- a/src/main/java/com/sipai/controller/maintenance/LibraryMaintenanceLubricationController.java +++ b/src/main/java/com/sipai/controller/maintenance/LibraryMaintenanceLubricationController.java @@ -1,19 +1,19 @@ package com.sipai.controller.maintenance; -import java.io.IOException; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.TreeSet; - -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.equipment.EquipmentCard; +import com.sipai.entity.equipment.EquipmentClass; +import com.sipai.entity.maintenance.LibraryMaintenanceLubrication; +import com.sipai.entity.user.User; +import com.sipai.service.equipment.EquipmentCardService; +import com.sipai.service.equipment.EquipmentClassService; +import com.sipai.service.maintenance.LibraryMaintenanceLubricationService; +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; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.ModelAttribute; @@ -23,20 +23,11 @@ import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartRequest; 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.equipment.EquipmentCard; -import com.sipai.entity.equipment.EquipmentClass; -import com.sipai.entity.maintenance.LibraryMaintenanceCommon; -import com.sipai.entity.maintenance.LibraryMaintenanceLubrication; -import com.sipai.entity.user.User; -import com.sipai.service.equipment.EquipmentCardService; -import com.sipai.service.equipment.EquipmentClassService; -import com.sipai.service.maintenance.LibraryMaintenanceLubricationService; -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 javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.*; /** * 设备润滑库 diff --git a/src/main/java/com/sipai/controller/maintenance/LibraryMaterialQuotaController.java b/src/main/java/com/sipai/controller/maintenance/LibraryMaterialQuotaController.java index c70d9f1d..61c2761c 100644 --- a/src/main/java/com/sipai/controller/maintenance/LibraryMaterialQuotaController.java +++ b/src/main/java/com/sipai/controller/maintenance/LibraryMaterialQuotaController.java @@ -1,24 +1,21 @@ package com.sipai.controller.maintenance; -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 org.springframework.web.servlet.ModelAndView; - import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.sipai.entity.maintenance.LibraryMaterialQuota; import com.sipai.entity.user.User; import com.sipai.service.maintenance.LibraryMaterialQuotaService; 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("/maintenance/libraryMaterialQuota") diff --git a/src/main/java/com/sipai/controller/maintenance/LibraryOverhaulContentBlocController.java b/src/main/java/com/sipai/controller/maintenance/LibraryOverhaulContentBlocController.java index 5c1f269a..18cf49f4 100644 --- a/src/main/java/com/sipai/controller/maintenance/LibraryOverhaulContentBlocController.java +++ b/src/main/java/com/sipai/controller/maintenance/LibraryOverhaulContentBlocController.java @@ -1,12 +1,20 @@ package com.sipai.controller.maintenance; -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.maintenance.LibraryOverhaulContentBloc; +import com.sipai.entity.maintenance.LibraryOverhaulContentEquBiz; +import com.sipai.entity.maintenance.LibraryOverhaulContentModelBloc; +import com.sipai.entity.maintenance.LibraryOverhaulProjectBloc; +import com.sipai.entity.user.Company; +import com.sipai.service.company.CompanyService; +import com.sipai.service.maintenance.LibraryOverhaulContentBlocService; +import com.sipai.service.maintenance.LibraryOverhaulContentEquBizService; +import com.sipai.service.maintenance.LibraryOverhaulContentModelBlocService; +import com.sipai.service.maintenance.LibraryOverhaulProjectBlocService; +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,20 +22,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.maintenance.LibraryOverhaulContentEquBiz; -import com.sipai.entity.maintenance.LibraryOverhaulContentModelBloc; -import com.sipai.entity.maintenance.LibraryOverhaulProjectBloc; -import com.sipai.entity.maintenance.LibraryOverhaulContentBloc; -import com.sipai.entity.user.Company; -import com.sipai.service.company.CompanyService; -import com.sipai.service.maintenance.LibraryOverhaulContentEquBizService; -import com.sipai.service.maintenance.LibraryOverhaulContentModelBlocService; -import com.sipai.service.maintenance.LibraryOverhaulProjectBlocService; -import com.sipai.service.maintenance.LibraryOverhaulContentBlocService; -import com.sipai.tools.CommUtil; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import java.util.List; /** * 设备大修库（集团层标准库） 内容附表 diff --git a/src/main/java/com/sipai/controller/maintenance/LibraryOverhaulProjectBlocController.java b/src/main/java/com/sipai/controller/maintenance/LibraryOverhaulProjectBlocController.java index 4e68105e..975333db 100644 --- a/src/main/java/com/sipai/controller/maintenance/LibraryOverhaulProjectBlocController.java +++ b/src/main/java/com/sipai/controller/maintenance/LibraryOverhaulProjectBlocController.java @@ -1,32 +1,9 @@ package com.sipai.controller.maintenance; -import java.io.IOException; -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.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.MultipartRequest; -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.equipment.EquipmentClass; -import com.sipai.entity.maintenance.LibraryOverhaulContentEquBiz; -import com.sipai.entity.maintenance.LibraryOverhaulContentModelBloc; import com.sipai.entity.maintenance.LibraryOverhaulProjectBloc; import com.sipai.entity.maintenance.LibraryOverhaulProjectEquBiz; import com.sipai.entity.maintenance.LibraryOverhaulProjectModelBloc; @@ -40,6 +17,24 @@ import com.sipai.service.maintenance.LibraryOverhaulProjectModelBlocService; 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; +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.MultipartRequest; +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.util.HashMap; +import java.util.List; +import java.util.Map; /** * 设备大修库-项目（集团层标准库） diff --git a/src/main/java/com/sipai/controller/maintenance/LibraryRepairBlocContraller.java b/src/main/java/com/sipai/controller/maintenance/LibraryRepairBlocContraller.java index 717790ed..a55a9246 100644 --- a/src/main/java/com/sipai/controller/maintenance/LibraryRepairBlocContraller.java +++ b/src/main/java/com/sipai/controller/maintenance/LibraryRepairBlocContraller.java @@ -1,17 +1,24 @@ package com.sipai.controller.maintenance; -import java.util.Iterator; -import java.util.List; -import java.util.TreeSet; - -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.equipment.EquipmentCard; +import com.sipai.entity.maintenance.LibraryFaultBloc; +import com.sipai.entity.maintenance.LibraryRepairBloc; +import com.sipai.entity.maintenance.LibraryRepairEquBiz; +import com.sipai.entity.maintenance.LibraryRepairModelBloc; +import com.sipai.entity.user.Company; +import com.sipai.entity.user.User; +import com.sipai.service.company.CompanyService; import com.sipai.service.equipment.EquipmentCardService; import com.sipai.service.equipment.EquipmentClassService; +import com.sipai.service.maintenance.LibraryFaultBlocService; +import com.sipai.service.maintenance.LibraryRepairBlocService; +import com.sipai.service.maintenance.LibraryRepairEquBizService; +import com.sipai.service.maintenance.LibraryRepairModelBlocService; +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; @@ -19,22 +26,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.maintenance.LibraryFaultBloc; -import com.sipai.entity.maintenance.LibraryOverhaulContentModelBloc; -import com.sipai.entity.maintenance.LibraryRepairBloc; -import com.sipai.entity.maintenance.LibraryRepairEquBiz; -import com.sipai.entity.maintenance.LibraryRepairModelBloc; -import com.sipai.entity.user.Company; -import com.sipai.entity.user.User; -import com.sipai.service.company.CompanyService; -import com.sipai.service.maintenance.LibraryFaultBlocService; -import com.sipai.service.maintenance.LibraryRepairBlocService; -import com.sipai.service.maintenance.LibraryRepairEquBizService; -import com.sipai.service.maintenance.LibraryRepairModelBlocService; -import com.sipai.tools.CommUtil; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import java.util.Iterator; +import java.util.List; +import java.util.TreeSet; @Controller @RequestMapping("/maintenance/libraryRepairBloc") diff --git a/src/main/java/com/sipai/controller/maintenance/LibraryRepairEquBizController.java b/src/main/java/com/sipai/controller/maintenance/LibraryRepairEquBizController.java index 3f76c588..0369b10f 100644 --- a/src/main/java/com/sipai/controller/maintenance/LibraryRepairEquBizController.java +++ b/src/main/java/com/sipai/controller/maintenance/LibraryRepairEquBizController.java @@ -1,26 +1,21 @@ package com.sipai.controller.maintenance; -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.maintenance.LibraryRepairBloc; +import com.sipai.entity.maintenance.LibraryRepairEquBiz; +import com.sipai.service.maintenance.LibraryRepairEquBizService; 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.maintenance.LibraryRepairEquBiz; -import com.sipai.service.maintenance.LibraryRepairEquBizService; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import java.util.List; @Controller @RequestMapping("/maintenance/libraryRepairEquBiz") diff --git a/src/main/java/com/sipai/controller/maintenance/MaintainCarController.java b/src/main/java/com/sipai/controller/maintenance/MaintainCarController.java index 028604b1..7570c7aa 100644 --- a/src/main/java/com/sipai/controller/maintenance/MaintainCarController.java +++ b/src/main/java/com/sipai/controller/maintenance/MaintainCarController.java @@ -1,39 +1,10 @@ package com.sipai.controller.maintenance; -import java.math.BigDecimal; -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 org.activiti.engine.RuntimeService; -import org.activiti.engine.TaskService; -import org.activiti.engine.impl.pvm.process.ActivityImpl; -import org.activiti.engine.repository.ProcessDefinition; -import org.activiti.engine.runtime.ProcessInstance; -import org.activiti.engine.task.Task; -import org.springframework.stereotype.Controller; -import org.springframework.transaction.annotation.Transactional; -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.activiti.ProcessType; import com.sipai.entity.base.Result; import com.sipai.entity.business.BusinessUnitAudit; -import com.sipai.entity.business.BusinessUnitRecord; -import com.sipai.entity.maintenance.LibraryMaintainCar; -import com.sipai.entity.maintenance.LibraryMaintainCarDetail; import com.sipai.entity.maintenance.MaintainCar; -import com.sipai.entity.maintenance.MaintenanceCommString; -import com.sipai.entity.sparepart.InStockRecord; import com.sipai.entity.user.Company; import com.sipai.entity.user.User; import com.sipai.service.activiti.WorkflowProcessDefinitionService; @@ -43,6 +14,21 @@ import com.sipai.service.maintenance.MaintainCarService; import com.sipai.service.user.UnitService; import com.sipai.service.user.UserService; import com.sipai.tools.CommUtil; +import net.sf.json.JSONArray; +import org.activiti.engine.RuntimeService; +import org.activiti.engine.TaskService; +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 javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import java.util.List; @Controller @RequestMapping("/maintenance/maintainCar") diff --git a/src/main/java/com/sipai/controller/maintenance/MaintainController.java b/src/main/java/com/sipai/controller/maintenance/MaintainController.java index c4f3f7c1..2a924dc1 100644 --- a/src/main/java/com/sipai/controller/maintenance/MaintainController.java +++ b/src/main/java/com/sipai/controller/maintenance/MaintainController.java @@ -1,12 +1,16 @@ package com.sipai.controller.maintenance; -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.maintenance.EquipmentPlanType; +import com.sipai.entity.maintenance.Maintain; +import com.sipai.entity.user.Company; +import com.sipai.entity.user.User; +import com.sipai.service.maintenance.EquipmentPlanTypeService; +import com.sipai.service.maintenance.MaintainService; +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 +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.maintenance.EquipmentPlan; -import com.sipai.entity.maintenance.EquipmentPlanType; -import com.sipai.entity.maintenance.Maintain; -import com.sipai.entity.user.Company; -import com.sipai.entity.user.User; -import com.sipai.service.maintenance.EquipmentPlanService; -import com.sipai.service.maintenance.EquipmentPlanTypeService; -import com.sipai.service.maintenance.MaintainService; -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("/maintenance/maintain") diff --git a/src/main/java/com/sipai/controller/maintenance/MaintainPlanController.java b/src/main/java/com/sipai/controller/maintenance/MaintainPlanController.java index 370c0a0b..b1271517 100644 --- a/src/main/java/com/sipai/controller/maintenance/MaintainPlanController.java +++ b/src/main/java/com/sipai/controller/maintenance/MaintainPlanController.java @@ -1,19 +1,15 @@ package com.sipai.controller.maintenance; -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.PageHelper; +import com.github.pagehelper.PageInfo; +import com.sipai.entity.maintenance.MaintainPlan; +import com.sipai.entity.user.Company; +import com.sipai.entity.user.User; +import com.sipai.service.maintenance.MaintainPlanService; +import com.sipai.service.user.UnitService; +import com.sipai.tools.CommUtil; 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; @@ -21,22 +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.Tree; -import com.sipai.entity.maintenance.MaintainPlan; -import com.sipai.entity.maintenance.Maintainer; -import com.sipai.entity.maintenance.MaintainerType; -import com.sipai.entity.user.Company; -import com.sipai.entity.user.Menu; -import com.sipai.entity.user.RoleMenu; -import com.sipai.entity.user.User; -import com.sipai.service.maintenance.MaintainPlanService; -import com.sipai.service.user.MenuService; -import com.sipai.service.user.RoleService; -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 diff --git a/src/main/java/com/sipai/controller/maintenance/MaintainerController.java b/src/main/java/com/sipai/controller/maintenance/MaintainerController.java index 4651dd76..8457218b 100644 --- a/src/main/java/com/sipai/controller/maintenance/MaintainerController.java +++ b/src/main/java/com/sipai/controller/maintenance/MaintainerController.java @@ -1,60 +1,39 @@ package com.sipai.controller.maintenance; -import java.io.UnsupportedEncodingException; -import java.net.URLEncoder; -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 com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import com.sipai.entity.maintenance.Maintainer; +import com.sipai.entity.maintenance.MaintainerCompany; +import com.sipai.entity.maintenance.MaintainerSelectType; +import com.sipai.entity.maintenance.MaintainerType; +import com.sipai.entity.user.Company; +import com.sipai.entity.user.ExtSystem; +import com.sipai.entity.user.Unit; +import com.sipai.entity.user.User; +import com.sipai.service.activiti.WorkflowService; +import com.sipai.service.maintenance.*; +import com.sipai.service.user.ExtSystemService; +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.validation.BindingResult; -import org.springframework.validation.Errors; 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.TodoTask; -import com.sipai.entity.business.BusinessUnitAudit; -import com.sipai.entity.maintenance.Maintainer; -import com.sipai.entity.maintenance.MaintainerCompany; -import com.sipai.entity.maintenance.MaintainerSelectType; -import com.sipai.entity.maintenance.MaintainerType; -import com.sipai.entity.maintenance.Maintenance; -import com.sipai.entity.maintenance.MaintenanceDetail; -import com.sipai.entity.user.ExtSystem; -import com.sipai.entity.user.Company; -import com.sipai.entity.user.Unit; -import com.sipai.entity.user.User; -import com.sipai.entity.user.UserRole; -import com.sipai.entity.work.Group; -import com.sipai.entity.work.GroupMember; -import com.sipai.entity.work.UserWorkStation; -import com.sipai.service.activiti.WorkflowService; -import com.sipai.service.base.LoginService; -import com.sipai.service.maintenance.MaintainerSelectTypeService; -import com.sipai.service.maintenance.MaintainerService; -import com.sipai.service.maintenance.MaintainerTypeService; -import com.sipai.service.maintenance.MaintenanceDetailService; -import com.sipai.service.maintenance.MaintenanceService; -import com.sipai.service.user.ExtSystemService; -import com.sipai.service.user.UnitService; -import com.sipai.service.user.UserService; -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.io.UnsupportedEncodingException; +import java.net.URLEncoder; +import java.util.HashMap; +import java.util.List; +import java.util.Map; @Controller diff --git a/src/main/java/com/sipai/controller/maintenance/MaintainerTypeController.java b/src/main/java/com/sipai/controller/maintenance/MaintainerTypeController.java index 80a3f5a7..8b8ad432 100644 --- a/src/main/java/com/sipai/controller/maintenance/MaintainerTypeController.java +++ b/src/main/java/com/sipai/controller/maintenance/MaintainerTypeController.java @@ -1,44 +1,24 @@ package com.sipai.controller.maintenance; -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.maintenance.MaintainerType; +import com.sipai.entity.user.User; +import com.sipai.service.maintenance.MaintainerTypeService; +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.validation.BindingResult; -import org.springframework.validation.Errors; 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.maintenance.Maintainer; -import com.sipai.entity.maintenance.MaintainerType; -import com.sipai.entity.maintenance.Maintenance; -import com.sipai.entity.maintenance.MaintenanceDetail; -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.maintenance.MaintainerService; -import com.sipai.service.maintenance.MaintainerTypeService; -import com.sipai.service.maintenance.MaintenanceDetailService; -import com.sipai.service.maintenance.MaintenanceService; -import com.sipai.service.user.UnitService; -import com.sipai.service.work.GroupMemberService; -import com.sipai.service.work.GroupService; -import com.sipai.tools.CommUtil; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpSession; +import java.util.List; @Controller diff --git a/src/main/java/com/sipai/controller/maintenance/MaintenanceController.java b/src/main/java/com/sipai/controller/maintenance/MaintenanceController.java index 73787917..d0c5b47d 100644 --- a/src/main/java/com/sipai/controller/maintenance/MaintenanceController.java +++ b/src/main/java/com/sipai/controller/maintenance/MaintenanceController.java @@ -1,24 +1,37 @@ package com.sipai.controller.maintenance; -import java.io.IOException; -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Calendar; -import java.util.Collections; -import java.util.Comparator; -import java.util.Date; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; -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 com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import com.sipai.entity.activiti.ProcessType; +import com.sipai.entity.activiti.TodoTask; +import com.sipai.entity.activiti.WorkTask; +import com.sipai.entity.base.CommonFile; +import com.sipai.entity.business.*; +import com.sipai.entity.equipment.EquipmentClass; +import com.sipai.entity.maintenance.*; +import com.sipai.entity.user.Company; +import com.sipai.entity.user.Unit; +import com.sipai.entity.user.User; +import com.sipai.service.activiti.WorkflowProcessDefinitionService; +import com.sipai.service.activiti.WorkflowService; +import com.sipai.service.base.CommonFileService; +import com.sipai.service.business.BusinessUnitAuditService; +import com.sipai.service.business.BusinessUnitHandleDetailService; +import com.sipai.service.business.BusinessUnitHandleService; +import com.sipai.service.equipment.EquipmentCardService; +import com.sipai.service.equipment.EquipmentClassService; +import com.sipai.service.maintenance.*; +import com.sipai.service.sparepart.SubscribeService; +import com.sipai.service.user.ProcessSectionService; +import com.sipai.service.user.UnitService; +import com.sipai.service.user.UserService; +import com.sipai.service.workorder.WorkorderAchievementService; +import com.sipai.tools.ActivitiUtil; +import com.sipai.tools.CommString; +import com.sipai.tools.CommUtil; +import net.sf.json.JSONArray; +import net.sf.json.JSONObject; +import net.sf.json.JsonConfig; import org.activiti.engine.RuntimeService; import org.activiti.engine.TaskService; import org.activiti.engine.history.HistoricTaskInstance; @@ -32,59 +45,13 @@ 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.ProcessType; -import com.sipai.entity.activiti.TodoTask; -import com.sipai.entity.activiti.WorkTask; -import com.sipai.entity.base.CommonFile; -import com.sipai.entity.business.BusinessUnit; -import com.sipai.entity.business.BusinessUnitAudit; -import com.sipai.entity.business.BusinessUnitHandle; -import com.sipai.entity.business.BusinessUnitHandleDetail; -import com.sipai.entity.business.BusinessUnitRecord; -import com.sipai.entity.equipment.EquipmentClass; -import com.sipai.entity.maintenance.Abnormity; -import com.sipai.entity.maintenance.CompanyMaintenanceResult; -import com.sipai.entity.maintenance.LibraryFaultBloc; -import com.sipai.entity.maintenance.Maintainer; -import com.sipai.entity.maintenance.MaintainerType; -import com.sipai.entity.maintenance.Maintenance; -import com.sipai.entity.maintenance.MaintenanceCommString; -import com.sipai.entity.maintenance.MaintenanceDetail; -import com.sipai.entity.maintenance.MaintenanceRecord; -import com.sipai.entity.maintenance.StaffMaintenanceResult; -import com.sipai.entity.user.Company; -import com.sipai.entity.user.Unit; -import com.sipai.entity.user.User; -import com.sipai.service.activiti.WorkflowProcessDefinitionService; -import com.sipai.service.activiti.WorkflowService; -import com.sipai.service.base.CommonFileService; -import com.sipai.service.business.BusinessUnitAuditService; -import com.sipai.service.business.BusinessUnitHandleDetailService; -import com.sipai.service.business.BusinessUnitHandleService; -import com.sipai.service.equipment.EquipmentCardService; -import com.sipai.service.equipment.EquipmentClassService; -import com.sipai.service.maintenance.AbnormityService; -import com.sipai.service.maintenance.LibraryFaultBlocService; -import com.sipai.service.maintenance.MaintainerService; -import com.sipai.service.maintenance.MaintainerTypeService; -import com.sipai.service.maintenance.MaintenanceDetailService; -import com.sipai.service.maintenance.MaintenanceRecordService; -import com.sipai.service.maintenance.MaintenanceService; -import com.sipai.service.maintenance.PlanRecordAbnormityService; -import com.sipai.service.sparepart.SubscribeService; -import com.sipai.service.user.ProcessSectionService; -import com.sipai.service.user.UnitService; -import com.sipai.service.user.UserService; -import com.sipai.service.workorder.WorkorderAchievementService; -import com.sipai.tools.ActivitiUtil; -import com.sipai.tools.CommString; -import com.sipai.tools.CommUtil; - -import net.sf.json.JSONArray; -import net.sf.json.JSONObject; -import net.sf.json.JsonConfig; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.*; @Controller diff --git a/src/main/java/com/sipai/controller/maintenance/RepairCarController.java b/src/main/java/com/sipai/controller/maintenance/RepairCarController.java index 3a024b69..541a6139 100644 --- a/src/main/java/com/sipai/controller/maintenance/RepairCarController.java +++ b/src/main/java/com/sipai/controller/maintenance/RepairCarController.java @@ -1,23 +1,5 @@ package com.sipai.controller.maintenance; -import java.util.List; - -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.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 com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.sipai.entity.base.Result; @@ -31,6 +13,21 @@ import com.sipai.service.maintenance.RepairCarService; import com.sipai.service.user.UnitService; import com.sipai.service.user.UserService; import com.sipai.tools.CommUtil; +import net.sf.json.JSONArray; +import org.activiti.engine.RuntimeService; +import org.activiti.engine.TaskService; +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 javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import java.util.List; @Controller @RequestMapping("/maintenance/repairCar") diff --git a/src/main/java/com/sipai/controller/maintenance/RepairController.java b/src/main/java/com/sipai/controller/maintenance/RepairController.java index b00b7b45..4b604f77 100644 --- a/src/main/java/com/sipai/controller/maintenance/RepairController.java +++ b/src/main/java/com/sipai/controller/maintenance/RepairController.java @@ -1,29 +1,28 @@ package com.sipai.controller.maintenance; -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 com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import com.sipai.entity.activiti.ProcessType; +import com.sipai.entity.base.Result; +import com.sipai.entity.business.BusinessUnitAudit; +import com.sipai.entity.business.BusinessUnitHandle; +import com.sipai.entity.business.BusinessUnitRecord; +import com.sipai.entity.maintenance.MaintenanceCommString; +import com.sipai.entity.maintenance.Repair; import com.sipai.entity.user.Company; +import com.sipai.entity.user.User; +import com.sipai.service.activiti.WorkflowProcessDefinitionService; +import com.sipai.service.activiti.WorkflowService; +import com.sipai.service.business.BusinessUnitAuditService; +import com.sipai.service.business.BusinessUnitHandleService; +import com.sipai.service.maintenance.RepairService; import com.sipai.service.user.UnitService; +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.HistoricActivityInstance; -import org.activiti.engine.history.HistoricTaskInstance; -import org.activiti.engine.impl.pvm.process.ActivityImpl; import org.activiti.engine.repository.ProcessDefinition; import org.activiti.engine.runtime.ProcessInstance; import org.activiti.engine.task.Task; @@ -34,30 +33,12 @@ 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.ProcessType; -import com.sipai.entity.activiti.WorkTask; -import com.sipai.entity.base.Result; -import com.sipai.entity.business.BusinessUnit; -import com.sipai.entity.business.BusinessUnitAudit; -import com.sipai.entity.business.BusinessUnitDeptApply; -import com.sipai.entity.business.BusinessUnitHandle; -import com.sipai.entity.business.BusinessUnitInquiry; -import com.sipai.entity.business.BusinessUnitRecord; -import com.sipai.entity.equipment.EquipmentRepairPlan; -import com.sipai.entity.maintenance.MaintenanceCommString; -import com.sipai.entity.maintenance.MaintenanceDetail; -import com.sipai.entity.maintenance.Repair; -import com.sipai.entity.user.User; -import com.sipai.service.activiti.WorkflowProcessDefinitionService; -import com.sipai.service.activiti.WorkflowService; -import com.sipai.service.business.BusinessUnitAuditService; -import com.sipai.service.business.BusinessUnitHandleService; -import com.sipai.service.maintenance.RepairService; -import com.sipai.tools.ActivitiUtil; -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 java.util.HashMap; +import java.util.List; +import java.util.Map; @Controller @RequestMapping("/maintenance/repair") diff --git a/src/main/java/com/sipai/controller/maintenance/WorkorderLibraryMaintainController.java b/src/main/java/com/sipai/controller/maintenance/WorkorderLibraryMaintainController.java index 0ae7cee0..a8099d07 100644 --- a/src/main/java/com/sipai/controller/maintenance/WorkorderLibraryMaintainController.java +++ b/src/main/java/com/sipai/controller/maintenance/WorkorderLibraryMaintainController.java @@ -1,25 +1,22 @@ package com.sipai.controller.maintenance; -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; import com.sipai.entity.maintenance.WorkorderLibraryMaintain; import com.sipai.service.maintenance.WorkorderLibraryMaintainService; 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("/maintenance/workorderLibraryMaintain") diff --git a/src/main/java/com/sipai/controller/model/ModelDataController.java b/src/main/java/com/sipai/controller/model/ModelDataController.java index 4f865d9d..637fdf93 100644 --- a/src/main/java/com/sipai/controller/model/ModelDataController.java +++ b/src/main/java/com/sipai/controller/model/ModelDataController.java @@ -4,19 +4,15 @@ import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.sipai.entity.base.Result; import com.sipai.entity.model.ModelSetValue; -import com.sipai.entity.user.User; -import com.sipai.entity.workorder.WorkorderDetail; import com.sipai.service.model.ModelSetValueService; import com.sipai.tools.CommString; import com.sipai.tools.CommUtil; import net.sf.json.JSONArray; import net.sf.json.JSONObject; import org.redisson.api.RBatch; -import org.redisson.api.RMapCache; import org.redisson.api.RedissonClient; 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; diff --git a/src/main/java/com/sipai/controller/mqtt/MqttController.java b/src/main/java/com/sipai/controller/mqtt/MqttController.java index edf8e457..90743684 100644 --- a/src/main/java/com/sipai/controller/mqtt/MqttController.java +++ b/src/main/java/com/sipai/controller/mqtt/MqttController.java @@ -4,9 +4,6 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONException; import com.alibaba.fastjson.JSONObject; -import com.lowagie.text.pdf.PRIndirectReference; -import com.sipai.entity.alarm.AlarmLevelsCodeEnum; -import com.sipai.entity.alarm.AlarmMoldCodeEnum; import com.sipai.entity.base.Result; import com.sipai.entity.enums.XimenziDescriptionEnum; import com.sipai.entity.equipment.EquipmentCard; @@ -28,26 +25,31 @@ import com.sipai.tools.CommUtil; import com.sipai.tools.HttpUtil; import com.sipai.websocket.MsgWebSocket2; import io.swagger.annotations.*; -import okhttp3.OkHttpClient; -import org.apache.poi.ss.usermodel.*; import org.apache.poi.xssf.usermodel.XSSFCell; import org.apache.poi.xssf.usermodel.XSSFRow; import org.apache.poi.xssf.usermodel.XSSFSheet; import org.apache.poi.xssf.usermodel.XSSFWorkbook; -import org.junit.internal.runners.statements.Fail; import org.redisson.api.RMap; import org.redisson.api.RedissonClient; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.RequestBody; +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 javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; -import java.io.*; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.io.UnsupportedEncodingException; import java.net.URLEncoder; -import java.text.SimpleDateFormat; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; @Controller @RequestMapping("/mqtt") diff --git a/src/main/java/com/sipai/controller/mqtt/RecordDataController.java b/src/main/java/com/sipai/controller/mqtt/RecordDataController.java index 485885f7..01bc8473 100644 --- a/src/main/java/com/sipai/controller/mqtt/RecordDataController.java +++ b/src/main/java/com/sipai/controller/mqtt/RecordDataController.java @@ -1,10 +1,8 @@ package com.sipai.controller.mqtt; -import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.sipai.entity.base.Result; import com.sipai.service.scada.MPointService; -import com.sipai.tools.CommString; import com.sipai.tools.CommUtil; import io.swagger.annotations.*; import org.redisson.api.RBatch; @@ -18,8 +16,6 @@ import org.springframework.web.bind.annotation.RequestMethod; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; -import java.math.BigDecimal; -import java.util.Map; import java.util.concurrent.TimeUnit; @Controller diff --git a/src/main/java/com/sipai/controller/msg/Client.java b/src/main/java/com/sipai/controller/msg/Client.java index 03ab2560..6f90c781 100644 --- a/src/main/java/com/sipai/controller/msg/Client.java +++ b/src/main/java/com/sipai/controller/msg/Client.java @@ -1,14 +1,14 @@ package com.sipai.controller.msg; -import java.rmi.RemoteException; -import java.util.Arrays; -import java.util.List; - import com.sipai.emsg.Mo; import com.sipai.emsg.SDKServiceBindingStub; import com.sipai.emsg.SDKServiceLocator; import com.sipai.emsg.StatusReport; +import java.rmi.RemoteException; +import java.util.Arrays; +import java.util.List; + public class Client { private String softwareSerialNo; private String key; diff --git a/src/main/java/com/sipai/controller/msg/FrequentContactsController.java b/src/main/java/com/sipai/controller/msg/FrequentContactsController.java index f2146c3e..1f47b0b5 100644 --- a/src/main/java/com/sipai/controller/msg/FrequentContactsController.java +++ b/src/main/java/com/sipai/controller/msg/FrequentContactsController.java @@ -3,16 +3,12 @@ package com.sipai.controller.msg; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.sipai.entity.msg.FrequentContacts; -import com.sipai.entity.timeefficiency.PatrolPlan; -import com.sipai.entity.user.User; -import com.sipai.entity.workorder.WorkorderDetail; import com.sipai.service.msg.FrequentContactsService; import com.sipai.tools.CommUtil; import io.swagger.annotations.Api; 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; diff --git a/src/main/java/com/sipai/controller/msg/MsgController.java b/src/main/java/com/sipai/controller/msg/MsgController.java index a17c1818..cbfbb3ae 100644 --- a/src/main/java/com/sipai/controller/msg/MsgController.java +++ b/src/main/java/com/sipai/controller/msg/MsgController.java @@ -1,24 +1,23 @@ package com.sipai.controller.msg; -import java.io.IOException; -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Calendar; -import java.util.Collections; -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 com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import com.sipai.entity.msg.EmppSendUser; +import com.sipai.entity.msg.Msg; +import com.sipai.entity.msg.MsgRecv; +import com.sipai.entity.msg.MsgType; import com.sipai.entity.scada.ProAlarm; +import com.sipai.entity.user.User; +import com.sipai.service.msg.EmppSendUserService; +import com.sipai.service.msg.MsgRecvServiceImpl; +import com.sipai.service.msg.MsgServiceImpl; +import com.sipai.service.msg.MsgTypeService; import com.sipai.service.scada.ProAlarmService; -import com.sipai.tools.CommString; +import com.sipai.service.user.UserService; +import com.sipai.tools.CommUtil; +import com.sipai.websocket.MsgWebSocket; import net.sf.json.JSONArray; import net.sf.json.JSONObject; - import org.redisson.api.RMap; import org.redisson.api.RedissonClient; import org.springframework.stereotype.Controller; @@ -27,22 +26,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.msg.EmppSendUser; -import com.sipai.entity.msg.Msg; -import com.sipai.entity.msg.MsgRecv; -import com.sipai.entity.msg.MsgType; -import com.sipai.entity.user.User; -import com.sipai.service.msg.EmppAdminService; -import com.sipai.service.msg.EmppSendService; -import com.sipai.service.msg.EmppSendUserService; -import com.sipai.service.msg.MsgRecvServiceImpl; -import com.sipai.service.msg.MsgServiceImpl; -import com.sipai.service.msg.MsgTypeService; -import com.sipai.service.user.UserService; -import com.sipai.tools.CommUtil; -import com.sipai.websocket.MsgWebSocket; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import java.io.IOException; +import java.text.SimpleDateFormat; +import java.util.*; @Controller diff --git a/src/main/java/com/sipai/controller/msg/MsgPushServlet.java b/src/main/java/com/sipai/controller/msg/MsgPushServlet.java index e3d9ae13..43085c17 100644 --- a/src/main/java/com/sipai/controller/msg/MsgPushServlet.java +++ b/src/main/java/com/sipai/controller/msg/MsgPushServlet.java @@ -1,17 +1,16 @@ package com.sipai.controller.msg; +import com.sipai.entity.msg.Msg; + +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.PrintWriter; import java.util.ArrayList; import java.util.Hashtable; import java.util.Iterator; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletResponse; - -import com.sipai.entity.msg.Msg; - @SuppressWarnings("serial") public class MsgPushServlet extends HttpServlet { diff --git a/src/main/java/com/sipai/controller/msg/MsgTypeController.java b/src/main/java/com/sipai/controller/msg/MsgTypeController.java index 0a9a042a..dff1c052 100644 --- a/src/main/java/com/sipai/controller/msg/MsgTypeController.java +++ b/src/main/java/com/sipai/controller/msg/MsgTypeController.java @@ -1,14 +1,18 @@ package com.sipai.controller.msg; -import java.util.ArrayList; -import java.util.Date; -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.msg.MsgAlarmlevel; +import com.sipai.entity.msg.MsgType; +import com.sipai.entity.msg.Msguser; +import com.sipai.entity.msg.Smsuser; +import com.sipai.entity.user.User; +import com.sipai.service.msg.MsgAlarmlevelService; +import com.sipai.service.msg.MsgTypeService; +import com.sipai.service.user.RoleService; +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.ModelAttribute; @@ -16,22 +20,11 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.servlet.ModelAndView; -import com.fasterxml.jackson.annotation.JsonFormat.Value; -import com.fasterxml.jackson.annotation.JsonTypeInfo.Id; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; -import com.sipai.entity.msg.MsgAlarmlevel; -import com.sipai.entity.msg.MsgType; -import com.sipai.entity.msg.Msguser; -import com.sipai.entity.msg.Smsuser; -import com.sipai.entity.scada.MPoint; -import com.sipai.entity.scada.MPointHistory; -import com.sipai.entity.user.User; -import com.sipai.service.msg.MsgAlarmlevelService; -import com.sipai.service.msg.MsgTypeService; -import com.sipai.service.user.RoleService; -import com.sipai.service.user.UserService; -import com.sipai.tools.CommUtil; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; @Controller @RequestMapping("/msg") diff --git a/src/main/java/com/sipai/controller/process/DataPatrolController.java b/src/main/java/com/sipai/controller/process/DataPatrolController.java index 8fa2bcc5..61d983c3 100644 --- a/src/main/java/com/sipai/controller/process/DataPatrolController.java +++ b/src/main/java/com/sipai/controller/process/DataPatrolController.java @@ -13,7 +13,6 @@ import com.sipai.service.process.DecisionExpertBaseService; import com.sipai.service.scada.MPointHistoryService; 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; @@ -25,7 +24,6 @@ import org.springframework.web.servlet.ModelAndView; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; - import java.math.BigDecimal; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/com/sipai/controller/process/DataVisualBarChartController.java b/src/main/java/com/sipai/controller/process/DataVisualBarChartController.java index 75abab99..9b9e252a 100644 --- a/src/main/java/com/sipai/controller/process/DataVisualBarChartController.java +++ b/src/main/java/com/sipai/controller/process/DataVisualBarChartController.java @@ -2,13 +2,13 @@ package com.sipai.controller.process; import com.sipai.entity.base.Result; import com.sipai.entity.process.DataVisualBarChart; -import com.sipai.entity.process.DataVisualContent; import com.sipai.entity.process.DataVisualBarChartSeries; import com.sipai.entity.process.DataVisualBarChartYAxis; -import com.sipai.service.process.DataVisualContentService; +import com.sipai.entity.process.DataVisualContent; import com.sipai.service.process.DataVisualBarChartSeriesService; import com.sipai.service.process.DataVisualBarChartService; import com.sipai.service.process.DataVisualBarChartYAxisService; +import com.sipai.service.process.DataVisualContentService; import com.sipai.tools.CommUtil; import net.sf.json.JSONArray; import org.springframework.stereotype.Controller; diff --git a/src/main/java/com/sipai/controller/process/DataVisualBarChartSeriesController.java b/src/main/java/com/sipai/controller/process/DataVisualBarChartSeriesController.java index 167844c8..b1b4c03a 100644 --- a/src/main/java/com/sipai/controller/process/DataVisualBarChartSeriesController.java +++ b/src/main/java/com/sipai/controller/process/DataVisualBarChartSeriesController.java @@ -4,7 +4,6 @@ import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.sipai.entity.base.Result; import com.sipai.entity.process.DataVisualBarChartSeries; -import com.sipai.entity.process.DataVisualContent; import com.sipai.service.process.DataVisualBarChartSeriesService; import com.sipai.tools.CommUtil; import net.sf.json.JSONArray; diff --git a/src/main/java/com/sipai/controller/process/DataVisualBarChartYAxisController.java b/src/main/java/com/sipai/controller/process/DataVisualBarChartYAxisController.java index 6e12ea64..33ecc7b2 100644 --- a/src/main/java/com/sipai/controller/process/DataVisualBarChartYAxisController.java +++ b/src/main/java/com/sipai/controller/process/DataVisualBarChartYAxisController.java @@ -4,7 +4,6 @@ import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.sipai.entity.base.Result; import com.sipai.entity.process.DataVisualBarChartYAxis; -import com.sipai.entity.process.DataVisualContent; import com.sipai.service.process.DataVisualBarChartYAxisService; import com.sipai.tools.CommUtil; import net.sf.json.JSONArray; diff --git a/src/main/java/com/sipai/controller/process/DataVisualCameraController.java b/src/main/java/com/sipai/controller/process/DataVisualCameraController.java index ba5bdd06..82a96ca3 100644 --- a/src/main/java/com/sipai/controller/process/DataVisualCameraController.java +++ b/src/main/java/com/sipai/controller/process/DataVisualCameraController.java @@ -3,13 +3,11 @@ package com.sipai.controller.process; import com.sipai.entity.base.Result; import com.sipai.entity.process.DataVisualCamera; import com.sipai.entity.process.DataVisualContent; -import com.sipai.entity.process.DataVisualText; import com.sipai.entity.user.User; import com.sipai.service.process.DataVisualCameraService; import com.sipai.service.process.DataVisualContentService; 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; diff --git a/src/main/java/com/sipai/controller/process/DataVisualCombineAssemblyController.java b/src/main/java/com/sipai/controller/process/DataVisualCombineAssemblyController.java index ca5c219f..44729bff 100644 --- a/src/main/java/com/sipai/controller/process/DataVisualCombineAssemblyController.java +++ b/src/main/java/com/sipai/controller/process/DataVisualCombineAssemblyController.java @@ -2,8 +2,6 @@ package com.sipai.controller.process; import com.sipai.service.scada.MPointHistoryService; import com.sipai.service.scada.MPointService; -import com.sipai.tools.CommUtil; - import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.RequestMapping; @@ -11,9 +9,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; -import java.util.ArrayList; -import java.util.List; - @Controller @RequestMapping("/process/combineAssembly") public class DataVisualCombineAssemblyController { diff --git a/src/main/java/com/sipai/controller/process/DataVisualContentController.java b/src/main/java/com/sipai/controller/process/DataVisualContentController.java index e2df1aa1..b95ba3ba 100644 --- a/src/main/java/com/sipai/controller/process/DataVisualContentController.java +++ b/src/main/java/com/sipai/controller/process/DataVisualContentController.java @@ -22,9 +22,6 @@ import org.springframework.web.servlet.ModelAndView; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; - -import static org.hamcrest.CoreMatchers.nullValue; - import java.util.ArrayList; import java.util.HashMap; import java.util.List; diff --git a/src/main/java/com/sipai/controller/process/DataVisualDateController.java b/src/main/java/com/sipai/controller/process/DataVisualDateController.java index af6bc467..74285dbc 100644 --- a/src/main/java/com/sipai/controller/process/DataVisualDateController.java +++ b/src/main/java/com/sipai/controller/process/DataVisualDateController.java @@ -1,17 +1,12 @@ package com.sipai.controller.process; import com.sipai.entity.base.Result; -import com.sipai.entity.process.DataVisualDate; -import com.sipai.entity.scada.MPoint; import com.sipai.entity.process.DataVisualContent; -import com.sipai.entity.process.DataVisualFrame; -import com.sipai.entity.user.User; +import com.sipai.entity.process.DataVisualDate; import com.sipai.service.process.DataVisualContentService; import com.sipai.service.process.DataVisualDateService; -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; diff --git a/src/main/java/com/sipai/controller/process/DataVisualDateSelectController.java b/src/main/java/com/sipai/controller/process/DataVisualDateSelectController.java index 94e33c80..17be880a 100644 --- a/src/main/java/com/sipai/controller/process/DataVisualDateSelectController.java +++ b/src/main/java/com/sipai/controller/process/DataVisualDateSelectController.java @@ -1,17 +1,12 @@ package com.sipai.controller.process; import com.sipai.entity.base.Result; -import com.sipai.entity.process.DataVisualDateSelect; -import com.sipai.entity.scada.MPoint; import com.sipai.entity.process.DataVisualContent; -import com.sipai.entity.process.DataVisualFrame; -import com.sipai.entity.user.User; +import com.sipai.entity.process.DataVisualDateSelect; import com.sipai.service.process.DataVisualContentService; import com.sipai.service.process.DataVisualDateSelectService; -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; diff --git a/src/main/java/com/sipai/controller/process/DataVisualEqPointsController.java b/src/main/java/com/sipai/controller/process/DataVisualEqPointsController.java index 86472db9..04566f65 100644 --- a/src/main/java/com/sipai/controller/process/DataVisualEqPointsController.java +++ b/src/main/java/com/sipai/controller/process/DataVisualEqPointsController.java @@ -1,11 +1,11 @@ package com.sipai.controller.process; import com.sipai.entity.base.Result; -import com.sipai.entity.process.DataVisualEqPoints; import com.sipai.entity.process.DataVisualContent; +import com.sipai.entity.process.DataVisualEqPoints; import com.sipai.entity.user.User; -import com.sipai.service.process.DataVisualEqPointsService; import com.sipai.service.process.DataVisualContentService; +import com.sipai.service.process.DataVisualEqPointsService; import com.sipai.tools.CommUtil; import net.sf.json.JSONArray; import org.springframework.stereotype.Controller; diff --git a/src/main/java/com/sipai/controller/process/DataVisualFormController.java b/src/main/java/com/sipai/controller/process/DataVisualFormController.java index 5c3e560b..793c2b92 100644 --- a/src/main/java/com/sipai/controller/process/DataVisualFormController.java +++ b/src/main/java/com/sipai/controller/process/DataVisualFormController.java @@ -3,7 +3,6 @@ package com.sipai.controller.process; import com.sipai.entity.base.Result; import com.sipai.entity.process.DataVisualContent; import com.sipai.entity.process.DataVisualForm; -import com.sipai.entity.scada.MPoint; import com.sipai.entity.user.User; import com.sipai.service.process.DataVisualContentService; import com.sipai.service.process.DataVisualFormService; @@ -11,7 +10,6 @@ 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; diff --git a/src/main/java/com/sipai/controller/process/DataVisualFormShowStyleController.java b/src/main/java/com/sipai/controller/process/DataVisualFormShowStyleController.java index b2e9bf8c..27f3c8c0 100644 --- a/src/main/java/com/sipai/controller/process/DataVisualFormShowStyleController.java +++ b/src/main/java/com/sipai/controller/process/DataVisualFormShowStyleController.java @@ -18,7 +18,7 @@ import org.springframework.web.servlet.ModelAndView; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; -import java.util.*; +import java.util.List; @Controller @RequestMapping("/process/dataVisualFormShowStyle") diff --git a/src/main/java/com/sipai/controller/process/DataVisualFormSqlPointController.java b/src/main/java/com/sipai/controller/process/DataVisualFormSqlPointController.java index 6530204e..0765be7e 100644 --- a/src/main/java/com/sipai/controller/process/DataVisualFormSqlPointController.java +++ b/src/main/java/com/sipai/controller/process/DataVisualFormSqlPointController.java @@ -18,7 +18,7 @@ import org.springframework.web.servlet.ModelAndView; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; -import java.util.*; +import java.util.List; @Controller @RequestMapping("/process/dataVisualFormSqlPoint") diff --git a/src/main/java/com/sipai/controller/process/DataVisualFrameContainerController.java b/src/main/java/com/sipai/controller/process/DataVisualFrameContainerController.java index 82fd0228..90db291f 100644 --- a/src/main/java/com/sipai/controller/process/DataVisualFrameContainerController.java +++ b/src/main/java/com/sipai/controller/process/DataVisualFrameContainerController.java @@ -7,8 +7,6 @@ import com.sipai.service.process.DataVisualFrameContainerService; import com.sipai.tools.CommUtil; import net.sf.json.JSONArray; import net.sf.json.JSONObject; -import sun.misc.Perf.GetPerfAction; - import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.ModelAttribute; diff --git a/src/main/java/com/sipai/controller/process/DataVisualFrameController.java b/src/main/java/com/sipai/controller/process/DataVisualFrameController.java index 579a6b9e..7aa99b8e 100644 --- a/src/main/java/com/sipai/controller/process/DataVisualFrameController.java +++ b/src/main/java/com/sipai/controller/process/DataVisualFrameController.java @@ -3,29 +3,17 @@ package com.sipai.controller.process; 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.process.DataVisualContent; import com.sipai.entity.process.DataVisualFrame; import com.sipai.entity.process.DataVisualFrameContainer; -import com.sipai.entity.process.LibraryProcessManageDetail; -import com.sipai.entity.schedule.ScheduleJob; import com.sipai.entity.user.Company; import com.sipai.entity.user.User; -import com.sipai.quartz.job.DataVisualTopic_Job; import com.sipai.service.company.CompanyService; -import com.sipai.service.process.DataVisualCameraService; -import com.sipai.service.process.DataVisualContentService; -import com.sipai.service.process.DataVisualFrameContainerService; -import com.sipai.service.process.DataVisualFrameService; -import com.sipai.service.process.DataVisualMPointService; -import com.sipai.service.process.DataVisualTextService; +import com.sipai.service.process.*; import com.sipai.service.user.UnitService; import com.sipai.tools.CommString; import com.sipai.tools.CommUtil; -import com.sipai.tools.SpringContextUtil; import net.sf.json.JSONArray; import net.sf.json.JSONObject; - import org.redisson.api.RMapCache; import org.redisson.api.RedissonClient; import org.springframework.stereotype.Controller; diff --git a/src/main/java/com/sipai/controller/process/DataVisualGaugeChartController.java b/src/main/java/com/sipai/controller/process/DataVisualGaugeChartController.java index c58e159b..b298e603 100644 --- a/src/main/java/com/sipai/controller/process/DataVisualGaugeChartController.java +++ b/src/main/java/com/sipai/controller/process/DataVisualGaugeChartController.java @@ -1,17 +1,13 @@ package com.sipai.controller.process; import com.sipai.entity.base.Result; -import com.sipai.entity.process.DataVisualGaugeChart; -import com.sipai.entity.scada.MPoint; import com.sipai.entity.process.DataVisualContent; -import com.sipai.entity.process.DataVisualFrame; -import com.sipai.entity.user.User; +import com.sipai.entity.process.DataVisualGaugeChart; import com.sipai.service.process.DataVisualContentService; import com.sipai.service.process.DataVisualGaugeChartService; 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; diff --git a/src/main/java/com/sipai/controller/process/DataVisualLineChartController.java b/src/main/java/com/sipai/controller/process/DataVisualLineChartController.java index 9912d76c..fb64ac76 100644 --- a/src/main/java/com/sipai/controller/process/DataVisualLineChartController.java +++ b/src/main/java/com/sipai/controller/process/DataVisualLineChartController.java @@ -1,8 +1,8 @@ package com.sipai.controller.process; import com.sipai.entity.base.Result; -import com.sipai.entity.process.DataVisualLineChart; import com.sipai.entity.process.DataVisualContent; +import com.sipai.entity.process.DataVisualLineChart; import com.sipai.entity.process.DataVisualLineChartSeries; import com.sipai.entity.process.DataVisualLineChartYAxis; import com.sipai.service.process.DataVisualContentService; diff --git a/src/main/java/com/sipai/controller/process/DataVisualLineChartSeriesController.java b/src/main/java/com/sipai/controller/process/DataVisualLineChartSeriesController.java index f29b7078..18c0a739 100644 --- a/src/main/java/com/sipai/controller/process/DataVisualLineChartSeriesController.java +++ b/src/main/java/com/sipai/controller/process/DataVisualLineChartSeriesController.java @@ -4,7 +4,6 @@ import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.sipai.entity.base.Result; import com.sipai.entity.process.DataVisualLineChartSeries; -import com.sipai.entity.process.DataVisualContent; import com.sipai.service.process.DataVisualLineChartSeriesService; import com.sipai.tools.CommUtil; import net.sf.json.JSONArray; diff --git a/src/main/java/com/sipai/controller/process/DataVisualLineChartYAxisController.java b/src/main/java/com/sipai/controller/process/DataVisualLineChartYAxisController.java index 4fb73df0..d6d07118 100644 --- a/src/main/java/com/sipai/controller/process/DataVisualLineChartYAxisController.java +++ b/src/main/java/com/sipai/controller/process/DataVisualLineChartYAxisController.java @@ -4,7 +4,6 @@ import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.sipai.entity.base.Result; import com.sipai.entity.process.DataVisualLineChartYAxis; -import com.sipai.entity.process.DataVisualContent; import com.sipai.service.process.DataVisualLineChartYAxisService; import com.sipai.tools.CommUtil; import net.sf.json.JSONArray; diff --git a/src/main/java/com/sipai/controller/process/DataVisualMPointController.java b/src/main/java/com/sipai/controller/process/DataVisualMPointController.java index 187096d7..ed4f083c 100644 --- a/src/main/java/com/sipai/controller/process/DataVisualMPointController.java +++ b/src/main/java/com/sipai/controller/process/DataVisualMPointController.java @@ -1,19 +1,16 @@ package com.sipai.controller.process; import com.sipai.entity.base.Result; +import com.sipai.entity.process.DataVisualContent; import com.sipai.entity.process.DataVisualMPoint; import com.sipai.entity.process.DataVisualMPointWarehouse; import com.sipai.entity.scada.MPoint; -import com.sipai.entity.process.DataVisualContent; -import com.sipai.entity.process.DataVisualFrame; -import com.sipai.entity.user.User; import com.sipai.service.process.DataVisualContentService; import com.sipai.service.process.DataVisualMPointService; import com.sipai.service.process.DataVisualMPointWarehouseService; 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; diff --git a/src/main/java/com/sipai/controller/process/DataVisualMpViewController.java b/src/main/java/com/sipai/controller/process/DataVisualMpViewController.java index 5dc150e4..9983e6ca 100644 --- a/src/main/java/com/sipai/controller/process/DataVisualMpViewController.java +++ b/src/main/java/com/sipai/controller/process/DataVisualMpViewController.java @@ -5,15 +5,14 @@ import com.github.pagehelper.PageInfo; import com.sipai.entity.base.CommonFile; import com.sipai.entity.base.Result; import com.sipai.entity.document.FileIn; -import com.sipai.entity.process.DataVisualMpView; import com.sipai.entity.process.DataVisualContent; +import com.sipai.entity.process.DataVisualMpView; import com.sipai.service.base.CommonFileService; import com.sipai.service.process.DataVisualContentService; import com.sipai.service.process.DataVisualMpViewService; import com.sipai.tools.CommUtil; import net.sf.json.JSONArray; import net.sf.json.JSONObject; -import org.apache.axis.encoding.Base64; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.ModelAttribute; diff --git a/src/main/java/com/sipai/controller/process/DataVisualPercentChartController.java b/src/main/java/com/sipai/controller/process/DataVisualPercentChartController.java index 96878077..7e8f40e2 100644 --- a/src/main/java/com/sipai/controller/process/DataVisualPercentChartController.java +++ b/src/main/java/com/sipai/controller/process/DataVisualPercentChartController.java @@ -1,17 +1,12 @@ package com.sipai.controller.process; import com.sipai.entity.base.Result; -import com.sipai.entity.process.DataVisualPercentChart; -import com.sipai.entity.scada.MPoint; import com.sipai.entity.process.DataVisualContent; -import com.sipai.entity.process.DataVisualFrame; -import com.sipai.entity.user.User; +import com.sipai.entity.process.DataVisualPercentChart; import com.sipai.service.process.DataVisualContentService; import com.sipai.service.process.DataVisualPercentChartService; -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; diff --git a/src/main/java/com/sipai/controller/process/DataVisualPersonnelPositioningController.java b/src/main/java/com/sipai/controller/process/DataVisualPersonnelPositioningController.java index 5e2ddc38..16a12063 100644 --- a/src/main/java/com/sipai/controller/process/DataVisualPersonnelPositioningController.java +++ b/src/main/java/com/sipai/controller/process/DataVisualPersonnelPositioningController.java @@ -1,15 +1,13 @@ package com.sipai.controller.process; import com.sipai.entity.base.Result; -import com.sipai.entity.process.DataVisualPersonnelPositioning; import com.sipai.entity.process.DataVisualContent; -import com.sipai.entity.process.DataVisualText; +import com.sipai.entity.process.DataVisualPersonnelPositioning; import com.sipai.entity.user.User; -import com.sipai.service.process.DataVisualPersonnelPositioningService; import com.sipai.service.process.DataVisualContentService; +import com.sipai.service.process.DataVisualPersonnelPositioningService; 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; diff --git a/src/main/java/com/sipai/controller/process/DataVisualPieChartController.java b/src/main/java/com/sipai/controller/process/DataVisualPieChartController.java index 03897a8d..2c9443da 100644 --- a/src/main/java/com/sipai/controller/process/DataVisualPieChartController.java +++ b/src/main/java/com/sipai/controller/process/DataVisualPieChartController.java @@ -1,8 +1,8 @@ package com.sipai.controller.process; import com.sipai.entity.base.Result; -import com.sipai.entity.process.DataVisualPieChart; import com.sipai.entity.process.DataVisualContent; +import com.sipai.entity.process.DataVisualPieChart; import com.sipai.entity.process.DataVisualPieChartSeries; import com.sipai.service.process.DataVisualContentService; import com.sipai.service.process.DataVisualPieChartSeriesService; diff --git a/src/main/java/com/sipai/controller/process/DataVisualPieChartSeriesController.java b/src/main/java/com/sipai/controller/process/DataVisualPieChartSeriesController.java index dcc76d40..a9b0b584 100644 --- a/src/main/java/com/sipai/controller/process/DataVisualPieChartSeriesController.java +++ b/src/main/java/com/sipai/controller/process/DataVisualPieChartSeriesController.java @@ -4,7 +4,6 @@ import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.sipai.entity.base.Result; import com.sipai.entity.process.DataVisualPieChartSeries; -import com.sipai.entity.process.DataVisualContent; import com.sipai.service.process.DataVisualPieChartSeriesService; import com.sipai.tools.CommUtil; import net.sf.json.JSONArray; diff --git a/src/main/java/com/sipai/controller/process/DataVisualPolarCoordinatesController.java b/src/main/java/com/sipai/controller/process/DataVisualPolarCoordinatesController.java index 60238fff..095558dd 100644 --- a/src/main/java/com/sipai/controller/process/DataVisualPolarCoordinatesController.java +++ b/src/main/java/com/sipai/controller/process/DataVisualPolarCoordinatesController.java @@ -1,22 +1,14 @@ package com.sipai.controller.process; import com.sipai.entity.base.Result; +import com.sipai.entity.process.DataVisualContent; import com.sipai.entity.process.DataVisualPolarCoordinates; import com.sipai.entity.process.DataVisualPolarCoordinatesSeries; -import com.sipai.entity.process.DataVisualText; -import com.sipai.entity.scada.MPoint; -import com.sipai.entity.process.DataVisualContent; -import com.sipai.entity.process.DataVisualFrame; -import com.sipai.entity.process.DataVisualPieChart; -import com.sipai.entity.process.DataVisualPieChartSeries; -import com.sipai.entity.user.User; import com.sipai.service.process.DataVisualContentService; import com.sipai.service.process.DataVisualPolarCoordinatesSeriesService; import com.sipai.service.process.DataVisualPolarCoordinatesService; -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; diff --git a/src/main/java/com/sipai/controller/process/DataVisualPolarCoordinatesSeriesController.java b/src/main/java/com/sipai/controller/process/DataVisualPolarCoordinatesSeriesController.java index e040df15..d85982a3 100644 --- a/src/main/java/com/sipai/controller/process/DataVisualPolarCoordinatesSeriesController.java +++ b/src/main/java/com/sipai/controller/process/DataVisualPolarCoordinatesSeriesController.java @@ -4,7 +4,6 @@ import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.sipai.entity.base.Result; import com.sipai.entity.process.DataVisualPolarCoordinatesSeries; -import com.sipai.entity.process.DataVisualContent; import com.sipai.service.process.DataVisualPolarCoordinatesSeriesService; import com.sipai.tools.CommUtil; import net.sf.json.JSONArray; diff --git a/src/main/java/com/sipai/controller/process/DataVisualProgressBarChartController.java b/src/main/java/com/sipai/controller/process/DataVisualProgressBarChartController.java index 45474c03..8d7a7686 100644 --- a/src/main/java/com/sipai/controller/process/DataVisualProgressBarChartController.java +++ b/src/main/java/com/sipai/controller/process/DataVisualProgressBarChartController.java @@ -1,18 +1,12 @@ package com.sipai.controller.process; import com.sipai.entity.base.Result; -import com.sipai.entity.process.DataVisualProgressBarChart; -import com.sipai.entity.process.DataVisualText; -import com.sipai.entity.scada.MPoint; import com.sipai.entity.process.DataVisualContent; -import com.sipai.entity.process.DataVisualFrame; -import com.sipai.entity.user.User; +import com.sipai.entity.process.DataVisualProgressBarChart; import com.sipai.service.process.DataVisualContentService; import com.sipai.service.process.DataVisualProgressBarChartService; -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; diff --git a/src/main/java/com/sipai/controller/process/DataVisualRadarChartAxisController.java b/src/main/java/com/sipai/controller/process/DataVisualRadarChartAxisController.java index bfb3e0c1..cdb91736 100644 --- a/src/main/java/com/sipai/controller/process/DataVisualRadarChartAxisController.java +++ b/src/main/java/com/sipai/controller/process/DataVisualRadarChartAxisController.java @@ -4,7 +4,6 @@ import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.sipai.entity.base.Result; import com.sipai.entity.process.DataVisualRadarChartAxis; -import com.sipai.entity.process.DataVisualContent; import com.sipai.service.process.DataVisualRadarChartAxisService; import com.sipai.tools.CommUtil; import net.sf.json.JSONArray; diff --git a/src/main/java/com/sipai/controller/process/DataVisualRadarChartController.java b/src/main/java/com/sipai/controller/process/DataVisualRadarChartController.java index 3ec1257d..f6105eca 100644 --- a/src/main/java/com/sipai/controller/process/DataVisualRadarChartController.java +++ b/src/main/java/com/sipai/controller/process/DataVisualRadarChartController.java @@ -1,9 +1,10 @@ package com.sipai.controller.process; import com.sipai.entity.base.Result; -import com.sipai.entity.process.*; -import com.sipai.entity.scada.MPoint; -import com.sipai.entity.user.User; +import com.sipai.entity.process.DataVisualContent; +import com.sipai.entity.process.DataVisualRadarChart; +import com.sipai.entity.process.DataVisualRadarChartAxis; +import com.sipai.entity.process.DataVisualRadarChartSeries; import com.sipai.service.process.DataVisualContentService; import com.sipai.service.process.DataVisualRadarChartAxisService; import com.sipai.service.process.DataVisualRadarChartSeriesService; @@ -11,7 +12,6 @@ import com.sipai.service.process.DataVisualRadarChartService; 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; diff --git a/src/main/java/com/sipai/controller/process/DataVisualRadarChartSeriesController.java b/src/main/java/com/sipai/controller/process/DataVisualRadarChartSeriesController.java index d203a8ba..c6f4f9c3 100644 --- a/src/main/java/com/sipai/controller/process/DataVisualRadarChartSeriesController.java +++ b/src/main/java/com/sipai/controller/process/DataVisualRadarChartSeriesController.java @@ -4,7 +4,6 @@ import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.sipai.entity.base.Result; import com.sipai.entity.process.DataVisualRadarChartSeries; -import com.sipai.entity.process.DataVisualContent; import com.sipai.service.process.DataVisualRadarChartSeriesService; import com.sipai.tools.CommUtil; import net.sf.json.JSONArray; diff --git a/src/main/java/com/sipai/controller/process/DataVisualSelectController.java b/src/main/java/com/sipai/controller/process/DataVisualSelectController.java index 7f7b7929..ac9cea44 100644 --- a/src/main/java/com/sipai/controller/process/DataVisualSelectController.java +++ b/src/main/java/com/sipai/controller/process/DataVisualSelectController.java @@ -4,7 +4,6 @@ import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.sipai.entity.base.Result; import com.sipai.entity.process.DataVisualSelect; -import com.sipai.entity.process.DataVisualContent; import com.sipai.service.process.DataVisualContentService; import com.sipai.service.process.DataVisualSelectService; import com.sipai.tools.CommUtil; diff --git a/src/main/java/com/sipai/controller/process/DataVisualSuspensionFrameController.java b/src/main/java/com/sipai/controller/process/DataVisualSuspensionFrameController.java index 69269620..1f94a7a9 100644 --- a/src/main/java/com/sipai/controller/process/DataVisualSuspensionFrameController.java +++ b/src/main/java/com/sipai/controller/process/DataVisualSuspensionFrameController.java @@ -1,22 +1,13 @@ package com.sipai.controller.process; import com.sipai.entity.base.Result; -import com.sipai.entity.process.DataVisualSuspensionFrame; -import com.sipai.entity.process.DataVisualTab; -import com.sipai.entity.scada.MPoint; import com.sipai.entity.process.DataVisualContent; -import com.sipai.entity.process.DataVisualFrame; -import com.sipai.entity.process.DataVisualGaugeChart; -import com.sipai.entity.process.DataVisualRadarChart; -import com.sipai.entity.process.DataVisualRadarChartAxis; -import com.sipai.entity.process.DataVisualRadarChartSeries; -import com.sipai.entity.user.User; +import com.sipai.entity.process.DataVisualSuspensionFrame; import com.sipai.service.process.DataVisualContentService; import com.sipai.service.process.DataVisualSuspensionFrameService; 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; diff --git a/src/main/java/com/sipai/controller/process/DataVisualSvgController.java b/src/main/java/com/sipai/controller/process/DataVisualSvgController.java index 07c86460..42f96432 100644 --- a/src/main/java/com/sipai/controller/process/DataVisualSvgController.java +++ b/src/main/java/com/sipai/controller/process/DataVisualSvgController.java @@ -1,13 +1,12 @@ package com.sipai.controller.process; import com.sipai.entity.base.Result; -import com.sipai.entity.process.DataVisualSvg; import com.sipai.entity.process.DataVisualContent; +import com.sipai.entity.process.DataVisualSvg; import com.sipai.service.process.DataVisualContentService; import com.sipai.service.process.DataVisualSvgService; 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; diff --git a/src/main/java/com/sipai/controller/process/DataVisualSwitchController.java b/src/main/java/com/sipai/controller/process/DataVisualSwitchController.java index 12b81a59..6e073abe 100644 --- a/src/main/java/com/sipai/controller/process/DataVisualSwitchController.java +++ b/src/main/java/com/sipai/controller/process/DataVisualSwitchController.java @@ -1,15 +1,12 @@ package com.sipai.controller.process; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; import com.sipai.entity.base.Result; -import com.sipai.entity.process.DataVisualSwitch; import com.sipai.entity.process.DataVisualContent; +import com.sipai.entity.process.DataVisualSwitch; import com.sipai.service.process.DataVisualContentService; import com.sipai.service.process.DataVisualSwitchService; 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; diff --git a/src/main/java/com/sipai/controller/process/DataVisualSwitchPointController.java b/src/main/java/com/sipai/controller/process/DataVisualSwitchPointController.java index a11bb4b5..5b351858 100644 --- a/src/main/java/com/sipai/controller/process/DataVisualSwitchPointController.java +++ b/src/main/java/com/sipai/controller/process/DataVisualSwitchPointController.java @@ -3,17 +3,12 @@ package com.sipai.controller.process; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.sipai.entity.base.Result; -import com.sipai.entity.process.DataVisualSwitchPoint; -import com.sipai.entity.scada.MPoint; import com.sipai.entity.process.DataVisualContent; -import com.sipai.entity.process.DataVisualFrame; -import com.sipai.entity.user.User; +import com.sipai.entity.process.DataVisualSwitchPoint; import com.sipai.service.process.DataVisualContentService; import com.sipai.service.process.DataVisualSwitchPointService; -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; diff --git a/src/main/java/com/sipai/controller/process/DataVisualTabController.java b/src/main/java/com/sipai/controller/process/DataVisualTabController.java index 78cffd88..897d0f05 100644 --- a/src/main/java/com/sipai/controller/process/DataVisualTabController.java +++ b/src/main/java/com/sipai/controller/process/DataVisualTabController.java @@ -3,15 +3,10 @@ package com.sipai.controller.process; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.sipai.entity.base.Result; -import com.sipai.entity.process.DataVisualTab; -import com.sipai.entity.scada.MPoint; import com.sipai.entity.process.DataVisualContent; -import com.sipai.entity.process.DataVisualFrame; -import com.sipai.entity.process.DataVisualLineChartSeries; -import com.sipai.entity.user.User; +import com.sipai.entity.process.DataVisualTab; import com.sipai.service.process.DataVisualContentService; import com.sipai.service.process.DataVisualTabService; -import com.sipai.service.scada.MPointService; import com.sipai.tools.CommUtil; import net.sf.json.JSONArray; import net.sf.json.JSONObject; diff --git a/src/main/java/com/sipai/controller/process/DataVisualTaskPointsController.java b/src/main/java/com/sipai/controller/process/DataVisualTaskPointsController.java index 07f38077..5c20e19c 100644 --- a/src/main/java/com/sipai/controller/process/DataVisualTaskPointsController.java +++ b/src/main/java/com/sipai/controller/process/DataVisualTaskPointsController.java @@ -1,11 +1,11 @@ package com.sipai.controller.process; import com.sipai.entity.base.Result; -import com.sipai.entity.process.DataVisualTaskPoints; import com.sipai.entity.process.DataVisualContent; +import com.sipai.entity.process.DataVisualTaskPoints; import com.sipai.entity.user.User; -import com.sipai.service.process.DataVisualTaskPointsService; import com.sipai.service.process.DataVisualContentService; +import com.sipai.service.process.DataVisualTaskPointsService; import com.sipai.tools.CommUtil; import net.sf.json.JSONArray; import org.springframework.stereotype.Controller; diff --git a/src/main/java/com/sipai/controller/process/DataVisualTextController.java b/src/main/java/com/sipai/controller/process/DataVisualTextController.java index 84838532..94e5e7a5 100644 --- a/src/main/java/com/sipai/controller/process/DataVisualTextController.java +++ b/src/main/java/com/sipai/controller/process/DataVisualTextController.java @@ -1,19 +1,14 @@ package com.sipai.controller.process; import com.sipai.entity.base.Result; -import com.sipai.entity.process.DataVisualText; -import com.sipai.entity.process.DataVisualTextWarehouse; -import com.sipai.entity.scada.MPoint; import com.sipai.entity.process.DataVisualContent; -import com.sipai.entity.process.DataVisualFrame; -import com.sipai.entity.user.User; +import com.sipai.entity.process.DataVisualText; import com.sipai.service.process.DataVisualContentService; import com.sipai.service.process.DataVisualTextService; import com.sipai.service.process.DataVisualTextWarehouseService; 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; diff --git a/src/main/java/com/sipai/controller/process/DataVisualWeatherController.java b/src/main/java/com/sipai/controller/process/DataVisualWeatherController.java index 2a55e12a..445a55a0 100644 --- a/src/main/java/com/sipai/controller/process/DataVisualWeatherController.java +++ b/src/main/java/com/sipai/controller/process/DataVisualWeatherController.java @@ -1,17 +1,12 @@ package com.sipai.controller.process; import com.sipai.entity.base.Result; -import com.sipai.entity.process.DataVisualWeather; -import com.sipai.entity.scada.MPoint; import com.sipai.entity.process.DataVisualContent; -import com.sipai.entity.process.DataVisualFrame; -import com.sipai.entity.user.User; +import com.sipai.entity.process.DataVisualWeather; import com.sipai.service.process.DataVisualContentService; import com.sipai.service.process.DataVisualWeatherService; -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; diff --git a/src/main/java/com/sipai/controller/process/DecisionExpertBaseTextController.java b/src/main/java/com/sipai/controller/process/DecisionExpertBaseTextController.java index cb6298cb..06f01090 100644 --- a/src/main/java/com/sipai/controller/process/DecisionExpertBaseTextController.java +++ b/src/main/java/com/sipai/controller/process/DecisionExpertBaseTextController.java @@ -4,12 +4,6 @@ import com.sipai.entity.base.Result; import com.sipai.entity.process.DecisionExpertBase; import com.sipai.entity.process.DecisionExpertBaseText; import com.sipai.entity.scada.MPoint; -import com.sipai.entity.process.DataVisualContent; -import com.sipai.entity.process.DataVisualFrame; -import com.sipai.entity.sparepart.GoodsClass; -import com.sipai.entity.user.Unit; -import com.sipai.entity.user.User; -import com.sipai.service.process.DataVisualContentService; import com.sipai.service.process.DecisionExpertBaseService; import com.sipai.service.process.DecisionExpertBaseTextService; import com.sipai.service.scada.MPointService; diff --git a/src/main/java/com/sipai/controller/process/EquipmentAdjustmentController.java b/src/main/java/com/sipai/controller/process/EquipmentAdjustmentController.java index a43609fa..365d9146 100644 --- a/src/main/java/com/sipai/controller/process/EquipmentAdjustmentController.java +++ b/src/main/java/com/sipai/controller/process/EquipmentAdjustmentController.java @@ -1,18 +1,16 @@ package com.sipai.controller.process; -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.Result; import com.sipai.entity.process.EquipmentAdjustment; import com.sipai.entity.user.Company; -import com.sipai.service.base.LoginService; +import com.sipai.entity.user.User; +import com.sipai.service.process.EquipmentAdjustmentService; import com.sipai.service.user.UnitService; 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.ModelAttribute; @@ -20,12 +18,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.base.Result; -import com.sipai.entity.user.User; -import com.sipai.service.process.EquipmentAdjustmentService; -import com.sipai.tools.CommUtil; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpSession; +import java.util.List; @Controller @RequestMapping("/process/equipmentAdjustment") diff --git a/src/main/java/com/sipai/controller/process/EquipmentAdjustmentDetailController.java b/src/main/java/com/sipai/controller/process/EquipmentAdjustmentDetailController.java index bbfc4d0e..523bc5e5 100644 --- a/src/main/java/com/sipai/controller/process/EquipmentAdjustmentDetailController.java +++ b/src/main/java/com/sipai/controller/process/EquipmentAdjustmentDetailController.java @@ -1,19 +1,5 @@ package com.sipai.controller.process; -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.process.EquipmentAdjustmentDetail; import com.sipai.entity.user.User; import com.sipai.service.process.EquipmentAdjustmentDetailService; 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("/process/equipmentAdjustmentDetail") diff --git a/src/main/java/com/sipai/controller/process/LibraryProcessAbnormalController.java b/src/main/java/com/sipai/controller/process/LibraryProcessAbnormalController.java index 13f9abce..02257c17 100644 --- a/src/main/java/com/sipai/controller/process/LibraryProcessAbnormalController.java +++ b/src/main/java/com/sipai/controller/process/LibraryProcessAbnormalController.java @@ -4,7 +4,6 @@ import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.sipai.entity.base.Result; import com.sipai.entity.process.LibraryProcessAbnormal; -import com.sipai.entity.process.LibraryProcessAdjustment; import com.sipai.entity.user.User; import com.sipai.service.process.LibraryProcessAbnormalService; import com.sipai.tools.CommUtil; diff --git a/src/main/java/com/sipai/controller/process/LibraryProcessAdjustmentController.java b/src/main/java/com/sipai/controller/process/LibraryProcessAdjustmentController.java index 3ddab735..d883397a 100644 --- a/src/main/java/com/sipai/controller/process/LibraryProcessAdjustmentController.java +++ b/src/main/java/com/sipai/controller/process/LibraryProcessAdjustmentController.java @@ -3,7 +3,6 @@ package com.sipai.controller.process; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.sipai.entity.base.Result; -import com.sipai.entity.maintenance.LibraryRepairBloc; import com.sipai.entity.process.LibraryProcessAbnormal; import com.sipai.entity.process.LibraryProcessAdjustment; import com.sipai.entity.process.ProcessAdjustmentType; @@ -14,18 +13,9 @@ import com.sipai.service.process.ProcessAdjustmentTypeService; import com.sipai.tools.CommUtil; 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.HSSFFont; -import org.apache.poi.hssf.usermodel.HSSFPatriarch; -import org.apache.poi.hssf.usermodel.HSSFRichTextString; -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.hssf.usermodel.*; import org.apache.poi.ss.usermodel.*; import org.apache.poi.ss.util.CellRangeAddress; -import org.apache.poi.hssf.util.HSSFColor; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.ModelAttribute; @@ -38,7 +28,6 @@ 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.io.OutputStream; import java.net.URLEncoder; diff --git a/src/main/java/com/sipai/controller/process/LibraryProcessManageController.java b/src/main/java/com/sipai/controller/process/LibraryProcessManageController.java index 6159e562..3e77bacb 100644 --- a/src/main/java/com/sipai/controller/process/LibraryProcessManageController.java +++ b/src/main/java/com/sipai/controller/process/LibraryProcessManageController.java @@ -4,7 +4,6 @@ import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.sipai.entity.base.Result; import com.sipai.entity.process.LibraryProcessManage; -import com.sipai.entity.user.Company; import com.sipai.entity.user.User; import com.sipai.service.process.LibraryProcessManageService; import com.sipai.service.user.UnitService; diff --git a/src/main/java/com/sipai/controller/process/LibraryProcessManageTypeController.java b/src/main/java/com/sipai/controller/process/LibraryProcessManageTypeController.java index 2421bd7b..8dd99996 100644 --- a/src/main/java/com/sipai/controller/process/LibraryProcessManageTypeController.java +++ b/src/main/java/com/sipai/controller/process/LibraryProcessManageTypeController.java @@ -1,13 +1,14 @@ package com.sipai.controller.process; -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.process.LibraryProcessManageType; +import com.sipai.entity.user.User; +import com.sipai.service.process.LibraryProcessManageTypeService; +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 +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.Result; -import com.sipai.entity.process.LibraryProcessAdjustment; -import com.sipai.entity.process.LibraryProcessManageType; -import com.sipai.entity.user.User; -import com.sipai.service.process.LibraryProcessManageTypeService; -import com.sipai.tools.CommUtil; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import java.util.List; @Controller @RequestMapping("/process/libraryProcessManageType") diff --git a/src/main/java/com/sipai/controller/process/LibraryProcessManageWorkOrderController.java b/src/main/java/com/sipai/controller/process/LibraryProcessManageWorkOrderController.java index 3dbe9252..27a69dac 100644 --- a/src/main/java/com/sipai/controller/process/LibraryProcessManageWorkOrderController.java +++ b/src/main/java/com/sipai/controller/process/LibraryProcessManageWorkOrderController.java @@ -1,19 +1,5 @@ package com.sipai.controller.process; -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.process.LibraryProcessManageWorkOrder; import com.sipai.entity.user.User; import com.sipai.service.process.LibraryProcessManageWorkOrderService; 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("/process/libraryProcessManageWorkOrder") diff --git a/src/main/java/com/sipai/controller/process/LibraryRoutineWorkController.java b/src/main/java/com/sipai/controller/process/LibraryRoutineWorkController.java index 83e07b87..af384b3f 100644 --- a/src/main/java/com/sipai/controller/process/LibraryRoutineWorkController.java +++ b/src/main/java/com/sipai/controller/process/LibraryRoutineWorkController.java @@ -6,27 +6,15 @@ import com.sipai.entity.administration.OrganizationClass; import com.sipai.entity.base.Result; import com.sipai.entity.process.LibraryRoutineWork; import com.sipai.entity.user.User; -import com.sipai.entity.work.ProductionIndexPlanNameConfigure; import com.sipai.service.administration.OrganizationClassService; import com.sipai.service.process.LibraryRoutineWorkService; import com.sipai.tools.CommUtil; import net.sf.json.JSONArray; import net.sf.json.JSONObject; - -import org.apache.poi.hssf.usermodel.DVConstraint; -import org.apache.poi.hssf.usermodel.HSSFCell; -import org.apache.poi.hssf.usermodel.HSSFCellStyle; -import org.apache.poi.hssf.usermodel.HSSFDataValidation; -import org.apache.poi.hssf.usermodel.HSSFFont; -import org.apache.poi.hssf.usermodel.HSSFPatriarch; -import org.apache.poi.hssf.usermodel.HSSFRichTextString; -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.hssf.usermodel.*; import org.apache.poi.ss.usermodel.*; import org.apache.poi.ss.util.CellRangeAddress; import org.apache.poi.ss.util.CellRangeAddressList; -import org.apache.poi.hssf.util.HSSFColor; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.ModelAttribute; @@ -39,7 +27,6 @@ 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.io.OutputStream; import java.net.URLEncoder; diff --git a/src/main/java/com/sipai/controller/process/LibraryWaterTestController.java b/src/main/java/com/sipai/controller/process/LibraryWaterTestController.java index 99f56c20..38528c90 100644 --- a/src/main/java/com/sipai/controller/process/LibraryWaterTestController.java +++ b/src/main/java/com/sipai/controller/process/LibraryWaterTestController.java @@ -9,18 +9,9 @@ import com.sipai.service.process.LibraryWaterTestService; import com.sipai.tools.CommUtil; 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.HSSFFont; -import org.apache.poi.hssf.usermodel.HSSFPatriarch; -import org.apache.poi.hssf.usermodel.HSSFRichTextString; -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.hssf.usermodel.*; import org.apache.poi.ss.usermodel.*; import org.apache.poi.ss.util.CellRangeAddress; -import org.apache.poi.hssf.util.HSSFColor; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.ModelAttribute; @@ -29,10 +20,10 @@ 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 javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; - import java.io.IOException; import java.io.OutputStream; import java.net.URLEncoder; diff --git a/src/main/java/com/sipai/controller/process/MeterCheckLibraryController.java b/src/main/java/com/sipai/controller/process/MeterCheckLibraryController.java index 1d39cca4..cf8684fe 100644 --- a/src/main/java/com/sipai/controller/process/MeterCheckLibraryController.java +++ b/src/main/java/com/sipai/controller/process/MeterCheckLibraryController.java @@ -6,7 +6,6 @@ import com.sipai.entity.base.Result; import com.sipai.entity.process.MeterCheckLibrary; import com.sipai.entity.user.User; import com.sipai.service.process.MeterCheckLibraryService; -import com.sipai.service.user.UnitService; import com.sipai.tools.CommUtil; import net.sf.json.JSONArray; import net.sf.json.JSONObject; diff --git a/src/main/java/com/sipai/controller/process/ProcessAdjustmentContentController.java b/src/main/java/com/sipai/controller/process/ProcessAdjustmentContentController.java index 1f76fb7c..30bac0e2 100644 --- a/src/main/java/com/sipai/controller/process/ProcessAdjustmentContentController.java +++ b/src/main/java/com/sipai/controller/process/ProcessAdjustmentContentController.java @@ -4,15 +4,12 @@ import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.sipai.entity.base.Result; import com.sipai.entity.process.ProcessAdjustmentContent; -import com.sipai.entity.user.Company; import com.sipai.entity.user.User; import com.sipai.service.process.ProcessAdjustmentContentService; -import com.sipai.service.user.UnitService; 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; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.ModelAttribute; diff --git a/src/main/java/com/sipai/controller/process/ProcessAdjustmentController.java b/src/main/java/com/sipai/controller/process/ProcessAdjustmentController.java index 17310cc6..2f9349ce 100644 --- a/src/main/java/com/sipai/controller/process/ProcessAdjustmentController.java +++ b/src/main/java/com/sipai/controller/process/ProcessAdjustmentController.java @@ -1,26 +1,30 @@ package com.sipai.controller.process; -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.HttpSession; - +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import com.sipai.entity.activiti.WorkTask; import com.sipai.entity.base.Result; -import com.sipai.entity.process.*; -import com.sipai.service.base.LoginService; +import com.sipai.entity.business.BusinessUnit; +import com.sipai.entity.business.BusinessUnitAudit; +import com.sipai.entity.business.BusinessUnitHandle; +import com.sipai.entity.business.BusinessUnitRecord; +import com.sipai.entity.process.LibraryProcessAdjustment; +import com.sipai.entity.process.ProcessAdjustment; +import com.sipai.entity.process.ProcessAdjustmentContent; +import com.sipai.entity.user.Company; +import com.sipai.entity.user.User; +import com.sipai.service.activiti.WorkflowProcessDefinitionService; +import com.sipai.service.activiti.WorkflowService; +import com.sipai.service.business.BusinessUnitAuditService; +import com.sipai.service.business.BusinessUnitHandleService; import com.sipai.service.process.LibraryProcessAdjustmentService; import com.sipai.service.process.ProcessAdjustmentContentService; +import com.sipai.service.process.ProcessAdjustmentService; +import com.sipai.service.user.UnitService; +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; @@ -34,25 +38,12 @@ 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; -import com.sipai.entity.business.BusinessUnit; -import com.sipai.entity.business.BusinessUnitAudit; -import com.sipai.entity.business.BusinessUnitHandle; -import com.sipai.entity.business.BusinessUnitRecord; -import com.sipai.entity.user.Company; -import com.sipai.entity.user.User; -import com.sipai.entity.process.ProcessAdjustment; -import com.sipai.service.activiti.WorkflowProcessDefinitionService; -import com.sipai.service.activiti.WorkflowService; -import com.sipai.service.business.BusinessUnitAuditService; -import com.sipai.service.business.BusinessUnitHandleService; -import com.sipai.service.user.UnitService; -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.HttpSession; +import java.text.SimpleDateFormat; +import java.util.*; @Controller diff --git a/src/main/java/com/sipai/controller/process/ProcessAdjustmentTypeController.java b/src/main/java/com/sipai/controller/process/ProcessAdjustmentTypeController.java index a88ce140..c782ed3b 100644 --- a/src/main/java/com/sipai/controller/process/ProcessAdjustmentTypeController.java +++ b/src/main/java/com/sipai/controller/process/ProcessAdjustmentTypeController.java @@ -4,11 +4,8 @@ import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.sipai.entity.base.Result; import com.sipai.entity.process.ProcessAdjustmentType; -import com.sipai.entity.user.Company; import com.sipai.entity.user.User; import com.sipai.service.process.ProcessAdjustmentTypeService; -import com.sipai.service.user.UnitService; -import com.sipai.service.user.UserService; import com.sipai.tools.CommUtil; import net.sf.json.JSONArray; import net.sf.json.JSONObject; diff --git a/src/main/java/com/sipai/controller/process/ProcessController.java b/src/main/java/com/sipai/controller/process/ProcessController.java index de114c42..4789cb31 100644 --- a/src/main/java/com/sipai/controller/process/ProcessController.java +++ b/src/main/java/com/sipai/controller/process/ProcessController.java @@ -1,17 +1,12 @@ package com.sipai.controller.process; -import java.io.UnsupportedEncodingException; -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.List; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpSession; - +import com.sipai.entity.user.ExtSystem; +import com.sipai.entity.user.User; +import com.sipai.service.user.ExtSystemService; +import com.sipai.tools.CommUtil; +import com.sipai.tools.HttpUtil; 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; @@ -19,21 +14,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.user.ExtSystem; -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.user.ExtSystemService; -import com.sipai.service.user.UnitService; -import com.sipai.service.work.GroupMemberService; -import com.sipai.service.work.GroupService; -import com.sipai.tools.HttpUtil; -import com.sipai.tools.CommUtil; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpSession; @Controller diff --git a/src/main/java/com/sipai/controller/process/ProcessSectionInformationController.java b/src/main/java/com/sipai/controller/process/ProcessSectionInformationController.java index 7cadd194..4ef7a4a6 100644 --- a/src/main/java/com/sipai/controller/process/ProcessSectionInformationController.java +++ b/src/main/java/com/sipai/controller/process/ProcessSectionInformationController.java @@ -1,20 +1,5 @@ package com.sipai.controller.process; -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.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.bind.annotation.ResponseBody; -import org.springframework.web.servlet.ModelAndView; - -import com.alibaba.fastjson.JSONObject; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.sipai.entity.base.Result; @@ -24,14 +9,16 @@ import com.sipai.entity.user.User; import com.sipai.service.process.ProcessSectionInformationService; import com.sipai.service.user.ProcessSectionService; import com.sipai.tools.CommUtil; - -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiResponse; -import io.swagger.annotations.ApiResponses; +import io.swagger.annotations.*; import net.sf.json.JSONArray; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.ModelAndView; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import java.util.List; @Controller @RequestMapping("/process/processSectionInformation") diff --git a/src/main/java/com/sipai/controller/process/ProcessWebsiteController.java b/src/main/java/com/sipai/controller/process/ProcessWebsiteController.java index 954d0d5a..d115fb69 100644 --- a/src/main/java/com/sipai/controller/process/ProcessWebsiteController.java +++ b/src/main/java/com/sipai/controller/process/ProcessWebsiteController.java @@ -1,25 +1,22 @@ package com.sipai.controller.process; -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.process.ProcessWebsite; import com.sipai.entity.user.User; import com.sipai.service.process.ProcessWebsiteService; 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("/processWebsite") diff --git a/src/main/java/com/sipai/controller/process/RoutineWorkController.java b/src/main/java/com/sipai/controller/process/RoutineWorkController.java index a0e07853..ea02885b 100644 --- a/src/main/java/com/sipai/controller/process/RoutineWorkController.java +++ b/src/main/java/com/sipai/controller/process/RoutineWorkController.java @@ -9,8 +9,7 @@ import com.sipai.entity.business.BusinessUnitAudit; import com.sipai.entity.business.BusinessUnitHandle; import com.sipai.entity.business.BusinessUnitRecord; import com.sipai.entity.document.DocFileRelation; -import com.sipai.entity.process.*; -import com.sipai.entity.report.RptCreate; +import com.sipai.entity.process.RoutineWork; import com.sipai.entity.user.Company; import com.sipai.entity.user.User; import com.sipai.service.activiti.WorkflowProcessDefinitionService; @@ -25,7 +24,6 @@ import com.sipai.tools.CommString; import com.sipai.tools.CommUtil; import net.sf.json.JSONArray; import net.sf.json.JSONObject; - import org.activiti.engine.RuntimeService; import org.activiti.engine.TaskService; import org.activiti.engine.history.HistoricTaskInstance; diff --git a/src/main/java/com/sipai/controller/process/TestIndexManageController.java b/src/main/java/com/sipai/controller/process/TestIndexManageController.java index b59249e1..5006e9fc 100644 --- a/src/main/java/com/sipai/controller/process/TestIndexManageController.java +++ b/src/main/java/com/sipai/controller/process/TestIndexManageController.java @@ -3,17 +3,11 @@ package com.sipai.controller.process; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.sipai.entity.base.Result; -import com.sipai.entity.process.LibraryProcessAdjustment; import com.sipai.entity.process.TestIndexManage; -import com.sipai.entity.process.TestMethods; -import com.sipai.entity.user.Company; import com.sipai.entity.user.User; import com.sipai.service.process.TestIndexManageService; -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; @@ -23,7 +17,6 @@ import org.springframework.web.servlet.ModelAndView; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; - import java.util.List; @Controller diff --git a/src/main/java/com/sipai/controller/process/TestMethodsController.java b/src/main/java/com/sipai/controller/process/TestMethodsController.java index 3bea38a5..895eacd5 100644 --- a/src/main/java/com/sipai/controller/process/TestMethodsController.java +++ b/src/main/java/com/sipai/controller/process/TestMethodsController.java @@ -3,16 +3,11 @@ package com.sipai.controller.process; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.sipai.entity.base.Result; -import com.sipai.entity.process.LibraryProcessAdjustment; import com.sipai.entity.process.TestMethods; -import com.sipai.entity.user.Company; import com.sipai.entity.user.User; import com.sipai.service.process.TestMethodsService; -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; @@ -22,7 +17,6 @@ import org.springframework.web.servlet.ModelAndView; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; - import java.util.List; @Controller diff --git a/src/main/java/com/sipai/controller/process/TestTaskController.java b/src/main/java/com/sipai/controller/process/TestTaskController.java index a5a1a4c3..8faa6a9e 100644 --- a/src/main/java/com/sipai/controller/process/TestTaskController.java +++ b/src/main/java/com/sipai/controller/process/TestTaskController.java @@ -3,18 +3,13 @@ package com.sipai.controller.process; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.sipai.entity.base.Result; -import com.sipai.entity.process.LibraryProcessAdjustment; import com.sipai.entity.process.TestIndexManage; import com.sipai.entity.process.TestTask; -import com.sipai.entity.user.Company; import com.sipai.entity.user.User; import com.sipai.service.process.TestIndexManageService; import com.sipai.service.process.TestTaskService; -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; @@ -24,7 +19,6 @@ import org.springframework.web.servlet.ModelAndView; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; - import java.util.List; @Controller diff --git a/src/main/java/com/sipai/controller/process/WaterTestController.java b/src/main/java/com/sipai/controller/process/WaterTestController.java index 30758540..0788dbf3 100644 --- a/src/main/java/com/sipai/controller/process/WaterTestController.java +++ b/src/main/java/com/sipai/controller/process/WaterTestController.java @@ -8,10 +8,7 @@ import com.sipai.entity.business.BusinessUnit; import com.sipai.entity.business.BusinessUnitAudit; import com.sipai.entity.business.BusinessUnitHandle; import com.sipai.entity.business.BusinessUnitRecord; -import com.sipai.entity.process.ProcessAdjustment; import com.sipai.entity.process.WaterTest; -import com.sipai.entity.process.WaterTest; -import com.sipai.entity.sparepart.InStockRecord; import com.sipai.entity.user.Company; import com.sipai.entity.user.User; import com.sipai.service.activiti.WorkflowProcessDefinitionService; diff --git a/src/main/java/com/sipai/controller/process/WaterTestDetailController.java b/src/main/java/com/sipai/controller/process/WaterTestDetailController.java index 898e1b72..23891d4a 100644 --- a/src/main/java/com/sipai/controller/process/WaterTestDetailController.java +++ b/src/main/java/com/sipai/controller/process/WaterTestDetailController.java @@ -3,15 +3,12 @@ package com.sipai.controller.process; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.sipai.entity.base.Result; -import com.sipai.entity.process.RoutineWork; import com.sipai.entity.process.WaterTestDetail; -import com.sipai.entity.user.Company; import com.sipai.entity.user.User; import com.sipai.service.process.WaterTestDetailService; 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; diff --git a/src/main/java/com/sipai/controller/report/CustomReportController.java b/src/main/java/com/sipai/controller/report/CustomReportController.java index ba393112..c1ab0344 100644 --- a/src/main/java/com/sipai/controller/report/CustomReportController.java +++ b/src/main/java/com/sipai/controller/report/CustomReportController.java @@ -1,72 +1,49 @@ package com.sipai.controller.report; -import java.io.File; -import java.io.IOException; -import java.math.BigDecimal; -import java.sql.ResultSet; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import javax.annotation.Resource; -import javax.servlet.ServletContext; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; - -import com.sipai.entity.data.XServer; -import com.sipai.entity.user.UserRole; -import com.sipai.service.data.XServerService; -import com.sipai.service.user.UserRoleService; -import net.sf.json.JSONArray; -import net.sf.json.JSONNull; -import net.sf.json.JSONObject; - -import org.apache.commons.lang3.StringUtils; -import org.springframework.stereotype.Controller; -import org.springframework.ui.Model; -import org.springframework.validation.BindingResult; -import org.springframework.validation.Errors; -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.CommonFile; import com.sipai.entity.base.Result; -import com.sipai.entity.data.CurveMpoint; -import com.sipai.entity.data.DataCurve; -import com.sipai.entity.report.CustomReportMPoint; -import com.sipai.entity.report.ReportEnergyPump; +import com.sipai.entity.data.XServer; import com.sipai.entity.report.CustomReport; -import com.sipai.entity.report.ReportWaterBackWashEquipment; -import com.sipai.entity.report.TemplateType; +import com.sipai.entity.report.CustomReportMPoint; import com.sipai.entity.scada.MPoint; import com.sipai.entity.scada.MPointHistory; -import com.sipai.entity.timeefficiency.PatrolPlan; 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.DataCurveService; -import com.sipai.service.report.BaseService; +import com.sipai.service.data.XServerService; import com.sipai.service.report.CustomReportMPointService; -import com.sipai.service.report.ReportEnergyPumpService; import com.sipai.service.report.CustomReportService; +import com.sipai.service.report.ReportEnergyPumpService; import com.sipai.service.report.ReportWaterBackWashEquipmentService; import com.sipai.service.scada.MPointHistoryService; import com.sipai.service.scada.MPointService; import com.sipai.service.user.UnitService; import com.sipai.service.user.UserDetailService; +import com.sipai.service.user.UserRoleService; import com.sipai.service.user.UserService; import com.sipai.tools.CommString; import com.sipai.tools.CommUtil; -import com.sipai.tools.FileUtil; -//import com.sipai.tools.JasperHelper; -import com.sipai.tools.SpringContextUtil; +import net.sf.json.JSONArray; +import net.sf.json.JSONNull; +import net.sf.json.JSONObject; +import org.apache.commons.lang3.StringUtils; +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.IOException; +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; @Controller @RequestMapping("/report/customReport") diff --git a/src/main/java/com/sipai/controller/report/CustomReportMPointController.java b/src/main/java/com/sipai/controller/report/CustomReportMPointController.java index c159d16b..e470d8e4 100644 --- a/src/main/java/com/sipai/controller/report/CustomReportMPointController.java +++ b/src/main/java/com/sipai/controller/report/CustomReportMPointController.java @@ -1,53 +1,32 @@ package com.sipai.controller.report; -import java.io.File; -import java.io.IOException; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import javax.annotation.Resource; -import javax.servlet.ServletContext; -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.report.CustomReportMPoint; import com.sipai.entity.scada.MPoint; +import com.sipai.entity.user.User; +import com.sipai.service.base.CommonFileService; +import com.sipai.service.report.CustomReportMPointService; +import com.sipai.service.report.ReportEnergyPumpService; +import com.sipai.service.report.ReportWaterBackWashEquipmentService; import com.sipai.service.scada.MPointService; +import com.sipai.service.user.UnitService; +import com.sipai.tools.CommUtil; import net.sf.json.JSONArray; - import net.sf.json.JSONObject; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; -import org.springframework.validation.BindingResult; -import org.springframework.validation.Errors; 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.CommonFile; -import com.sipai.entity.base.Result; -import com.sipai.entity.report.ReportEnergyPump; -import com.sipai.entity.report.CustomReportMPoint; -import com.sipai.entity.report.ReportTemplate; -import com.sipai.entity.report.ReportWaterBackWashEquipment; -import com.sipai.entity.report.TemplateType; -import com.sipai.entity.timeefficiency.PatrolPlan; -import com.sipai.entity.user.Company; -import com.sipai.entity.user.User; -import com.sipai.service.base.CommonFileService; -import com.sipai.service.report.BaseService; -import com.sipai.service.report.ReportEnergyPumpService; -import com.sipai.service.report.CustomReportMPointService; -import com.sipai.service.report.ReportWaterBackWashEquipmentService; -import com.sipai.service.user.UnitService; -import com.sipai.tools.CommUtil; -import com.sipai.tools.FileUtil; -//import com.sipai.tools.JasperHelper; -import com.sipai.tools.SpringContextUtil; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import java.io.IOException; +import java.util.List; @Controller @RequestMapping("/report/customReportMPoint") diff --git a/src/main/java/com/sipai/controller/report/DrainageDataomprehensiveTableConfigureController.java b/src/main/java/com/sipai/controller/report/DrainageDataomprehensiveTableConfigureController.java index 7d3fdec4..ccb502e5 100644 --- a/src/main/java/com/sipai/controller/report/DrainageDataomprehensiveTableConfigureController.java +++ b/src/main/java/com/sipai/controller/report/DrainageDataomprehensiveTableConfigureController.java @@ -1,38 +1,22 @@ package com.sipai.controller.report; -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 net.sf.json.JSON; -import net.sf.json.JSONArray; -import net.sf.json.JSONObject; - -import org.springframework.beans.BeanUtils; +import com.sipai.entity.report.DrainageDataomprehensiveTableConfigure; +import com.sipai.entity.report.DrainageDataomprehensiveTableMainconfigure; +import com.sipai.entity.user.User; +import com.sipai.service.report.DrainageDataomprehensiveTableConfigureService; +import com.sipai.service.report.DrainageDataomprehensiveTableMainconfigureService; +import com.sipai.tools.CommString; +import com.sipai.tools.CommUtil; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; -import org.springframework.validation.Errors; 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.Tree; -import com.sipai.entity.report.DrainageDataomprehensiveTableConfigure; -import com.sipai.entity.report.DrainageDataomprehensiveTableMainconfigure; -import com.sipai.entity.user.Menu; -import com.sipai.entity.user.RoleMenu; -import com.sipai.entity.user.User; -import com.sipai.service.report.DrainageDataomprehensiveTableConfigureService; -import com.sipai.service.report.DrainageDataomprehensiveTableMainconfigureService; -import com.sipai.service.user.MenuService; -import com.sipai.service.user.RoleService; -import com.sipai.tools.CommString; -import com.sipai.tools.CommUtil; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import java.util.List; @Controller diff --git a/src/main/java/com/sipai/controller/report/DrainageDataomprehensiveTableController.java b/src/main/java/com/sipai/controller/report/DrainageDataomprehensiveTableController.java index 36253d25..55875e3e 100644 --- a/src/main/java/com/sipai/controller/report/DrainageDataomprehensiveTableController.java +++ b/src/main/java/com/sipai/controller/report/DrainageDataomprehensiveTableController.java @@ -1,55 +1,20 @@ package com.sipai.controller.report; -import groovy.time.BaseDuration.From; - -import java.io.File; -import java.io.IOException; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import javax.annotation.Resource; -import javax.servlet.ServletContext; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import net.sf.json.JSONArray; - -import org.springframework.stereotype.Controller; -import org.springframework.ui.Model; -import org.springframework.validation.BindingResult; -import org.springframework.validation.Errors; -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.CommonFile; import com.sipai.entity.report.DrainageDataomprehensiveTable; import com.sipai.entity.report.DrainageDataomprehensiveTableMainconfigure; import com.sipai.entity.report.DrainageDataomprehensiveTableMainconfigureDetail; -import com.sipai.entity.report.ReportEnergyPump; -import com.sipai.entity.report.ReportTemplate; -import com.sipai.entity.report.ReportWaterBackWashEquipment; -import com.sipai.entity.report.TemplateType; -import com.sipai.entity.timeefficiency.PatrolPlan; -import com.sipai.entity.user.Company; -import com.sipai.entity.user.User; -import com.sipai.service.base.CommonFileService; -import com.sipai.service.report.BaseService; import com.sipai.service.report.DrainageDataomprehensiveTableMainconfigureDetailService; import com.sipai.service.report.DrainageDataomprehensiveTableMainconfigureService; import com.sipai.service.report.DrainageDataomprehensiveTableService; -import com.sipai.service.report.ReportEnergyPumpService; -import com.sipai.service.report.ReportTemplateService; -import com.sipai.service.report.ReportWaterBackWashEquipmentService; import com.sipai.service.user.UnitService; import com.sipai.tools.CommUtil; -import com.sipai.tools.FileUtil; -//import com.sipai.tools.JasperHelper; -import com.sipai.tools.SpringContextUtil; +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("/report/drainageDataomprehensiveTable") diff --git a/src/main/java/com/sipai/controller/report/DrainageDataomprehensiveTableMainconfigureController.java b/src/main/java/com/sipai/controller/report/DrainageDataomprehensiveTableMainconfigureController.java index fc16276d..442bf60e 100644 --- a/src/main/java/com/sipai/controller/report/DrainageDataomprehensiveTableMainconfigureController.java +++ b/src/main/java/com/sipai/controller/report/DrainageDataomprehensiveTableMainconfigureController.java @@ -1,10 +1,11 @@ package com.sipai.controller.report; -import java.util.List; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; - +import com.sipai.entity.report.DrainageDataomprehensiveTableMainconfigure; +import com.sipai.entity.user.User; +import com.sipai.service.report.DrainageDataomprehensiveTableMainconfigureService; +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; @@ -12,13 +13,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.report.DrainageDataomprehensiveTableMainconfigure; -import com.sipai.entity.user.User; -import com.sipai.service.report.DrainageDataomprehensiveTableMainconfigureService; -import com.sipai.tools.CommUtil; - -import net.sf.json.JSONArray; -import net.sf.json.JSONObject; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import java.util.List; @Controller diff --git a/src/main/java/com/sipai/controller/report/DrainageDataomprehensiveTableMainconfigureDetailController.java b/src/main/java/com/sipai/controller/report/DrainageDataomprehensiveTableMainconfigureDetailController.java index ada355ad..9eb523ec 100644 --- a/src/main/java/com/sipai/controller/report/DrainageDataomprehensiveTableMainconfigureDetailController.java +++ b/src/main/java/com/sipai/controller/report/DrainageDataomprehensiveTableMainconfigureDetailController.java @@ -1,10 +1,11 @@ package com.sipai.controller.report; -import java.util.List; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; - +import com.sipai.entity.report.DrainageDataomprehensiveTableMainconfigureDetail; +import com.sipai.entity.user.User; +import com.sipai.service.report.DrainageDataomprehensiveTableMainconfigureDetailService; +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; @@ -12,13 +13,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.report.DrainageDataomprehensiveTableMainconfigureDetail; -import com.sipai.entity.user.User; -import com.sipai.service.report.DrainageDataomprehensiveTableMainconfigureDetailService; -import com.sipai.tools.CommUtil; - -import net.sf.json.JSONArray; -import net.sf.json.JSONObject; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import java.util.List; @Controller diff --git a/src/main/java/com/sipai/controller/report/OperatingCostAnalysisController.java b/src/main/java/com/sipai/controller/report/OperatingCostAnalysisController.java index 136e5d36..8da81a8f 100644 --- a/src/main/java/com/sipai/controller/report/OperatingCostAnalysisController.java +++ b/src/main/java/com/sipai/controller/report/OperatingCostAnalysisController.java @@ -1,36 +1,22 @@ package com.sipai.controller.report; -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.PageHelper; +import com.github.pagehelper.PageInfo; +import com.sipai.entity.user.Unit; +import com.sipai.entity.user.User; +import com.sipai.service.user.UnitService; +import com.sipai.tools.CommString; 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.validation.Errors; -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.data.CurveMpoint; -import com.sipai.entity.data.DataCurve; -import com.sipai.entity.user.Unit; -import com.sipai.entity.user.User; -import com.sipai.service.data.DataCurveService; -import com.sipai.service.user.UnitService; -import com.sipai.tools.CommString; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpSession; +import java.util.List; @Controller @RequestMapping("/report/operatingCostAnalysis") diff --git a/src/main/java/com/sipai/controller/report/ReportTemplateController.java b/src/main/java/com/sipai/controller/report/ReportTemplateController.java index 559cd515..ed4f8c85 100644 --- a/src/main/java/com/sipai/controller/report/ReportTemplateController.java +++ b/src/main/java/com/sipai/controller/report/ReportTemplateController.java @@ -1,47 +1,30 @@ package com.sipai.controller.report; -import java.io.File; -import java.io.IOException; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import javax.annotation.Resource; -import javax.servlet.ServletContext; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import net.sf.json.JSONArray; - -import org.springframework.stereotype.Controller; -import org.springframework.ui.Model; -import org.springframework.validation.BindingResult; -import org.springframework.validation.Errors; -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.CommonFile; -import com.sipai.entity.report.ReportEnergyPump; import com.sipai.entity.report.ReportTemplate; -import com.sipai.entity.report.ReportWaterBackWashEquipment; -import com.sipai.entity.report.TemplateType; -import com.sipai.entity.timeefficiency.PatrolPlan; import com.sipai.entity.user.Company; import com.sipai.entity.user.User; import com.sipai.service.base.CommonFileService; -import com.sipai.service.report.BaseService; import com.sipai.service.report.ReportEnergyPumpService; import com.sipai.service.report.ReportTemplateService; import com.sipai.service.report.ReportWaterBackWashEquipmentService; import com.sipai.service.user.UnitService; import com.sipai.tools.CommUtil; -import com.sipai.tools.FileUtil; -//import com.sipai.tools.JasperHelper; -import com.sipai.tools.SpringContextUtil; +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 javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.List; @Controller @RequestMapping("/report/reportTemplate") diff --git a/src/main/java/com/sipai/controller/report/RptCollectModeController.java b/src/main/java/com/sipai/controller/report/RptCollectModeController.java index 5857f111..30539830 100644 --- a/src/main/java/com/sipai/controller/report/RptCollectModeController.java +++ b/src/main/java/com/sipai/controller/report/RptCollectModeController.java @@ -9,7 +9,6 @@ import org.springframework.ui.Model; import org.springframework.web.bind.annotation.RequestMapping; import javax.annotation.Resource; -import javax.json.Json; import javax.servlet.http.HttpServletRequest; import java.util.List; diff --git a/src/main/java/com/sipai/controller/report/RptCreateController.java b/src/main/java/com/sipai/controller/report/RptCreateController.java index 8b3ef55b..c11e4d6c 100644 --- a/src/main/java/com/sipai/controller/report/RptCreateController.java +++ b/src/main/java/com/sipai/controller/report/RptCreateController.java @@ -1,116 +1,72 @@ package com.sipai.controller.report; +import com.alibaba.fastjson.JSONException; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; import com.sipai.entity.activiti.ProcessType; import com.sipai.entity.activiti.TodoTask; import com.sipai.entity.activiti.WorkTask; +import com.sipai.entity.base.Result; +import com.sipai.entity.base.Result_Report; import com.sipai.entity.business.BusinessUnit; import com.sipai.entity.business.BusinessUnitAudit; import com.sipai.entity.business.BusinessUnitHandle; import com.sipai.entity.business.BusinessUnitRecord; +import com.sipai.entity.enums.FileNameSpaceEnum; import com.sipai.entity.maintenance.Maintenance; -import com.sipai.entity.process.ProcessAdjustment; -import com.sipai.entity.process.WaterTest; -import com.sipai.entity.report.*; -import com.sipai.entity.workorder.WorkorderDetail; +import com.sipai.entity.report.RptCreate; +import com.sipai.entity.report.RptInfoSet; +import com.sipai.entity.report.RptInfoSetFile; +import com.sipai.entity.report.RptInfoSetSheet; +import com.sipai.entity.user.Company; +import com.sipai.entity.user.User; import com.sipai.service.activiti.WorkflowProcessDefinitionService; import com.sipai.service.activiti.WorkflowService; +import com.sipai.service.base.CommonFileService; import com.sipai.service.business.BusinessUnitAuditService; import com.sipai.service.business.BusinessUnitHandleDetailService; import com.sipai.service.business.BusinessUnitHandleService; - +import com.sipai.service.maintenance.MaintenanceService; import com.sipai.service.report.*; -import com.sipai.tools.*; -import com.sun.scenario.effect.impl.sw.sse.SSEBlend_SRC_OUTPeer; -import io.minio.MinioClient; -import io.minio.errors.ErrorResponseException; -import io.minio.errors.InsufficientDataException; -import io.minio.errors.InternalException; -import io.minio.errors.InvalidArgumentException; -import io.minio.errors.InvalidBucketNameException; -import io.minio.errors.InvalidEndpointException; -import io.minio.errors.InvalidPortException; -import io.minio.errors.InvalidResponseException; -import io.minio.errors.MinioException; -import io.minio.errors.NoResponseException; -import io.minio.errors.RegionConflictException; - -import java.io.ByteArrayInputStream; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.io.Reader; -import java.math.BigDecimal; -import java.security.InvalidKeyException; -import java.security.NoSuchAlgorithmException; -import java.text.DecimalFormat; -import java.text.SimpleDateFormat; -import java.util.*; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; - -import jdk.nashorn.internal.runtime.regexp.JoniRegExp; +import com.sipai.service.scada.MPointService; +import com.sipai.service.scada.TempReportService; +import com.sipai.service.user.UnitService; +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 net.sf.json.JSONObject; - 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.apache.poi.hssf.usermodel.HSSFCell; -import org.apache.poi.hssf.usermodel.HSSFCellStyle; -import org.apache.poi.hssf.usermodel.HSSFDataFormat; -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.Cell; -import org.apache.poi.ss.usermodel.FillPatternType; -import org.apache.poi.ss.usermodel.FormulaEvaluator; -import org.apache.poi.ss.usermodel.IndexedColors; -import org.apache.poi.ss.usermodel.Row; -import org.apache.poi.ss.usermodel.Sheet; import org.apache.poi.xssf.usermodel.XSSFSheet; import org.apache.poi.xssf.usermodel.XSSFWorkbook; -import org.apache.commons.lang3.StringUtils; 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.servlet.ModelAndView; import org.xmlpull.v1.XmlPullParserException; -import com.alibaba.fastjson.JSONException; -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.base.CommonFile; -import com.sipai.entity.base.MinioConfiguration; -import com.sipai.entity.base.Result; -import com.sipai.entity.base.Result_Report; -import com.sipai.entity.enums.FileNameSpaceEnum; -import com.sipai.entity.scada.MPoint; -import com.sipai.entity.scada.TempReport; -import com.sipai.entity.user.Company; -import com.sipai.entity.user.User; -import com.sipai.service.base.CommonFileService; -import com.sipai.service.base.MinioTemplate; -import com.sipai.service.maintenance.MaintenanceService; -import com.sipai.service.scada.MPointService; -import com.sipai.service.scada.TempReportService; -import com.sipai.service.user.UnitService; -import com.sipai.service.user.UserService; +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.security.InvalidKeyException; +import java.security.NoSuchAlgorithmException; +import java.text.SimpleDateFormat; +import java.util.*; /** * 报表生成记录 diff --git a/src/main/java/com/sipai/controller/report/RptInfoSetController.java b/src/main/java/com/sipai/controller/report/RptInfoSetController.java index 5815ddeb..8b807a70 100644 --- a/src/main/java/com/sipai/controller/report/RptInfoSetController.java +++ b/src/main/java/com/sipai/controller/report/RptInfoSetController.java @@ -1,37 +1,31 @@ package com.sipai.controller.report; -import java.io.ByteArrayInputStream; -import java.io.File; -import java.io.InputStream; -import java.text.SimpleDateFormat; -import java.util.*; - -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.activiti.ProcessType; import com.sipai.entity.activiti.TodoTask; -import com.sipai.entity.base.Result_Report; +import com.sipai.entity.base.CommonFile; +import com.sipai.entity.base.Result; import com.sipai.entity.enums.FileNameSpaceEnum; -import com.sipai.entity.report.*; -import com.sipai.entity.user.Unit; +import com.sipai.entity.report.RptCreate; +import com.sipai.entity.report.RptInfoSet; +import com.sipai.entity.report.RptInfoSetFile; +import com.sipai.entity.report.RptInfoSetSheet; +import com.sipai.entity.user.User; import com.sipai.service.activiti.WorkflowService; +import com.sipai.service.base.CommonFileService; import com.sipai.service.company.CompanyService; import com.sipai.service.report.RptCreateService; import com.sipai.service.report.RptInfoSetFileService; +import com.sipai.service.report.RptInfoSetService; import com.sipai.service.report.RptInfoSetSheetService; -import com.sipai.service.user.UserService; - -import com.sipai.tools.CommString; +import com.sipai.service.user.UnitService; +import com.sipai.tools.CommUtil; import net.sf.json.JSONArray; import net.sf.json.JSONObject; - import org.apache.commons.fileupload.servlet.ServletFileUpload; import org.apache.poi.hssf.usermodel.HSSFSheet; import org.apache.poi.hssf.usermodel.HSSFWorkbook; -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.ModelAttribute; @@ -41,17 +35,14 @@ 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.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.base.CommonFileService; -import com.sipai.service.report.RptInfoSetService; -import com.sipai.service.user.UnitService; -import com.sipai.tools.CommUtil; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.ByteArrayInputStream; +import java.io.File; +import java.io.InputStream; +import java.text.SimpleDateFormat; +import java.util.*; /** * 报表信息设置 主表 diff --git a/src/main/java/com/sipai/controller/report/RptInfoSetFileController.java b/src/main/java/com/sipai/controller/report/RptInfoSetFileController.java index cb1c5c11..8dbeadaa 100644 --- a/src/main/java/com/sipai/controller/report/RptInfoSetFileController.java +++ b/src/main/java/com/sipai/controller/report/RptInfoSetFileController.java @@ -1,18 +1,17 @@ package com.sipai.controller.report; -import java.io.ByteArrayInputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.util.List; -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.RptInfoSetFile; +import com.sipai.entity.user.Company; +import com.sipai.entity.user.User; import com.sipai.service.base.CommonFileService; +import com.sipai.service.report.RptInfoSetFileService; +import com.sipai.service.user.UnitService; +import com.sipai.tools.CommUtil; import net.sf.json.JSONArray; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Controller; @@ -21,15 +20,15 @@ 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; -import com.sipai.entity.report.RptInfoSetFile; -import com.sipai.entity.user.Company; -import com.sipai.entity.user.User; -import com.sipai.service.report.RptInfoSetFileService; -import com.sipai.service.user.UnitService; -import com.sipai.tools.CommUtil; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.util.List; @Controller @RequestMapping("/report/rptInfoSetFile") diff --git a/src/main/java/com/sipai/controller/report/RptLogController.java b/src/main/java/com/sipai/controller/report/RptLogController.java index 58c145ec..7136526f 100644 --- a/src/main/java/com/sipai/controller/report/RptLogController.java +++ b/src/main/java/com/sipai/controller/report/RptLogController.java @@ -1,30 +1,25 @@ package com.sipai.controller.report; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import com.sipai.entity.base.Result; +import com.sipai.entity.report.RptCreate; +import com.sipai.entity.report.RptLog; +import com.sipai.entity.user.User; +import com.sipai.service.report.RptCreateService; +import com.sipai.service.report.RptLogService; +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 javax.xml.parsers.ParserConfigurationException; import javax.xml.transform.TransformerException; - -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; -import com.sipai.entity.report.RptCreate; -import com.sipai.service.report.RptCreateService; -import net.sf.json.JSONArray; -import net.sf.json.JSONObject; -import org.apache.ibatis.jdbc.Null; -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.Result; -import com.sipai.entity.report.RptLog; -import com.sipai.entity.user.User; -import com.sipai.service.report.RptLogService; -import com.sipai.tools.CommUtil; - import java.io.IOException; import java.util.List; diff --git a/src/main/java/com/sipai/controller/report/RptMpSetController.java b/src/main/java/com/sipai/controller/report/RptMpSetController.java index db9b0ce2..34b98ec7 100644 --- a/src/main/java/com/sipai/controller/report/RptMpSetController.java +++ b/src/main/java/com/sipai/controller/report/RptMpSetController.java @@ -1,16 +1,17 @@ package com.sipai.controller.report; -import java.util.List; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; - -import com.sipai.entity.report.RptSpSet; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import com.sipai.entity.base.Result; +import com.sipai.entity.report.RptMpSet; import com.sipai.entity.scada.MPoint; +import com.sipai.entity.user.User; +import com.sipai.service.report.RptMpSetService; import com.sipai.service.scada.MPointService; +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; @@ -18,16 +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.Result; -import com.sipai.entity.report.RptDayValSet; -import com.sipai.entity.report.RptMpSet; -import com.sipai.entity.user.Company; -import com.sipai.entity.user.User; -import com.sipai.service.report.RptMpSetService; -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("/report/rptMpSet") diff --git a/src/main/java/com/sipai/controller/report/RptSpSetController.java b/src/main/java/com/sipai/controller/report/RptSpSetController.java index f6f22219..ee5edb10 100644 --- a/src/main/java/com/sipai/controller/report/RptSpSetController.java +++ b/src/main/java/com/sipai/controller/report/RptSpSetController.java @@ -1,32 +1,24 @@ package com.sipai.controller.report; -import java.io.ByteArrayInputStream; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileNotFoundException; -import java.io.IOException; -import java.io.InputStream; -import java.security.InvalidKeyException; -import java.security.NoSuchAlgorithmException; -import java.util.List; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; - -import com.sipai.entity.enums.SourceTypeEnum; -import com.sipai.entity.report.*; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import com.sipai.entity.base.Result; +import com.sipai.entity.report.RptInfoSetFile; +import com.sipai.entity.report.RptSpSet; +import com.sipai.entity.user.User; +import com.sipai.service.base.CommonFileService; +import com.sipai.service.report.RptInfoSetFileService; +import com.sipai.service.report.RptSpSetService; +import com.sipai.service.user.UnitService; +import com.sipai.tools.CommUtil; 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.commons.lang3.StringUtils; -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.xssf.usermodel.XSSFSheet; -import org.apache.poi.xssf.usermodel.XSSFWorkbook; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; @@ -34,23 +26,18 @@ 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.CommonFile; -import com.sipai.entity.base.Result; -import com.sipai.entity.base.Result_Report; -import com.sipai.entity.enums.FileNameSpaceEnum; -import com.sipai.entity.process.ProcessAdjustmentType; -import com.sipai.entity.user.Company; -import com.sipai.entity.user.User; -import com.sipai.service.base.CommonFileService; -import com.sipai.service.report.RptInfoSetFileService; -import com.sipai.service.report.RptSpSetService; -import com.sipai.service.user.UnitService; -import com.sipai.tools.CommUtil; import org.xmlpull.v1.XmlPullParserException; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import java.io.ByteArrayInputStream; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.io.InputStream; +import java.security.InvalidKeyException; +import java.security.NoSuchAlgorithmException; +import java.util.List; + @Controller @RequestMapping("/report/rptSpSet") public class RptSpSetController { diff --git a/src/main/java/com/sipai/controller/report/RptTypeSetController.java b/src/main/java/com/sipai/controller/report/RptTypeSetController.java index bf280ae1..491d61eb 100644 --- a/src/main/java/com/sipai/controller/report/RptTypeSetController.java +++ b/src/main/java/com/sipai/controller/report/RptTypeSetController.java @@ -1,19 +1,5 @@ package com.sipai.controller.report; -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.report.RptTypeSetService; 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("/report/rptTypeSet") diff --git a/src/main/java/com/sipai/controller/report/TemplateTypeController.java b/src/main/java/com/sipai/controller/report/TemplateTypeController.java index 2159c665..7e6e9d4f 100644 --- a/src/main/java/com/sipai/controller/report/TemplateTypeController.java +++ b/src/main/java/com/sipai/controller/report/TemplateTypeController.java @@ -1,13 +1,13 @@ package com.sipai.controller.report; -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.report.TemplateType; +import com.sipai.entity.user.User; +import com.sipai.service.report.TemplateTypeService; +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.report.TemplateType; -import com.sipai.entity.sparepart.SparePartCommString; -import com.sipai.entity.sparepart.Warehouse; -import com.sipai.entity.user.User; -import com.sipai.service.report.TemplateTypeService; -import com.sipai.tools.CommUtil; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import java.util.List; @Controller @RequestMapping("/report/templateType") diff --git a/src/main/java/com/sipai/controller/robot/Ro2Controller.java b/src/main/java/com/sipai/controller/robot/Ro2Controller.java index c3a48331..ea8cdc86 100644 --- a/src/main/java/com/sipai/controller/robot/Ro2Controller.java +++ b/src/main/java/com/sipai/controller/robot/Ro2Controller.java @@ -2,7 +2,6 @@ package com.sipai.controller.robot; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import com.sipai.entity.base.Result; import org.apache.commons.httpclient.DefaultHttpMethodRetryHandler; import org.apache.commons.httpclient.HttpClient; import org.apache.commons.httpclient.HttpStatus; diff --git a/src/main/java/com/sipai/controller/robot/RobotController.java b/src/main/java/com/sipai/controller/robot/RobotController.java index 44ff727d..f9911550 100644 --- a/src/main/java/com/sipai/controller/robot/RobotController.java +++ b/src/main/java/com/sipai/controller/robot/RobotController.java @@ -4,18 +4,15 @@ package com.sipai.controller.robot; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import com.sipai.tools.CommString; import com.sipai.tools.HttpUtil; import org.apache.commons.httpclient.DefaultHttpMethodRetryHandler; import org.apache.commons.httpclient.HttpClient; import org.apache.commons.httpclient.HttpStatus; import org.apache.commons.httpclient.methods.GetMethod; import org.apache.commons.httpclient.params.HttpMethodParams; -import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.ui.Model; -import org.springframework.web.HttpRequestHandler; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; diff --git a/src/main/java/com/sipai/controller/safety/SafetyCertificateController.java b/src/main/java/com/sipai/controller/safety/SafetyCertificateController.java index 1d4647aa..8dfbcf4d 100644 --- a/src/main/java/com/sipai/controller/safety/SafetyCertificateController.java +++ b/src/main/java/com/sipai/controller/safety/SafetyCertificateController.java @@ -12,7 +12,6 @@ import com.github.pagehelper.PageInfo; import com.sipai.entity.base.Result; import com.sipai.entity.enums.safety.SafetyFunctionEnum; import com.sipai.entity.safety.SafetyCertificate; -import com.sipai.entity.safety.SafetyFiles; import com.sipai.entity.safety.SafetyInternalCertificateExcel; import com.sipai.entity.safety.SafetyInternalCertificateVo; import com.sipai.entity.user.Company; diff --git a/src/main/java/com/sipai/controller/safety/SafetyEducationTraineeController.java b/src/main/java/com/sipai/controller/safety/SafetyEducationTraineeController.java index b7b63ea3..3e8685cb 100644 --- a/src/main/java/com/sipai/controller/safety/SafetyEducationTraineeController.java +++ b/src/main/java/com/sipai/controller/safety/SafetyEducationTraineeController.java @@ -3,9 +3,10 @@ package com.sipai.controller.safety; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.sipai.entity.base.Result; -import com.sipai.entity.enums.safety.SafetyEducationTypeEnum; import com.sipai.entity.enums.safety.SafetyFunctionEnum; -import com.sipai.entity.safety.*; +import com.sipai.entity.safety.SafetyEducationTrainee; +import com.sipai.entity.safety.SafetyEducationTraineeQuery; +import com.sipai.entity.safety.SafetyFiles; import com.sipai.entity.user.Unit; import com.sipai.service.safety.SafetyEducationTraineeService; import com.sipai.service.safety.SafetyFilesService; diff --git a/src/main/java/com/sipai/controller/safety/SafetyExternalCertificateController.java b/src/main/java/com/sipai/controller/safety/SafetyExternalCertificateController.java index 9bf78801..92dc3f63 100644 --- a/src/main/java/com/sipai/controller/safety/SafetyExternalCertificateController.java +++ b/src/main/java/com/sipai/controller/safety/SafetyExternalCertificateController.java @@ -10,7 +10,10 @@ import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.sipai.entity.base.Result; import com.sipai.entity.enums.safety.SafetyFunctionEnum; -import com.sipai.entity.safety.*; +import com.sipai.entity.safety.SafetyCertificate; +import com.sipai.entity.safety.SafetyExternalCertificateExcel; +import com.sipai.entity.safety.SafetyExternalCertificateVo; +import com.sipai.entity.safety.SafetyExternalStaff; import com.sipai.entity.user.Company; import com.sipai.entity.user.Unit; import com.sipai.entity.user.User; diff --git a/src/main/java/com/sipai/controller/safety/SafetyFilesController.java b/src/main/java/com/sipai/controller/safety/SafetyFilesController.java index e95fcfb8..358c1c0a 100644 --- a/src/main/java/com/sipai/controller/safety/SafetyFilesController.java +++ b/src/main/java/com/sipai/controller/safety/SafetyFilesController.java @@ -16,12 +16,8 @@ import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.io.BufferedOutputStream; -import java.io.FileInputStream; import java.io.IOException; -import java.io.OutputStream; import java.util.List; -import java.util.UUID; @Controller @RequestMapping("/safety/SafetyFiles") diff --git a/src/main/java/com/sipai/controller/safety/SafetyJobOutsideController.java b/src/main/java/com/sipai/controller/safety/SafetyJobOutsideController.java index 8283924c..0c3ee64b 100644 --- a/src/main/java/com/sipai/controller/safety/SafetyJobOutsideController.java +++ b/src/main/java/com/sipai/controller/safety/SafetyJobOutsideController.java @@ -5,8 +5,13 @@ import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.sipai.entity.base.Result; import com.sipai.entity.enums.EnumJsonObject; -import com.sipai.entity.enums.safety.*; -import com.sipai.entity.safety.*; +import com.sipai.entity.enums.safety.SafetyEducationTypeEnum; +import com.sipai.entity.enums.safety.SafetyFunctionEnum; +import com.sipai.entity.enums.safety.SafetyJobTypeEnum; +import com.sipai.entity.enums.safety.SafetyOutsiderJobStatusEnum; +import com.sipai.entity.safety.SafetyJobCommonQuery; +import com.sipai.entity.safety.SafetyJobOutside; +import com.sipai.entity.safety.SafetyJobOutsideVo; import com.sipai.entity.user.User; import com.sipai.service.safety.*; import com.sipai.tools.DateUtil; diff --git a/src/main/java/com/sipai/controller/schedule/ScheduleJobController.java b/src/main/java/com/sipai/controller/schedule/ScheduleJobController.java index b4dd7d35..be580e4b 100644 --- a/src/main/java/com/sipai/controller/schedule/ScheduleJobController.java +++ b/src/main/java/com/sipai/controller/schedule/ScheduleJobController.java @@ -1,26 +1,23 @@ package com.sipai.controller.schedule; -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.apache.commons.lang.StringUtils; -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.schedule.ScheduleJob; import com.sipai.entity.user.User; import com.sipai.service.schedule.ScheduleJobService; import com.sipai.tools.CommUtil; +import net.sf.json.JSONArray; +import net.sf.json.JSONObject; +import org.apache.commons.lang.StringUtils; +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 diff --git a/src/main/java/com/sipai/controller/schedule/ScheduleJobDetailController.java b/src/main/java/com/sipai/controller/schedule/ScheduleJobDetailController.java index 5a8465f5..0ef16d17 100644 --- a/src/main/java/com/sipai/controller/schedule/ScheduleJobDetailController.java +++ b/src/main/java/com/sipai/controller/schedule/ScheduleJobDetailController.java @@ -1,19 +1,5 @@ package com.sipai.controller.schedule; -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.schedule.ScheduleJobDetail; @@ -22,6 +8,16 @@ import com.sipai.entity.user.User; import com.sipai.service.schedule.ScheduleJobDetailService; import com.sipai.service.schedule.ScheduleJobTypeService; 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("/schedule/scheduleJobDetail") diff --git a/src/main/java/com/sipai/controller/schedule/ScheduleJobTypeController.java b/src/main/java/com/sipai/controller/schedule/ScheduleJobTypeController.java index a8c19bea..1fcff658 100644 --- a/src/main/java/com/sipai/controller/schedule/ScheduleJobTypeController.java +++ b/src/main/java/com/sipai/controller/schedule/ScheduleJobTypeController.java @@ -1,25 +1,22 @@ package com.sipai.controller.schedule; -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 com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.sipai.entity.schedule.ScheduleJobType; import com.sipai.entity.user.User; import com.sipai.service.schedule.ScheduleJobTypeService; 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("/schedule/scheduleJobType") diff --git a/src/main/java/com/sipai/controller/schedule/XxlJobController.java b/src/main/java/com/sipai/controller/schedule/XxlJobController.java index 0c3cc6fd..4737b207 100644 --- a/src/main/java/com/sipai/controller/schedule/XxlJobController.java +++ b/src/main/java/com/sipai/controller/schedule/XxlJobController.java @@ -1,23 +1,10 @@ package com.sipai.controller.schedule; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; -import com.sipai.entity.schedule.ScheduleJob; -import com.sipai.entity.user.User; -import com.sipai.service.schedule.ScheduleJobService; -import com.sipai.tools.CommUtil; -import net.sf.json.JSONArray; -import net.sf.json.JSONObject; -import org.apache.commons.lang.StringUtils; 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 diff --git a/src/main/java/com/sipai/controller/sparepart/ApplyPurchasePlanController.java b/src/main/java/com/sipai/controller/sparepart/ApplyPurchasePlanController.java index 3d016b23..2dcce896 100644 --- a/src/main/java/com/sipai/controller/sparepart/ApplyPurchasePlanController.java +++ b/src/main/java/com/sipai/controller/sparepart/ApplyPurchasePlanController.java @@ -1,8 +1,11 @@ package com.sipai.controller.sparepart; -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.sparepart.ApplyPurchasePlan; +import com.sipai.entity.user.User; +import com.sipai.service.sparepart.ApplyPurchasePlanService; +import com.sipai.tools.CommUtil; import net.sf.json.JSONArray; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; @@ -10,12 +13,10 @@ 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.sparepart.ApplyPurchasePlan; -import com.sipai.entity.user.User; -import com.sipai.service.sparepart.ApplyPurchasePlanService; -import com.sipai.tools.CommUtil; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import java.util.List; @Controller @RequestMapping("/sparepart/applyPurchasePlan") diff --git a/src/main/java/com/sipai/controller/sparepart/ChannelsController.java b/src/main/java/com/sipai/controller/sparepart/ChannelsController.java index 7c387226..0afcf67e 100644 --- a/src/main/java/com/sipai/controller/sparepart/ChannelsController.java +++ b/src/main/java/com/sipai/controller/sparepart/ChannelsController.java @@ -1,28 +1,17 @@ package com.sipai.controller.sparepart; -import java.io.IOException; -import java.io.OutputStream; -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.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import com.sipai.entity.sparepart.Channels; +import com.sipai.entity.user.User; +import com.sipai.service.sparepart.ChannelsService; +import com.sipai.tools.CommUtil; import net.sf.json.JSONArray; import net.sf.json.JSONObject; - -import org.apache.poi.hssf.usermodel.HSSFCell; -import org.apache.poi.hssf.usermodel.HSSFRichTextString; -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.hssf.usermodel.*; +import org.apache.poi.ss.usermodel.CellStyle; +import org.apache.poi.ss.usermodel.DateUtil; +import org.apache.poi.ss.usermodel.Font; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.ModelAttribute; @@ -32,17 +21,16 @@ import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartRequest; import org.springframework.web.servlet.ModelAndView; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; -import com.sipai.entity.sparepart.Channels; -import com.sipai.entity.sparepart.ContractClass; -import com.sipai.entity.user.Company; -import com.sipai.entity.user.Unit; -import com.sipai.entity.user.User; -import com.sipai.service.sparepart.ChannelsService; -import com.sipai.tools.CommUtil; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.io.OutputStream; +import java.net.URLEncoder; +import java.text.SimpleDateFormat; +import java.util.*; -import static org.apache.poi.ss.usermodel.CellType.*; +import static org.apache.poi.ss.usermodel.CellType.STRING; @Controller @RequestMapping("/sparepart/channels") diff --git a/src/main/java/com/sipai/controller/sparepart/ConsumeDetailController.java b/src/main/java/com/sipai/controller/sparepart/ConsumeDetailController.java index 2fce7992..2ffd2ea5 100644 --- a/src/main/java/com/sipai/controller/sparepart/ConsumeDetailController.java +++ b/src/main/java/com/sipai/controller/sparepart/ConsumeDetailController.java @@ -1,29 +1,8 @@ package com.sipai.controller.sparepart; -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.List; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; - -import net.sf.json.JSONArray; - -import org.apache.ibatis.scripting.xmltags.WhereSqlNode; -import org.springframework.stereotype.Controller; -import org.springframework.ui.Model; -import org.springframework.validation.BindingResult; -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.itextpdf.text.pdf.PdfStructTreeController.returnType; import com.sipai.entity.sparepart.ConsumeDetail; - - import com.sipai.entity.sparepart.Goods; import com.sipai.entity.user.User; import com.sipai.entity.workorder.WorkorderConsume; @@ -32,6 +11,17 @@ import com.sipai.service.sparepart.GoodsService; import com.sipai.service.sparepart.OutStockRecordDetailService; import com.sipai.service.workorder.WorkorderConsumeService; 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.math.BigDecimal; +import java.util.List; @Controller @RequestMapping("/sparepart/consumeDetail") diff --git a/src/main/java/com/sipai/controller/sparepart/ContractClassController.java b/src/main/java/com/sipai/controller/sparepart/ContractClassController.java index 689ced85..0ae32818 100644 --- a/src/main/java/com/sipai/controller/sparepart/ContractClassController.java +++ b/src/main/java/com/sipai/controller/sparepart/ContractClassController.java @@ -1,13 +1,12 @@ package com.sipai.controller.sparepart; -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.sparepart.ContractClass; +import com.sipai.entity.user.User; +import com.sipai.service.sparepart.ContractClassService; +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,15 +14,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.sparepart.ContractClass; -import com.sipai.entity.sparepart.ContractClass; -import com.sipai.entity.sparepart.GoodsClass; -import com.sipai.entity.user.Company; -import com.sipai.entity.user.User; -import com.sipai.service.sparepart.ContractClassService; -import com.sipai.tools.CommUtil; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import java.util.List; @Controller @RequestMapping("/sparepart/contractClass") diff --git a/src/main/java/com/sipai/controller/sparepart/ContractController.java b/src/main/java/com/sipai/controller/sparepart/ContractController.java index 478e5423..22b3b09c 100644 --- a/src/main/java/com/sipai/controller/sparepart/ContractController.java +++ b/src/main/java/com/sipai/controller/sparepart/ContractController.java @@ -1,24 +1,28 @@ package com.sipai.controller.sparepart; -import java.math.BigDecimal; -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 com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import com.sipai.entity.activiti.WorkTask; +import com.sipai.entity.business.*; +import com.sipai.entity.sparepart.*; +import com.sipai.entity.user.Company; +import com.sipai.entity.user.Dept; +import com.sipai.entity.user.User; +import com.sipai.service.activiti.WorkflowProcessDefinitionService; +import com.sipai.service.activiti.WorkflowService; +import com.sipai.service.business.BusinessUnitAuditService; +import com.sipai.service.business.BusinessUnitDeptApplyService; +import com.sipai.service.business.BusinessUnitHandleService; +import com.sipai.service.business.BusinessUnitInquiryService; +import com.sipai.service.sparepart.*; +import com.sipai.service.user.UnitService; +import com.sipai.service.user.UserService; +import com.sipai.tools.ActivitiUtil; +import com.sipai.tools.CommString; +import com.sipai.tools.CommUtil; +import com.sipai.tools.SpringContextUtil; import net.sf.json.JSONArray; import net.sf.json.JSONObject; -import net.sf.json.JsonConfig; - import org.activiti.engine.RuntimeService; import org.activiti.engine.TaskService; import org.activiti.engine.history.HistoricTaskInstance; @@ -32,56 +36,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.activiti.WorkTask; -import com.sipai.entity.business.BusinessUnit; -import com.sipai.entity.business.BusinessUnitAudit; -import com.sipai.entity.business.BusinessUnitDeptApply; -import com.sipai.entity.business.BusinessUnitHandle; -import com.sipai.entity.business.BusinessUnitHandleDetail; -import com.sipai.entity.business.BusinessUnitInquiry; -import com.sipai.entity.business.BusinessUnitRecord; -import com.sipai.entity.equipment.EquipmentCard; -import com.sipai.entity.equipment.SpecialEquipment; -import com.sipai.entity.maintenance.Maintenance; -import com.sipai.entity.maintenance.MaintenanceDetail; -import com.sipai.entity.sparepart.Channels; -import com.sipai.entity.sparepart.ContractClass; -import com.sipai.entity.sparepart.Goods; -import com.sipai.entity.sparepart.PurchaseDetail; -import com.sipai.entity.sparepart.PurchasePlan; -import com.sipai.entity.sparepart.PurchaseRecordDetail; -import com.sipai.entity.sparepart.SparePartCommString; -import com.sipai.entity.sparepart.Contract; -import com.sipai.entity.sparepart.ContractDetail; -import com.sipai.entity.sparepart.Contract; -import com.sipai.entity.sparepart.Subscribe; -import com.sipai.entity.timeefficiency.PatrolPlanPatrolEquipment; -import com.sipai.entity.user.Company; -import com.sipai.entity.user.Dept; -import com.sipai.entity.user.User; -import com.sipai.service.activiti.WorkflowProcessDefinitionService; -import com.sipai.service.activiti.WorkflowService; -import com.sipai.service.business.BusinessUnitAuditService; -import com.sipai.service.business.BusinessUnitDeptApplyService; -import com.sipai.service.business.BusinessUnitHandleService; -import com.sipai.service.business.BusinessUnitInquiryService; -import com.sipai.service.sparepart.ChannelsService; -import com.sipai.service.sparepart.ContractClassService; -import com.sipai.service.sparepart.GoodsService; -import com.sipai.service.sparepart.PurchaseDetailService; -import com.sipai.service.sparepart.PurchasePlanService; -import com.sipai.service.sparepart.PurchaseRecordDetailService; -import com.sipai.service.sparepart.ContractDetailService; -import com.sipai.service.sparepart.ContractService; -import com.sipai.service.sparepart.SubscribeService; -import com.sipai.service.user.UnitService; -import com.sipai.service.user.UserService; -import com.sipai.tools.ActivitiUtil; -import com.sipai.tools.CommString; -import com.sipai.tools.CommUtil; -import com.sipai.tools.SpringContextUtil; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import java.text.SimpleDateFormat; +import java.util.*; @Controller @RequestMapping("/sparepart/contract") diff --git a/src/main/java/com/sipai/controller/sparepart/ContractDetailInvoiceController.java b/src/main/java/com/sipai/controller/sparepart/ContractDetailInvoiceController.java index 3c755992..0a7774ca 100644 --- a/src/main/java/com/sipai/controller/sparepart/ContractDetailInvoiceController.java +++ b/src/main/java/com/sipai/controller/sparepart/ContractDetailInvoiceController.java @@ -1,14 +1,14 @@ package com.sipai.controller.sparepart; -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.sparepart.ContractDetailInvoice; +import com.sipai.entity.user.User; +import com.sipai.service.sparepart.ContractDetailInvoiceService; +import com.sipai.service.sparepart.ContractService; +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,16 +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.sparepart.Contract; -import com.sipai.entity.sparepart.ContractDetailInvoice; -import com.sipai.entity.sparepart.ContractDetailPayment; -import com.sipai.entity.user.Company; -import com.sipai.entity.user.User; -import com.sipai.service.sparepart.ContractDetailInvoiceService; -import com.sipai.service.sparepart.ContractService; -import com.sipai.tools.CommUtil; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import java.math.BigDecimal; +import java.util.List; @Controller @RequestMapping("/sparepart/contractDetailInvoice") diff --git a/src/main/java/com/sipai/controller/sparepart/ContractDetailPaymentController.java b/src/main/java/com/sipai/controller/sparepart/ContractDetailPaymentController.java index 0f9610b5..eab86109 100644 --- a/src/main/java/com/sipai/controller/sparepart/ContractDetailPaymentController.java +++ b/src/main/java/com/sipai/controller/sparepart/ContractDetailPaymentController.java @@ -1,14 +1,14 @@ package com.sipai.controller.sparepart; -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.sparepart.Contract; +import com.sipai.entity.sparepart.ContractDetailPayment; +import com.sipai.entity.user.User; +import com.sipai.service.sparepart.ContractDetailPaymentService; +import com.sipai.service.sparepart.ContractService; +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,15 +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.sparepart.Contract; -import com.sipai.entity.sparepart.ContractDetailPayment; -import com.sipai.entity.user.Company; -import com.sipai.entity.user.User; -import com.sipai.service.sparepart.ContractDetailPaymentService; -import com.sipai.service.sparepart.ContractService; -import com.sipai.tools.CommUtil; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import java.math.BigDecimal; +import java.util.List; @Controller @RequestMapping("/sparepart/contractDetailPayment") diff --git a/src/main/java/com/sipai/controller/sparepart/ContractTaxRateController.java b/src/main/java/com/sipai/controller/sparepart/ContractTaxRateController.java index 86e60a76..ee67c97e 100644 --- a/src/main/java/com/sipai/controller/sparepart/ContractTaxRateController.java +++ b/src/main/java/com/sipai/controller/sparepart/ContractTaxRateController.java @@ -1,13 +1,13 @@ package com.sipai.controller.sparepart; -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.sparepart.ContractTaxRate; +import com.sipai.entity.user.User; +import com.sipai.service.sparepart.ContractTaxRateService; +import com.sipai.tools.CommUtil; import net.sf.json.JSONArray; import net.sf.json.JSONObject; - import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; @@ -16,13 +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.sparepart.ContractTaxRate; -import com.sipai.entity.user.Company; -import com.sipai.entity.user.User; -import com.sipai.service.sparepart.ContractTaxRateService; -import com.sipai.tools.CommUtil; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import java.util.List; @Controller @RequestMapping("/sparepart/contractTaxRate") diff --git a/src/main/java/com/sipai/controller/sparepart/GoodsClassController.java b/src/main/java/com/sipai/controller/sparepart/GoodsClassController.java index 62134639..be4848b1 100644 --- a/src/main/java/com/sipai/controller/sparepart/GoodsClassController.java +++ b/src/main/java/com/sipai/controller/sparepart/GoodsClassController.java @@ -1,12 +1,12 @@ package com.sipai.controller.sparepart; -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.sparepart.GoodsClass; +import com.sipai.entity.user.User; +import com.sipai.service.sparepart.GoodsClassService; +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,14 +14,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.sparepart.Goods; -import com.sipai.entity.sparepart.GoodsClass; -import com.sipai.entity.user.User; -import com.sipai.service.sparepart.GoodsClassService; -import com.sipai.service.sparepart.GoodsService; -import com.sipai.tools.CommUtil; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import java.util.List; @Controller @RequestMapping("/sparepart/goodsClass") diff --git a/src/main/java/com/sipai/controller/sparepart/GoodsController.java b/src/main/java/com/sipai/controller/sparepart/GoodsController.java index 9d778f8c..345acce6 100644 --- a/src/main/java/com/sipai/controller/sparepart/GoodsController.java +++ b/src/main/java/com/sipai/controller/sparepart/GoodsController.java @@ -1,21 +1,15 @@ package com.sipai.controller.sparepart; -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.Calendar; -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 com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; import com.sipai.entity.sparepart.*; +import com.sipai.entity.user.Unit; +import com.sipai.entity.user.User; import com.sipai.service.sparepart.*; +import com.sipai.service.user.UnitService; +import com.sipai.tools.CommUtil; import net.sf.json.JSONArray; import net.sf.json.JSONObject; - import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; @@ -24,12 +18,12 @@ 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.user.Unit; -import com.sipai.entity.user.User; -import com.sipai.service.user.UnitService; -import com.sipai.tools.CommUtil; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.List; @Controller @RequestMapping("/sparepart/goods") diff --git a/src/main/java/com/sipai/controller/sparepart/GoodsReserveController.java b/src/main/java/com/sipai/controller/sparepart/GoodsReserveController.java index 8f2065aa..c28fd998 100644 --- a/src/main/java/com/sipai/controller/sparepart/GoodsReserveController.java +++ b/src/main/java/com/sipai/controller/sparepart/GoodsReserveController.java @@ -2,16 +2,13 @@ package com.sipai.controller.sparepart; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; -import com.sipai.entity.sparepart.*; +import com.sipai.entity.sparepart.GoodsReserve; import com.sipai.entity.user.Company; -import com.sipai.entity.user.Unit; import com.sipai.entity.user.User; import com.sipai.service.company.CompanyService; -import com.sipai.service.sparepart.*; -import com.sipai.service.user.UnitService; +import com.sipai.service.sparepart.GoodsReserveService; 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; @@ -21,9 +18,6 @@ import org.springframework.web.servlet.ModelAndView; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.Calendar; import java.util.List; @Controller diff --git a/src/main/java/com/sipai/controller/sparepart/InStockRecordController.java b/src/main/java/com/sipai/controller/sparepart/InStockRecordController.java index bbd195d8..b54a3860 100644 --- a/src/main/java/com/sipai/controller/sparepart/InStockRecordController.java +++ b/src/main/java/com/sipai/controller/sparepart/InStockRecordController.java @@ -1,40 +1,5 @@ package com.sipai.controller.sparepart; -import java.math.BigDecimal; -import java.text.SimpleDateFormat; -import java.time.LocalDateTime; -import java.util.*; -import java.util.concurrent.CompletableFuture; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; -import java.util.concurrent.ThreadPoolExecutor; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; - -import com.sipai.entity.sparepart.*; -import com.sipai.service.sparepart.*; -import com.sipai.tools.ThreadPoolUpdateMoney; -import net.sf.json.JSONArray; -import net.sf.json.JSONObject; - -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.apache.commons.lang3.StringUtils; -import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; -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.bind.annotation.RestController; -import org.springframework.web.context.request.async.DeferredResult; -import org.springframework.web.servlet.ModelAndView; - import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.sipai.entity.activiti.WorkTask; @@ -42,17 +7,42 @@ import com.sipai.entity.business.BusinessUnit; import com.sipai.entity.business.BusinessUnitAudit; import com.sipai.entity.business.BusinessUnitHandle; import com.sipai.entity.business.BusinessUnitRecord; +import com.sipai.entity.sparepart.*; import com.sipai.entity.user.Company; import com.sipai.entity.user.User; import com.sipai.service.activiti.WorkflowProcessDefinitionService; import com.sipai.service.activiti.WorkflowService; import com.sipai.service.business.BusinessUnitAuditService; import com.sipai.service.business.BusinessUnitHandleService; +import com.sipai.service.sparepart.*; import com.sipai.service.user.UnitService; 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 net.sf.json.JSONObject; +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.apache.commons.lang3.StringUtils; +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.math.BigDecimal; +import java.text.SimpleDateFormat; +import java.util.*; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.Executors; @Controller @RequestMapping("/sparepart/inStockRecord") diff --git a/src/main/java/com/sipai/controller/sparepart/OutStockRecordController.java b/src/main/java/com/sipai/controller/sparepart/OutStockRecordController.java index b8601f17..941c018d 100644 --- a/src/main/java/com/sipai/controller/sparepart/OutStockRecordController.java +++ b/src/main/java/com/sipai/controller/sparepart/OutStockRecordController.java @@ -1,26 +1,29 @@ package com.sipai.controller.sparepart; -import java.math.BigDecimal; -import java.math.RoundingMode; -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 com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import com.sipai.entity.activiti.WorkTask; +import com.sipai.entity.business.BusinessUnit; +import com.sipai.entity.business.BusinessUnitAudit; +import com.sipai.entity.business.BusinessUnitHandle; +import com.sipai.entity.business.BusinessUnitRecord; +import com.sipai.entity.equipment.EquipmentCard; import com.sipai.entity.sparepart.*; +import com.sipai.entity.user.Company; +import com.sipai.entity.user.User; +import com.sipai.service.activiti.WorkflowProcessDefinitionService; +import com.sipai.service.activiti.WorkflowService; +import com.sipai.service.business.BusinessUnitAuditService; +import com.sipai.service.business.BusinessUnitHandleService; +import com.sipai.service.equipment.EquipmentCardService; import com.sipai.service.sparepart.*; +import com.sipai.service.user.UnitService; +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 net.sf.json.JSONObject; - import org.activiti.engine.RuntimeService; import org.activiti.engine.TaskService; import org.activiti.engine.history.HistoricTaskInstance; @@ -31,35 +34,17 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Controller; import org.springframework.transaction.annotation.Transactional; import org.springframework.ui.Model; -import org.springframework.validation.BindingResult; -import org.springframework.validation.Errors; 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.itextpdf.text.pdf.PdfStructTreeController.returnType; -import com.sipai.entity.activiti.WorkTask; -import com.sipai.entity.business.BusinessUnit; -import com.sipai.entity.business.BusinessUnitAudit; -import com.sipai.entity.business.BusinessUnitHandle; -import com.sipai.entity.business.BusinessUnitRecord; -import com.sipai.entity.equipment.EquipmentCard; -import com.sipai.entity.timeefficiency.PatrolArea; -import com.sipai.entity.user.Company; -import com.sipai.entity.user.User; -import com.sipai.service.activiti.WorkflowProcessDefinitionService; -import com.sipai.service.activiti.WorkflowService; -import com.sipai.service.business.BusinessUnitAuditService; -import com.sipai.service.business.BusinessUnitHandleService; -import com.sipai.service.equipment.EquipmentCardService; -import com.sipai.service.user.UnitService; -import com.sipai.service.user.UserService; -import com.sipai.tools.ActivitiUtil; -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.math.RoundingMode; +import java.text.SimpleDateFormat; +import java.util.*; @Controller @RequestMapping("/sparepart/outStockRecord") diff --git a/src/main/java/com/sipai/controller/sparepart/OutStockRecordSectionController.java b/src/main/java/com/sipai/controller/sparepart/OutStockRecordSectionController.java index 8c92f38a..4c3f1409 100644 --- a/src/main/java/com/sipai/controller/sparepart/OutStockRecordSectionController.java +++ b/src/main/java/com/sipai/controller/sparepart/OutStockRecordSectionController.java @@ -1,24 +1,29 @@ package com.sipai.controller.sparepart; -import java.math.BigDecimal; -import java.math.RoundingMode; -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 com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import com.sipai.entity.activiti.WorkTask; +import com.sipai.entity.business.BusinessUnit; +import com.sipai.entity.business.BusinessUnitAudit; +import com.sipai.entity.business.BusinessUnitHandle; +import com.sipai.entity.business.BusinessUnitRecord; +import com.sipai.entity.equipment.EquipmentCard; +import com.sipai.entity.sparepart.*; +import com.sipai.entity.user.Company; +import com.sipai.entity.user.User; +import com.sipai.service.activiti.WorkflowProcessDefinitionService; +import com.sipai.service.activiti.WorkflowService; +import com.sipai.service.business.BusinessUnitAuditService; +import com.sipai.service.business.BusinessUnitHandleService; +import com.sipai.service.equipment.EquipmentCardService; +import com.sipai.service.sparepart.*; +import com.sipai.service.user.UnitService; +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 net.sf.json.JSONObject; - import org.activiti.engine.RuntimeService; import org.activiti.engine.TaskService; import org.activiti.engine.history.HistoricTaskInstance; @@ -28,56 +33,17 @@ import org.activiti.engine.task.Task; import org.springframework.stereotype.Controller; import org.springframework.transaction.annotation.Transactional; import org.springframework.ui.Model; -import org.springframework.validation.BindingResult; -import org.springframework.validation.Errors; 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.itextpdf.text.pdf.PdfStructTreeController.returnType; -import com.sipai.entity.activiti.WorkTask; -import com.sipai.entity.business.BusinessUnit; -import com.sipai.entity.business.BusinessUnitAudit; -import com.sipai.entity.business.BusinessUnitHandle; -import com.sipai.entity.business.BusinessUnitRecord; -import com.sipai.entity.equipment.EquipmentCard; -import com.sipai.entity.sparepart.Goods; -import com.sipai.entity.sparepart.InStockRecord; -import com.sipai.entity.sparepart.InStockRecordDetail; -import com.sipai.entity.sparepart.OutStockRecord; -import com.sipai.entity.sparepart.OutStockRecordDetail; -import com.sipai.entity.sparepart.PurchaseRecord; -import com.sipai.entity.sparepart.PurchaseRecordDetail; -import com.sipai.entity.sparepart.SparePartCommString; -import com.sipai.entity.sparepart.Stock; -import com.sipai.entity.sparepart.Subscribe; -import com.sipai.entity.sparepart.SubscribeDetail; -import com.sipai.entity.sparepart.Warehouse; -import com.sipai.entity.timeefficiency.PatrolArea; -import com.sipai.entity.user.Company; -import com.sipai.entity.user.User; -import com.sipai.service.activiti.WorkflowProcessDefinitionService; -import com.sipai.service.activiti.WorkflowService; -import com.sipai.service.business.BusinessUnitAuditService; -import com.sipai.service.business.BusinessUnitHandleService; -import com.sipai.service.equipment.EquipmentCardService; -import com.sipai.service.sparepart.InStockRecordDetailService; -import com.sipai.service.sparepart.InStockRecordService; -import com.sipai.service.sparepart.OutStockRecordDetailService; -import com.sipai.service.sparepart.OutStockRecordService; -import com.sipai.service.sparepart.PurchaseRecordDetailService; -import com.sipai.service.sparepart.PurchaseRecordService; -import com.sipai.service.sparepart.StockService; -import com.sipai.service.sparepart.SubscribeDetailService; -import com.sipai.service.sparepart.WarehouseService; -import com.sipai.service.user.UnitService; -import com.sipai.service.user.UserService; -import com.sipai.tools.ActivitiUtil; -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.math.RoundingMode; +import java.text.SimpleDateFormat; +import java.util.*; @Controller @RequestMapping("/sparepart/outStocksectionRecord") diff --git a/src/main/java/com/sipai/controller/sparepart/PerformanceController.java b/src/main/java/com/sipai/controller/sparepart/PerformanceController.java index 0e9d55d9..45f88565 100644 --- a/src/main/java/com/sipai/controller/sparepart/PerformanceController.java +++ b/src/main/java/com/sipai/controller/sparepart/PerformanceController.java @@ -1,13 +1,13 @@ package com.sipai.controller.sparepart; -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.sparepart.Performance; +import com.sipai.entity.user.User; +import com.sipai.service.sparepart.PerformanceService; +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,13 +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.sparepart.Performance; -import com.sipai.entity.user.Company; -import com.sipai.entity.user.User; -import com.sipai.service.sparepart.PerformanceService; -import com.sipai.tools.CommUtil; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import java.util.List; @Controller @RequestMapping("/sparepart/performance") diff --git a/src/main/java/com/sipai/controller/sparepart/PurchaseMethodsController.java b/src/main/java/com/sipai/controller/sparepart/PurchaseMethodsController.java index 7ee4633f..c826ddc8 100644 --- a/src/main/java/com/sipai/controller/sparepart/PurchaseMethodsController.java +++ b/src/main/java/com/sipai/controller/sparepart/PurchaseMethodsController.java @@ -1,13 +1,13 @@ package com.sipai.controller.sparepart; -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.sparepart.PurchaseMethods; +import com.sipai.entity.user.User; +import com.sipai.service.sparepart.PurchaseMethodsService; +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,13 +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.sparepart.PurchaseMethods; -import com.sipai.entity.user.Company; -import com.sipai.entity.user.User; -import com.sipai.service.sparepart.PurchaseMethodsService; -import com.sipai.tools.CommUtil; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import java.util.List; @Controller @RequestMapping("/sparepart/purchaseMethods") diff --git a/src/main/java/com/sipai/controller/sparepart/PurchasePlanController.java b/src/main/java/com/sipai/controller/sparepart/PurchasePlanController.java index 192e1ede..a341496f 100644 --- a/src/main/java/com/sipai/controller/sparepart/PurchasePlanController.java +++ b/src/main/java/com/sipai/controller/sparepart/PurchasePlanController.java @@ -1,14 +1,14 @@ package com.sipai.controller.sparepart; -import java.io.IOException; -import java.util.List; - -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.sparepart.*; +import com.sipai.entity.user.Company; +import com.sipai.entity.user.User; +import com.sipai.service.sparepart.*; +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; @@ -16,23 +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.sparepart.Goods; -import com.sipai.entity.sparepart.PurchaseDetail; -import com.sipai.entity.sparepart.PurchasePlan; -import com.sipai.entity.sparepart.SparePartCommString; -import com.sipai.entity.sparepart.Subscribe; -import com.sipai.entity.sparepart.SubscribeDetail; -import com.sipai.entity.user.Company; -import com.sipai.entity.user.User; -import com.sipai.service.sparepart.GoodsService; -import com.sipai.service.sparepart.PurchaseDetailService; -import com.sipai.service.sparepart.PurchasePlanService; -import com.sipai.service.sparepart.SubscribeDetailService; -import com.sipai.service.sparepart.SubscribeService; -import com.sipai.service.user.UnitService; -import com.sipai.tools.CommUtil; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.List; @Controller @RequestMapping("/sparepart/purchasePlan") diff --git a/src/main/java/com/sipai/controller/sparepart/PurchaseRecordController.java b/src/main/java/com/sipai/controller/sparepart/PurchaseRecordController.java index ea2dd17e..58b2a97c 100644 --- a/src/main/java/com/sipai/controller/sparepart/PurchaseRecordController.java +++ b/src/main/java/com/sipai/controller/sparepart/PurchaseRecordController.java @@ -1,15 +1,15 @@ package com.sipai.controller.sparepart; -import java.math.BigDecimal; -import java.util.ArrayList; -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.sparepart.*; +import com.sipai.entity.user.Company; +import com.sipai.entity.user.User; +import com.sipai.service.sparepart.*; +import com.sipai.service.user.UnitService; +import com.sipai.tools.CommUtil; import net.sf.json.JSONArray; import net.sf.json.JSONObject; - import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; @@ -18,31 +18,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.sparepart.Goods; -import com.sipai.entity.sparepart.InStockRecordDetail; -import com.sipai.entity.sparepart.PurchaseDetail; -import com.sipai.entity.sparepart.PurchasePlan; -import com.sipai.entity.sparepart.PurchaseRecord; -import com.sipai.entity.sparepart.PurchaseRecordDetail; -import com.sipai.entity.sparepart.SparePartCommString; -import com.sipai.entity.sparepart.Subscribe; -import com.sipai.entity.sparepart.SubscribeDetail; -import com.sipai.entity.sparepart.Supplier; -import com.sipai.entity.user.Company; -import com.sipai.entity.user.User; -import com.sipai.service.sparepart.GoodsService; -import com.sipai.service.sparepart.InStockRecordDetailService; -import com.sipai.service.sparepart.PurchaseDetailService; -import com.sipai.service.sparepart.PurchasePlanService; -import com.sipai.service.sparepart.PurchaseRecordDetailService; -import com.sipai.service.sparepart.PurchaseRecordService; -import com.sipai.service.sparepart.SubscribeDetailService; -import com.sipai.service.sparepart.SubscribeService; -import com.sipai.service.user.UnitService; -import com.sipai.tools.CommUtil; -import com.sun.tools.xjc.generator.bean.ImplStructureStrategy.Result; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import java.util.ArrayList; +import java.util.List; @Controller @RequestMapping("/sparepart/purchaseRecord") diff --git a/src/main/java/com/sipai/controller/sparepart/PurposeController.java b/src/main/java/com/sipai/controller/sparepart/PurposeController.java index 60e7f5fb..6091c33f 100644 --- a/src/main/java/com/sipai/controller/sparepart/PurposeController.java +++ b/src/main/java/com/sipai/controller/sparepart/PurposeController.java @@ -1,26 +1,23 @@ package com.sipai.controller.sparepart; -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.sparepart.Purpose; import com.sipai.entity.user.User; import com.sipai.service.sparepart.PurposeService; 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.List; @Controller @RequestMapping("/sparepart/purpose") diff --git a/src/main/java/com/sipai/controller/sparepart/QualificationTypeController.java b/src/main/java/com/sipai/controller/sparepart/QualificationTypeController.java index b5dfc393..020c4743 100644 --- a/src/main/java/com/sipai/controller/sparepart/QualificationTypeController.java +++ b/src/main/java/com/sipai/controller/sparepart/QualificationTypeController.java @@ -1,39 +1,25 @@ package com.sipai.controller.sparepart; -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.List; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; - +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import com.sipai.entity.sparepart.QualificationType; +import com.sipai.entity.user.User; +import com.sipai.service.sparepart.QualificationTypeService; +import com.sipai.service.sparepart.SupplierQualificationService; +import com.sipai.tools.CommUtil; import net.sf.json.JSONArray; -import net.sf.json.JSONObject; - -import org.apache.batik.ext.awt.image.SVGComposite.ScreenCompositeContext; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; -import org.springframework.validation.BindingResult; 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.itextpdf.text.pdf.PdfStructTreeController.returnType; -import com.sipai.entity.sparepart.QualificationType; -import com.sipai.entity.sparepart.Score; -import com.sipai.entity.sparepart.Supplier; -import com.sipai.entity.sparepart.SupplierClass; -import com.sipai.entity.sparepart.SupplierQualification; -import com.sipai.entity.user.User; -import com.sipai.service.sparepart.QualificationTypeService; -import com.sipai.service.sparepart.SupplierQualificationService; -import com.sipai.tools.CommUtil; -import com.sipai.tools.DateUtil; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpSession; +import java.util.List; @Controller @RequestMapping("/sparepart/qualificationType") diff --git a/src/main/java/com/sipai/controller/sparepart/QualificationType_copyController.java b/src/main/java/com/sipai/controller/sparepart/QualificationType_copyController.java index 0d0eda5e..33bf8e24 100644 --- a/src/main/java/com/sipai/controller/sparepart/QualificationType_copyController.java +++ b/src/main/java/com/sipai/controller/sparepart/QualificationType_copyController.java @@ -1,26 +1,5 @@ package com.sipai.controller.sparepart; -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.List; - -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.apache.batik.ext.awt.image.SVGComposite.ScreenCompositeContext; -import org.springframework.stereotype.Controller; -import org.springframework.ui.Model; -import org.springframework.validation.BindingResult; -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.sparepart.QualificationType_copy; @@ -28,6 +7,19 @@ import com.sipai.entity.user.User; import com.sipai.service.sparepart.QualificationType_copyService; import com.sipai.service.sparepart.SupplierQualification_copyService; 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 javax.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpSession; +import java.util.List; @Controller @RequestMapping("/sparepart/qualificationType_copy") diff --git a/src/main/java/com/sipai/controller/sparepart/RawMaterialController.java b/src/main/java/com/sipai/controller/sparepart/RawMaterialController.java index 5aab2d33..817b21c2 100644 --- a/src/main/java/com/sipai/controller/sparepart/RawMaterialController.java +++ b/src/main/java/com/sipai/controller/sparepart/RawMaterialController.java @@ -1,24 +1,28 @@ package com.sipai.controller.sparepart; -import java.math.BigDecimal; -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Arrays; -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 com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import com.sipai.entity.activiti.WorkTask; +import com.sipai.entity.business.BusinessUnit; +import com.sipai.entity.business.BusinessUnitAudit; +import com.sipai.entity.business.BusinessUnitHandle; +import com.sipai.entity.business.BusinessUnitRecord; +import com.sipai.entity.sparepart.RawMaterial; +import com.sipai.entity.sparepart.RawMaterialDetail; +import com.sipai.entity.user.Company; +import com.sipai.entity.user.User; +import com.sipai.service.activiti.WorkflowProcessDefinitionService; +import com.sipai.service.activiti.WorkflowService; +import com.sipai.service.business.BusinessUnitAuditService; +import com.sipai.service.business.BusinessUnitHandleService; +import com.sipai.service.sparepart.RawMaterialDetailService; +import com.sipai.service.sparepart.RawMaterialService; +import com.sipai.service.user.UnitService; +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 net.sf.json.JSONObject; - import org.activiti.engine.RuntimeService; import org.activiti.engine.TaskService; import org.activiti.engine.history.HistoricTaskInstance; @@ -32,34 +36,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.activiti.WorkTask; -import com.sipai.entity.business.BusinessUnit; -import com.sipai.entity.business.BusinessUnitAudit; -import com.sipai.entity.business.BusinessUnitHandle; -import com.sipai.entity.business.BusinessUnitRecord; -import com.sipai.entity.sparepart.RawMaterial; -import com.sipai.entity.sparepart.RawMaterialDetail; -import com.sipai.entity.sparepart.PurchaseRecord; -import com.sipai.entity.sparepart.PurchaseRecordDetail; -import com.sipai.entity.sparepart.SparePartCommString; -import com.sipai.entity.user.Company; -import com.sipai.entity.user.User; -import com.sipai.service.activiti.WorkflowProcessDefinitionService; -import com.sipai.service.activiti.WorkflowService; -import com.sipai.service.business.BusinessUnitAuditService; -import com.sipai.service.business.BusinessUnitHandleService; -import com.sipai.service.sparepart.RawMaterialDetailService; -import com.sipai.service.sparepart.RawMaterialService; -import com.sipai.service.sparepart.PurchaseRecordDetailService; -import com.sipai.service.sparepart.PurchaseRecordService; -import com.sipai.service.sparepart.SubscribeDetailService; -import com.sipai.service.user.UnitService; -import com.sipai.service.user.UserService; -import com.sipai.tools.ActivitiUtil; -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.text.SimpleDateFormat; +import java.util.*; @Controller @RequestMapping("/sparepart/rawMaterial") diff --git a/src/main/java/com/sipai/controller/sparepart/ReturnStockRecordController.java b/src/main/java/com/sipai/controller/sparepart/ReturnStockRecordController.java index 697d768a..b70250ec 100644 --- a/src/main/java/com/sipai/controller/sparepart/ReturnStockRecordController.java +++ b/src/main/java/com/sipai/controller/sparepart/ReturnStockRecordController.java @@ -1,14 +1,20 @@ package com.sipai.controller.sparepart; -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.sparepart.*; +import com.sipai.entity.user.Company; +import com.sipai.entity.user.User; +import com.sipai.service.activiti.WorkflowProcessDefinitionService; +import com.sipai.service.activiti.WorkflowService; +import com.sipai.service.business.BusinessUnitAuditService; +import com.sipai.service.business.BusinessUnitHandleService; +import com.sipai.service.sparepart.*; +import com.sipai.service.user.UnitService; +import com.sipai.service.user.UserService; +import com.sipai.tools.CommUtil; import net.sf.json.JSONArray; import net.sf.json.JSONObject; - import org.activiti.engine.RuntimeService; import org.activiti.engine.TaskService; import org.springframework.stereotype.Controller; @@ -18,27 +24,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.sparepart.ReturnStockRecord; -import com.sipai.entity.sparepart.ReturnStockRecordDetail; -import com.sipai.entity.sparepart.OutStockRecord; -import com.sipai.entity.sparepart.OutStockRecordDetail; -import com.sipai.entity.sparepart.SparePartCommString; -import com.sipai.entity.user.Company; -import com.sipai.entity.user.User; -import com.sipai.service.activiti.WorkflowProcessDefinitionService; -import com.sipai.service.activiti.WorkflowService; -import com.sipai.service.business.BusinessUnitAuditService; -import com.sipai.service.business.BusinessUnitHandleService; -import com.sipai.service.sparepart.ReturnStockRecordDetailService; -import com.sipai.service.sparepart.ReturnStockRecordService; -import com.sipai.service.sparepart.OutStockRecordDetailService; -import com.sipai.service.sparepart.OutStockRecordService; -import com.sipai.service.sparepart.SubscribeDetailService; -import com.sipai.service.user.UnitService; -import com.sipai.service.user.UserService; -import com.sipai.tools.CommUtil; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import java.math.BigDecimal; +import java.util.List; @Controller @RequestMapping("/sparepart/returnStockRecord") diff --git a/src/main/java/com/sipai/controller/sparepart/ScoreController.java b/src/main/java/com/sipai/controller/sparepart/ScoreController.java index 5371ac07..e1b47329 100644 --- a/src/main/java/com/sipai/controller/sparepart/ScoreController.java +++ b/src/main/java/com/sipai/controller/sparepart/ScoreController.java @@ -1,37 +1,27 @@ package com.sipai.controller.sparepart; -import java.math.BigDecimal; -import java.util.ArrayList; -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.apache.batik.ext.awt.image.SVGComposite.ScreenCompositeContext; -import org.springframework.stereotype.Controller; -import org.springframework.ui.Model; -import org.springframework.validation.BindingResult; -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.itextpdf.text.pdf.PdfStructTreeController.returnType; -import com.sipai.entity.sparepart.Goods; -import com.sipai.entity.sparepart.Supplier; import com.sipai.entity.sparepart.Score; +import com.sipai.entity.sparepart.Supplier; import com.sipai.entity.sparepart.SupplierClass; import com.sipai.entity.user.User; import com.sipai.service.sparepart.ScoreService; import com.sipai.service.sparepart.SupplierClassService; import com.sipai.service.sparepart.SupplierService; import com.sipai.tools.CommUtil; -import com.sipai.tools.DateUtil; +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.List; @Controller @RequestMapping("/sparepart/Score") diff --git a/src/main/java/com/sipai/controller/sparepart/Score_copyController.java b/src/main/java/com/sipai/controller/sparepart/Score_copyController.java index 7ece0a73..b470b1de 100644 --- a/src/main/java/com/sipai/controller/sparepart/Score_copyController.java +++ b/src/main/java/com/sipai/controller/sparepart/Score_copyController.java @@ -1,37 +1,27 @@ package com.sipai.controller.sparepart; -import java.math.BigDecimal; -import java.util.ArrayList; -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.apache.batik.ext.awt.image.SVGComposite.ScreenCompositeContext; -import org.springframework.stereotype.Controller; -import org.springframework.ui.Model; -import org.springframework.validation.BindingResult; -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.itextpdf.text.pdf.PdfStructTreeController.returnType; -import com.sipai.entity.sparepart.Goods; -import com.sipai.entity.sparepart.Supplier_copy; import com.sipai.entity.sparepart.Score_copy; import com.sipai.entity.sparepart.SupplierClass_copy; +import com.sipai.entity.sparepart.Supplier_copy; import com.sipai.entity.user.User; import com.sipai.service.sparepart.Score_copyService; import com.sipai.service.sparepart.SupplierClass_copyService; import com.sipai.service.sparepart.Supplier_copyService; import com.sipai.tools.CommUtil; -import com.sipai.tools.DateUtil; +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.List; @Controller @RequestMapping("/sparepart/Score_copy") diff --git a/src/main/java/com/sipai/controller/sparepart/SewageController.java b/src/main/java/com/sipai/controller/sparepart/SewageController.java index 42f7c432..0b993844 100644 --- a/src/main/java/com/sipai/controller/sparepart/SewageController.java +++ b/src/main/java/com/sipai/controller/sparepart/SewageController.java @@ -1,17 +1,17 @@ package com.sipai.controller.sparepart; -import java.io.IOException; -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.sparepart.Sewage; +import com.sipai.entity.user.Unit; +import com.sipai.entity.user.User; +import com.sipai.service.sparepart.SewageService; +import com.sipai.service.user.ProcessSectionService; +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; @@ -21,21 +21,13 @@ import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartRequest; 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.sparepart.GoodsClass; -import com.sipai.entity.sparepart.Sewage; -import com.sipai.entity.sparepart.SewageInput; -import com.sipai.entity.user.Company; -import com.sipai.entity.user.ProcessSection; -import com.sipai.entity.user.Unit; -import com.sipai.entity.user.User; -import com.sipai.service.sparepart.SewageService; -import com.sipai.service.user.ProcessSectionService; -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 javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.HashMap; +import java.util.List; +import java.util.Map; @Controller @RequestMapping("/sparepart/sewage") diff --git a/src/main/java/com/sipai/controller/sparepart/StockCheckController.java b/src/main/java/com/sipai/controller/sparepart/StockCheckController.java index a386fe9b..59a0c831 100644 --- a/src/main/java/com/sipai/controller/sparepart/StockCheckController.java +++ b/src/main/java/com/sipai/controller/sparepart/StockCheckController.java @@ -1,52 +1,5 @@ package com.sipai.controller.sparepart; -import java.io.BufferedOutputStream; -import java.io.Closeable; -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.OutputStream; -import java.math.BigDecimal; -import java.net.URLEncoder; -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 net.sf.json.JSONObject; - -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.apache.commons.lang3.StringUtils; -import org.apache.poi.hssf.usermodel.HSSFWorkbook; -import org.apache.poi.ss.usermodel.Row; -import org.apache.poi.ss.usermodel.Sheet; -import org.apache.poi.ss.usermodel.Workbook; -import org.springframework.stereotype.Controller; -import org.springframework.transaction.annotation.Transactional; -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.MultipartRequest; -import org.springframework.web.servlet.ModelAndView; - import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.sipai.entity.activiti.WorkTask; @@ -54,9 +7,7 @@ import com.sipai.entity.business.BusinessUnit; import com.sipai.entity.business.BusinessUnitAudit; import com.sipai.entity.business.BusinessUnitHandle; import com.sipai.entity.business.BusinessUnitRecord; -import com.sipai.entity.sparepart.InStockRecord; import com.sipai.entity.sparepart.SparePartCommString; -import com.sipai.entity.sparepart.Stock; import com.sipai.entity.sparepart.StockCheck; import com.sipai.entity.sparepart.StockCheckDetail; import com.sipai.entity.sparepart.Warehouse; @@ -75,7 +26,30 @@ import com.sipai.service.user.UserService; import com.sipai.tools.ActivitiUtil; import com.sipai.tools.CommString; import com.sipai.tools.CommUtil; -import com.sun.mail.iap.Response; +import net.sf.json.JSONArray; +import net.sf.json.JSONObject; +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.multipart.MultipartFile; +import org.springframework.web.multipart.MultipartRequest; +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.math.BigDecimal; +import java.text.SimpleDateFormat; +import java.util.*; @Controller @RequestMapping("/sparepart/stockCheck") diff --git a/src/main/java/com/sipai/controller/sparepart/StockController.java b/src/main/java/com/sipai/controller/sparepart/StockController.java index 0e16f09f..ba75d8fd 100644 --- a/src/main/java/com/sipai/controller/sparepart/StockController.java +++ b/src/main/java/com/sipai/controller/sparepart/StockController.java @@ -1,31 +1,22 @@ package com.sipai.controller.sparepart; -import java.math.BigDecimal; -import java.util.ArrayList; -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.sparepart.*; +import com.sipai.entity.user.User; import com.sipai.service.sparepart.*; import net.sf.json.JSONArray; - import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; -import org.springframework.validation.BindingResult; -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.itextpdf.text.pdf.PdfStructTreeController.returnType; -import com.sipai.entity.timeefficiency.PatrolArea; -import com.sipai.entity.user.User; -import com.sipai.tools.CommUtil; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import java.math.BigDecimal; +import java.util.List; @Controller @RequestMapping("/sparepart/stock") diff --git a/src/main/java/com/sipai/controller/sparepart/SubscribeController.java b/src/main/java/com/sipai/controller/sparepart/SubscribeController.java index e842f2d7..de30da97 100644 --- a/src/main/java/com/sipai/controller/sparepart/SubscribeController.java +++ b/src/main/java/com/sipai/controller/sparepart/SubscribeController.java @@ -1,24 +1,27 @@ package com.sipai.controller.sparepart; -import java.io.IOException; -import java.math.BigDecimal; -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 com.google.gson.JsonArray; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import com.sipai.entity.activiti.WorkTask; +import com.sipai.entity.business.*; import com.sipai.entity.sparepart.*; +import com.sipai.entity.user.Company; +import com.sipai.entity.user.User; +import com.sipai.service.activiti.WorkflowProcessDefinitionService; +import com.sipai.service.activiti.WorkflowService; +import com.sipai.service.business.BusinessUnitAuditService; +import com.sipai.service.business.BusinessUnitDeptApplyService; +import com.sipai.service.business.BusinessUnitHandleService; +import com.sipai.service.business.BusinessUnitInquiryService; +import com.sipai.service.sparepart.*; +import com.sipai.service.user.UnitService; +import com.sipai.service.user.UserService; +import com.sipai.tools.ActivitiUtil; +import com.sipai.tools.CommString; +import com.sipai.tools.CommUtil; +import com.sipai.tools.SSCL; +import net.sf.json.JSONArray; +import net.sf.json.JSONObject; import org.activiti.engine.RuntimeService; import org.activiti.engine.TaskService; import org.activiti.engine.history.HistoricTaskInstance; @@ -35,40 +38,13 @@ import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartRequest; import org.springframework.web.servlet.ModelAndView; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; -import com.sipai.entity.activiti.WorkTask; -import com.sipai.entity.business.BusinessUnit; -import com.sipai.entity.business.BusinessUnitAudit; -import com.sipai.entity.business.BusinessUnitDeptApply; -import com.sipai.entity.business.BusinessUnitHandle; -import com.sipai.entity.business.BusinessUnitInquiry; -import com.sipai.entity.business.BusinessUnitRecord; -import com.sipai.entity.user.Company; -import com.sipai.entity.user.User; -import com.sipai.service.activiti.WorkflowProcessDefinitionService; -import com.sipai.service.activiti.WorkflowService; -import com.sipai.service.business.BusinessUnitAuditService; -import com.sipai.service.business.BusinessUnitDeptApplyService; -import com.sipai.service.business.BusinessUnitHandleService; -import com.sipai.service.business.BusinessUnitInquiryService; -import com.sipai.service.sparepart.ApplyPurchasePlanService; -import com.sipai.service.sparepart.ContractService; -import com.sipai.service.sparepart.GoodsService; -import com.sipai.service.sparepart.PurchaseDetailService; -import com.sipai.service.sparepart.PurchasePlanService; -import com.sipai.service.sparepart.PurchaseRecordDetailService; -import com.sipai.service.sparepart.SubscribeDetailService; -import com.sipai.service.sparepart.SubscribeService; -import com.sipai.service.user.UnitService; -import com.sipai.service.user.UserService; -import com.sipai.tools.ActivitiUtil; -import com.sipai.tools.CommString; -import com.sipai.tools.CommUtil; -import com.sipai.tools.SSCL; - -import net.sf.json.JSONArray; -import net.sf.json.JSONObject; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.math.BigDecimal; +import java.text.SimpleDateFormat; +import java.util.*; @Controller @RequestMapping("/sparepart/subscribe") diff --git a/src/main/java/com/sipai/controller/sparepart/SupplierClassController.java b/src/main/java/com/sipai/controller/sparepart/SupplierClassController.java index fb94baa0..bd8e972b 100644 --- a/src/main/java/com/sipai/controller/sparepart/SupplierClassController.java +++ b/src/main/java/com/sipai/controller/sparepart/SupplierClassController.java @@ -1,13 +1,13 @@ package com.sipai.controller.sparepart; -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.sparepart.SupplierClass; +import com.sipai.entity.user.User; +import com.sipai.service.sparepart.SupplierClassService; +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,13 +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.sparepart.SupplierClass; -import com.sipai.entity.user.Company; -import com.sipai.entity.user.User; -import com.sipai.service.sparepart.SupplierClassService; -import com.sipai.tools.CommUtil; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import java.util.List; @Controller @RequestMapping("/sparepart/supplierClass") diff --git a/src/main/java/com/sipai/controller/sparepart/SupplierClass_copyController.java b/src/main/java/com/sipai/controller/sparepart/SupplierClass_copyController.java index 2398a1ef..1ddf8349 100644 --- a/src/main/java/com/sipai/controller/sparepart/SupplierClass_copyController.java +++ b/src/main/java/com/sipai/controller/sparepart/SupplierClass_copyController.java @@ -1,13 +1,13 @@ package com.sipai.controller.sparepart; -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.sparepart.SupplierClass_copy; +import com.sipai.entity.user.User; +import com.sipai.service.sparepart.SupplierClass_copyService; +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,13 +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.sparepart.SupplierClass_copy; -import com.sipai.entity.user.Company; -import com.sipai.entity.user.User; -import com.sipai.service.sparepart.SupplierClass_copyService; -import com.sipai.tools.CommUtil; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import java.util.List; @Controller @RequestMapping("/sparepart/supplierClass_copy") diff --git a/src/main/java/com/sipai/controller/sparepart/SupplierController.java b/src/main/java/com/sipai/controller/sparepart/SupplierController.java index 3b0f8725..59f1c39d 100644 --- a/src/main/java/com/sipai/controller/sparepart/SupplierController.java +++ b/src/main/java/com/sipai/controller/sparepart/SupplierController.java @@ -1,20 +1,5 @@ package com.sipai.controller.sparepart; -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.sparepart.Supplier; @@ -23,6 +8,18 @@ import com.sipai.entity.user.User; import com.sipai.service.sparepart.SupplierQualificationService; import com.sipai.service.sparepart.SupplierService; 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.List; @Controller @RequestMapping("/sparepart/supplier") diff --git a/src/main/java/com/sipai/controller/sparepart/SupplierQualificationController.java b/src/main/java/com/sipai/controller/sparepart/SupplierQualificationController.java index 57f76957..34c0da78 100644 --- a/src/main/java/com/sipai/controller/sparepart/SupplierQualificationController.java +++ b/src/main/java/com/sipai/controller/sparepart/SupplierQualificationController.java @@ -1,40 +1,26 @@ package com.sipai.controller.sparepart; -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.List; - -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.apache.batik.ext.awt.image.SVGComposite.ScreenCompositeContext; -import org.springframework.stereotype.Controller; -import org.springframework.ui.Model; -import org.springframework.validation.BindingResult; -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.itextpdf.text.pdf.PdfStructTreeController.returnType; import com.sipai.entity.sparepart.QualificationType; -import com.sipai.entity.sparepart.Score; -import com.sipai.entity.sparepart.Supplier; -import com.sipai.entity.sparepart.SupplierClass; import com.sipai.entity.sparepart.SupplierQualification; import com.sipai.entity.user.User; import com.sipai.service.sparepart.QualificationTypeService; import com.sipai.service.sparepart.SupplierQualificationService; import com.sipai.tools.CommUtil; -import com.sipai.tools.DateUtil; +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.HttpSession; +import java.util.List; @Controller @RequestMapping("/sparepart/supplierQualification") diff --git a/src/main/java/com/sipai/controller/sparepart/SupplierQualification_copyController.java b/src/main/java/com/sipai/controller/sparepart/SupplierQualification_copyController.java index 3cb9e5b9..28018f86 100644 --- a/src/main/java/com/sipai/controller/sparepart/SupplierQualification_copyController.java +++ b/src/main/java/com/sipai/controller/sparepart/SupplierQualification_copyController.java @@ -1,21 +1,5 @@ package com.sipai.controller.sparepart; -import java.util.List; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -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.RequestParam; -import org.springframework.web.servlet.ModelAndView; - import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.sipai.entity.sparepart.QualificationType_copy; @@ -24,6 +8,19 @@ import com.sipai.entity.user.User; import com.sipai.service.sparepart.QualificationType_copyService; import com.sipai.service.sparepart.SupplierQualification_copyService; 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.HttpSession; +import java.util.List; @Controller @RequestMapping("/sparepart/supplierQualification_copy") diff --git a/src/main/java/com/sipai/controller/sparepart/WarehouseController.java b/src/main/java/com/sipai/controller/sparepart/WarehouseController.java index 905625ff..a201c9ad 100644 --- a/src/main/java/com/sipai/controller/sparepart/WarehouseController.java +++ b/src/main/java/com/sipai/controller/sparepart/WarehouseController.java @@ -1,34 +1,27 @@ package com.sipai.controller.sparepart; -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.validation.BindingResult; -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.itextpdf.text.pdf.PdfStructTreeController.returnType; -import com.sipai.entity.equipment.EquipmentLevel; import com.sipai.entity.sparepart.SparePartCommString; import com.sipai.entity.sparepart.Warehouse; -import com.sipai.entity.timeefficiency.PatrolArea; import com.sipai.entity.user.Company; import com.sipai.entity.user.Unit; import com.sipai.entity.user.User; import com.sipai.service.sparepart.WarehouseService; 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; +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("/sparepart/warehouse") diff --git a/src/main/java/com/sipai/controller/sparepart/WarrantyPeriodController.java b/src/main/java/com/sipai/controller/sparepart/WarrantyPeriodController.java index 60ff27b9..0ce5b6f5 100644 --- a/src/main/java/com/sipai/controller/sparepart/WarrantyPeriodController.java +++ b/src/main/java/com/sipai/controller/sparepart/WarrantyPeriodController.java @@ -1,13 +1,13 @@ package com.sipai.controller.sparepart; -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.sparepart.WarrantyPeriod; +import com.sipai.entity.user.User; +import com.sipai.service.sparepart.WarrantyPeriodService; +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,13 +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.sparepart.WarrantyPeriod; -import com.sipai.entity.user.Company; -import com.sipai.entity.user.User; -import com.sipai.service.sparepart.WarrantyPeriodService; -import com.sipai.tools.CommUtil; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import java.util.List; @Controller @RequestMapping("/sparepart/warrantyPeriod") diff --git a/src/main/java/com/sipai/controller/structure/StructureCardController.java b/src/main/java/com/sipai/controller/structure/StructureCardController.java index e5105505..6294490c 100644 --- a/src/main/java/com/sipai/controller/structure/StructureCardController.java +++ b/src/main/java/com/sipai/controller/structure/StructureCardController.java @@ -1,75 +1,37 @@ package com.sipai.controller.structure; -import java.io.IOException; -import java.io.InputStreamReader; -import java.io.UnsupportedEncodingException; -import java.math.BigDecimal; -import java.sql.Struct; -import java.text.DecimalFormat; -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Calendar; -import java.util.Collections; -import java.util.Comparator; -import java.util.Date; -import java.util.GregorianCalendar; -import java.util.HashMap; -import java.util.Iterator; -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.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import com.sipai.entity.equipment.EquipmentCard; +import com.sipai.entity.scada.MPoint; +import com.sipai.entity.structure.Structure; +import com.sipai.entity.structure.StructureCard; +import com.sipai.entity.structure.StructureCardType; +import com.sipai.entity.user.User; +import com.sipai.service.equipment.EquipmentCardService; +import com.sipai.service.maintenance.MaintenanceDetailService; +import com.sipai.service.scada.MPointHistoryService; +import com.sipai.service.scada.MPointService; +import com.sipai.service.structure.StructureCardService; +import com.sipai.service.structure.StructureClassService; +import com.sipai.service.user.ExtSystemService; +import com.sipai.service.user.ProcessSectionService; +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.JSONException; import net.sf.json.JSONObject; -import net.sf.json.JsonConfig; - -import org.apache.axis2.databinding.types.soapencoding.Decimal; 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.servlet.ModelAndView; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; -import com.google.common.collect.Multiset.Entry; -import com.sipai.entity.activiti.WorkTask; -import com.sipai.entity.equipment.EquipmentCard; -import com.sipai.entity.equipment.EquipmentCard; -import com.sipai.entity.structure.Structure; -import com.sipai.entity.structure.StructureCard; -import com.sipai.entity.structure.StructureCardType; -import com.sipai.entity.structure.StructureClass; -import com.sipai.entity.scada.MPoint; -import com.sipai.entity.scada.MPointHistory; -import com.sipai.entity.timeefficiency.PatrolPointMeasurePoint; -import com.sipai.entity.user.Company; -import com.sipai.entity.user.ExtSystem; -import com.sipai.entity.user.Menu; -import com.sipai.entity.user.ProcessSection; -import com.sipai.entity.user.Role; -import com.sipai.entity.user.User; -import com.sipai.service.activiti.WorkflowProcessDefinitionService; -import com.sipai.service.equipment.EquipmentCardService; -import com.sipai.service.structure.StructureCardService; -import com.sipai.service.structure.StructureClassService; -import com.sipai.service.maintenance.MaintenanceDetailService; -import com.sipai.service.scada.MPointHistoryService; -import com.sipai.service.scada.MPointService; -import com.sipai.service.user.ExtSystemService; -import com.sipai.service.user.ProcessSectionService; -import com.sipai.service.user.UnitService; -import com.sipai.service.work.GroupManageService; -import com.sipai.tools.CommString; -import com.sipai.tools.CommUtil; -import com.sun.org.apache.bcel.internal.generic.NEW; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import java.math.BigDecimal; +import java.util.List; @Controller @RequestMapping("/structure") diff --git a/src/main/java/com/sipai/controller/structure/StructureCardPictureController.java b/src/main/java/com/sipai/controller/structure/StructureCardPictureController.java index d3d87edf..a9fdf11b 100644 --- a/src/main/java/com/sipai/controller/structure/StructureCardPictureController.java +++ b/src/main/java/com/sipai/controller/structure/StructureCardPictureController.java @@ -1,18 +1,19 @@ package com.sipai.controller.structure; -import java.math.BigDecimal; -import java.net.URLEncoder; -import java.util.List; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; - -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; -import com.sipai.entity.equipment.EquipmentCard; -import com.sipai.tools.HttpUtil; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import com.sipai.entity.base.Result; +import com.sipai.entity.structure.StructureCardPicture; +import com.sipai.entity.structure.StructureCardPictureRoute; +import com.sipai.entity.timeefficiency.PatrolPoint; +import com.sipai.entity.user.Unit; +import com.sipai.entity.user.User; +import com.sipai.service.structure.StructureCardPictureRouteService; +import com.sipai.service.structure.StructureCardPictureService; +import com.sipai.service.timeefficiency.PatrolPointService; +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,23 +21,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.timeefficiency.PatrolAreaFloor; -import com.sipai.entity.timeefficiency.PatrolPlan; -import com.sipai.entity.timeefficiency.PatrolPoint; -import com.sipai.entity.timeefficiency.PatrolRoute; -import com.sipai.entity.user.Company; -import com.sipai.entity.user.Unit; -import com.sipai.entity.user.User; -import com.sipai.service.structure.StructureCardPictureRouteService; -import com.sipai.service.structure.StructureCardPictureService; -import com.sipai.service.timeefficiency.PatrolPointService; -import com.sipai.service.user.UnitService; -import com.sipai.entity.base.Result; -import com.sipai.entity.structure.StructureCardPicture; -import com.sipai.entity.structure.StructureCardPictureRoute; -import com.sipai.tools.CommUtil; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import java.util.List; @Controller @RequestMapping("/structure/structureCardPicture") diff --git a/src/main/java/com/sipai/controller/structure/StructureCardPictureRoutePointdetailController.java b/src/main/java/com/sipai/controller/structure/StructureCardPictureRoutePointdetailController.java index 025ec904..9390a5a3 100644 --- a/src/main/java/com/sipai/controller/structure/StructureCardPictureRoutePointdetailController.java +++ b/src/main/java/com/sipai/controller/structure/StructureCardPictureRoutePointdetailController.java @@ -1,12 +1,12 @@ package com.sipai.controller.structure; -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.structure.StructureCardPictureRoutePointdetail; +import com.sipai.entity.user.User; +import com.sipai.service.structure.StructureCardPictureRoutePointdetailService; +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,12 +14,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.user.User; -import com.sipai.entity.structure.StructureCardPictureRoutePointdetail; -import com.sipai.service.structure.StructureCardPictureRoutePointdetailService; -import com.sipai.tools.CommUtil; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import java.util.List; @Controller @RequestMapping("/structure/structureCardPictureRoutePointdetail") diff --git a/src/main/java/com/sipai/controller/structure/StructureClassController.java b/src/main/java/com/sipai/controller/structure/StructureClassController.java index 176dbffc..69e66f31 100644 --- a/src/main/java/com/sipai/controller/structure/StructureClassController.java +++ b/src/main/java/com/sipai/controller/structure/StructureClassController.java @@ -1,13 +1,13 @@ package com.sipai.controller.structure; -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.structure.StructureClass; +import com.sipai.entity.user.User; +import com.sipai.service.structure.StructureClassService; +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,13 +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.structure.StructureClass; -import com.sipai.entity.user.User; -import com.sipai.service.structure.StructureClassService; -import com.sipai.tools.CommString; -import com.sipai.tools.CommUtil; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import java.util.List; @Controller @RequestMapping("/structure/structureClass") diff --git a/src/main/java/com/sipai/controller/teacher/TeachertypeController.java b/src/main/java/com/sipai/controller/teacher/TeachertypeController.java index 96f42e6d..1e1c053d 100644 --- a/src/main/java/com/sipai/controller/teacher/TeachertypeController.java +++ b/src/main/java/com/sipai/controller/teacher/TeachertypeController.java @@ -1,27 +1,24 @@ package com.sipai.controller.teacher; -import java.util.List; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -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.teacher.Teachertype; import com.sipai.entity.user.User; import com.sipai.service.teacher.TeachertypeService; 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 java.util.List; @Controller @RequestMapping("/teacher/teachertype") diff --git a/src/main/java/com/sipai/controller/third/ThirdPartyController.java b/src/main/java/com/sipai/controller/third/ThirdPartyController.java index dfd434eb..f3f35dd3 100644 --- a/src/main/java/com/sipai/controller/third/ThirdPartyController.java +++ b/src/main/java/com/sipai/controller/third/ThirdPartyController.java @@ -1,10 +1,7 @@ package com.sipai.controller.third; -import com.alibaba.fastjson.JSONObject; -import com.sipai.quartz.job.QWeatherJob; import com.sipai.service.third.impl.ThirdPartServiceImpl; import com.sipai.tools.CommUtil; -import org.springframework.stereotype.Repository; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -12,9 +9,7 @@ import org.springframework.web.servlet.ModelAndView; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; -import java.io.BufferedReader; import java.io.IOException; -import java.io.InputStreamReader; @RestController @RequestMapping("/third") diff --git a/src/main/java/com/sipai/controller/timeefficiency/ClockinRecordController.java b/src/main/java/com/sipai/controller/timeefficiency/ClockinRecordController.java index 30294f4b..ca2fda91 100644 --- a/src/main/java/com/sipai/controller/timeefficiency/ClockinRecordController.java +++ b/src/main/java/com/sipai/controller/timeefficiency/ClockinRecordController.java @@ -1,35 +1,10 @@ package com.sipai.controller.timeefficiency; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.util.List; - -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.axiom.util.blob.Blob; -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.sipai.entity.base.CommonFile; import com.sipai.entity.timeefficiency.ClockinCollection; import com.sipai.entity.timeefficiency.ClockinRecord; -import com.sipai.entity.timeefficiency.PatrolPlanCollection; -import com.sipai.entity.timeefficiency.PatrolRecord; import com.sipai.entity.user.Company; import com.sipai.entity.user.User; import com.sipai.entity.user.UserCommStr; @@ -39,6 +14,18 @@ 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 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 javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.List; @Controller @RequestMapping("/timeEfficiency/clockinRecord") diff --git a/src/main/java/com/sipai/controller/timeefficiency/ElectricityPriceController.java b/src/main/java/com/sipai/controller/timeefficiency/ElectricityPriceController.java index d1862828..2a13043a 100644 --- a/src/main/java/com/sipai/controller/timeefficiency/ElectricityPriceController.java +++ b/src/main/java/com/sipai/controller/timeefficiency/ElectricityPriceController.java @@ -1,21 +1,19 @@ package com.sipai.controller.timeefficiency; -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Calendar; -import java.util.Date; -import java.util.LinkedHashMap; -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.scada.MPointHistory; +import com.sipai.entity.timeefficiency.EfficiencyProcess; +import com.sipai.entity.timeefficiency.ElectricityPrice; +import com.sipai.entity.user.Company; +import com.sipai.entity.user.User; +import com.sipai.service.scada.MPointHistoryService; +import com.sipai.service.timeefficiency.EfficiencyProcessService; +import com.sipai.service.timeefficiency.ElectricityPriceService; +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; @@ -23,20 +21,12 @@ 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.MPointHistory; -import com.sipai.entity.timeefficiency.EfficiencyProcess; -import com.sipai.entity.timeefficiency.ElectricityPrice; -import com.sipai.entity.timeefficiency.PatrolRecord; -import com.sipai.entity.user.Company; -import com.sipai.entity.user.User; -import com.sipai.entity.workorder.WorkorderAchievement; -import com.sipai.service.scada.MPointHistoryService; -import com.sipai.service.timeefficiency.EfficiencyProcessService; -import com.sipai.service.timeefficiency.ElectricityPriceService; -import com.sipai.service.user.UnitService; -import com.sipai.tools.CommUtil; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.*; /** * 工作记录 diff --git a/src/main/java/com/sipai/controller/timeefficiency/PatrolAreaController.java b/src/main/java/com/sipai/controller/timeefficiency/PatrolAreaController.java index 1b59c152..79a04acf 100644 --- a/src/main/java/com/sipai/controller/timeefficiency/PatrolAreaController.java +++ b/src/main/java/com/sipai/controller/timeefficiency/PatrolAreaController.java @@ -1,27 +1,5 @@ package com.sipai.controller.timeefficiency; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.InputStream; -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.apache.axiom.util.blob.Blob; -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.sipai.entity.base.Result; @@ -38,8 +16,19 @@ import com.sipai.service.timeefficiency.PatrolAreaService; import com.sipai.service.timeefficiency.PatrolPointService; import com.sipai.service.user.ProcessSectionService; 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; +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("/timeEfficiency/patrolArea") diff --git a/src/main/java/com/sipai/controller/timeefficiency/PatrolAreaUserController.java b/src/main/java/com/sipai/controller/timeefficiency/PatrolAreaUserController.java index 3170646a..970b5fb6 100644 --- a/src/main/java/com/sipai/controller/timeefficiency/PatrolAreaUserController.java +++ b/src/main/java/com/sipai/controller/timeefficiency/PatrolAreaUserController.java @@ -2,8 +2,6 @@ package com.sipai.controller.timeefficiency; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; -import com.sipai.entity.timeefficiency.PatrolArea; -import com.sipai.entity.timeefficiency.PatrolAreaProcessSection; import com.sipai.entity.timeefficiency.PatrolAreaUser; import com.sipai.entity.user.User; import com.sipai.service.timeefficiency.PatrolAreaUserService; @@ -11,7 +9,6 @@ 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; diff --git a/src/main/java/com/sipai/controller/timeefficiency/PatrolContentsController.java b/src/main/java/com/sipai/controller/timeefficiency/PatrolContentsController.java index 1e82f1eb..8aa99ce9 100644 --- a/src/main/java/com/sipai/controller/timeefficiency/PatrolContentsController.java +++ b/src/main/java/com/sipai/controller/timeefficiency/PatrolContentsController.java @@ -1,19 +1,23 @@ package com.sipai.controller.timeefficiency; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -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.base.Result; +import com.sipai.entity.equipment.EquipmentCard; import com.sipai.entity.timeefficiency.*; +import com.sipai.entity.user.Company; +import com.sipai.entity.user.User; import com.sipai.service.company.CompanyService; +import com.sipai.service.equipment.EquipmentCardService; +import com.sipai.service.timeefficiency.PatrolContentsService; import com.sipai.service.timeefficiency.PatrolContentsStandardService; +import com.sipai.service.timeefficiency.PatrolPointEquipmentCardService; +import com.sipai.service.timeefficiency.PatrolPointService; +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; @@ -21,28 +25,11 @@ 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.github.pagehelper.PageInfo; -import com.sipai.entity.base.Result; -import com.sipai.entity.equipment.EquipmentCard; -//import com.sipai.entity.maintenance.MaintenanceLibrary; -//import com.sipai.entity.maintenance.MaintenanceLibrary; -//import com.sipai.entity.equipment.EquipmentClass; -//import com.sipai.entity.equipment.EquipmentTypeNumber; -//import com.sipai.entity.timeefficiency.PatrolRecord; -import com.sipai.entity.user.Company; -//import com.sipai.entity.user.Menu; -import com.sipai.entity.user.User; -import com.sipai.service.equipment.EquipmentCardService; -import com.sipai.service.timeefficiency.PatrolContentsService; -import com.sipai.service.timeefficiency.PatrolPointEquipmentCardService; -import com.sipai.service.timeefficiency.PatrolPointService; -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.HashMap; +import java.util.List; +import java.util.Map; /** * 巡检内容--配置 diff --git a/src/main/java/com/sipai/controller/timeefficiency/PatrolContentsPlanController.java b/src/main/java/com/sipai/controller/timeefficiency/PatrolContentsPlanController.java index bf8bc4d9..b849ddb4 100644 --- a/src/main/java/com/sipai/controller/timeefficiency/PatrolContentsPlanController.java +++ b/src/main/java/com/sipai/controller/timeefficiency/PatrolContentsPlanController.java @@ -1,28 +1,9 @@ package com.sipai.controller.timeefficiency; -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.google.gson.JsonArray; -import com.google.gson.JsonObject; import com.sipai.entity.base.Result; -import com.sipai.entity.timeefficiency.PatrolContents; import com.sipai.entity.timeefficiency.PatrolContentsPlan; -import com.sipai.entity.timeefficiency.PatrolPoint; import com.sipai.entity.timeefficiency.TimeEfficiencyCommStr; import com.sipai.entity.user.Company; import com.sipai.entity.user.User; @@ -30,8 +11,19 @@ import com.sipai.service.timeefficiency.PatrolContentsPlanService; import com.sipai.service.timeefficiency.PatrolContentsService; import com.sipai.service.timeefficiency.PatrolPlanPatrolEquipmentService; 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; +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; /** * 巡检内容--（关联巡检计划） 2020-03-16 * @author SJ diff --git a/src/main/java/com/sipai/controller/timeefficiency/PatrolContentsRecordController.java b/src/main/java/com/sipai/controller/timeefficiency/PatrolContentsRecordController.java index a1bade37..ed4f8c2b 100644 --- a/src/main/java/com/sipai/controller/timeefficiency/PatrolContentsRecordController.java +++ b/src/main/java/com/sipai/controller/timeefficiency/PatrolContentsRecordController.java @@ -1,24 +1,6 @@ package com.sipai.controller.timeefficiency; -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.base.Result; -import com.sipai.entity.timeefficiency.PatrolContentsPlan; import com.sipai.entity.timeefficiency.PatrolContentsRecord; import com.sipai.entity.timeefficiency.PatrolRecord; import com.sipai.entity.timeefficiency.TimeEfficiencyCommStr; @@ -26,8 +8,19 @@ import com.sipai.entity.user.Company; import com.sipai.entity.user.User; import com.sipai.service.timeefficiency.PatrolContentsRecordService; 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; +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; /** * 巡检内容--（关联巡检记录） 2020-03-16 diff --git a/src/main/java/com/sipai/controller/timeefficiency/PatrolContentsStandardController.java b/src/main/java/com/sipai/controller/timeefficiency/PatrolContentsStandardController.java index 256319f0..107b0e9a 100644 --- a/src/main/java/com/sipai/controller/timeefficiency/PatrolContentsStandardController.java +++ b/src/main/java/com/sipai/controller/timeefficiency/PatrolContentsStandardController.java @@ -1,26 +1,5 @@ package com.sipai.controller.timeefficiency; -import java.io.IOException; -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.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.MultipartRequest; -import org.springframework.web.servlet.ModelAndView; - import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.sipai.entity.base.Result; @@ -30,6 +9,24 @@ import com.sipai.entity.user.User; import com.sipai.service.equipment.EquipmentClassService; import com.sipai.service.timeefficiency.PatrolContentsStandardService; 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.multipart.MultipartFile; +import org.springframework.web.multipart.MultipartRequest; +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.util.HashMap; +import java.util.List; +import java.util.Map; @Controller @RequestMapping("/timeEfficiency/patrolContentsStandard") diff --git a/src/main/java/com/sipai/controller/timeefficiency/PatrolMeasurePointPlanController.java b/src/main/java/com/sipai/controller/timeefficiency/PatrolMeasurePointPlanController.java index de4d99d4..14d57652 100644 --- a/src/main/java/com/sipai/controller/timeefficiency/PatrolMeasurePointPlanController.java +++ b/src/main/java/com/sipai/controller/timeefficiency/PatrolMeasurePointPlanController.java @@ -1,23 +1,7 @@ package com.sipai.controller.timeefficiency; -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.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.servlet.ModelAndView; - import com.sipai.entity.base.Result; -import com.sipai.entity.equipment.EquipmentCard; import com.sipai.entity.scada.MPoint; -import com.sipai.entity.timeefficiency.PatrolContents; import com.sipai.entity.timeefficiency.PatrolMeasurePointPlan; import com.sipai.entity.timeefficiency.PatrolPointMeasurePoint; import com.sipai.entity.timeefficiency.TimeEfficiencyCommStr; @@ -26,8 +10,17 @@ import com.sipai.service.equipment.EquipmentCardService; import com.sipai.service.scada.MPointService; import com.sipai.service.timeefficiency.PatrolMeasurePointPlanService; import com.sipai.service.timeefficiency.PatrolPointMeasurePointService; -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.bind.annotation.RequestParam; +import org.springframework.web.servlet.ModelAndView; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import java.util.List; /** * 填报内容--（关联巡检计划） 2020-04-10 * @author SJ diff --git a/src/main/java/com/sipai/controller/timeefficiency/PatrolMeasurePointRecordController.java b/src/main/java/com/sipai/controller/timeefficiency/PatrolMeasurePointRecordController.java index fe7030bc..2de18a07 100644 --- a/src/main/java/com/sipai/controller/timeefficiency/PatrolMeasurePointRecordController.java +++ b/src/main/java/com/sipai/controller/timeefficiency/PatrolMeasurePointRecordController.java @@ -1,34 +1,27 @@ package com.sipai.controller.timeefficiency; -import java.math.BigDecimal; -import java.util.List; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; - +import com.sipai.entity.base.Result; import com.sipai.entity.scada.MPoint; import com.sipai.entity.scada.MPointHistory; +import com.sipai.entity.timeefficiency.PatrolMeasurePointRecord; +import com.sipai.entity.timeefficiency.PatrolRecord; +import com.sipai.entity.timeefficiency.TimeEfficiencyCommStr; import com.sipai.service.scada.MPointHistoryService; import com.sipai.service.scada.MPointService; +import com.sipai.service.timeefficiency.PatrolMeasurePointRecordService; +import com.sipai.service.timeefficiency.PatrolPointMeasurePointService; 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.RequestMethod; import org.springframework.web.servlet.ModelAndView; -import com.sipai.entity.base.Result; -import com.sipai.entity.timeefficiency.PatrolContentsRecord; -import com.sipai.entity.timeefficiency.PatrolMeasurePointPlan; -import com.sipai.entity.timeefficiency.PatrolMeasurePointRecord; -import com.sipai.entity.timeefficiency.PatrolPointMeasurePoint; -import com.sipai.entity.timeefficiency.PatrolRecord; -import com.sipai.entity.timeefficiency.TimeEfficiencyCommStr; -import com.sipai.service.timeefficiency.PatrolMeasurePointRecordService; -import com.sipai.service.timeefficiency.PatrolPointMeasurePointService; -import com.sipai.tools.CommUtil; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import java.math.BigDecimal; +import java.util.List; /** * 填报内容--（关联巡检计划） 2020-04-10 diff --git a/src/main/java/com/sipai/controller/timeefficiency/PatrolModelController.java b/src/main/java/com/sipai/controller/timeefficiency/PatrolModelController.java index d2436087..6b84abcb 100644 --- a/src/main/java/com/sipai/controller/timeefficiency/PatrolModelController.java +++ b/src/main/java/com/sipai/controller/timeefficiency/PatrolModelController.java @@ -1,21 +1,5 @@ package com.sipai.controller.timeefficiency; -import java.util.ArrayList; -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.info.Select2; @@ -27,6 +11,19 @@ import com.sipai.entity.user.User; import com.sipai.service.timeefficiency.PatrolModelService; 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; +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.ArrayList; +import java.util.List; @Controller @RequestMapping("/timeEfficiency/patrolModel") diff --git a/src/main/java/com/sipai/controller/timeefficiency/PatrolPlanController.java b/src/main/java/com/sipai/controller/timeefficiency/PatrolPlanController.java index af079052..969b40cb 100644 --- a/src/main/java/com/sipai/controller/timeefficiency/PatrolPlanController.java +++ b/src/main/java/com/sipai/controller/timeefficiency/PatrolPlanController.java @@ -1,37 +1,32 @@ package com.sipai.controller.timeefficiency; -import java.math.BigDecimal; -import java.util.*; -/*import net.sf.jasperreports.engine.JRDataSource; -import net.sf.jasperreports.engine.JRException; -import net.sf.jasperreports.engine.JasperReport; -import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource;*/ - - - - - - - - - - - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - - -import com.google.gson.JsonArray; +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.timeefficiency.*; +import com.sipai.entity.user.Company; +import com.sipai.entity.user.Dept; +import com.sipai.entity.user.User; +import com.sipai.entity.user.UserCommStr; +import com.sipai.entity.work.Camera; +import com.sipai.entity.workorder.WorkorderAchievement; import com.sipai.entity.workorder.WorkorderAchievementOrder; import com.sipai.entity.workorder.WorkorderDetail; +import com.sipai.service.base.CommonFileService; +import com.sipai.service.equipment.EquipmentCardService; import com.sipai.service.timeefficiency.*; +import com.sipai.service.user.UnitService; +import com.sipai.service.user.UserService; +import com.sipai.service.work.CameraService; +import com.sipai.service.workorder.WorkorderAchievementOrderService; +import com.sipai.service.workorder.WorkorderAchievementService; import com.sipai.service.workorder.WorkorderDetailService; +import com.sipai.tools.CommString; +import com.sipai.tools.CommUtil; import io.swagger.annotations.*; 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; @@ -40,26 +35,11 @@ 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.base.CommonFile; -import com.sipai.entity.base.Result; -import com.sipai.entity.user.Company; -import com.sipai.entity.user.Dept; -import com.sipai.entity.user.User; -import com.sipai.entity.user.UserCommStr; -import com.sipai.entity.work.Camera; -import com.sipai.entity.workorder.WorkorderAchievement; -import com.sipai.service.base.CommonFileService; -import com.sipai.service.user.UnitService; -import com.sipai.service.user.UserService; -import com.sipai.service.work.CameraService; -import com.sipai.service.workorder.WorkorderAchievementOrderService; -import com.sipai.service.workorder.WorkorderAchievementService; -import com.sipai.tools.CommString; -import com.sipai.tools.CommUtil; -//import com.sipai.tools.JasperHelper; -import com.sipai.service.equipment.EquipmentCardService; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.math.BigDecimal; +import java.util.*; @Controller @RequestMapping("/timeEfficiency/patrolPlan") diff --git a/src/main/java/com/sipai/controller/timeefficiency/PatrolPlanTypeController.java b/src/main/java/com/sipai/controller/timeefficiency/PatrolPlanTypeController.java index c21ffa9b..a0036873 100644 --- a/src/main/java/com/sipai/controller/timeefficiency/PatrolPlanTypeController.java +++ b/src/main/java/com/sipai/controller/timeefficiency/PatrolPlanTypeController.java @@ -4,7 +4,6 @@ package com.sipai.controller.timeefficiency; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.sipai.entity.base.CommonFile; -import com.sipai.entity.timeefficiency.PatrolArea; import com.sipai.entity.timeefficiency.PatrolPlanType; import com.sipai.entity.user.Company; import com.sipai.entity.user.User; diff --git a/src/main/java/com/sipai/controller/timeefficiency/PatrolPointController.java b/src/main/java/com/sipai/controller/timeefficiency/PatrolPointController.java index e18e8f25..d3667fca 100644 --- a/src/main/java/com/sipai/controller/timeefficiency/PatrolPointController.java +++ b/src/main/java/com/sipai/controller/timeefficiency/PatrolPointController.java @@ -1,58 +1,36 @@ package com.sipai.controller.timeefficiency; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; - -import com.sipai.entity.report.RptMpSet; -import com.sipai.entity.work.AreaManage; -import com.sipai.service.work.AreaManageService; -import io.swagger.annotations.*; -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.sipai.entity.base.CommonFile; import com.sipai.entity.base.Result; -import com.sipai.entity.scada.MPoint4APP; -import com.sipai.entity.timeefficiency.PatrolPoint; -import com.sipai.entity.timeefficiency.PatrolPointCamera; -import com.sipai.entity.timeefficiency.PatrolPointEquipmentCard; -import com.sipai.entity.timeefficiency.PatrolPointMeasurePoint; -import com.sipai.entity.timeefficiency.PatrolRecordPatrolEquipment; -import com.sipai.entity.timeefficiency.PatrolRecordPatrolRoute; -import com.sipai.entity.timeefficiency.PatrolRoute; -import com.sipai.entity.timeefficiency.PatrolType; -import com.sipai.entity.timeefficiency.TimeEfficiencyCommStr; +import com.sipai.entity.timeefficiency.*; import com.sipai.entity.user.Company; import com.sipai.entity.user.Unit; import com.sipai.entity.user.User; +import com.sipai.entity.work.AreaManage; import com.sipai.service.company.CompanyService; import com.sipai.service.equipment.EquipmentCardService; import com.sipai.service.scada.MPointService; -import com.sipai.service.timeefficiency.PatrolPointCameraService; -import com.sipai.service.timeefficiency.PatrolPointEquipmentCardService; -import com.sipai.service.timeefficiency.PatrolPointMeasurePointService; -import com.sipai.service.timeefficiency.PatrolPointService; -import com.sipai.service.timeefficiency.PatrolRecordPatrolEquipmentService; -import com.sipai.service.timeefficiency.PatrolRecordPatrolRouteService; -import com.sipai.service.timeefficiency.PatrolRecordService; -import com.sipai.service.timeefficiency.PatrolRouteService; +import com.sipai.service.timeefficiency.*; import com.sipai.service.user.UnitService; -import com.sipai.tools.CommString; +import com.sipai.service.work.AreaManageService; import com.sipai.tools.CommUtil; +import io.swagger.annotations.*; +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.ArrayList; +import java.util.Iterator; +import java.util.List; @Controller @RequestMapping("/timeEfficiency/patrolPoint") diff --git a/src/main/java/com/sipai/controller/timeefficiency/PatrolRecordController.java b/src/main/java/com/sipai/controller/timeefficiency/PatrolRecordController.java index 0e3820a0..e80e2fa3 100644 --- a/src/main/java/com/sipai/controller/timeefficiency/PatrolRecordController.java +++ b/src/main/java/com/sipai/controller/timeefficiency/PatrolRecordController.java @@ -9,19 +9,7 @@ import com.sipai.entity.business.BusinessUnitAudit; import com.sipai.entity.business.BusinessUnitHandle; import com.sipai.entity.business.BusinessUnitRecord; import com.sipai.entity.maintenance.Abnormity; -import com.sipai.entity.timeefficiency.PatrolArea; -import com.sipai.entity.timeefficiency.PatrolModel; -import com.sipai.entity.timeefficiency.PatrolPlan; -import com.sipai.entity.timeefficiency.PatrolPoint; -import com.sipai.entity.timeefficiency.PatrolRecord; -import com.sipai.entity.timeefficiency.PatrolRecordDetailStatistics; -import com.sipai.entity.timeefficiency.PatrolRecordPatrolCamera; -import com.sipai.entity.timeefficiency.PatrolRecordPatrolEquipment; -import com.sipai.entity.timeefficiency.PatrolRecordPatrolRoute; -import com.sipai.entity.timeefficiency.PatrolRoute; -import com.sipai.entity.timeefficiency.PatrolType; -import com.sipai.entity.timeefficiency.TimeEfficiencyCommStr; -import com.sipai.entity.timeefficiency.WorkerPosition; +import com.sipai.entity.timeefficiency.*; import com.sipai.entity.user.Company; import com.sipai.entity.user.ExtSystem; import com.sipai.entity.user.Unit; @@ -36,18 +24,7 @@ import com.sipai.service.business.BusinessUnitHandleService; import com.sipai.service.equipment.EquipmentCardService; import com.sipai.service.maintenance.AbnormityService; import com.sipai.service.scada.MPointService; -import com.sipai.service.timeefficiency.PatrolAreaService; -import com.sipai.service.timeefficiency.PatrolModelService; -import com.sipai.service.timeefficiency.PatrolPlanPatrolCameraService; -import com.sipai.service.timeefficiency.PatrolPlanPatrolEquipmentService; -import com.sipai.service.timeefficiency.PatrolPlanService; -import com.sipai.service.timeefficiency.PatrolPointService; -import com.sipai.service.timeefficiency.PatrolRecordPatrolCameraService; -import com.sipai.service.timeefficiency.PatrolRecordPatrolEquipmentService; -import com.sipai.service.timeefficiency.PatrolRecordPatrolRouteService; -import com.sipai.service.timeefficiency.PatrolRecordService; -import com.sipai.service.timeefficiency.PatrolRouteService; -import com.sipai.service.timeefficiency.WorkerPositionService; +import com.sipai.service.timeefficiency.*; import com.sipai.service.user.ExtSystemService; import com.sipai.service.user.UnitService; import com.sipai.service.user.UserService; @@ -59,12 +36,7 @@ import com.sipai.tools.ActivitiUtil; import com.sipai.tools.CommString; import com.sipai.tools.CommUtil; import com.sipai.tools.HttpUtil; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiResponse; -import io.swagger.annotations.ApiResponses; +import io.swagger.annotations.*; import net.sf.json.JSONArray; import net.sf.json.JSONObject; import org.activiti.engine.RuntimeService; @@ -75,11 +47,7 @@ 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.RequestMethod; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.ModelAndView; import javax.annotation.Resource; @@ -88,17 +56,7 @@ import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.text.ParseException; import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Calendar; -import java.util.Collections; -import java.util.Comparator; -import java.util.Date; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Set; +import java.util.*; @Controller diff --git a/src/main/java/com/sipai/controller/timeefficiency/PatrolRecordViolationRecordController.java b/src/main/java/com/sipai/controller/timeefficiency/PatrolRecordViolationRecordController.java index 6844c8ab..b5e1740e 100644 --- a/src/main/java/com/sipai/controller/timeefficiency/PatrolRecordViolationRecordController.java +++ b/src/main/java/com/sipai/controller/timeefficiency/PatrolRecordViolationRecordController.java @@ -1,38 +1,14 @@ package com.sipai.controller.timeefficiency; -import java.io.IOException; -import java.util.List; - -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.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.equipment.EquipmentCard; -import com.sipai.entity.sparepart.Supplier; -import com.sipai.entity.timeefficiency.PatrolPlan; -import com.sipai.entity.timeefficiency.PatrolRecord; -import com.sipai.entity.timeefficiency.PatrolRecordViolationRecord; -import com.sipai.entity.user.Company; -import com.sipai.entity.user.User; import com.sipai.service.timeefficiency.PatrolPlanService; import com.sipai.service.timeefficiency.PatrolRecordService; import com.sipai.service.user.UnitService; import com.sipai.service.user.UserService; -import com.sipai.service.user.UserServiceImpl; -import com.sipai.tools.CommUtil; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; + +import javax.annotation.Resource; @Controller @RequestMapping("/timeEfficiency/patrolRecordViolationRecord") diff --git a/src/main/java/com/sipai/controller/timeefficiency/ViolationRecordCountController.java b/src/main/java/com/sipai/controller/timeefficiency/ViolationRecordCountController.java index 9c0896e7..60ba5498 100644 --- a/src/main/java/com/sipai/controller/timeefficiency/ViolationRecordCountController.java +++ b/src/main/java/com/sipai/controller/timeefficiency/ViolationRecordCountController.java @@ -1,24 +1,21 @@ package com.sipai.controller.timeefficiency; -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 org.springframework.web.servlet.ModelAndView; - import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.sipai.entity.timeefficiency.ViolationRecordCount; import com.sipai.service.timeefficiency.ViolationRecordCountService; import com.sipai.service.user.UnitService; import com.sipai.service.user.UserService; +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("/timeEfficiency/violationRecordCount") diff --git a/src/main/java/com/sipai/controller/timeefficiency/WorkRecordController.java b/src/main/java/com/sipai/controller/timeefficiency/WorkRecordController.java index d334be3a..007e8530 100644 --- a/src/main/java/com/sipai/controller/timeefficiency/WorkRecordController.java +++ b/src/main/java/com/sipai/controller/timeefficiency/WorkRecordController.java @@ -1,19 +1,5 @@ package com.sipai.controller.timeefficiency; -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.timeefficiency.WorkRecord; @@ -22,6 +8,18 @@ import com.sipai.entity.user.User; import com.sipai.service.timeefficiency.WorkRecordService; 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; +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; /** * 工作记录 diff --git a/src/main/java/com/sipai/controller/timeefficiency/WorkerPositionController.java b/src/main/java/com/sipai/controller/timeefficiency/WorkerPositionController.java index fd6f4eef..10015e83 100644 --- a/src/main/java/com/sipai/controller/timeefficiency/WorkerPositionController.java +++ b/src/main/java/com/sipai/controller/timeefficiency/WorkerPositionController.java @@ -1,16 +1,15 @@ package com.sipai.controller.timeefficiency; -import java.util.List; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; - +import com.sipai.entity.base.Result; +import com.sipai.entity.timeefficiency.WorkerPosition; +import com.sipai.entity.user.User; +import com.sipai.service.timeefficiency.WorkerPositionService; import com.sipai.service.user.UserService; import com.sipai.tools.CommString; +import com.sipai.tools.CommUtil; import io.swagger.annotations.Api; import net.sf.json.JSONArray; import net.sf.json.JSONObject; - import org.redisson.api.RMap; import org.redisson.api.RedissonClient; import org.springframework.stereotype.Controller; @@ -18,15 +17,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 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.timeefficiency.WorkerPosition; -import com.sipai.entity.user.User; -import com.sipai.service.timeefficiency.WorkerPositionService; -import com.sipai.tools.CommUtil; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; @Controller diff --git a/src/main/java/com/sipai/controller/user/BonusPointController.java b/src/main/java/com/sipai/controller/user/BonusPointController.java index ef617be4..daceaaa0 100644 --- a/src/main/java/com/sipai/controller/user/BonusPointController.java +++ b/src/main/java/com/sipai/controller/user/BonusPointController.java @@ -1,55 +1,24 @@ package com.sipai.controller.user; -import java.io.IOException; -import java.io.UnsupportedEncodingException; -import java.net.URLEncoder; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.ResourceBundle; - -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.junit.runners.Parameterized.Parameter; -import org.springframework.stereotype.Controller; -import org.springframework.ui.Model; -import org.springframework.validation.BindingResult; -import org.springframework.validation.Errors; -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.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.entity.business.BusinessUnitHandleDetail; -import com.sipai.entity.maintenance.MaintainerType; -import com.sipai.entity.maintenance.Maintenance; -import com.sipai.entity.maintenance.MaintenanceDetail; import com.sipai.entity.user.BonusPoint; import com.sipai.entity.user.BonusPointRecord; -import com.sipai.entity.user.Company; -import com.sipai.entity.user.ExtSystem; -import com.sipai.entity.user.Unit; import com.sipai.entity.user.User; import com.sipai.service.user.BonusPointRecordService; import com.sipai.service.user.BonusPointService; -import com.sipai.service.user.ExtSystemService; -import com.sipai.service.user.UnitService; import com.sipai.service.user.UserService; -import com.sipai.tools.CommString; import com.sipai.tools.CommUtil; -import com.sipai.tools.FileUtil; -import com.sipai.tools.SessionManager; +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 diff --git a/src/main/java/com/sipai/controller/user/ExtSystemController.java b/src/main/java/com/sipai/controller/user/ExtSystemController.java index d9620eb6..3dd6ff08 100644 --- a/src/main/java/com/sipai/controller/user/ExtSystemController.java +++ b/src/main/java/com/sipai/controller/user/ExtSystemController.java @@ -1,17 +1,14 @@ package com.sipai.controller.user; -import java.io.UnsupportedEncodingException; -import java.text.ParseException; -import java.text.SimpleDateFormat; -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.user.ExtSystem; +import com.sipai.entity.user.User; +import com.sipai.service.user.ExtSystemService; +import com.sipai.tools.CommUtil; +import com.sipai.tools.HttpUtil; 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; @@ -19,21 +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.user.ExtSystem; -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.user.ExtSystemService; -import com.sipai.service.user.UnitService; -import com.sipai.service.work.GroupMemberService; -import com.sipai.service.work.GroupService; -import com.sipai.tools.HttpUtil; -import com.sipai.tools.CommUtil; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpSession; +import java.util.List; @Controller diff --git a/src/main/java/com/sipai/controller/user/JobController.java b/src/main/java/com/sipai/controller/user/JobController.java index 77bdae67..2e045bb3 100644 --- a/src/main/java/com/sipai/controller/user/JobController.java +++ b/src/main/java/com/sipai/controller/user/JobController.java @@ -1,13 +1,17 @@ package com.sipai.controller.user; -import java.util.*; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; - +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; import com.sipai.dao.activiti.ModelNodeJobDao; import com.sipai.entity.base.Tree; import com.sipai.entity.enums.PositionTypeEnum; +import com.sipai.entity.user.*; +import com.sipai.service.user.JobService; +import com.sipai.service.user.UnitService; +import com.sipai.service.user.UserJobService; +import com.sipai.service.user.UserService; +import com.sipai.tools.CommUtil; +import net.sf.json.JSONArray; import org.activiti.engine.RepositoryService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -17,20 +21,12 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.servlet.ModelAndView; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; -import com.sipai.entity.user.Company; -import com.sipai.entity.user.Job; -import com.sipai.entity.user.Unit; -import com.sipai.entity.user.User; -import com.sipai.entity.user.UserJob; -import com.sipai.service.user.JobService; -import com.sipai.service.user.UnitService; -import com.sipai.service.user.UserJobService; -import com.sipai.service.user.UserService; -import com.sipai.tools.CommUtil; - -import net.sf.json.JSONArray; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; @Controller diff --git a/src/main/java/com/sipai/controller/user/MobileManagementController.java b/src/main/java/com/sipai/controller/user/MobileManagementController.java index f8c6d4e8..d7cebc03 100644 --- a/src/main/java/com/sipai/controller/user/MobileManagementController.java +++ b/src/main/java/com/sipai/controller/user/MobileManagementController.java @@ -1,19 +1,5 @@ package com.sipai.controller.user; -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.user.Company; @@ -22,8 +8,18 @@ import com.sipai.entity.user.Unit; import com.sipai.entity.user.User; import com.sipai.service.user.MobileManagementService; 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 @RequestMapping("/user/mobileManagement") diff --git a/src/main/java/com/sipai/controller/user/ProcessSectionController.java b/src/main/java/com/sipai/controller/user/ProcessSectionController.java index 57bce59d..72317e1f 100644 --- a/src/main/java/com/sipai/controller/user/ProcessSectionController.java +++ b/src/main/java/com/sipai/controller/user/ProcessSectionController.java @@ -1,19 +1,23 @@ package com.sipai.controller.user; -import java.util.ArrayList; -import java.util.List; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; - import com.alibaba.fastjson.JSON; -import com.google.gson.JsonArray; -import com.sipai.entity.equipment.EquipmentCard; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import com.sipai.entity.enums.PatrolType; +import com.sipai.entity.scada.MPoint4APP; +import com.sipai.entity.scada.PersonalMpCollection; import com.sipai.entity.timeefficiency.TimeEfficiencyCommStr; +import com.sipai.entity.user.*; import com.sipai.service.company.CompanyService; +import com.sipai.service.scada.MPointService; +import com.sipai.service.scada.PersonalMpCollectionService; +import com.sipai.service.user.ProcessSectionService; +import com.sipai.service.user.ProcessSectionTypeService; +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.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; @@ -22,23 +26,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.enums.PatrolType; -import com.sipai.entity.scada.MPoint4APP; -import com.sipai.entity.scada.PersonalMpCollection; -import com.sipai.entity.user.Company; -import com.sipai.entity.user.ProcessSection; -import com.sipai.entity.user.ProcessSectionType; -import com.sipai.entity.user.Unit; -import com.sipai.entity.user.User; -import com.sipai.service.scada.MPointService; -import com.sipai.service.scada.PersonalMpCollectionService; -import com.sipai.service.user.ProcessSectionService; -import com.sipai.service.user.ProcessSectionTypeService; -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.ArrayList; +import java.util.List; @Controller diff --git a/src/main/java/com/sipai/controller/user/ProcessSectionScoreController.java b/src/main/java/com/sipai/controller/user/ProcessSectionScoreController.java index 548746aa..bc04ed21 100644 --- a/src/main/java/com/sipai/controller/user/ProcessSectionScoreController.java +++ b/src/main/java/com/sipai/controller/user/ProcessSectionScoreController.java @@ -1,25 +1,22 @@ package com.sipai.controller.user; -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 com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.sipai.entity.user.ProcessSectionScore; import com.sipai.entity.user.User; import com.sipai.service.user.ProcessSectionScoreService; 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("user/processSectionScore") diff --git a/src/main/java/com/sipai/controller/valueEngineering/EquipmentDepreciationController.java b/src/main/java/com/sipai/controller/valueEngineering/EquipmentDepreciationController.java index f3a9fd10..51540f34 100644 --- a/src/main/java/com/sipai/controller/valueEngineering/EquipmentDepreciationController.java +++ b/src/main/java/com/sipai/controller/valueEngineering/EquipmentDepreciationController.java @@ -1,13 +1,16 @@ package com.sipai.controller.valueEngineering; -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.equipment.EquipmentCard; +import com.sipai.entity.user.Company; +import com.sipai.entity.user.Unit; +import com.sipai.entity.user.User; +import com.sipai.service.equipment.EquipmentCardPropService; +import com.sipai.service.equipment.EquipmentCardService; +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; @@ -15,19 +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.equipment.AssetClass; -import com.sipai.entity.equipment.EquipmentCard; -import com.sipai.entity.user.Company; -import com.sipai.entity.user.Unit; -import com.sipai.entity.user.User; -import com.sipai.entity.equipment.EquipmentCardProp; -import com.sipai.service.equipment.AssetClassService; -import com.sipai.service.equipment.EquipmentCardService; -import com.sipai.service.user.UnitService; -import com.sipai.service.equipment.EquipmentCardPropService; -import com.sipai.tools.CommUtil; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import java.util.List; @Controller @RequestMapping("/valueEngineering/equipmentDepreciation") diff --git a/src/main/java/com/sipai/controller/valueEngineering/EquipmentEvaluateController.java b/src/main/java/com/sipai/controller/valueEngineering/EquipmentEvaluateController.java index 5f3af829..1acb194d 100644 --- a/src/main/java/com/sipai/controller/valueEngineering/EquipmentEvaluateController.java +++ b/src/main/java/com/sipai/controller/valueEngineering/EquipmentEvaluateController.java @@ -1,64 +1,17 @@ package com.sipai.controller.valueEngineering; -import java.math.BigDecimal; -import java.text.DecimalFormat; -import java.text.NumberFormat; -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Calendar; -import java.util.Comparator; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.TreeSet; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; - import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import com.sipai.entity.base.LineChart; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; -import com.sipai.entity.equipment.AssetClass; -import com.sipai.entity.equipment.EquipmentAge; -import com.sipai.entity.equipment.EquipmentCard; -import com.sipai.entity.equipment.EquipmentCardProp; -import com.sipai.entity.equipment.EquipmentClass; -import com.sipai.entity.equipment.EquipmentClassProp; -import com.sipai.entity.equipment.EquipmentCommStr; -import com.sipai.entity.equipment.EquipmentIncreaseValue; -import com.sipai.entity.equipment.EquipmentLevel; -import com.sipai.entity.equipment.EquipmentSpecification; -import com.sipai.entity.equipment.EquipmentStatistics; -import com.sipai.entity.equipment.EquipmentTypeNumber; -import com.sipai.entity.equipment.EquipmentUseAge; -import com.sipai.entity.maintenance.MaintenanceCommString; -import com.sipai.entity.maintenance.MaintenanceDetail; -import com.sipai.entity.scada.MPoint; +import com.sipai.entity.base.LineChart; +import com.sipai.entity.equipment.*; import com.sipai.entity.scada.MPointHistory; -import com.sipai.entity.user.Company; import com.sipai.entity.user.Unit; import com.sipai.entity.user.User; -import com.sipai.entity.user.UserCommStr; import com.sipai.entity.valueEngineering.EquipmentEvaluate; -import com.sipai.entity.valueEngineering.EquipmentEvaluateCommStr; -import com.sipai.entity.valueEngineering.EquipmentModel; -import com.sipai.service.equipment.AssetClassService; -import com.sipai.service.equipment.EquipmentCardPropService; -import com.sipai.service.equipment.EquipmentCardService; -import com.sipai.service.equipment.EquipmentClassPropService; -import com.sipai.service.equipment.EquipmentClassService; -import com.sipai.service.equipment.EquipmentIncreaseValueService; -import com.sipai.service.equipment.EquipmentLevelService; -import com.sipai.service.equipment.EquipmentSpecificationService; -import com.sipai.service.equipment.EquipmentStatisticsService; -import com.sipai.service.equipment.EquipmentTypeNumberService; -import com.sipai.service.equipment.EquipmentUseAgeService; +import com.sipai.service.equipment.*; import com.sipai.service.maintenance.AbnormityService; import com.sipai.service.maintenance.MaintenanceDetailService; import com.sipai.service.scada.MPointHistoryService; @@ -66,7 +19,6 @@ import com.sipai.service.user.UnitService; import com.sipai.service.valueEngineering.EquipmentEvaluateService; import com.sipai.tools.CommString; import com.sipai.tools.CommUtil; - import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.ModelAttribute; @@ -75,6 +27,13 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.servlet.ModelAndView; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import java.math.BigDecimal; +import java.text.NumberFormat; +import java.text.SimpleDateFormat; +import java.util.*; + @Controller @RequestMapping("/valueEngineering/equipmentEvaluate") public class EquipmentEvaluateController { diff --git a/src/main/java/com/sipai/controller/valueEngineering/EquipmentModelController.java b/src/main/java/com/sipai/controller/valueEngineering/EquipmentModelController.java index 6d8da396..3daea766 100644 --- a/src/main/java/com/sipai/controller/valueEngineering/EquipmentModelController.java +++ b/src/main/java/com/sipai/controller/valueEngineering/EquipmentModelController.java @@ -1,25 +1,12 @@ package com.sipai.controller.valueEngineering; -import java.util.List; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpSession; - -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; -import com.sipai.entity.scada.MPoint; -import com.sipai.entity.user.Company; -import com.sipai.entity.user.ProcessSection; import com.sipai.entity.user.User; import com.sipai.entity.valueEngineering.EquipmentModel; -import com.sipai.service.scada.MPointService; import com.sipai.service.valueEngineering.EquipmentModelService; import com.sipai.tools.CommString; import com.sipai.tools.CommUtil; - import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.ModelAttribute; @@ -27,6 +14,11 @@ 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.HttpSession; +import java.util.List; + @Controller @RequestMapping("/valueEngineering/equipmentModel") public class EquipmentModelController { diff --git a/src/main/java/com/sipai/controller/valueEngineering/TodoController.java b/src/main/java/com/sipai/controller/valueEngineering/TodoController.java index d93ff3bf..2cf444b5 100644 --- a/src/main/java/com/sipai/controller/valueEngineering/TodoController.java +++ b/src/main/java/com/sipai/controller/valueEngineering/TodoController.java @@ -1,48 +1,8 @@ package com.sipai.controller.valueEngineering; -import java.io.BufferedInputStream; -import java.io.BufferedOutputStream; -import java.io.File; -import java.io.FileInputStream; -import java.io.IOException; -import java.io.PrintWriter; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Iterator; -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.jsp.jstl.sql.Result; - -import net.sf.json.JSONArray; -import net.sf.json.JSONObject; - -import org.apache.commons.fileupload.DiskFileUpload; -import org.apache.commons.fileupload.FileItem; -import org.apache.commons.fileupload.disk.DiskFileItemFactory; -import org.apache.commons.fileupload.servlet.ServletFileUpload; -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.itextpdf.text.pdf.PdfStructTreeController.returnType; -import com.sipai.entity.command.EmergencyConfigure; -import com.sipai.entity.command.EmergencyRecords; -import com.sipai.entity.maintenance.Maintenance; -import com.sipai.entity.msg.Msg; -import com.sipai.entity.msg.MsgRecv; import com.sipai.entity.user.Company; import com.sipai.entity.user.Unit; -import com.sipai.entity.user.User; import com.sipai.entity.visual.JspElement; -import com.sipai.entity.work.KPIPoint; import com.sipai.service.command.EmergencyRecordsService; import com.sipai.service.company.CompanyService; import com.sipai.service.msg.MsgRecvServiceImpl; @@ -52,8 +12,17 @@ import com.sipai.service.user.UserService; import com.sipai.service.visual.GetValueService; import com.sipai.service.visual.JspElementService; import com.sipai.service.work.KPIPointService; -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.RequestMapping; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import java.io.IOException; +import java.util.List; @Controller @RequestMapping("/todo") diff --git a/src/main/java/com/sipai/controller/visit/VisitSafetyCommitmentController.java b/src/main/java/com/sipai/controller/visit/VisitSafetyCommitmentController.java index dc10fe3b..397e00b2 100644 --- a/src/main/java/com/sipai/controller/visit/VisitSafetyCommitmentController.java +++ b/src/main/java/com/sipai/controller/visit/VisitSafetyCommitmentController.java @@ -10,12 +10,7 @@ import com.sipai.entity.visit.VisitVisitors; import com.sipai.service.visit.VisitSafetyCommitmentService; import com.sipai.service.visit.VisitVisitorsService; import com.sipai.tools.CommUtil; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiResponse; -import io.swagger.annotations.ApiResponses; +import io.swagger.annotations.*; import net.sf.json.JSONArray; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; diff --git a/src/main/java/com/sipai/controller/visual/CityHallShowController.java b/src/main/java/com/sipai/controller/visual/CityHallShowController.java index 9cbb2ce4..40a0704e 100644 --- a/src/main/java/com/sipai/controller/visual/CityHallShowController.java +++ b/src/main/java/com/sipai/controller/visual/CityHallShowController.java @@ -1,17 +1,10 @@ package com.sipai.controller.visual; -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.CommonFile; +import com.sipai.service.base.CommonFileService; +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; @@ -21,15 +14,16 @@ import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartHttpServletRequest; import org.springframework.web.servlet.ModelAndView; -import com.sipai.entity.base.CommonFile; -import com.sipai.entity.teacher.TeacherFile; -import com.sipai.entity.user.User; -import com.sipai.service.base.CommonFileService; -import com.sipai.tools.CommUtil; -import com.sipai.tools.FileUtil; - -import net.sf.json.JSONArray; -import net.sf.json.JSONObject; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +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; @Controller diff --git a/src/main/java/com/sipai/controller/visual/DataTypeController.java b/src/main/java/com/sipai/controller/visual/DataTypeController.java index 6272a214..f1e0bbab 100644 --- a/src/main/java/com/sipai/controller/visual/DataTypeController.java +++ b/src/main/java/com/sipai/controller/visual/DataTypeController.java @@ -1,35 +1,15 @@ package com.sipai.controller.visual; -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.user.User; +import com.sipai.entity.visual.DataType; +import com.sipai.entity.visual.PlanInteraction; +import com.sipai.service.visual.DataTypeService; +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; @@ -37,20 +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.user.User; -import com.sipai.entity.visual.DataType; -import com.sipai.entity.visual.DataType; -import com.sipai.entity.visual.InteractionMethod; -import com.sipai.entity.visual.JspElement; -import com.sipai.entity.visual.Layout; -import com.sipai.entity.visual.PlanInteraction; -import com.sipai.entity.visual.VisualJsp; -import com.sipai.service.visual.DataTypeService; -import com.sipai.service.visual.JspElementService; -import com.sipai.service.visual.VisualJspService; -import com.sipai.tools.CommUtil; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import java.util.List; @Controller @RequestMapping("/datatype") diff --git a/src/main/java/com/sipai/controller/visual/InteractionController.java b/src/main/java/com/sipai/controller/visual/InteractionController.java index e1e1d34c..74666d2e 100644 --- a/src/main/java/com/sipai/controller/visual/InteractionController.java +++ b/src/main/java/com/sipai/controller/visual/InteractionController.java @@ -1,32 +1,15 @@ package com.sipai.controller.visual; -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.user.User; +import com.sipai.entity.visual.Interaction; +import com.sipai.entity.visual.InteractionMethod; +import com.sipai.entity.visual.PlanInteraction; +import com.sipai.service.visual.InteractionService; +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; @@ -34,20 +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.user.User; -import com.sipai.entity.visual.DataType; -import com.sipai.entity.visual.Interaction; -import com.sipai.entity.visual.JspElement; -import com.sipai.entity.visual.Layout; -import com.sipai.entity.visual.PlanInteraction; -import com.sipai.entity.visual.VisualJsp; -import com.sipai.entity.visual.InteractionMethod; -import com.sipai.service.visual.InteractionService; -import com.sipai.service.visual.JspElementService; -import com.sipai.service.visual.VisualJspService; -import com.sipai.tools.CommUtil; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import java.util.List; @Controller @RequestMapping("/interaction") diff --git a/src/main/java/com/sipai/controller/visual/InterfaceController.java b/src/main/java/com/sipai/controller/visual/InterfaceController.java index fa9c398c..b1b13776 100644 --- a/src/main/java/com/sipai/controller/visual/InterfaceController.java +++ b/src/main/java/com/sipai/controller/visual/InterfaceController.java @@ -1,18 +1,13 @@ package com.sipai.controller.visual; -import java.util.List; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; - -import net.sf.json.JSONArray; - +import com.sipai.service.user.UnitService; 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.service.user.UnitService; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; @Controller diff --git a/src/main/java/com/sipai/controller/visual/JspConfigureController.java b/src/main/java/com/sipai/controller/visual/JspConfigureController.java index 19d5ca0a..967e4921 100644 --- a/src/main/java/com/sipai/controller/visual/JspConfigureController.java +++ b/src/main/java/com/sipai/controller/visual/JspConfigureController.java @@ -1,9 +1,13 @@ package com.sipai.controller.visual; -import java.util.List; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; +import com.alibaba.fastjson.JSON; +import com.sipai.entity.base.Result; +import com.sipai.entity.user.User; +import com.sipai.entity.visual.JspConfigure; +import com.sipai.entity.visual.JspConfigureDetail; +import com.sipai.service.visual.JspConfigureDetailService; +import com.sipai.service.visual.JspConfigureService; +import com.sipai.tools.CommUtil; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.ModelAttribute; @@ -11,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.alibaba.fastjson.JSON; -import com.sipai.entity.base.Result; -import com.sipai.entity.user.User; -import com.sipai.entity.visual.JspConfigure; -import com.sipai.service.visual.JspConfigureService; -import com.sipai.entity.visual.JspConfigureDetail; -import com.sipai.service.visual.JspConfigureDetailService; -import com.sipai.tools.CommUtil; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import java.util.List; @Controller @RequestMapping("/jspConfigure") diff --git a/src/main/java/com/sipai/controller/visual/LayoutController.java b/src/main/java/com/sipai/controller/visual/LayoutController.java index 55ddc701..bec3b5a8 100644 --- a/src/main/java/com/sipai/controller/visual/LayoutController.java +++ b/src/main/java/com/sipai/controller/visual/LayoutController.java @@ -1,25 +1,15 @@ package com.sipai.controller.visual; -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.user.User; +import com.sipai.entity.visual.Layout; +import com.sipai.entity.visual.LayoutDetail; +import com.sipai.service.visual.LayoutDetailService; +import com.sipai.service.visual.LayoutService; +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; @@ -27,17 +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.equipment.EquipmentClass; -import com.sipai.entity.timeefficiency.PatrolModel; -import com.sipai.entity.user.Company; -import com.sipai.entity.user.User; -import com.sipai.entity.visual.Layout; -import com.sipai.entity.visual.LayoutDetail; -import com.sipai.service.visual.LayoutDetailService; -import com.sipai.service.visual.LayoutService; -import com.sipai.tools.CommUtil; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import java.util.List; @Controller @RequestMapping("/layout") diff --git a/src/main/java/com/sipai/controller/visual/PlanController.java b/src/main/java/com/sipai/controller/visual/PlanController.java index 34d0b9e1..f60e8b19 100644 --- a/src/main/java/com/sipai/controller/visual/PlanController.java +++ b/src/main/java/com/sipai/controller/visual/PlanController.java @@ -1,21 +1,19 @@ package com.sipai.controller.visual; -import java.io.File; -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 javax.servlet.http.HttpSession; - -import net.sf.json.JSON; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import com.sipai.entity.scada.MPoint; +import com.sipai.entity.user.User; +import com.sipai.entity.visual.*; +import com.sipai.entity.work.Camera; +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.service.visual.*; +import com.sipai.service.work.CameraService; +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; @@ -23,40 +21,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.base.Tree; -import com.sipai.entity.scada.MPoint; -import com.sipai.entity.user.Company; -import com.sipai.entity.user.User; -import com.sipai.entity.user.UserDetail; -import com.sipai.entity.visual.DataType; -import com.sipai.entity.visual.Interaction; -import com.sipai.entity.visual.JspElement; -import com.sipai.entity.visual.Layout; -import com.sipai.entity.visual.LayoutDetail; -import com.sipai.entity.visual.Plan; -import com.sipai.entity.visual.PlanInteraction; -import com.sipai.entity.visual.PlanLayout; -import com.sipai.entity.visual.VisualJsp; -import com.sipai.entity.work.Camera; -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.service.visual.DataTypeService; -import com.sipai.service.visual.GetValueService; -import com.sipai.service.visual.InteractionService; -import com.sipai.service.visual.LayoutDetailService; -import com.sipai.service.visual.LayoutService; -import com.sipai.service.visual.PlanInteractionService; -import com.sipai.service.visual.PlanLayoutService; -import com.sipai.service.visual.PlanService; -import com.sipai.service.visual.VisualJspService; -import com.sipai.service.work.CameraService; -import com.sipai.tools.CommString; -import com.sipai.tools.CommUtil; -import com.sipai.websocket.VisualMessage; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import java.io.IOException; +import java.util.List; @Controller @RequestMapping("/plan") diff --git a/src/main/java/com/sipai/controller/visual/ProcessOperationController.java b/src/main/java/com/sipai/controller/visual/ProcessOperationController.java index 9a05ed89..31c7dc0f 100644 --- a/src/main/java/com/sipai/controller/visual/ProcessOperationController.java +++ b/src/main/java/com/sipai/controller/visual/ProcessOperationController.java @@ -1,21 +1,16 @@ package com.sipai.controller.visual; -import java.util.ArrayList; -import java.util.List; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; - +import com.sipai.entity.visual.ProcessOperation; +import com.sipai.service.visual.ProcessOperationService; 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.user.Company; -import com.sipai.entity.visual.ProcessOperation; -import com.sipai.service.visual.ProcessOperationService; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import java.util.List; @Controller diff --git a/src/main/java/com/sipai/controller/visual/ShaKouController.java b/src/main/java/com/sipai/controller/visual/ShaKouController.java index b1b491a5..ac50cf48 100644 --- a/src/main/java/com/sipai/controller/visual/ShaKouController.java +++ b/src/main/java/com/sipai/controller/visual/ShaKouController.java @@ -1,20 +1,19 @@ package com.sipai.controller.visual; -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.servlet.ModelAndView; - import com.alibaba.fastjson.JSONArray; import com.sipai.entity.user.Unit; import com.sipai.service.user.UnitService; import com.sipai.service.visual.JspElementService; import com.sipai.tools.CommString; import com.sipai.tools.CommUtil; +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("/shakou") diff --git a/src/main/java/com/sipai/controller/visual/SmartController.java b/src/main/java/com/sipai/controller/visual/SmartController.java index c0c2b330..efbd5c83 100644 --- a/src/main/java/com/sipai/controller/visual/SmartController.java +++ b/src/main/java/com/sipai/controller/visual/SmartController.java @@ -1,12 +1,17 @@ package com.sipai.controller.visual; -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.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import com.sipai.entity.base.Result; +import com.sipai.entity.user.Unit; +import com.sipai.entity.user.User; +import com.sipai.entity.visual.JspElement; +import com.sipai.entity.visual.VisualCacheData; +import com.sipai.service.user.UnitService; +import com.sipai.service.visual.JspElementService; +import com.sipai.service.visual.VisualCacheDataService; +import com.sipai.tools.CommString; +import com.sipai.tools.CommUtil; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.ModelAttribute; @@ -14,20 +19,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.JSONArray; -import com.alibaba.fastjson.JSONObject; -import com.sipai.entity.base.Result; -import com.sipai.entity.user.Unit; -import com.sipai.entity.user.User; -import com.sipai.entity.visual.JspConfigureDetail; -import com.sipai.entity.visual.JspElement; -import com.sipai.entity.visual.VisualCacheData; -import com.sipai.service.user.UnitService; -import com.sipai.service.visual.JspElementService; -import com.sipai.service.visual.VisualCacheConfigService; -import com.sipai.service.visual.VisualCacheDataService; -import com.sipai.tools.CommString; -import com.sipai.tools.CommUtil; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import java.util.List; @Controller @RequestMapping("/smart") diff --git a/src/main/java/com/sipai/controller/visual/VisualJspController.java b/src/main/java/com/sipai/controller/visual/VisualJspController.java index c0e6b1cd..8d33c6b7 100644 --- a/src/main/java/com/sipai/controller/visual/VisualJspController.java +++ b/src/main/java/com/sipai/controller/visual/VisualJspController.java @@ -1,57 +1,14 @@ package com.sipai.controller.visual; -import java.util.ArrayList; -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.equipment.EquipmentCard; -import com.sipai.entity.equipment.EquipmentPoint; import com.sipai.entity.scada.MPoint; import com.sipai.entity.user.Company; import com.sipai.entity.user.User; import com.sipai.entity.visual.DataType; import com.sipai.entity.visual.JspElement; -import com.sipai.entity.visual.Layout; import com.sipai.entity.visual.VisualJsp; -import com.sipai.entity.work.Camera; import com.sipai.service.scada.MPointService; import com.sipai.service.user.UnitService; import com.sipai.service.visual.DataTypeService; @@ -59,6 +16,17 @@ import com.sipai.service.visual.JspElementService; import com.sipai.service.visual.VisualJspService; import com.sipai.service.work.CameraService; 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("/visualjsp") diff --git a/src/main/java/com/sipai/controller/visual/ZengChengController.java b/src/main/java/com/sipai/controller/visual/ZengChengController.java index 76f38963..1a50a726 100644 --- a/src/main/java/com/sipai/controller/visual/ZengChengController.java +++ b/src/main/java/com/sipai/controller/visual/ZengChengController.java @@ -1,14 +1,5 @@ package com.sipai.controller.visual; -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.servlet.ModelAndView; - import com.alibaba.fastjson.JSONArray; import com.sipai.entity.user.Company; import com.sipai.entity.user.Unit; @@ -16,9 +7,15 @@ import com.sipai.service.company.CompanyService; import com.sipai.service.user.UnitService; import com.sipai.service.visual.JspElementService; import com.sipai.tools.CommString; -import com.sipai.tools.CommUtil; - 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.List; @Controller @RequestMapping("/zengCheng") diff --git a/src/main/java/com/sipai/controller/visual/ZnpdController.java b/src/main/java/com/sipai/controller/visual/ZnpdController.java index 4958087b..8201a858 100644 --- a/src/main/java/com/sipai/controller/visual/ZnpdController.java +++ b/src/main/java/com/sipai/controller/visual/ZnpdController.java @@ -1,13 +1,10 @@ package com.sipai.controller.visual; -import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.sipai.entity.equipment.EquipmentCardLinks; import com.sipai.entity.equipment.EquipmentCardLinksParameter; import com.sipai.service.equipment.EquipmentCardLinksService; import com.sipai.tools.CommString; - -import org.apache.cxf.transport.Session; import org.apache.http.HttpResponse; import org.apache.http.client.HttpClient; import org.apache.http.client.methods.HttpPost; @@ -20,7 +17,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; -import java.io.UnsupportedEncodingException; import java.util.List; /** diff --git a/src/main/java/com/sipai/controller/whp/baseinfo/TestController.java b/src/main/java/com/sipai/controller/whp/baseinfo/TestController.java index 86e8b68c..dec919ba 100644 --- a/src/main/java/com/sipai/controller/whp/baseinfo/TestController.java +++ b/src/main/java/com/sipai/controller/whp/baseinfo/TestController.java @@ -5,7 +5,6 @@ import com.sipai.service.whp.baseinfo.WhpTestOrgService; 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; diff --git a/src/main/java/com/sipai/controller/whp/baseinfo/WhpEquipmentController.java b/src/main/java/com/sipai/controller/whp/baseinfo/WhpEquipmentController.java index e5cc511d..51249e45 100644 --- a/src/main/java/com/sipai/controller/whp/baseinfo/WhpEquipmentController.java +++ b/src/main/java/com/sipai/controller/whp/baseinfo/WhpEquipmentController.java @@ -7,7 +7,9 @@ import com.sipai.controller.exception.BizCheckException; import com.sipai.entity.base.Result; import com.sipai.entity.enums.EnableTypeEnum; import com.sipai.entity.user.User; -import com.sipai.entity.whp.baseinfo.*; +import com.sipai.entity.whp.baseinfo.WhpEquipment; +import com.sipai.entity.whp.baseinfo.WhpEquipmentQuery; +import com.sipai.entity.whp.baseinfo.WhpEquipmentVo; import com.sipai.entity.whp.test.WhpSamplingPlanTaskTestConfirm; import com.sipai.service.whp.baseinfo.WhpEquipmentService; import com.sipai.service.whp.test.WhpSamplingPlanTaskTestConfirmService; diff --git a/src/main/java/com/sipai/controller/whp/baseinfo/WhpResidualSampleDisposeTypeController.java b/src/main/java/com/sipai/controller/whp/baseinfo/WhpResidualSampleDisposeTypeController.java index b0fe049d..924c0592 100644 --- a/src/main/java/com/sipai/controller/whp/baseinfo/WhpResidualSampleDisposeTypeController.java +++ b/src/main/java/com/sipai/controller/whp/baseinfo/WhpResidualSampleDisposeTypeController.java @@ -10,7 +10,6 @@ import com.sipai.entity.whp.baseinfo.WhpResidualSampleDisposeType; import com.sipai.entity.whp.baseinfo.WhpResidualSampleDisposeTypeQuery; import com.sipai.entity.whp.baseinfo.WhpResidualSampleDisposeTypeVo; import com.sipai.entity.whp.plan.WhpSamplingPlanTask; -import com.sipai.entity.whp.test.WhpSamplingPlanTaskTestConfirm; import com.sipai.service.whp.baseinfo.WhpResidualSampleDisposeTypeService; import com.sipai.service.whp.plan.WhpSamplingPlanTaskService; import net.sf.json.JSONArray; diff --git a/src/main/java/com/sipai/controller/whp/baseinfo/WhpSampleCodeController.java b/src/main/java/com/sipai/controller/whp/baseinfo/WhpSampleCodeController.java index be3c87e6..41bde278 100644 --- a/src/main/java/com/sipai/controller/whp/baseinfo/WhpSampleCodeController.java +++ b/src/main/java/com/sipai/controller/whp/baseinfo/WhpSampleCodeController.java @@ -1,7 +1,6 @@ package com.sipai.controller.whp.baseinfo; import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.sipai.controller.exception.BizCheckException; @@ -28,7 +27,6 @@ import org.springframework.web.servlet.ModelAndView; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; /** diff --git a/src/main/java/com/sipai/controller/whp/baseinfo/WhpSampleTypeController.java b/src/main/java/com/sipai/controller/whp/baseinfo/WhpSampleTypeController.java index ab89eff1..7e36599c 100644 --- a/src/main/java/com/sipai/controller/whp/baseinfo/WhpSampleTypeController.java +++ b/src/main/java/com/sipai/controller/whp/baseinfo/WhpSampleTypeController.java @@ -2,25 +2,25 @@ package com.sipai.controller.whp.baseinfo; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; +import com.sipai.controller.exception.BizCheckException; import com.sipai.entity.base.Result; import com.sipai.entity.enums.EnableTypeEnum; -//import com.sipai.entity.enums.whp.AmplingPeriodEnum; import com.sipai.entity.enums.whp.AmplingPeriodEnum; import com.sipai.entity.user.User; import com.sipai.entity.whp.baseinfo.WhpSampleCode; import com.sipai.entity.whp.baseinfo.WhpSampleType; import com.sipai.entity.whp.baseinfo.WhpSampleTypeQuery; import com.sipai.entity.whp.baseinfo.WhpSampleTypeVo; -import com.sipai.controller.exception.BizCheckException; -import com.sipai.entity.whp.plan.WhpSamplingPlan; -import com.sipai.entity.whp.plan.WhpSamplingPlanTask; import com.sipai.service.whp.baseinfo.WhpSampleCodeService; import com.sipai.service.whp.baseinfo.WhpSampleTypeService; import net.sf.json.JSONArray; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.servlet.ModelAndView; import javax.annotation.Resource; diff --git a/src/main/java/com/sipai/controller/whp/baseinfo/WhpTestItemController.java b/src/main/java/com/sipai/controller/whp/baseinfo/WhpTestItemController.java index c7b8f540..4f07e1be 100644 --- a/src/main/java/com/sipai/controller/whp/baseinfo/WhpTestItemController.java +++ b/src/main/java/com/sipai/controller/whp/baseinfo/WhpTestItemController.java @@ -6,14 +6,11 @@ import com.github.pagehelper.PageInfo; import com.sipai.controller.exception.BizCheckException; import com.sipai.entity.base.Result; import com.sipai.entity.enums.EnableTypeEnum; -import com.sipai.entity.enums.KpiApplyStatusEnum; import com.sipai.entity.enums.whp.TestCurveFormulatypeEnum; import com.sipai.entity.scada.MPoint; import com.sipai.entity.user.Company; import com.sipai.entity.user.User; import com.sipai.entity.whp.baseinfo.*; - -import com.sipai.service.company.CompanyService; import com.sipai.service.scada.MPointService; import com.sipai.service.user.UnitService; import com.sipai.service.whp.baseinfo.WhpEquipmentService; diff --git a/src/main/java/com/sipai/controller/whp/baseinfo/WhpTestItemWorkingCurveController.java b/src/main/java/com/sipai/controller/whp/baseinfo/WhpTestItemWorkingCurveController.java index 3815755b..9a7df286 100644 --- a/src/main/java/com/sipai/controller/whp/baseinfo/WhpTestItemWorkingCurveController.java +++ b/src/main/java/com/sipai/controller/whp/baseinfo/WhpTestItemWorkingCurveController.java @@ -1 +1 @@ -package com.sipai.controller.whp.baseinfo; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.sipai.entity.base.Result; import com.sipai.controller.exception.BizCheckException; import com.sipai.entity.enums.EnableTypeEnum; import com.sipai.entity.enums.whp.TestCurveFormulatypeEnum; import com.sipai.entity.scada.MPoint; import com.sipai.entity.scada.MPointFormula; import com.sipai.entity.scada.MPointPropSource; import com.sipai.entity.whp.baseinfo.*; import com.sipai.entity.user.User; import com.sipai.service.scada.MPointFormulaService; import com.sipai.service.scada.MPointPropSourceService; import com.sipai.service.scada.MPointService; import com.sipai.service.whp.baseinfo.*; import com.sipai.entity.base.Result; import com.sipai.service.user.UserService; import com.sipai.tools.DateUtil; import net.sf.json.JSONArray; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Controller; import org.springframework.transaction.annotation.Transactional; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.servlet.ModelAndView; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.UUID; import java.util.stream.Collectors; /** * 方法依据Controller类 * * @Author: zxq * @Date: 2023/05/15 **/ @Controller @RequestMapping("/whp/baseinfo/WhpTestItemWorkingCurve") public class WhpTestItemWorkingCurveController { @Resource private WhpTestItemWorkingCurveService whpTestItemWorkingCurveService; @Resource private MPointService mPointService; @Resource private MPointFormulaService mPointFormulaService; @Resource private MPointPropSourceService mPointPropSourceService; /** * 页面跳转：列表页面 * * @Author: zxq * @Date: 2023/05/15 **/ @RequestMapping("/showList.do") public String showList(HttpServletRequest request, Model model ) { User cu = (User) request.getSession().getAttribute("cu"); return "whp/baseinfo/WhpTestItemWorkingCurveList"; } /** * 获取列表 * * @Author: zxq * @Date: 2023/05/15 **/ @RequestMapping("/getList.do") public ModelAndView getList(HttpServletRequest request, Model model, @RequestParam(value = "page", required = false, defaultValue = "1") Integer page, @RequestParam(value = "rows", required = false, defaultValue = "10") Integer rows, @RequestParam(value = "sort", required = false) String sort, @RequestParam(value = "order", required = false) String order, WhpTestItemWorkingCurveQuery query ) { User cu = (User) request.getSession().getAttribute("cu"); PageHelper.startPage(page, rows); List list = whpTestItemWorkingCurveService.queryList(query); List voList = new ArrayList<>(); // 编辑列表需要的字段 for (WhpTestItemWorkingCurve item : list) { WhpTestItemWorkingCurveVo vo = new WhpTestItemWorkingCurveVo(); BeanUtils.copyProperties(item, vo); if (item.getKpi_id() != null && !item.getKpi_id().equals("")) { MPoint mPoint = mPointService.selectById(item.getKpi_id()); if (mPoint != null) { vo.setMPoint(mPoint); } } else { MPoint mPoint = new MPoint(); mPoint.setParmname(item.getName()); mPoint.setDisname(item.getName()); mPoint.setUnit(item.getUnit()); vo.setMPoint(mPoint); } if (item.getFormulatype() != null) { vo.setFormulaName(TestCurveFormulatypeEnum.getNameByid(Integer.valueOf(item.getFormulatype()))); } vo.setDefaultValue(vo.getDefault_value()); // 此处加工Vo数据 voList.add(vo); } PageInfo pi = new PageInfo<>(list); JSONArray json = JSONArray.fromObject(voList); String result = "{\"total\":" + pi.getTotal() + ",\"rows\":" + json + "}"; model.addAttribute("result", result); return new ModelAndView("result"); } /** * 原始数据配置获取列表 * * @Author: zxq * @Date: 2023/05/15 **/ @RequestMapping("/getfamList.do") public ModelAndView getfamList(HttpServletRequest request, Model model, @RequestParam(value = "page", required = false, defaultValue = "1") Integer page, @RequestParam(value = "rows", required = false, defaultValue = "10") Integer rows, @RequestParam(value = "sort", required = false) String sort, @RequestParam(value = "order", required = false) String order, String unitId,String kpi_id ) { User cu = (User) request.getSession().getAttribute("cu"); String sql=" where pid='"+kpi_id+"' order by index_details"; PageHelper.startPage(page, rows); // List list = mPointFormulaService.selectListByWhere(unitId,sql); List list = this.mPointPropSourceService.selectListByWhere(unitId,sql); PageInfo pi = new PageInfo(list); JSONArray json = JSONArray.fromObject(list); String result = "{\"total\":" + pi.getTotal() + ",\"rows\":" + json + "}"; model.addAttribute("result", result); return new ModelAndView("result"); } /** * 页面跳转：曲线新增页面 * * @Author: zxq * @Date: 2023/05/15 **/ @RequestMapping("/add.do") public String doadd(HttpServletRequest request, Model model, String test_item_id ) { System.out.println(TestCurveFormulatypeEnum.getForm4JSON()); model.addAttribute("formulatypeDropDown", TestCurveFormulatypeEnum.getForm4JSON()); model.addAttribute("test_item_id", test_item_id); return "whp/baseinfo/WhpTestItemWorkingCurveAdd"; } /** * 页面跳转：调整曲线常量新增页面 * * @Author: zxq * @Date: 2023/05/15 **/ @RequestMapping("/constantadd.do") public String doconstantadd(HttpServletRequest request, Model model, String test_item_id) { //model.addAttribute("formulatypeDropDown", TestCurveFormulatypeEnum.getAll4JSON()); model.addAttribute("test_item_id", test_item_id); return "whp/baseinfo/WhpTestItemWorkingConstantAdd"; } /** * 页面跳转：跳转 基础秒速增页面 * * @Author: zxq * @Date: 2023/05/15 **/ @RequestMapping("/basicadd.do") public String dobasicadd(HttpServletRequest request, Model model, String test_item_id) { //model.addAttribute("formulatypeDropDown", TestCurveFormulatypeEnum.getAll4JSON()); model.addAttribute("test_item_id", test_item_id); return "whp/baseinfo/WhpTestItemBasicAdd"; } /** * 新增 * * @Author: zxq * @Date: 2023/05/15 **/ @RequestMapping("/save.do") @ResponseBody public Result dosave(HttpServletRequest request, Model model, WhpTestItemWorkingCurve bean ) throws BizCheckException { User cu = (User) request.getSession().getAttribute("cu"); whpTestItemWorkingCurveService.bizCheck(bean); whpTestItemWorkingCurveService.save(bean); return Result.success(); } /** * 页面跳转：常量编辑页面 * * @Author: zxq * @Date: 2023/05/15 **/ @RequestMapping("/constantedit.do") public String doconstantedit(HttpServletRequest request, Model model, String id) { //model.addAttribute("formulatypeDropDown", TestCurveFormulatypeEnum.getForm4JSON()); WhpTestItemWorkingCurve curve = whpTestItemWorkingCurveService.selectById(id); WhpTestItemWorkingCurveVo vo = new WhpTestItemWorkingCurveVo(); BeanUtils.copyProperties(curve, vo); if (curve.getKpi_id() != null && !curve.getKpi_id().equals("")) { MPoint mPoint = mPointService.selectById(curve.getKpi_id()); if (mPoint != null) { vo.setMPoint(mPoint); } } model.addAttribute("bean", vo); return "whp/baseinfo/WhpTestItemWorkingConstantEdit"; } /* *//** * 页面跳转：基础描述编辑页面 * * @Author: zxq * @Date: 2023/05/15 **//* @RequestMapping("/basicedit.do") public String dobasicedit(HttpServletRequest request, Model model, String id ) { // model.addAttribute("formulatypeDropDown", TestCurveFormulatypeEnum.getForm4JSON()); WhpTestItemWorkingCurve curve = whpTestItemWorkingCurveService.selectById(id); WhpTestItemWorkingCurveVo vo = new WhpTestItemWorkingCurveVo(); BeanUtils.copyProperties(curve, vo); if(curve.getKpi_id()!=null&&!curve.getKpi_id().equals("")) { MPoint mPoint= mPointService.selectById(curve.getKpi_id()); if(mPoint!=null) { vo.setMPoint(mPoint); } } model.addAttribute("bean", vo); return "whp/baseinfo/WhpTestItemBasicEdit"; }*/ /** * 页面跳转：曲线编辑页面 * * @Author: zxq * @Date: 2023/05/15 **/ @RequestMapping("/edit.do") public String doedit(HttpServletRequest request, Model model, String id) { model.addAttribute("formulatypeDropDown", TestCurveFormulatypeEnum.getForm4JSON()); WhpTestItemWorkingCurve curve = whpTestItemWorkingCurveService.selectById(id); WhpTestItemWorkingCurveVo vo = new WhpTestItemWorkingCurveVo(); BeanUtils.copyProperties(curve, vo); if (curve.getKpi_id() != null && !curve.getKpi_id().equals("")) { MPoint mPoint = mPointService.selectById(curve.getKpi_id()); if (mPoint != null) { vo.setMPoint(mPoint); } } model.addAttribute("bean", vo); if (curve.getFormulatype() != null && curve.getFormulatype().equals("0")) { return "whp/baseinfo/WhpTestItemBasicEdit"; } else { return "whp/baseinfo/WhpTestItemWorkingCurveEdit"; } } /** * 更新 * * @Author: zxq * @Date: 2023/05/15 **/ @RequestMapping("/update.do") @ResponseBody public Result doupdate(HttpServletRequest request, Model model, WhpTestItemWorkingCurve bean ) throws BizCheckException { User cu = (User) request.getSession().getAttribute("cu"); whpTestItemWorkingCurveService.bizCheck(bean); whpTestItemWorkingCurveService.update(bean); return Result.success(); } /** * 批量删除 * * @Author: zxq * @Date: 2023/05/15 **/ @RequestMapping("/deletes.do") @ResponseBody public Result dodels(HttpServletRequest request, Model model, @RequestParam(value = "ids") String ids) { ids = ids.replace(",", "','"); whpTestItemWorkingCurveService.deleteByWhere("where id in ('" + ids + "')"); return Result.success(); } } \ No newline at end of file +package com.sipai.controller.whp.baseinfo; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.sipai.controller.exception.BizCheckException; import com.sipai.entity.base.Result; import com.sipai.entity.enums.whp.TestCurveFormulatypeEnum; import com.sipai.entity.scada.MPoint; import com.sipai.entity.scada.MPointPropSource; import com.sipai.entity.user.User; import com.sipai.entity.whp.baseinfo.WhpTestItemWorkingCurve; import com.sipai.entity.whp.baseinfo.WhpTestItemWorkingCurveQuery; import com.sipai.entity.whp.baseinfo.WhpTestItemWorkingCurveVo; import com.sipai.service.scada.MPointFormulaService; import com.sipai.service.scada.MPointPropSourceService; import com.sipai.service.scada.MPointService; import com.sipai.service.whp.baseinfo.WhpTestItemWorkingCurveService; import net.sf.json.JSONArray; import org.springframework.beans.BeanUtils; 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.bind.annotation.ResponseBody; import org.springframework.web.servlet.ModelAndView; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import java.util.ArrayList; import java.util.List; /** * 方法依据Controller类 * * @Author: zxq * @Date: 2023/05/15 **/ @Controller @RequestMapping("/whp/baseinfo/WhpTestItemWorkingCurve") public class WhpTestItemWorkingCurveController { @Resource private WhpTestItemWorkingCurveService whpTestItemWorkingCurveService; @Resource private MPointService mPointService; @Resource private MPointFormulaService mPointFormulaService; @Resource private MPointPropSourceService mPointPropSourceService; /** * 页面跳转：列表页面 * * @Author: zxq * @Date: 2023/05/15 **/ @RequestMapping("/showList.do") public String showList(HttpServletRequest request, Model model ) { User cu = (User) request.getSession().getAttribute("cu"); return "whp/baseinfo/WhpTestItemWorkingCurveList"; } /** * 获取列表 * * @Author: zxq * @Date: 2023/05/15 **/ @RequestMapping("/getList.do") public ModelAndView getList(HttpServletRequest request, Model model, @RequestParam(value = "page", required = false, defaultValue = "1") Integer page, @RequestParam(value = "rows", required = false, defaultValue = "10") Integer rows, @RequestParam(value = "sort", required = false) String sort, @RequestParam(value = "order", required = false) String order, WhpTestItemWorkingCurveQuery query ) { User cu = (User) request.getSession().getAttribute("cu"); PageHelper.startPage(page, rows); List list = whpTestItemWorkingCurveService.queryList(query); List voList = new ArrayList<>(); // 编辑列表需要的字段 for (WhpTestItemWorkingCurve item : list) { WhpTestItemWorkingCurveVo vo = new WhpTestItemWorkingCurveVo(); BeanUtils.copyProperties(item, vo); if (item.getKpi_id() != null && !item.getKpi_id().equals("")) { MPoint mPoint = mPointService.selectById(item.getKpi_id()); if (mPoint != null) { vo.setMPoint(mPoint); } } else { MPoint mPoint = new MPoint(); mPoint.setParmname(item.getName()); mPoint.setDisname(item.getName()); mPoint.setUnit(item.getUnit()); vo.setMPoint(mPoint); } if (item.getFormulatype() != null) { vo.setFormulaName(TestCurveFormulatypeEnum.getNameByid(Integer.valueOf(item.getFormulatype()))); } vo.setDefaultValue(vo.getDefault_value()); // 此处加工Vo数据 voList.add(vo); } PageInfo pi = new PageInfo<>(list); JSONArray json = JSONArray.fromObject(voList); String result = "{\"total\":" + pi.getTotal() + ",\"rows\":" + json + "}"; model.addAttribute("result", result); return new ModelAndView("result"); } /** * 原始数据配置获取列表 * * @Author: zxq * @Date: 2023/05/15 **/ @RequestMapping("/getfamList.do") public ModelAndView getfamList(HttpServletRequest request, Model model, @RequestParam(value = "page", required = false, defaultValue = "1") Integer page, @RequestParam(value = "rows", required = false, defaultValue = "10") Integer rows, @RequestParam(value = "sort", required = false) String sort, @RequestParam(value = "order", required = false) String order, String unitId,String kpi_id ) { User cu = (User) request.getSession().getAttribute("cu"); String sql=" where pid='"+kpi_id+"' order by index_details"; PageHelper.startPage(page, rows); // List list = mPointFormulaService.selectListByWhere(unitId,sql); List list = this.mPointPropSourceService.selectListByWhere(unitId,sql); PageInfo pi = new PageInfo(list); JSONArray json = JSONArray.fromObject(list); String result = "{\"total\":" + pi.getTotal() + ",\"rows\":" + json + "}"; model.addAttribute("result", result); return new ModelAndView("result"); } /** * 页面跳转：曲线新增页面 * * @Author: zxq * @Date: 2023/05/15 **/ @RequestMapping("/add.do") public String doadd(HttpServletRequest request, Model model, String test_item_id ) { System.out.println(TestCurveFormulatypeEnum.getForm4JSON()); model.addAttribute("formulatypeDropDown", TestCurveFormulatypeEnum.getForm4JSON()); model.addAttribute("test_item_id", test_item_id); return "whp/baseinfo/WhpTestItemWorkingCurveAdd"; } /** * 页面跳转：调整曲线常量新增页面 * * @Author: zxq * @Date: 2023/05/15 **/ @RequestMapping("/constantadd.do") public String doconstantadd(HttpServletRequest request, Model model, String test_item_id) { //model.addAttribute("formulatypeDropDown", TestCurveFormulatypeEnum.getAll4JSON()); model.addAttribute("test_item_id", test_item_id); return "whp/baseinfo/WhpTestItemWorkingConstantAdd"; } /** * 页面跳转：跳转 基础秒速增页面 * * @Author: zxq * @Date: 2023/05/15 **/ @RequestMapping("/basicadd.do") public String dobasicadd(HttpServletRequest request, Model model, String test_item_id) { //model.addAttribute("formulatypeDropDown", TestCurveFormulatypeEnum.getAll4JSON()); model.addAttribute("test_item_id", test_item_id); return "whp/baseinfo/WhpTestItemBasicAdd"; } /** * 新增 * * @Author: zxq * @Date: 2023/05/15 **/ @RequestMapping("/save.do") @ResponseBody public Result dosave(HttpServletRequest request, Model model, WhpTestItemWorkingCurve bean ) throws BizCheckException { User cu = (User) request.getSession().getAttribute("cu"); whpTestItemWorkingCurveService.bizCheck(bean); whpTestItemWorkingCurveService.save(bean); return Result.success(); } /** * 页面跳转：常量编辑页面 * * @Author: zxq * @Date: 2023/05/15 **/ @RequestMapping("/constantedit.do") public String doconstantedit(HttpServletRequest request, Model model, String id) { //model.addAttribute("formulatypeDropDown", TestCurveFormulatypeEnum.getForm4JSON()); WhpTestItemWorkingCurve curve = whpTestItemWorkingCurveService.selectById(id); WhpTestItemWorkingCurveVo vo = new WhpTestItemWorkingCurveVo(); BeanUtils.copyProperties(curve, vo); if (curve.getKpi_id() != null && !curve.getKpi_id().equals("")) { MPoint mPoint = mPointService.selectById(curve.getKpi_id()); if (mPoint != null) { vo.setMPoint(mPoint); } } model.addAttribute("bean", vo); return "whp/baseinfo/WhpTestItemWorkingConstantEdit"; } /* *//** * 页面跳转：基础描述编辑页面 * * @Author: zxq * @Date: 2023/05/15 **//* @RequestMapping("/basicedit.do") public String dobasicedit(HttpServletRequest request, Model model, String id ) { // model.addAttribute("formulatypeDropDown", TestCurveFormulatypeEnum.getForm4JSON()); WhpTestItemWorkingCurve curve = whpTestItemWorkingCurveService.selectById(id); WhpTestItemWorkingCurveVo vo = new WhpTestItemWorkingCurveVo(); BeanUtils.copyProperties(curve, vo); if(curve.getKpi_id()!=null&&!curve.getKpi_id().equals("")) { MPoint mPoint= mPointService.selectById(curve.getKpi_id()); if(mPoint!=null) { vo.setMPoint(mPoint); } } model.addAttribute("bean", vo); return "whp/baseinfo/WhpTestItemBasicEdit"; }*/ /** * 页面跳转：曲线编辑页面 * * @Author: zxq * @Date: 2023/05/15 **/ @RequestMapping("/edit.do") public String doedit(HttpServletRequest request, Model model, String id) { model.addAttribute("formulatypeDropDown", TestCurveFormulatypeEnum.getForm4JSON()); WhpTestItemWorkingCurve curve = whpTestItemWorkingCurveService.selectById(id); WhpTestItemWorkingCurveVo vo = new WhpTestItemWorkingCurveVo(); BeanUtils.copyProperties(curve, vo); if (curve.getKpi_id() != null && !curve.getKpi_id().equals("")) { MPoint mPoint = mPointService.selectById(curve.getKpi_id()); if (mPoint != null) { vo.setMPoint(mPoint); } } model.addAttribute("bean", vo); if (curve.getFormulatype() != null && curve.getFormulatype().equals("0")) { return "whp/baseinfo/WhpTestItemBasicEdit"; } else { return "whp/baseinfo/WhpTestItemWorkingCurveEdit"; } } /** * 更新 * * @Author: zxq * @Date: 2023/05/15 **/ @RequestMapping("/update.do") @ResponseBody public Result doupdate(HttpServletRequest request, Model model, WhpTestItemWorkingCurve bean ) throws BizCheckException { User cu = (User) request.getSession().getAttribute("cu"); whpTestItemWorkingCurveService.bizCheck(bean); whpTestItemWorkingCurveService.update(bean); return Result.success(); } /** * 批量删除 * * @Author: zxq * @Date: 2023/05/15 **/ @RequestMapping("/deletes.do") @ResponseBody public Result dodels(HttpServletRequest request, Model model, @RequestParam(value = "ids") String ids) { ids = ids.replace(",", "','"); whpTestItemWorkingCurveService.deleteByWhere("where id in ('" + ids + "')"); return Result.success(); } } \ No newline at end of file diff --git a/src/main/java/com/sipai/controller/whp/baseinfo/WhpTestMethodController.java b/src/main/java/com/sipai/controller/whp/baseinfo/WhpTestMethodController.java index 1a37a946..665641d0 100644 --- a/src/main/java/com/sipai/controller/whp/baseinfo/WhpTestMethodController.java +++ b/src/main/java/com/sipai/controller/whp/baseinfo/WhpTestMethodController.java @@ -1 +1 @@ -package com.sipai.controller.whp.baseinfo; import com.alibaba.fastjson.JSON; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.sipai.entity.base.Result; import com.sipai.controller.exception.BizCheckException; import com.sipai.entity.enums.EnableTypeEnum; import com.sipai.entity.enums.whp.TestCurveFormulatypeEnum; import com.sipai.entity.user.Company; import com.sipai.entity.whp.baseinfo.*; import com.sipai.entity.user.User; import com.sipai.service.user.UnitService; import com.sipai.service.whp.baseinfo.*; import com.sipai.entity.base.Result; import com.sipai.service.user.UserService; import com.sipai.tools.DateUtil; import net.sf.json.JSONArray; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Controller; import org.springframework.transaction.annotation.Transactional; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.servlet.ModelAndView; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.UUID; import java.util.stream.Collectors; /** * 方法依据Controller类 * * @Author: zxq * @Date: 2023/05/15 **/ @Controller @RequestMapping("/whp/baseinfo/WhpTestMethod") public class WhpTestMethodController { @Resource private WhpTestMethodService whpTestMethodService; @Resource private WhpTestItemService whpTestItemService; @Resource private UnitService unitService; /** * 页面跳转：列表页面 * * @Author: zxq * @Date: 2023/05/15 **/ @RequestMapping("/showList.do") public String showList(HttpServletRequest request, Model model ) { User cu = (User) request.getSession().getAttribute("cu"); // 检测项目下拉 model.addAttribute("whpTestItemDropDown", JSON.toJSONString(whpTestItemService.testItemDropDownList())); return "whp/baseinfo/WhpTestMethodList"; } /** * 获取列表 * * @Author: zxq * @Date: 2023/05/15 **/ @RequestMapping("/getList.do") public ModelAndView getList(HttpServletRequest request, Model model, @RequestParam(value = "page", required = false, defaultValue = "1") Integer page, @RequestParam(value = "rows", required = false, defaultValue = "10") Integer rows, @RequestParam(value = "sort", required = false) String sort, @RequestParam(value = "order", required = false) String order, WhpTestMethodQuery query ) { User cu = (User) request.getSession().getAttribute("cu"); PageHelper.startPage(page, rows); List list = whpTestMethodService.queryList(query); List voList = new ArrayList<>(); // 编辑列表需要的字段 for (WhpTestMethod item : list) { WhpTestMethodVo vo = new WhpTestMethodVo(); BeanUtils.copyProperties(item, vo); vo.setStatusName(EnableTypeEnum.getNameByid(item.getStatus())); vo.setTestItemNames(whpTestItemService.getTestItemNamesByIds(item.getTestItem_id())); voList.add(vo); // 此处加工Vo数据 } PageInfo pi = new PageInfo<>(list); JSONArray json = JSONArray.fromObject(voList); String result = "{\"total\":" + pi.getTotal() + ",\"rows\":" + json + "}"; model.addAttribute("result", result); return new ModelAndView("result"); } /** * 页面跳转：新增页面 * * @Author: zxq * @Date: 2023/05/15 **/ @RequestMapping("/add.do") public String doadd(HttpServletRequest request, Model model ) { String companyId = request.getParameter("unitId"); Company company = this.unitService.getCompById(companyId); model.addAttribute("company",company); // 检测项目下拉 model.addAttribute("whpTestItemDropDown", JSON.toJSONString(whpTestItemService.testItemDropDownList())); // 启用下拉框 model.addAttribute("enableDropDown", EnableTypeEnum.getAllEnableType4JSON()); return "whp/baseinfo/WhpTestMethodAdd"; } /** * 新增 * * @Author: zxq * @Date: 2023/05/15 **/ @RequestMapping("/save.do") @ResponseBody public Result dosave(HttpServletRequest request, Model model, WhpTestMethod bean) throws BizCheckException { User cu = (User) request.getSession().getAttribute("cu"); whpTestMethodService.bizCheck(bean); whpTestMethodService.save(bean); return Result.success(); } /** * 页面跳转：编辑页面 * * @Author: zxq * @Date: 2023/05/15 **/ @RequestMapping("/edit.do") public String doedit(HttpServletRequest request, Model model, String id ) { // 检测项目下拉 model.addAttribute("whpTestItemDropDown", JSON.toJSONString(whpTestItemService.testItemDropDownList())); // 启用下拉框 model.addAttribute("enableDropDown", EnableTypeEnum.getAllEnableType4JSON()); WhpTestMethod whpTestMethod = whpTestMethodService.selectById(id); WhpTestMethodVo vo = new WhpTestMethodVo(); BeanUtils.copyProperties(whpTestMethod, vo); if (null != whpTestMethod.getBizId() && !whpTestMethod.getBizId().isEmpty()) { Company company = this.unitService.getCompById(whpTestMethod.getBizId()); vo.setCompany(company); } if(whpTestMethod.getTestItem_id()!=null) { vo.setTestItemNames(whpTestItemService.getTestItemNamesByIds(whpTestMethod.getTestItem_id())); } model.addAttribute("bean", vo); return "whp/baseinfo/WhpTestMethodEdit"; } /** * 更新 * * @Author: zxq * @Date: 2023/05/15 **/ @RequestMapping("/update.do") @ResponseBody public Result doupdate(HttpServletRequest request, Model model, WhpTestMethod bean ) throws BizCheckException { User cu = (User) request.getSession().getAttribute("cu"); whpTestMethodService.bizCheck(bean); whpTestMethodService.update(bean); return Result.success(); } /** * 批量删除 * * @Author: zxq * @Date: 2023/05/15 **/ @RequestMapping("/deletes.do") @ResponseBody public Result dodels(HttpServletRequest request, Model model, @RequestParam(value = "ids") String ids) { ids = ids.replace(",", "','"); whpTestMethodService.deleteByWhere("where id in ('" + ids + "')"); return Result.success(); } @RequestMapping("/whpTestItemPop.do") public String unit4SelectModalLimitedCheck(HttpServletRequest request, Model model) { // 检测部门下拉 model.addAttribute("deptDropDown", JSON.toJSONString(whpTestItemService.testOrgDropDownList())); // 状态部门下拉 model.addAttribute("enableDropDown", EnableTypeEnum.getAllEnableType4JSON()); return "whp/baseinfo/WhpTestItemPop"; } } \ No newline at end of file +package com.sipai.controller.whp.baseinfo; import com.alibaba.fastjson.JSON; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.sipai.controller.exception.BizCheckException; import com.sipai.entity.base.Result; import com.sipai.entity.enums.EnableTypeEnum; import com.sipai.entity.user.Company; import com.sipai.entity.user.User; import com.sipai.entity.whp.baseinfo.WhpTestMethod; import com.sipai.entity.whp.baseinfo.WhpTestMethodQuery; import com.sipai.entity.whp.baseinfo.WhpTestMethodVo; import com.sipai.service.user.UnitService; import com.sipai.service.whp.baseinfo.WhpTestItemService; import com.sipai.service.whp.baseinfo.WhpTestMethodService; import net.sf.json.JSONArray; import org.springframework.beans.BeanUtils; 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.bind.annotation.ResponseBody; import org.springframework.web.servlet.ModelAndView; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import java.util.ArrayList; import java.util.List; /** * 方法依据Controller类 * * @Author: zxq * @Date: 2023/05/15 **/ @Controller @RequestMapping("/whp/baseinfo/WhpTestMethod") public class WhpTestMethodController { @Resource private WhpTestMethodService whpTestMethodService; @Resource private WhpTestItemService whpTestItemService; @Resource private UnitService unitService; /** * 页面跳转：列表页面 * * @Author: zxq * @Date: 2023/05/15 **/ @RequestMapping("/showList.do") public String showList(HttpServletRequest request, Model model ) { User cu = (User) request.getSession().getAttribute("cu"); // 检测项目下拉 model.addAttribute("whpTestItemDropDown", JSON.toJSONString(whpTestItemService.testItemDropDownList())); return "whp/baseinfo/WhpTestMethodList"; } /** * 获取列表 * * @Author: zxq * @Date: 2023/05/15 **/ @RequestMapping("/getList.do") public ModelAndView getList(HttpServletRequest request, Model model, @RequestParam(value = "page", required = false, defaultValue = "1") Integer page, @RequestParam(value = "rows", required = false, defaultValue = "10") Integer rows, @RequestParam(value = "sort", required = false) String sort, @RequestParam(value = "order", required = false) String order, WhpTestMethodQuery query ) { User cu = (User) request.getSession().getAttribute("cu"); PageHelper.startPage(page, rows); List list = whpTestMethodService.queryList(query); List voList = new ArrayList<>(); // 编辑列表需要的字段 for (WhpTestMethod item : list) { WhpTestMethodVo vo = new WhpTestMethodVo(); BeanUtils.copyProperties(item, vo); vo.setStatusName(EnableTypeEnum.getNameByid(item.getStatus())); vo.setTestItemNames(whpTestItemService.getTestItemNamesByIds(item.getTestItem_id())); voList.add(vo); // 此处加工Vo数据 } PageInfo pi = new PageInfo<>(list); JSONArray json = JSONArray.fromObject(voList); String result = "{\"total\":" + pi.getTotal() + ",\"rows\":" + json + "}"; model.addAttribute("result", result); return new ModelAndView("result"); } /** * 页面跳转：新增页面 * * @Author: zxq * @Date: 2023/05/15 **/ @RequestMapping("/add.do") public String doadd(HttpServletRequest request, Model model ) { String companyId = request.getParameter("unitId"); Company company = this.unitService.getCompById(companyId); model.addAttribute("company",company); // 检测项目下拉 model.addAttribute("whpTestItemDropDown", JSON.toJSONString(whpTestItemService.testItemDropDownList())); // 启用下拉框 model.addAttribute("enableDropDown", EnableTypeEnum.getAllEnableType4JSON()); return "whp/baseinfo/WhpTestMethodAdd"; } /** * 新增 * * @Author: zxq * @Date: 2023/05/15 **/ @RequestMapping("/save.do") @ResponseBody public Result dosave(HttpServletRequest request, Model model, WhpTestMethod bean) throws BizCheckException { User cu = (User) request.getSession().getAttribute("cu"); whpTestMethodService.bizCheck(bean); whpTestMethodService.save(bean); return Result.success(); } /** * 页面跳转：编辑页面 * * @Author: zxq * @Date: 2023/05/15 **/ @RequestMapping("/edit.do") public String doedit(HttpServletRequest request, Model model, String id ) { // 检测项目下拉 model.addAttribute("whpTestItemDropDown", JSON.toJSONString(whpTestItemService.testItemDropDownList())); // 启用下拉框 model.addAttribute("enableDropDown", EnableTypeEnum.getAllEnableType4JSON()); WhpTestMethod whpTestMethod = whpTestMethodService.selectById(id); WhpTestMethodVo vo = new WhpTestMethodVo(); BeanUtils.copyProperties(whpTestMethod, vo); if (null != whpTestMethod.getBizId() && !whpTestMethod.getBizId().isEmpty()) { Company company = this.unitService.getCompById(whpTestMethod.getBizId()); vo.setCompany(company); } if(whpTestMethod.getTestItem_id()!=null) { vo.setTestItemNames(whpTestItemService.getTestItemNamesByIds(whpTestMethod.getTestItem_id())); } model.addAttribute("bean", vo); return "whp/baseinfo/WhpTestMethodEdit"; } /** * 更新 * * @Author: zxq * @Date: 2023/05/15 **/ @RequestMapping("/update.do") @ResponseBody public Result doupdate(HttpServletRequest request, Model model, WhpTestMethod bean ) throws BizCheckException { User cu = (User) request.getSession().getAttribute("cu"); whpTestMethodService.bizCheck(bean); whpTestMethodService.update(bean); return Result.success(); } /** * 批量删除 * * @Author: zxq * @Date: 2023/05/15 **/ @RequestMapping("/deletes.do") @ResponseBody public Result dodels(HttpServletRequest request, Model model, @RequestParam(value = "ids") String ids) { ids = ids.replace(",", "','"); whpTestMethodService.deleteByWhere("where id in ('" + ids + "')"); return Result.success(); } @RequestMapping("/whpTestItemPop.do") public String unit4SelectModalLimitedCheck(HttpServletRequest request, Model model) { // 检测部门下拉 model.addAttribute("deptDropDown", JSON.toJSONString(whpTestItemService.testOrgDropDownList())); // 状态部门下拉 model.addAttribute("enableDropDown", EnableTypeEnum.getAllEnableType4JSON()); return "whp/baseinfo/WhpTestItemPop"; } } \ No newline at end of file diff --git a/src/main/java/com/sipai/controller/whp/liquidWasteDispose/WhpLiquidWasteDisposeController.java b/src/main/java/com/sipai/controller/whp/liquidWasteDispose/WhpLiquidWasteDisposeController.java index 84a0c9a1..f5bb5536 100644 --- a/src/main/java/com/sipai/controller/whp/liquidWasteDispose/WhpLiquidWasteDisposeController.java +++ b/src/main/java/com/sipai/controller/whp/liquidWasteDispose/WhpLiquidWasteDisposeController.java @@ -1 +1 @@ -package com.sipai.controller.whp.liquidWasteDispose; import com.alibaba.excel.EasyExcel; import com.alibaba.excel.ExcelWriter; import com.alibaba.excel.util.MapUtils; import com.alibaba.excel.write.metadata.WriteSheet; import com.alibaba.excel.write.metadata.fill.FillConfig; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.sipai.controller.exception.BizCheckException; import com.sipai.entity.base.Result; import com.sipai.entity.enums.whp.LiquidWasteDisposeStatusEnum; import com.sipai.entity.enums.whp.LiquidWasteDisposeTypeEnum; import com.sipai.entity.user.User; import com.sipai.entity.whp.liquidWasteDispose.*; import com.sipai.service.whp.liquidWasteDispose.WhpLiquidWasteDisposeLogService; import com.sipai.service.whp.liquidWasteDispose.WhpLiquidWasteDisposeService; import com.sipai.tools.DateUtil; import net.sf.json.JSONArray; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Controller; import org.springframework.transaction.annotation.Transactional; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; 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.math.BigDecimal; import java.util.*; /** * 余样处置方式Controller类 * * @Author: 李晨 * @Date: 2022/12/20 **/ @Controller @RequestMapping("/whp/liquidWasteDispose/WhpLiquidWasteDispose") public class WhpLiquidWasteDisposeController { @Resource private WhpLiquidWasteDisposeService whpLiquidWasteDisposeService; @Resource private WhpLiquidWasteDisposeLogService whpLiquidWasteDisposeLogService; /** * 页面跳转：废液入库页面 * * @Author: 李晨 * @Date: 2022/12/20 **/ @RequestMapping("/showListInput.do") public String showList(HttpServletRequest request, Model model ) { User cu = (User) request.getSession().getAttribute("cu"); model.addAttribute("statusConditionDropDown", LiquidWasteDisposeStatusEnum.getAll4JSON()); model.addAttribute("typeConditionDropDown", LiquidWasteDisposeTypeEnum.getAll4JSON()); return "whp/liquidWasteDispose/WhpLiquidWasteDisposeListInput"; } /** * 页面跳转：废液处置页面 * * @Author: 李晨 * @Date: 2022/12/20 **/ @RequestMapping("/showListDispose.do") public String showListDispose(HttpServletRequest request, Model model ) { User cu = (User) request.getSession().getAttribute("cu"); model.addAttribute("statusConditionDropDown", LiquidWasteDisposeStatusEnum.getWithOutRecord4JSON()); model.addAttribute("typeConditionDropDown", LiquidWasteDisposeTypeEnum.getAll4JSON()); return "whp/liquidWasteDispose/WhpLiquidWasteDisposeListDispose"; } /** * 获取列表 * * @Author: 李晨 * @Date: 2022/12/20 **/ @RequestMapping("/getList.do") public ModelAndView getList(HttpServletRequest request, Model model, @RequestParam(value = "page", required = false, defaultValue = "1") Integer page, @RequestParam(value = "rows", required = false, defaultValue = "10") Integer rows, @RequestParam(value = "sort", required = false) String sort, @RequestParam(value = "order", required = false) String order, WhpLiquidWasteDisposeQuery query ) { User cu = (User) request.getSession().getAttribute("cu"); PageHelper.startPage(page, rows); List list = whpLiquidWasteDisposeService.queryList(query); List voList = new ArrayList<>(); // 编辑列表需要的字段 for (WhpLiquidWasteDispose item : list) { WhpLiquidWasteDisposeVo vo = new WhpLiquidWasteDisposeVo(); BeanUtils.copyProperties(item, vo); // 此处加工Vo数据 vo.setStatusName(LiquidWasteDisposeStatusEnum.getNameByid(item.getStatus())); vo.setLiquidWasteTypeName(LiquidWasteDisposeTypeEnum.getNameByid(item.getLiquidWasteType())); voList.add(vo); } PageInfo pi = new PageInfo<>(list); JSONArray json = JSONArray.fromObject(voList); String result = "{\"total\":" + pi.getTotal() + ",\"rows\":" + json + "}"; model.addAttribute("result", result); return new ModelAndView("result"); } @RequestMapping("/getCurrentNumbCount.do") @ResponseBody public Float getCurrentNumbCount(HttpServletRequest request, Model model, @RequestParam(value = "page", required = false, defaultValue = "1") Integer page, @RequestParam(value = "rows", required = false, defaultValue = "10") Integer rows, @RequestParam(value = "sort", required = false) String sort, @RequestParam(value = "order", required = false) String order, WhpLiquidWasteDisposeQuery query){ Float countnum=0.0f; countnum=whpLiquidWasteDisposeService.getCurrentNumbCount(query); return countnum; } /** * 获取列表 * * @Author: 李晨 * @Date: 2022/12/20 **/ @RequestMapping("/getListDispose.do") public ModelAndView getListDispose(HttpServletRequest request, Model model, @RequestParam(value = "page", required = false, defaultValue = "1") Integer page, @RequestParam(value = "rows", required = false, defaultValue = "10") Integer rows, @RequestParam(value = "sort", required = false) String sort, @RequestParam(value = "order", required = false) String order, WhpLiquidWasteDisposeQuery query ) { User cu = (User) request.getSession().getAttribute("cu"); PageHelper.startPage(page, rows); List list = whpLiquidWasteDisposeService.queryListDispose(query); List voList = new ArrayList<>(); // 编辑列表需要的字段 for (WhpLiquidWasteDispose item : list) { WhpLiquidWasteDisposeVo vo = new WhpLiquidWasteDisposeVo(); BeanUtils.copyProperties(item, vo); // 此处加工Vo数据 vo.setStatusName(LiquidWasteDisposeStatusEnum.getNameByid(item.getStatus())); vo.setLiquidWasteTypeName(LiquidWasteDisposeTypeEnum.getNameByid(item.getLiquidWasteType())); voList.add(vo); } PageInfo pi = new PageInfo<>(list); JSONArray json = JSONArray.fromObject(voList); String result = "{\"total\":" + pi.getTotal() + ",\"rows\":" + json + "}"; model.addAttribute("result", result); return new ModelAndView("result"); } /** * 页面跳转：新增页面 * * @Author: 李晨 * @Date: 2022/12/20 **/ @RequestMapping("/add.do") public String doadd(HttpServletRequest request, Model model ) { User cu = (User) request.getSession().getAttribute("cu"); model.addAttribute("cu", cu); model.addAttribute("typeConditionDropDownList", LiquidWasteDisposeTypeEnum.getAll4JSON()); return "whp/liquidWasteDispose/WhpLiquidWasteDisposeAdd"; } /** * 新增（登记） * * @Author: 李晨 * @Date: 2022/12/20 **/ @RequestMapping("/save.do") @ResponseBody public Result dosave(HttpServletRequest request, Model model, WhpLiquidWasteDispose bean ) throws BizCheckException { User cu = (User) request.getSession().getAttribute("cu"); bean.setStatus(LiquidWasteDisposeStatusEnum.RECORD.getId()); bean.setCurrentNumber(bean.getNumber()); whpLiquidWasteDisposeService.save(bean); return Result.success(); } /** * 页面跳转：处置页面 * * @Author: 李晨 * @Date: 2022/12/20 **/ @RequestMapping("/editDispose.do") public String editDispose(HttpServletRequest request, Model model, String id ) { User cu = (User) request.getSession().getAttribute("cu"); model.addAttribute("cu", cu); WhpLiquidWasteDispose whpLiquidWasteDispose = whpLiquidWasteDisposeService.selectById(id); model.addAttribute("bean", whpLiquidWasteDispose); model.addAttribute("typeConditionDropDownList", LiquidWasteDisposeTypeEnum.getAll4JSON()); return "whp/liquidWasteDispose/WhpLiquidWasteDisposeEditDispose"; } /** * 页面跳转：批量处置页面 * * @Author: 李晨 * @Date: 2022/12/20 **/ @RequestMapping("/editBatchDispose.do") public String editBatchDispose(HttpServletRequest request, Model model, String ids ) { User cu = (User) request.getSession().getAttribute("cu"); model.addAttribute("cu", cu); String idsstr=ids.replaceAll(",","','"); WhpLiquidWasteDisposeQuery query=new WhpLiquidWasteDisposeQuery(); query.setIds("('"+idsstr+"')"); Float countnum=whpLiquidWasteDisposeService.getNumberCount(query); int countnumInt = countnum.intValue(); model.addAttribute("countnum",countnumInt); model.addAttribute("ids",ids); return "whp/liquidWasteDispose/WhpLiquidWasteDisposeBatchEditDispose"; } /** * 页面跳转：入库页面 * * @Author: 李晨 * @Date: 2022/12/20 **/ @RequestMapping("/editInput.do") public String doedit(HttpServletRequest request, Model model, String id ) { WhpLiquidWasteDispose whpLiquidWasteDispose = whpLiquidWasteDisposeService.selectById(id); model.addAttribute("bean", whpLiquidWasteDispose); model.addAttribute("typeConditionDropDownList", LiquidWasteDisposeTypeEnum.getAll4JSON()); User cu = (User) request.getSession().getAttribute("cu"); model.addAttribute("cu", cu); return "whp/liquidWasteDispose/WhpLiquidWasteDisposeEditInput"; } /** * 页面跳转：批量入库页面 * * @Author: zxq * @Date: 2023/8/1 **/ @RequestMapping("/doBatches.do") public String doBatchedit(HttpServletRequest request, Model model, String ids ) { model.addAttribute("ids", ids); User cu = (User) request.getSession().getAttribute("cu"); model.addAttribute("cu", cu); return "whp/liquidWasteDispose/WhpLiquidWasteDisposeBatchEditInput"; } /** * 页面跳转：入库详情页面 * * @Author: 李晨 * @Date: 2022/12/20 **/ @RequestMapping("/viewInput.do") public String view(HttpServletRequest request, Model model, String id ) { WhpLiquidWasteDispose whpLiquidWasteDispose = whpLiquidWasteDisposeService.selectById(id); model.addAttribute("bean", whpLiquidWasteDispose); model.addAttribute("typeConditionDropDownList", LiquidWasteDisposeTypeEnum.getAll4JSON()); return "whp/liquidWasteDispose/WhpLiquidWasteDisposeViewInput"; } /** * 页面跳转：处置详情页面 * * @Author: 李晨 * @Date: 2022/12/20 **/ @RequestMapping("/viewDispose.do") public String viewDispose(HttpServletRequest request, Model model, String id ) { WhpLiquidWasteDispose whpLiquidWasteDispose = whpLiquidWasteDisposeService.selectById(id); model.addAttribute("bean", whpLiquidWasteDispose); model.addAttribute("typeConditionDropDownList", LiquidWasteDisposeTypeEnum.getAll4JSON()); return "whp/liquidWasteDispose/WhpLiquidWasteDisposeViewDispose"; } /** * 更新（入库） * * @Author: 李晨 * @Date: 2022/12/20 **/ @RequestMapping("/updateInput.do") @ResponseBody public Result doupdate(HttpServletRequest request, Model model, WhpLiquidWasteDispose bean ) throws BizCheckException { whpLiquidWasteDisposeService.updateInputBizCheck(bean); WhpLiquidWasteDisposeLog wasteDisposeLog=new WhpLiquidWasteDisposeLog(); BeanUtils.copyProperties(bean,wasteDisposeLog); wasteDisposeLog.setDisposeId(bean.getId()); wasteDisposeLog.setId(UUID.randomUUID().toString()); whpLiquidWasteDisposeLogService.save(wasteDisposeLog); bean.setStatus(LiquidWasteDisposeStatusEnum.NON_DISPOSED.getId()); whpLiquidWasteDisposeService.update(bean); return Result.success(); } /** * 更新（登记编辑） * * @Author: 李晨 * @Date: 2022/12/20 **/ @RequestMapping("/update.do") @ResponseBody public Result update(HttpServletRequest request, Model model, WhpLiquidWasteDispose bean ) throws BizCheckException { whpLiquidWasteDisposeService.updateInputBizCheck(bean); WhpLiquidWasteDisposeLog wasteDisposeLog=new WhpLiquidWasteDisposeLog(); BeanUtils.copyProperties(bean,wasteDisposeLog); wasteDisposeLog.setDisposeId(bean.getId()); wasteDisposeLog.setId(UUID.randomUUID().toString()); whpLiquidWasteDisposeLogService.save(wasteDisposeLog); bean.setRepositionUserId(""); bean.setRepositionUserName(""); whpLiquidWasteDisposeService.update(bean); return Result.success(); } /** * 更新（处置） * * @Author: 李晨 * @Date: 2022/12/20 **/ @RequestMapping("/updateDispose.do") @ResponseBody @Transactional(rollbackFor = Exception.class) public Result updateDispose(HttpServletRequest request, Model model, WhpLiquidWasteDispose bean, BigDecimal disposeNumber ) throws BizCheckException { User cu = (User) request.getSession().getAttribute("cu"); if (Objects.isNull(disposeNumber) || disposeNumber == BigDecimal.ZERO) { throw new BizCheckException("转移数量不能是0！"); } else if (disposeNumber.compareTo(bean.getNumber())==1) { throw new BizCheckException("转移数量不能超过库存数量！"); } else if (disposeNumber .compareTo(bean.getNumber())==-1) { WhpLiquidWasteDispose disposeOne = new WhpLiquidWasteDispose(); BeanUtils.copyProperties(bean, disposeOne); disposeOne.setNumber(disposeNumber); disposeOne.setStatus(LiquidWasteDisposeStatusEnum.DISPOSED.getId()); whpLiquidWasteDisposeService.save(disposeOne); bean.setNumber(bean.getNumber().subtract(disposeNumber) ); whpLiquidWasteDisposeService.update(bean); } else { bean.setStatus(LiquidWasteDisposeStatusEnum.DISPOSED.getId()); bean.setOuputDate(DateUtil.toStr(null, new Date())); whpLiquidWasteDisposeService.update(bean); } return Result.success(); } /** * 更新（ 批量处置） * * @Author: 李晨 * @Date: 2022/12/20 **/ @RequestMapping("/updateBatchDispose.do") @ResponseBody @Transactional(rollbackFor = Exception.class) public Result updateBatchDispose(HttpServletRequest request, Model model, WhpLiquidWasteDispose bean,String ids ) throws BizCheckException { for (String id : ids.split(",")) { WhpLiquidWasteDispose whpLiquidWasteDispose=new WhpLiquidWasteDispose(); BeanUtils.copyProperties(bean,whpLiquidWasteDispose); whpLiquidWasteDispose.setId(id); whpLiquidWasteDisposeService.updateInputBatchBizCheck(whpLiquidWasteDispose,1); whpLiquidWasteDispose.setStatus(LiquidWasteDisposeStatusEnum.DISPOSED.getId()); whpLiquidWasteDispose.setOuputDate(DateUtil.toStr(null, new Date())); whpLiquidWasteDisposeService.update(whpLiquidWasteDispose); } return Result.success(); } /** * 批量入库 * * @Author: 李晨 * @Date: 2022/12/20s * 2023/08/01 * 完善 todo 批量入库的时候，运送经办人统一填写 **/ @RequestMapping("/inputs.do") @ResponseBody @Transactional(rollbackFor = BizCheckException.class) public Result inputs(HttpServletRequest request, Model model, @RequestParam(value = "ids") String ids,WhpLiquidWasteDispose bean) throws BizCheckException { // for (String id : ids.split(",")) { WhpLiquidWasteDispose whpLiquidWasteDispose =whpLiquidWasteDisposeService.selectById(id); whpLiquidWasteDisposeService.updateInputBatchBizCheck(whpLiquidWasteDispose,0); whpLiquidWasteDispose.setStatus(LiquidWasteDisposeStatusEnum.NON_DISPOSED.getId()); whpLiquidWasteDispose.setInputTime(bean.getInputTime()); whpLiquidWasteDispose.setTransportUserId(bean.getTransportUserId()); whpLiquidWasteDispose.setTransportUserName(bean.getTransportUserName()); whpLiquidWasteDispose.setRepositionUserId(bean.getRepositionUserId()); whpLiquidWasteDispose.setRepositionUserName(bean.getRepositionUserName()); //whpLiquidWasteDispose.setId(id); whpLiquidWasteDisposeService.update(whpLiquidWasteDispose); } return Result.success(); } /** * 批量删除 * * @Author: 李晨 * @Date: 2022/12/20 **/ @RequestMapping("/deletes.do") @ResponseBody public Result dodels(HttpServletRequest request, Model model, @RequestParam(value = "ids") String ids) throws BizCheckException { String idsCondition = ids.replace(",", "','"); for (String id : ids.split(",")) { WhpLiquidWasteDispose whpLiquidWasteDispose = whpLiquidWasteDisposeService.selectById(id); if (whpLiquidWasteDispose.getStatus() != LiquidWasteDisposeStatusEnum.RECORD.getId()) { throw new BizCheckException("只能删除状态是“登记”的记录！"); } } whpLiquidWasteDisposeService.deleteByWhere("where id in ('" + idsCondition + "')"); return Result.success(); } @RequestMapping("/export.do") public void export(HttpServletRequest request, HttpServletResponse response, Model model, WhpLiquidWasteDisposeQuery query) throws IOException { Map map = MapUtils.newHashMap(); if (query.getLiquidWasteType()!=2) { map.put("liquidWasteTypeName", LiquidWasteDisposeTypeEnum.getNameByid(query.getLiquidWasteType())); //query.setLiquidWasteType(null); }else{ map.put("liquidWasteTypeName", "全部"); } //获取列表 List listInfo = whpLiquidWasteDisposeService.queryListDispose(query); List volist = new ArrayList<>(); for (WhpLiquidWasteDispose item : listInfo) { WhpLiquidWasteDisposeVo vo = new WhpLiquidWasteDisposeVo(); BeanUtils.copyProperties(item, vo); if (item.getStatus() == LiquidWasteDisposeStatusEnum.NON_DISPOSED.getId()) { vo.setOutputNumber(BigDecimal.ZERO); } else { vo.setOutputNumber(item.getNumber()); } if(item.getOuputDate()!=null) { vo.setOuputDate(item.getOuputDate().substring(0,10)); } vo.setInputTime(item.getInputTime().substring(0,10)); volist.add(vo); } //文件的实际地址 String filepath = request.getSession().getServletContext().getRealPath("/"); String filename = "WhpLiquidWasteDispose.xls"; //兼容Linux路径 filepath = filepath + "Template" + System.getProperty("file.separator") + "whp" + System.getProperty("file.separator") + filename; response.setContentType("application/vnd.ms-excel"); response.setCharacterEncoding("utf8"); String fileName = "白龙港污水处理厂化验室危废储存记录表.xls"; response.setHeader("Content-disposition", "attachment;filename=" + java.net.URLEncoder.encode(fileName)); try (ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream()).withTemplate(filepath).build()) { WriteSheet writeSheet = EasyExcel.writerSheet().build(); FillConfig fillConfig = FillConfig.builder().forceNewRow(Boolean.TRUE).build(); excelWriter.fill(map, writeSheet); excelWriter.fill(volist, fillConfig, writeSheet); excelWriter.finish(); } } @RequestMapping("/preview.do") public String dopreview(HttpServletRequest request,Model model,WhpLiquidWasteDisposeQuery query) throws IOException { //获取列表 List listInfo = whpLiquidWasteDisposeService.queryListDispose(query); List volist = new ArrayList<>(); for (WhpLiquidWasteDispose item : listInfo) { WhpLiquidWasteDisposeVo vo = new WhpLiquidWasteDisposeVo(); BeanUtils.copyProperties(item, vo); if (item.getStatus() == LiquidWasteDisposeStatusEnum.NON_DISPOSED.getId()) { vo.setOutputNumber(BigDecimal.ZERO); } else { vo.setOutputNumber(item.getNumber()); } volist.add(vo); } JSONArray json = JSONArray.fromObject(volist); model.addAttribute("bean", json); model.addAttribute("disposeQuery", query); return "whp/liquidWasteDispose/WhpLiquidWasteDisposePreview"; } } \ No newline at end of file +package com.sipai.controller.whp.liquidWasteDispose; import com.alibaba.excel.EasyExcel; import com.alibaba.excel.ExcelWriter; import com.alibaba.excel.util.MapUtils; import com.alibaba.excel.write.metadata.WriteSheet; import com.alibaba.excel.write.metadata.fill.FillConfig; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.sipai.controller.exception.BizCheckException; import com.sipai.entity.base.Result; import com.sipai.entity.enums.whp.LiquidWasteDisposeStatusEnum; import com.sipai.entity.enums.whp.LiquidWasteDisposeTypeEnum; import com.sipai.entity.user.User; import com.sipai.entity.whp.liquidWasteDispose.WhpLiquidWasteDispose; import com.sipai.entity.whp.liquidWasteDispose.WhpLiquidWasteDisposeLog; import com.sipai.entity.whp.liquidWasteDispose.WhpLiquidWasteDisposeQuery; import com.sipai.entity.whp.liquidWasteDispose.WhpLiquidWasteDisposeVo; import com.sipai.service.whp.liquidWasteDispose.WhpLiquidWasteDisposeLogService; import com.sipai.service.whp.liquidWasteDispose.WhpLiquidWasteDisposeService; import com.sipai.tools.DateUtil; import net.sf.json.JSONArray; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Controller; import org.springframework.transaction.annotation.Transactional; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; 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.math.BigDecimal; import java.util.*; /** * 余样处置方式Controller类 * * @Author: 李晨 * @Date: 2022/12/20 **/ @Controller @RequestMapping("/whp/liquidWasteDispose/WhpLiquidWasteDispose") public class WhpLiquidWasteDisposeController { @Resource private WhpLiquidWasteDisposeService whpLiquidWasteDisposeService; @Resource private WhpLiquidWasteDisposeLogService whpLiquidWasteDisposeLogService; /** * 页面跳转：废液入库页面 * * @Author: 李晨 * @Date: 2022/12/20 **/ @RequestMapping("/showListInput.do") public String showList(HttpServletRequest request, Model model ) { User cu = (User) request.getSession().getAttribute("cu"); model.addAttribute("statusConditionDropDown", LiquidWasteDisposeStatusEnum.getAll4JSON()); model.addAttribute("typeConditionDropDown", LiquidWasteDisposeTypeEnum.getAll4JSON()); return "whp/liquidWasteDispose/WhpLiquidWasteDisposeListInput"; } /** * 页面跳转：废液处置页面 * * @Author: 李晨 * @Date: 2022/12/20 **/ @RequestMapping("/showListDispose.do") public String showListDispose(HttpServletRequest request, Model model ) { User cu = (User) request.getSession().getAttribute("cu"); model.addAttribute("statusConditionDropDown", LiquidWasteDisposeStatusEnum.getWithOutRecord4JSON()); model.addAttribute("typeConditionDropDown", LiquidWasteDisposeTypeEnum.getAll4JSON()); return "whp/liquidWasteDispose/WhpLiquidWasteDisposeListDispose"; } /** * 获取列表 * * @Author: 李晨 * @Date: 2022/12/20 **/ @RequestMapping("/getList.do") public ModelAndView getList(HttpServletRequest request, Model model, @RequestParam(value = "page", required = false, defaultValue = "1") Integer page, @RequestParam(value = "rows", required = false, defaultValue = "10") Integer rows, @RequestParam(value = "sort", required = false) String sort, @RequestParam(value = "order", required = false) String order, WhpLiquidWasteDisposeQuery query ) { User cu = (User) request.getSession().getAttribute("cu"); PageHelper.startPage(page, rows); List list = whpLiquidWasteDisposeService.queryList(query); List voList = new ArrayList<>(); // 编辑列表需要的字段 for (WhpLiquidWasteDispose item : list) { WhpLiquidWasteDisposeVo vo = new WhpLiquidWasteDisposeVo(); BeanUtils.copyProperties(item, vo); // 此处加工Vo数据 vo.setStatusName(LiquidWasteDisposeStatusEnum.getNameByid(item.getStatus())); vo.setLiquidWasteTypeName(LiquidWasteDisposeTypeEnum.getNameByid(item.getLiquidWasteType())); voList.add(vo); } PageInfo pi = new PageInfo<>(list); JSONArray json = JSONArray.fromObject(voList); String result = "{\"total\":" + pi.getTotal() + ",\"rows\":" + json + "}"; model.addAttribute("result", result); return new ModelAndView("result"); } @RequestMapping("/getCurrentNumbCount.do") @ResponseBody public Float getCurrentNumbCount(HttpServletRequest request, Model model, @RequestParam(value = "page", required = false, defaultValue = "1") Integer page, @RequestParam(value = "rows", required = false, defaultValue = "10") Integer rows, @RequestParam(value = "sort", required = false) String sort, @RequestParam(value = "order", required = false) String order, WhpLiquidWasteDisposeQuery query){ Float countnum=0.0f; countnum=whpLiquidWasteDisposeService.getCurrentNumbCount(query); return countnum; } /** * 获取列表 * * @Author: 李晨 * @Date: 2022/12/20 **/ @RequestMapping("/getListDispose.do") public ModelAndView getListDispose(HttpServletRequest request, Model model, @RequestParam(value = "page", required = false, defaultValue = "1") Integer page, @RequestParam(value = "rows", required = false, defaultValue = "10") Integer rows, @RequestParam(value = "sort", required = false) String sort, @RequestParam(value = "order", required = false) String order, WhpLiquidWasteDisposeQuery query ) { User cu = (User) request.getSession().getAttribute("cu"); PageHelper.startPage(page, rows); List list = whpLiquidWasteDisposeService.queryListDispose(query); List voList = new ArrayList<>(); // 编辑列表需要的字段 for (WhpLiquidWasteDispose item : list) { WhpLiquidWasteDisposeVo vo = new WhpLiquidWasteDisposeVo(); BeanUtils.copyProperties(item, vo); // 此处加工Vo数据 vo.setStatusName(LiquidWasteDisposeStatusEnum.getNameByid(item.getStatus())); vo.setLiquidWasteTypeName(LiquidWasteDisposeTypeEnum.getNameByid(item.getLiquidWasteType())); voList.add(vo); } PageInfo pi = new PageInfo<>(list); JSONArray json = JSONArray.fromObject(voList); String result = "{\"total\":" + pi.getTotal() + ",\"rows\":" + json + "}"; model.addAttribute("result", result); return new ModelAndView("result"); } /** * 页面跳转：新增页面 * * @Author: 李晨 * @Date: 2022/12/20 **/ @RequestMapping("/add.do") public String doadd(HttpServletRequest request, Model model ) { User cu = (User) request.getSession().getAttribute("cu"); model.addAttribute("cu", cu); model.addAttribute("typeConditionDropDownList", LiquidWasteDisposeTypeEnum.getAll4JSON()); return "whp/liquidWasteDispose/WhpLiquidWasteDisposeAdd"; } /** * 新增（登记） * * @Author: 李晨 * @Date: 2022/12/20 **/ @RequestMapping("/save.do") @ResponseBody public Result dosave(HttpServletRequest request, Model model, WhpLiquidWasteDispose bean ) throws BizCheckException { User cu = (User) request.getSession().getAttribute("cu"); bean.setStatus(LiquidWasteDisposeStatusEnum.RECORD.getId()); bean.setCurrentNumber(bean.getNumber()); whpLiquidWasteDisposeService.save(bean); return Result.success(); } /** * 页面跳转：处置页面 * * @Author: 李晨 * @Date: 2022/12/20 **/ @RequestMapping("/editDispose.do") public String editDispose(HttpServletRequest request, Model model, String id ) { User cu = (User) request.getSession().getAttribute("cu"); model.addAttribute("cu", cu); WhpLiquidWasteDispose whpLiquidWasteDispose = whpLiquidWasteDisposeService.selectById(id); model.addAttribute("bean", whpLiquidWasteDispose); model.addAttribute("typeConditionDropDownList", LiquidWasteDisposeTypeEnum.getAll4JSON()); return "whp/liquidWasteDispose/WhpLiquidWasteDisposeEditDispose"; } /** * 页面跳转：批量处置页面 * * @Author: 李晨 * @Date: 2022/12/20 **/ @RequestMapping("/editBatchDispose.do") public String editBatchDispose(HttpServletRequest request, Model model, String ids ) { User cu = (User) request.getSession().getAttribute("cu"); model.addAttribute("cu", cu); String idsstr=ids.replaceAll(",","','"); WhpLiquidWasteDisposeQuery query=new WhpLiquidWasteDisposeQuery(); query.setIds("('"+idsstr+"')"); Float countnum=whpLiquidWasteDisposeService.getNumberCount(query); int countnumInt = countnum.intValue(); model.addAttribute("countnum",countnumInt); model.addAttribute("ids",ids); return "whp/liquidWasteDispose/WhpLiquidWasteDisposeBatchEditDispose"; } /** * 页面跳转：入库页面 * * @Author: 李晨 * @Date: 2022/12/20 **/ @RequestMapping("/editInput.do") public String doedit(HttpServletRequest request, Model model, String id ) { WhpLiquidWasteDispose whpLiquidWasteDispose = whpLiquidWasteDisposeService.selectById(id); model.addAttribute("bean", whpLiquidWasteDispose); model.addAttribute("typeConditionDropDownList", LiquidWasteDisposeTypeEnum.getAll4JSON()); User cu = (User) request.getSession().getAttribute("cu"); model.addAttribute("cu", cu); return "whp/liquidWasteDispose/WhpLiquidWasteDisposeEditInput"; } /** * 页面跳转：批量入库页面 * * @Author: zxq * @Date: 2023/8/1 **/ @RequestMapping("/doBatches.do") public String doBatchedit(HttpServletRequest request, Model model, String ids ) { model.addAttribute("ids", ids); User cu = (User) request.getSession().getAttribute("cu"); model.addAttribute("cu", cu); return "whp/liquidWasteDispose/WhpLiquidWasteDisposeBatchEditInput"; } /** * 页面跳转：入库详情页面 * * @Author: 李晨 * @Date: 2022/12/20 **/ @RequestMapping("/viewInput.do") public String view(HttpServletRequest request, Model model, String id ) { WhpLiquidWasteDispose whpLiquidWasteDispose = whpLiquidWasteDisposeService.selectById(id); model.addAttribute("bean", whpLiquidWasteDispose); model.addAttribute("typeConditionDropDownList", LiquidWasteDisposeTypeEnum.getAll4JSON()); return "whp/liquidWasteDispose/WhpLiquidWasteDisposeViewInput"; } /** * 页面跳转：处置详情页面 * * @Author: 李晨 * @Date: 2022/12/20 **/ @RequestMapping("/viewDispose.do") public String viewDispose(HttpServletRequest request, Model model, String id ) { WhpLiquidWasteDispose whpLiquidWasteDispose = whpLiquidWasteDisposeService.selectById(id); model.addAttribute("bean", whpLiquidWasteDispose); model.addAttribute("typeConditionDropDownList", LiquidWasteDisposeTypeEnum.getAll4JSON()); return "whp/liquidWasteDispose/WhpLiquidWasteDisposeViewDispose"; } /** * 更新（入库） * * @Author: 李晨 * @Date: 2022/12/20 **/ @RequestMapping("/updateInput.do") @ResponseBody public Result doupdate(HttpServletRequest request, Model model, WhpLiquidWasteDispose bean ) throws BizCheckException { whpLiquidWasteDisposeService.updateInputBizCheck(bean); WhpLiquidWasteDisposeLog wasteDisposeLog=new WhpLiquidWasteDisposeLog(); BeanUtils.copyProperties(bean,wasteDisposeLog); wasteDisposeLog.setDisposeId(bean.getId()); wasteDisposeLog.setId(UUID.randomUUID().toString()); whpLiquidWasteDisposeLogService.save(wasteDisposeLog); bean.setStatus(LiquidWasteDisposeStatusEnum.NON_DISPOSED.getId()); whpLiquidWasteDisposeService.update(bean); return Result.success(); } /** * 更新（登记编辑） * * @Author: 李晨 * @Date: 2022/12/20 **/ @RequestMapping("/update.do") @ResponseBody public Result update(HttpServletRequest request, Model model, WhpLiquidWasteDispose bean ) throws BizCheckException { whpLiquidWasteDisposeService.updateInputBizCheck(bean); WhpLiquidWasteDisposeLog wasteDisposeLog=new WhpLiquidWasteDisposeLog(); BeanUtils.copyProperties(bean,wasteDisposeLog); wasteDisposeLog.setDisposeId(bean.getId()); wasteDisposeLog.setId(UUID.randomUUID().toString()); whpLiquidWasteDisposeLogService.save(wasteDisposeLog); bean.setRepositionUserId(""); bean.setRepositionUserName(""); whpLiquidWasteDisposeService.update(bean); return Result.success(); } /** * 更新（处置） * * @Author: 李晨 * @Date: 2022/12/20 **/ @RequestMapping("/updateDispose.do") @ResponseBody @Transactional(rollbackFor = Exception.class) public Result updateDispose(HttpServletRequest request, Model model, WhpLiquidWasteDispose bean, BigDecimal disposeNumber ) throws BizCheckException { User cu = (User) request.getSession().getAttribute("cu"); if (Objects.isNull(disposeNumber) || disposeNumber == BigDecimal.ZERO) { throw new BizCheckException("转移数量不能是0！"); } else if (disposeNumber.compareTo(bean.getNumber())==1) { throw new BizCheckException("转移数量不能超过库存数量！"); } else if (disposeNumber .compareTo(bean.getNumber())==-1) { WhpLiquidWasteDispose disposeOne = new WhpLiquidWasteDispose(); BeanUtils.copyProperties(bean, disposeOne); disposeOne.setNumber(disposeNumber); disposeOne.setStatus(LiquidWasteDisposeStatusEnum.DISPOSED.getId()); whpLiquidWasteDisposeService.save(disposeOne); bean.setNumber(bean.getNumber().subtract(disposeNumber) ); whpLiquidWasteDisposeService.update(bean); } else { bean.setStatus(LiquidWasteDisposeStatusEnum.DISPOSED.getId()); bean.setOuputDate(DateUtil.toStr(null, new Date())); whpLiquidWasteDisposeService.update(bean); } return Result.success(); } /** * 更新（ 批量处置） * * @Author: 李晨 * @Date: 2022/12/20 **/ @RequestMapping("/updateBatchDispose.do") @ResponseBody @Transactional(rollbackFor = Exception.class) public Result updateBatchDispose(HttpServletRequest request, Model model, WhpLiquidWasteDispose bean,String ids ) throws BizCheckException { for (String id : ids.split(",")) { WhpLiquidWasteDispose whpLiquidWasteDispose=new WhpLiquidWasteDispose(); BeanUtils.copyProperties(bean,whpLiquidWasteDispose); whpLiquidWasteDispose.setId(id); whpLiquidWasteDisposeService.updateInputBatchBizCheck(whpLiquidWasteDispose,1); whpLiquidWasteDispose.setStatus(LiquidWasteDisposeStatusEnum.DISPOSED.getId()); whpLiquidWasteDispose.setOuputDate(DateUtil.toStr(null, new Date())); whpLiquidWasteDisposeService.update(whpLiquidWasteDispose); } return Result.success(); } /** * 批量入库 * * @Author: 李晨 * @Date: 2022/12/20s * 2023/08/01 * 完善 todo 批量入库的时候，运送经办人统一填写 **/ @RequestMapping("/inputs.do") @ResponseBody @Transactional(rollbackFor = BizCheckException.class) public Result inputs(HttpServletRequest request, Model model, @RequestParam(value = "ids") String ids,WhpLiquidWasteDispose bean) throws BizCheckException { // for (String id : ids.split(",")) { WhpLiquidWasteDispose whpLiquidWasteDispose =whpLiquidWasteDisposeService.selectById(id); whpLiquidWasteDisposeService.updateInputBatchBizCheck(whpLiquidWasteDispose,0); whpLiquidWasteDispose.setStatus(LiquidWasteDisposeStatusEnum.NON_DISPOSED.getId()); whpLiquidWasteDispose.setInputTime(bean.getInputTime()); whpLiquidWasteDispose.setTransportUserId(bean.getTransportUserId()); whpLiquidWasteDispose.setTransportUserName(bean.getTransportUserName()); whpLiquidWasteDispose.setRepositionUserId(bean.getRepositionUserId()); whpLiquidWasteDispose.setRepositionUserName(bean.getRepositionUserName()); //whpLiquidWasteDispose.setId(id); whpLiquidWasteDisposeService.update(whpLiquidWasteDispose); } return Result.success(); } /** * 批量删除 * * @Author: 李晨 * @Date: 2022/12/20 **/ @RequestMapping("/deletes.do") @ResponseBody public Result dodels(HttpServletRequest request, Model model, @RequestParam(value = "ids") String ids) throws BizCheckException { String idsCondition = ids.replace(",", "','"); for (String id : ids.split(",")) { WhpLiquidWasteDispose whpLiquidWasteDispose = whpLiquidWasteDisposeService.selectById(id); if (whpLiquidWasteDispose.getStatus() != LiquidWasteDisposeStatusEnum.RECORD.getId()) { throw new BizCheckException("只能删除状态是“登记”的记录！"); } } whpLiquidWasteDisposeService.deleteByWhere("where id in ('" + idsCondition + "')"); return Result.success(); } @RequestMapping("/export.do") public void export(HttpServletRequest request, HttpServletResponse response, Model model, WhpLiquidWasteDisposeQuery query) throws IOException { Map map = MapUtils.newHashMap(); if (query.getLiquidWasteType()!=2) { map.put("liquidWasteTypeName", LiquidWasteDisposeTypeEnum.getNameByid(query.getLiquidWasteType())); //query.setLiquidWasteType(null); }else{ map.put("liquidWasteTypeName", "全部"); } //获取列表 List listInfo = whpLiquidWasteDisposeService.queryListDispose(query); List volist = new ArrayList<>(); for (WhpLiquidWasteDispose item : listInfo) { WhpLiquidWasteDisposeVo vo = new WhpLiquidWasteDisposeVo(); BeanUtils.copyProperties(item, vo); if (item.getStatus() == LiquidWasteDisposeStatusEnum.NON_DISPOSED.getId()) { vo.setOutputNumber(BigDecimal.ZERO); } else { vo.setOutputNumber(item.getNumber()); } if(item.getOuputDate()!=null) { vo.setOuputDate(item.getOuputDate().substring(0,10)); } vo.setInputTime(item.getInputTime().substring(0,10)); volist.add(vo); } //文件的实际地址 String filepath = request.getSession().getServletContext().getRealPath("/"); String filename = "WhpLiquidWasteDispose.xls"; //兼容Linux路径 filepath = filepath + "Template" + System.getProperty("file.separator") + "whp" + System.getProperty("file.separator") + filename; response.setContentType("application/vnd.ms-excel"); response.setCharacterEncoding("utf8"); String fileName = "白龙港污水处理厂化验室危废储存记录表.xls"; response.setHeader("Content-disposition", "attachment;filename=" + java.net.URLEncoder.encode(fileName)); try (ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream()).withTemplate(filepath).build()) { WriteSheet writeSheet = EasyExcel.writerSheet().build(); FillConfig fillConfig = FillConfig.builder().forceNewRow(Boolean.TRUE).build(); excelWriter.fill(map, writeSheet); excelWriter.fill(volist, fillConfig, writeSheet); excelWriter.finish(); } } @RequestMapping("/preview.do") public String dopreview(HttpServletRequest request,Model model,WhpLiquidWasteDisposeQuery query) throws IOException { //获取列表 List listInfo = whpLiquidWasteDisposeService.queryListDispose(query); List volist = new ArrayList<>(); for (WhpLiquidWasteDispose item : listInfo) { WhpLiquidWasteDisposeVo vo = new WhpLiquidWasteDisposeVo(); BeanUtils.copyProperties(item, vo); if (item.getStatus() == LiquidWasteDisposeStatusEnum.NON_DISPOSED.getId()) { vo.setOutputNumber(BigDecimal.ZERO); } else { vo.setOutputNumber(item.getNumber()); } volist.add(vo); } JSONArray json = JSONArray.fromObject(volist); model.addAttribute("bean", json); model.addAttribute("disposeQuery", query); return "whp/liquidWasteDispose/WhpLiquidWasteDisposePreview"; } } \ No newline at end of file diff --git a/src/main/java/com/sipai/controller/whp/liquidWasteDispose/WhpLiquidWasteDisposeLogController.java b/src/main/java/com/sipai/controller/whp/liquidWasteDispose/WhpLiquidWasteDisposeLogController.java index e2619c7f..bbe33943 100644 --- a/src/main/java/com/sipai/controller/whp/liquidWasteDispose/WhpLiquidWasteDisposeLogController.java +++ b/src/main/java/com/sipai/controller/whp/liquidWasteDispose/WhpLiquidWasteDisposeLogController.java @@ -1 +1 @@ -package com.sipai.controller.whp.liquidWasteDispose; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.sipai.entity.base.Result; import com.sipai.controller.exception.BizCheckException; import com.sipai.entity.whp.liquidWasteDispose.*; import com.sipai.entity.user.User; import com.sipai.service.whp.liquidWasteDispose.*; import com.sipai.entity.base.Result; import com.sipai.service.user.UserService; import com.sipai.tools.DateUtil; import net.sf.json.JSONArray; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Controller; import org.springframework.transaction.annotation.Transactional; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.servlet.ModelAndView; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.UUID; import java.util.stream.Collectors; /** * 方法依据Controller类 * * @Author: zxq * @Date: 2023/05/15 **/ @Controller @RequestMapping("/whp/liquidWasteDispose/WhpLiquidWasteDisposeLog") public class WhpLiquidWasteDisposeLogController { @Resource private WhpLiquidWasteDisposeLogService whpLiquidWasteDisposeLogService; /** * 页面跳转：列表页面 * * @Author: zxq * @Date: 2023/05/15 **/ @RequestMapping("/showList.do") public String showList(HttpServletRequest request, Model model ) { User cu = (User) request.getSession().getAttribute("cu"); return "whp/liquidWasteDispose/WhpLiquidWasteDisposeLogList"; } /** * 获取列表 * * @Author: zxq * @Date: 2023/05/15 **/ @RequestMapping("/getList.do") public ModelAndView getList(HttpServletRequest request, Model model, @RequestParam(value = "page", required = false, defaultValue = "1") Integer page, @RequestParam(value = "rows", required = false, defaultValue = "10") Integer rows, @RequestParam(value = "sort", required = false) String sort, @RequestParam(value = "order", required = false) String order, WhpLiquidWasteDisposeLogQuery query ) { User cu = (User) request.getSession().getAttribute("cu"); PageHelper.startPage(page, rows); List list = whpLiquidWasteDisposeLogService.queryList(query); List voList = new ArrayList<>(); // 编辑列表需要的字段 for (WhpLiquidWasteDisposeLog item : list) { WhpLiquidWasteDisposeLogVo vo = new WhpLiquidWasteDisposeLogVo(); BeanUtils.copyProperties(item, vo); // 此处加工Vo数据 voList.add(vo); } PageInfo pi = new PageInfo<>(list); JSONArray json = JSONArray.fromObject(voList); String result = "{\"total\":" + pi.getTotal() + ",\"rows\":" + json + "}"; model.addAttribute("result", result); return new ModelAndView("result"); } /** * 页面跳转：新增页面 * * @Author: zxq * @Date: 2023/05/15 **/ @RequestMapping("/add.do") public String doadd(HttpServletRequest request, Model model ) { return "whp/liquidWasteDispose/WhpLiquidWasteDisposeLogAdd"; } /** * 新增 * * @Author: zxq * @Date: 2023/05/15 **/ @RequestMapping("/save.do") @ResponseBody public Result dosave(HttpServletRequest request, Model model, WhpLiquidWasteDisposeLog bean ) throws BizCheckException { User cu = (User) request.getSession().getAttribute("cu"); whpLiquidWasteDisposeLogService.bizCheck(bean); whpLiquidWasteDisposeLogService.save(bean); return Result.success(); } /** * 页面跳转：编辑页面 * * @Author: zxq * @Date: 2023/05/15 **/ @RequestMapping("/edit.do") public String doedit(HttpServletRequest request, Model model, String id ) { WhpLiquidWasteDisposeLog whpLiquidWasteDisposeLog = whpLiquidWasteDisposeLogService.selectById(id); model.addAttribute("bean", whpLiquidWasteDisposeLog); return "whp/liquidWasteDispose/WhpLiquidWasteDisposeLogEdit"; } /** * 页面跳转：编辑页面 * * @Author: zxq * @Date: 2023/05/15 **/ @RequestMapping("/doDisPoseLogList.do") public String doDisPoseLogList(HttpServletRequest request, Model model, String disposeId) { model.addAttribute("disposeId", disposeId); return "whp/liquidWasteDispose/WhpLiquidWasteCheckDisposeLog"; } /** * 更新 * * @Author: zxq * @Date: 2023/05/15 **/ @RequestMapping("/update.do") @ResponseBody public Result doupdate(HttpServletRequest request, Model model, WhpLiquidWasteDisposeLog bean ) throws BizCheckException { User cu = (User) request.getSession().getAttribute("cu"); whpLiquidWasteDisposeLogService.bizCheck(bean); whpLiquidWasteDisposeLogService.update(bean); return Result.success(); } /** * 批量删除 * * @Author: zxq * @Date: 2023/05/15 **/ @RequestMapping("/deletes.do") @ResponseBody public Result dodels(HttpServletRequest request, Model model, @RequestParam(value = "ids") String ids) { ids = ids.replace(",", "','"); whpLiquidWasteDisposeLogService.deleteByWhere("where id in ('" + ids + "')"); return Result.success(); } } \ No newline at end of file +package com.sipai.controller.whp.liquidWasteDispose; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.sipai.controller.exception.BizCheckException; import com.sipai.entity.base.Result; import com.sipai.entity.user.User; import com.sipai.entity.whp.liquidWasteDispose.WhpLiquidWasteDisposeLog; import com.sipai.entity.whp.liquidWasteDispose.WhpLiquidWasteDisposeLogQuery; import com.sipai.entity.whp.liquidWasteDispose.WhpLiquidWasteDisposeLogVo; import com.sipai.service.whp.liquidWasteDispose.WhpLiquidWasteDisposeLogService; import net.sf.json.JSONArray; import org.springframework.beans.BeanUtils; 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.bind.annotation.ResponseBody; import org.springframework.web.servlet.ModelAndView; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import java.util.ArrayList; import java.util.List; /** * 方法依据Controller类 * * @Author: zxq * @Date: 2023/05/15 **/ @Controller @RequestMapping("/whp/liquidWasteDispose/WhpLiquidWasteDisposeLog") public class WhpLiquidWasteDisposeLogController { @Resource private WhpLiquidWasteDisposeLogService whpLiquidWasteDisposeLogService; /** * 页面跳转：列表页面 * * @Author: zxq * @Date: 2023/05/15 **/ @RequestMapping("/showList.do") public String showList(HttpServletRequest request, Model model ) { User cu = (User) request.getSession().getAttribute("cu"); return "whp/liquidWasteDispose/WhpLiquidWasteDisposeLogList"; } /** * 获取列表 * * @Author: zxq * @Date: 2023/05/15 **/ @RequestMapping("/getList.do") public ModelAndView getList(HttpServletRequest request, Model model, @RequestParam(value = "page", required = false, defaultValue = "1") Integer page, @RequestParam(value = "rows", required = false, defaultValue = "10") Integer rows, @RequestParam(value = "sort", required = false) String sort, @RequestParam(value = "order", required = false) String order, WhpLiquidWasteDisposeLogQuery query ) { User cu = (User) request.getSession().getAttribute("cu"); PageHelper.startPage(page, rows); List list = whpLiquidWasteDisposeLogService.queryList(query); List voList = new ArrayList<>(); // 编辑列表需要的字段 for (WhpLiquidWasteDisposeLog item : list) { WhpLiquidWasteDisposeLogVo vo = new WhpLiquidWasteDisposeLogVo(); BeanUtils.copyProperties(item, vo); // 此处加工Vo数据 voList.add(vo); } PageInfo pi = new PageInfo<>(list); JSONArray json = JSONArray.fromObject(voList); String result = "{\"total\":" + pi.getTotal() + ",\"rows\":" + json + "}"; model.addAttribute("result", result); return new ModelAndView("result"); } /** * 页面跳转：新增页面 * * @Author: zxq * @Date: 2023/05/15 **/ @RequestMapping("/add.do") public String doadd(HttpServletRequest request, Model model ) { return "whp/liquidWasteDispose/WhpLiquidWasteDisposeLogAdd"; } /** * 新增 * * @Author: zxq * @Date: 2023/05/15 **/ @RequestMapping("/save.do") @ResponseBody public Result dosave(HttpServletRequest request, Model model, WhpLiquidWasteDisposeLog bean ) throws BizCheckException { User cu = (User) request.getSession().getAttribute("cu"); whpLiquidWasteDisposeLogService.bizCheck(bean); whpLiquidWasteDisposeLogService.save(bean); return Result.success(); } /** * 页面跳转：编辑页面 * * @Author: zxq * @Date: 2023/05/15 **/ @RequestMapping("/edit.do") public String doedit(HttpServletRequest request, Model model, String id ) { WhpLiquidWasteDisposeLog whpLiquidWasteDisposeLog = whpLiquidWasteDisposeLogService.selectById(id); model.addAttribute("bean", whpLiquidWasteDisposeLog); return "whp/liquidWasteDispose/WhpLiquidWasteDisposeLogEdit"; } /** * 页面跳转：编辑页面 * * @Author: zxq * @Date: 2023/05/15 **/ @RequestMapping("/doDisPoseLogList.do") public String doDisPoseLogList(HttpServletRequest request, Model model, String disposeId) { model.addAttribute("disposeId", disposeId); return "whp/liquidWasteDispose/WhpLiquidWasteCheckDisposeLog"; } /** * 更新 * * @Author: zxq * @Date: 2023/05/15 **/ @RequestMapping("/update.do") @ResponseBody public Result doupdate(HttpServletRequest request, Model model, WhpLiquidWasteDisposeLog bean ) throws BizCheckException { User cu = (User) request.getSession().getAttribute("cu"); whpLiquidWasteDisposeLogService.bizCheck(bean); whpLiquidWasteDisposeLogService.update(bean); return Result.success(); } /** * 批量删除 * * @Author: zxq * @Date: 2023/05/15 **/ @RequestMapping("/deletes.do") @ResponseBody public Result dodels(HttpServletRequest request, Model model, @RequestParam(value = "ids") String ids) { ids = ids.replace(",", "','"); whpLiquidWasteDisposeLogService.deleteByWhere("where id in ('" + ids + "')"); return Result.success(); } } \ No newline at end of file diff --git a/src/main/java/com/sipai/controller/whp/plan/WhpSamplingPlanController.java b/src/main/java/com/sipai/controller/whp/plan/WhpSamplingPlanController.java index db98ea6e..ab728461 100644 --- a/src/main/java/com/sipai/controller/whp/plan/WhpSamplingPlanController.java +++ b/src/main/java/com/sipai/controller/whp/plan/WhpSamplingPlanController.java @@ -32,7 +32,10 @@ import org.springframework.web.servlet.ModelAndView; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; -import java.util.*; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Map; /** * 采样计划Controller类 diff --git a/src/main/java/com/sipai/controller/whp/sample/WhpSampleRepositoryController.java b/src/main/java/com/sipai/controller/whp/sample/WhpSampleRepositoryController.java index 8590d10d..150096c2 100644 --- a/src/main/java/com/sipai/controller/whp/sample/WhpSampleRepositoryController.java +++ b/src/main/java/com/sipai/controller/whp/sample/WhpSampleRepositoryController.java @@ -3,7 +3,6 @@ package com.sipai.controller.whp.sample; 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.enums.EnumJsonObject; import com.sipai.entity.enums.whp.*; import com.sipai.entity.user.User; @@ -19,7 +18,6 @@ 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.bind.annotation.ResponseBody; import org.springframework.web.servlet.ModelAndView; import javax.annotation.Resource; diff --git a/src/main/java/com/sipai/controller/whp/test/WhpSamplingPlanTaskTestConfirmController.java b/src/main/java/com/sipai/controller/whp/test/WhpSamplingPlanTaskTestConfirmController.java index 30acaccd..5bbbc61d 100644 --- a/src/main/java/com/sipai/controller/whp/test/WhpSamplingPlanTaskTestConfirmController.java +++ b/src/main/java/com/sipai/controller/whp/test/WhpSamplingPlanTaskTestConfirmController.java @@ -1 +1 @@ -package com.sipai.controller.whp.test; import cn.hutool.core.util.NumberUtil; 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.enums.EnumJsonObject; import com.sipai.entity.enums.whp.SamplingPlanTaskStatusEnum; import com.sipai.entity.enums.whp.SamplingPlanTaskTestConfirmStatusEnum; import com.sipai.entity.enums.whp.SamplingPlanTaskTestItemStatusEnum; import com.sipai.entity.enums.whp.TableHeader; import com.sipai.entity.scada.MPoint; import com.sipai.entity.user.User; import com.sipai.entity.whp.baseinfo.*; import com.sipai.entity.whp.plan.WhpSamplingPlanTask; import com.sipai.entity.whp.test.*; import com.sipai.service.scada.MPointService; import com.sipai.service.whp.baseinfo.*; import com.sipai.service.whp.plan.WhpSamplingPlanService; import com.sipai.service.whp.plan.WhpSamplingPlanTaskService; import com.sipai.service.whp.test.WhpSamplingPlanTaskTestConfirmService; import com.sipai.service.whp.test.WhpSamplingPlanTaskTestItemService; import com.sipai.service.whp.test.WhpTaskItemCurveService; import com.sipai.tools.DateUtil; import net.sf.json.JSONArray; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Controller; import org.springframework.transaction.annotation.Transactional; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.servlet.ModelAndView; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import java.math.BigDecimal; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.UUID; /** * 计划单检测项目分组信息Controller类 * * @Author: 李晨 * @Date: 2023/1/5 **/ @Controller @RequestMapping("/whp/test/WhpSamplingPlanTaskTestConfirm") public class WhpSamplingPlanTaskTestConfirmController { @Resource private WhpSamplingPlanService whpSamplingPlanService; @Resource private WhpSamplingPlanTaskTestConfirmService whpSamplingPlanTaskTestConfirmService; @Resource private WhpSampleTypeService sampleTypeService; @Resource private WhpSamplingPlanTaskTestItemService whpSamplingPlanTaskTestItemService; @Resource private WhpTestItemWorkingCurveService whpTestItemWorkingCurveService; @Resource private WhpEquipmentService whpEquipmentService; @Resource private WhpTestItemWorkingCurveService workingCurveService; @Resource private MPointService mPointService; @Resource private WhpTaskItemCurveService whpTaskItemCurveService; @Resource private WhpTestMethodService whpTestMethodService; @Resource private WhpTestItemService whpTestItemService; @Resource private WhpSamplingPlanTaskService whpSamplingPlanTaskService; /** * 页面跳转：我的任务 * * @Author: 李晨 * @Date: 2023/1/5 **/ @RequestMapping("/showListForTestTask.do") public String showListForTestTask(HttpServletRequest request, Model model ) { User cu = (User) request.getSession().getAttribute("cu"); //登录人id model.addAttribute("loginUserId", cu.getId()); //采样类型 model.addAttribute("sampleTypeDropDown", JSON.toJSONString(sampleTypeService.dropDownList())); //我的任务任务状态 model.addAttribute("StatusDropDown", SamplingPlanTaskTestConfirmStatusEnum.getAll4JsonWithInTask()); return "whp/test/WhpSamplingPlanTaskTestTask"; } /** * 页面跳转：检验任务管理 * * @Author: 李晨 * @Date: 2023/1/5 **/ @RequestMapping("/showListForTestConfirm.do") public String showListForTestConfirm(HttpServletRequest request, Model model ) { User cu = (User) request.getSession().getAttribute("cu"); //登录人id model.addAttribute("loginUserId", cu.getId()); //采样类型 model.addAttribute("sampleTypeDropDown", JSON.toJSONString(sampleTypeService.dropDownList())); //我的任务任务状态 model.addAttribute("StatusDropDown", SamplingPlanTaskTestConfirmStatusEnum.getAll4JsonWithInCONFIRM()); return "whp/test/WhpSamplingPlanTaskConfirmList"; } /** * 检测项目下拉 * * @Author: 李晨 * @Date: 2023/1/5 **/ @RequestMapping("/TestItemTree.do") @ResponseBody public Result dosave(HttpServletRequest request, String testItemName ) { WhpSamplingPlanTaskTestConfirmQuery query = new WhpSamplingPlanTaskTestConfirmQuery(); User cu = (User) request.getSession().getAttribute("cu"); //query.setDeptId(cu.getPid()); query.setLikeString(testItemName); return Result.success(whpSamplingPlanTaskTestConfirmService.testItemTree(query)); } /** * 获取列表 * * @Author: 李晨 * @Date: 2023/1/5 **/ @RequestMapping("/getList.do") public ModelAndView getList(HttpServletRequest request, Model model, @RequestParam(value = "page", required = false, defaultValue = "1") Integer page, @RequestParam(value = "rows", required = false, defaultValue = "10") Integer rows, @RequestParam(value = "sort", required = false) String sort, @RequestParam(value = "order", required = false) String order, WhpSamplingPlanTaskTestConfirmQuery query ) { String whereStr = ""; User cu = (User) request.getSession().getAttribute("cu"); String user_unitId = cu.getPid(); //获取检验任务管理下 人员对应部门的 检测项目 String testItemIds = ""; List WhpTestItem_list = whpTestItemService.selectListByWhere(" where dept_ids like '%" + user_unitId + "%' "); if (WhpTestItem_list != null && WhpTestItem_list.size() > 0) { for (int i = 0; i < WhpTestItem_list.size(); i++) { testItemIds += WhpTestItem_list.get(i).getId() + ","; } } if (testItemIds.length() > 0) { // testItemIds = testItemIds.replaceAll(",", "','"); testItemIds = "'"+testItemIds.replace(",","','")+"'"; }else{ testItemIds = ""; } // Sy打打 stem.out.println(testItemIds);,'2093a295-b9ff-4f41-9118-32af3f3a4746" query.setTestItemIds(testItemIds); PageHelper.startPage(page, rows); List list = whpSamplingPlanTaskTestConfirmService.queryList(query); List voList = new ArrayList<>(); // 编辑列表需要的字段 for (WhpSamplingPlanTaskTestConfirm item : list) { WhpSamplingPlanTaskTestConfirmVo vo = new WhpSamplingPlanTaskTestConfirmVo(); BeanUtils.copyProperties(item, vo); // 此处加工Vo数据 vo.setStatusName(whpSamplingPlanTaskTestConfirmService.writeStatusString(item)); vo.setSamplingTaskNumber(whpSamplingPlanTaskTestItemService.countByConfirmId(item.getId())); if (item.getConfirmDate() == null || item.getConfirmDate() == "") { vo.setConfirmUserName(""); } voList.add(vo); } PageInfo pi = new PageInfo<>(list); JSONArray json = JSONArray.fromObject(voList); String result = "{\"total\":" + pi.getTotal() + ",\"rows\":" + json + "}"; model.addAttribute("result", result); return new ModelAndView("result"); } /** * 获取列表 * * @Author: 李晨 * @Date: 2023/1/5 **/ @RequestMapping("/getIndexTaskList.do") public ModelAndView getIndexTaskList(HttpServletRequest request, Model model, @RequestParam(value = "page", required = false, defaultValue = "1") Integer page, @RequestParam(value = "rows", required = false, defaultValue = "10") Integer rows, @RequestParam(value = "sort", required = false) String sort, @RequestParam(value = "order", required = false) String order, WhpSamplingPlanTaskTestConfirmQuery query ) { User cu = (User) request.getSession().getAttribute("cu"); query.setTestUserId(cu.getId()); query.setStatus(SamplingPlanTaskTestConfirmStatusEnum.TEST.getId()); PageHelper.startPage(page, rows); List list = whpSamplingPlanTaskTestConfirmService.queryList(query); List voList = new ArrayList<>(); // 编辑列表需要的字段 for (WhpSamplingPlanTaskTestConfirm item : list) { WhpSamplingPlanTaskTestConfirmVo vo = new WhpSamplingPlanTaskTestConfirmVo(); BeanUtils.copyProperties(item, vo); // 此处加工Vo数据 vo.setStatusName(whpSamplingPlanTaskTestConfirmService.writeIndexStatusString(item)); vo.setSamplingTaskNumber(whpSamplingPlanTaskTestItemService.countByConfirmId(item.getId())); voList.add(vo); } PageInfo pi = new PageInfo<>(list); JSONArray json = JSONArray.fromObject(voList); String result = "{\"total\":" + pi.getTotal() + ",\"rows\":" + json + "}"; model.addAttribute("result", result); return new ModelAndView("result"); } /** * 保存检测结果 * * @Author: 李晨 * @Date: 2023/1/5 **/ @RequestMapping("/update.do") @ResponseBody public Result doupdate(HttpServletRequest request, Model model, WhpSamplingPlanTaskTestConfirmVo bean ) { User cu = (User) request.getSession().getAttribute("cu"); List contantlist = bean.getContantCurvelist(); if (bean.getContantCurvelist() != null) { for (int i = 0; i < contantlist.size(); i++) { WhpTaskItemCurve taskItemCurve = contantlist.get(i); if (taskItemCurve.getId() != null && !taskItemCurve.getId().equals("")) { WhpTaskItemCurve whpTaskItemCurve = contantlist.get(0); whpTaskItemCurveService.update(contantlist.get(0)); /* WhpTestItemWorkingCurve whpTestItemWorkingCurve = new WhpTestItemWorkingCurve(); whpTestItemWorkingCurve.setId(taskItemCurve.getWorking_curve_id()); whpTestItemWorkingCurve.setDefault_value(taskItemCurve.getCalculated_value()); whpTestItemWorkingCurveService.update(whpTestItemWorkingCurve);*/ } else { taskItemCurve.setId(UUID.randomUUID().toString()); taskItemCurve.setPlan_code(bean.getPlanCode()); whpTaskItemCurveService.save(taskItemCurve); } } } whpSamplingPlanTaskTestConfirmService.update(bean); return Result.success(); } /** * 保存提交检测结果 *

* 2023.8.30 更新为 提交即复核完成 * * @Author: 李晨 * @Date: 2023/1/5 **/ @RequestMapping("/submit.do") @ResponseBody @Transactional(rollbackFor = Exception.class) public Result submit(HttpServletRequest request, Model model, WhpSamplingPlanTaskTestConfirm bean ) { User cu = (User) request.getSession().getAttribute("cu"); // bean.setStatus(SamplingPlanTaskTestConfirmStatusEnum.CONFIRM.getId()); // bean.setStatus(SamplingPlanTaskTestConfirmStatusEnum.AUDIT.getId()); whpSamplingPlanTaskTestConfirmService.update(bean); /* WhpSamplingPlanTaskTestItem testItem = new WhpSamplingPlanTaskTestItem(); testItem.setTestConfirmId(bean.getId()); testItem.setStatus(SamplingPlanTaskTestItemStatusEnum.CONFIRM.getId());*/ WhpSamplingPlanTaskTestConfirm confirm = whpSamplingPlanTaskTestConfirmService.selectById(bean.getId()); // 检测完成提交 复核信息填写 confirm.setConfirmUserId(confirm.getTestUserId()); confirm.setConfirmUserName(confirm.getTestUserName()); confirm.setConfirmDate(confirm.getTestDate()); confirm.setStatus(SamplingPlanTaskTestConfirmStatusEnum.AUDIT.getId()); whpSamplingPlanTaskTestConfirmService.update(confirm); //更新检测项目 复核完成 WhpSamplingPlanTaskTestItem testItem = new WhpSamplingPlanTaskTestItem(); testItem.setTestConfirmId(bean.getId()); testItem.setStatus(SamplingPlanTaskTestItemStatusEnum.AUDIT.getId()); whpSamplingPlanTaskTestItemService.updateStatusByConfirmId(testItem); whpSamplingPlanService.isTestConfirmDone(confirm.getPlanId()); return Result.success(); } /** * 保存提交检测复核结果 * * @Author: 李晨 * @Date: 2023/1/5 **/ @RequestMapping("/confirm.do") @ResponseBody @Transactional(rollbackFor = Exception.class) public Result confirm(HttpServletRequest request, Model model, WhpSamplingPlanTaskTestConfirmVo bean ) { User cu = (User) request.getSession().getAttribute("cu"); List contantlist = bean.getContantCurvelist(); if (contantlist != null) { for (int i = 0; i < contantlist.size(); i++) { WhpTaskItemCurve taskItemCurve = contantlist.get(i); if (taskItemCurve.getId() != null && !taskItemCurve.getId().equals("")) { whpTaskItemCurveService.update(contantlist.get(0)); } else { taskItemCurve.setId(UUID.randomUUID().toString()); taskItemCurve.setPlan_code(bean.getPlanCode()); whpTaskItemCurveService.save(taskItemCurve); } } } if (bean.getStatus() != SamplingPlanTaskTestConfirmStatusEnum.BACK_FROM_CONFIRM.getId()) { bean.setStatus(SamplingPlanTaskTestConfirmStatusEnum.AUDIT.getId()); WhpSamplingPlanTaskTestConfirm confirm = whpSamplingPlanTaskTestConfirmService.selectById(bean.getId()); whpSamplingPlanService.isTestConfirmDone(confirm.getPlanId()); WhpSamplingPlanTaskTestItem testItem = new WhpSamplingPlanTaskTestItem(); testItem.setTestConfirmId(bean.getId()); testItem.setStatus(SamplingPlanTaskTestItemStatusEnum.AUDIT.getId()); whpSamplingPlanTaskTestItemService.updateStatusByConfirmId(testItem); } whpSamplingPlanTaskTestConfirmService.update(bean); return Result.success(); } /** * 页面跳转：接单弹窗 * * @Author: 李晨 * @Date: 2023/1/5 **/ @RequestMapping("/acceptShow.do") public String doedit(HttpServletRequest request, Model model, String id ) { WhpSamplingPlanTaskTestConfirm bean = whpSamplingPlanTaskTestConfirmService.selectById(id); WhpSamplingPlanTaskTestConfirmVo vo = new WhpSamplingPlanTaskTestConfirmVo(); BeanUtils.copyProperties(bean, vo); vo.setSamplingTaskNumber(whpSamplingPlanTaskTestItemService.countByConfirmId(bean.getId())); model.addAttribute("bean", vo); return "whp/test/WhpSamplingPlanTaskTestConfirmEditAccept"; } /** * 页面跳转：监测数据复核弹窗 * * @Author: 李晨 * @Date: 2023/1/5 **/ @RequestMapping("/confirmShow.do") public String confirmShow(HttpServletRequest request, Model model, String id ) { WhpSamplingPlanTaskTestConfirm whpSamplingPlanTaskTestConfirm = whpSamplingPlanTaskTestConfirmService.selectById(id); //查询结果公式 WhpTestItemWorkingCurve curve = whpTestItemWorkingCurveService.selectByTestItemId(whpSamplingPlanTaskTestConfirm.getTestItemId()); if (curve.getKpi_id() != null) { // MPoint mPoint = mPointService.selectById(curve.getKpi_id()); if (mPoint != null) { whpSamplingPlanTaskTestConfirm.setWorkCurveName(mPoint.getExp()); } } WhpSamplingPlanTaskTestConfirmVo vo = new WhpSamplingPlanTaskTestConfirmVo(); BeanUtils.copyProperties(whpSamplingPlanTaskTestConfirm, vo); //查询 关联测点信息 List whpTestItemWorkingCurves = workingCurveService.selectListByItem(whpSamplingPlanTaskTestConfirm.getTestItemId(), "1"); if (whpTestItemWorkingCurves != null && whpTestItemWorkingCurves.size() > 0) { for (WhpTestItemWorkingCurveVo item : whpTestItemWorkingCurves) { String sql = " where plan_code= '" + whpSamplingPlanTaskTestConfirm.getPlanCode() + "' and working_curve_id ='" + item.getId() + "' AND sample_code is NULL"; List taskItemCurveList = whpTaskItemCurveService.selectListByWhere(sql); //若保存值不为空 则 替换为最新值 if (taskItemCurveList != null && taskItemCurveList.size() > 0) { item.setTaskitemCureid(taskItemCurveList.get(0).getId()); item.setDefault_value(taskItemCurveList.get(0).getCalculated_value()); } if (item.getMPoint() != null && item.getMPoint().getNumtail() != null) { //item.setDefault_value(item.getDefault_value().setScale(Integer.parseInt(item.getMPoint().getNumtail()),BigDecimal.ROUND_HALF_UP)); // item.setDefault_value(NumberUtil.roundHalfEven(item.getDefault_value(), Integer.parseInt(String.valueOf(item.getMPoint().getNumtail())))); item.setDefault_value(item.getDefault_value()); } } } vo.setContantworkingCurveVoslist(whpTestItemWorkingCurves); // HashMap hashMap=new HashMap(); // JSONArray json = JSONArray.fromObject(voList); // String result = "{\"total\":" + pi.getTotal() + ",\"rows\":" + json + "}"; //表头 List tablelist = new ArrayList(); List list = workingCurveService.selectListByItem(whpSamplingPlanTaskTestConfirm.getTestItemId(), "0,2,3"); if (list != null && list.size() > 0) { for (int i = 0; i < list.size(); i++) { WhpTestItemWorkingCurveVo curveVo = list.get(i); TableHeader header = new TableHeader(); if (curveVo.getFormulatype().equals("0")) { header.setField(curveVo.getName()); header.setTitle(curveVo.getName()); header.setAlign("center"); header.setValign("middle"); } else { header.setField(curveVo.getMPoint().getMpointcode()); String parmname = curveVo.getMPoint().getParmname(); if (parmname.contains("(")) { parmname = parmname.substring(0, parmname.indexOf("(")); } if (parmname.contains("（")) { parmname = parmname.substring(0, parmname.indexOf("（")); } header.setTitle(parmname); header.setAlign("center"); header.setValign("middle"); } tablelist.add(header); } } JSONArray json = JSONArray.fromObject(tablelist); model.addAttribute("itemMethodDropDown", JSON.toJSONString(whpTestMethodService.testMethodDropDownList(whpSamplingPlanTaskTestConfirm.getTestItemId()))); model.addAttribute("tableheaders", json); model.addAttribute("confirmStatusDropDown", SamplingPlanTaskTestConfirmStatusEnum.getIsConfirm4JSON()); model.addAttribute("bean", vo); return "whp/test/WhpSamplingPlanTaskTestConfirmEditConfirm"; } /** * 接单 * * @Author: 李晨 * @Date: 2023/1/5 **/ @RequestMapping("/accept.do") @ResponseBody @Transactional(rollbackFor = Exception.class) public Result accept(HttpServletRequest request, String id ) { User cu = (User) request.getSession().getAttribute("cu"); WhpSamplingPlanTaskTestConfirm bean = new WhpSamplingPlanTaskTestConfirm(); bean.setId(id); bean.setStatus(SamplingPlanTaskTestConfirmStatusEnum.TEST.getId()); bean.setTestUserId(cu.getId()); bean.setTestUserName(cu.getCaption()); whpSamplingPlanTaskTestConfirmService.update(bean); WhpSamplingPlanTaskTestItem testItem = new WhpSamplingPlanTaskTestItem(); testItem.setTestConfirmId(id); testItem.setStatus(SamplingPlanTaskTestItemStatusEnum.TEST.getId()); whpSamplingPlanTaskTestItemService.updateStatusByConfirmId(testItem); return Result.success(); } /** * 撤销 * * @Author: 李晨 * @Date: 2023/1/5 **/ @RequestMapping("/back.do") @ResponseBody @Transactional(rollbackFor = Exception.class) public Result back(HttpServletRequest request, String id ) { User cu = (User) request.getSession().getAttribute("cu"); WhpSamplingPlanTaskTestConfirm bean = new WhpSamplingPlanTaskTestConfirm(); bean.setId(id); bean.setStatus(SamplingPlanTaskTestConfirmStatusEnum.WAIT.getId()); bean.setTestUserId(""); bean.setTestUserName(""); whpSamplingPlanTaskTestConfirmService.update(bean); WhpSamplingPlanTaskTestItem testItem = new WhpSamplingPlanTaskTestItem(); testItem.setTestConfirmId(id); testItem.setStatus(SamplingPlanTaskTestItemStatusEnum.WAIT.getId()); whpSamplingPlanTaskTestItemService.updateStatusByConfirmId(testItem); return Result.success(); } /** * 页面跳转：检测任务浏览页面 * * @Author: 李晨 * @Date: 2023/1/5 **/ @RequestMapping("/view.do") public String view(HttpServletRequest request, Model model, String id ) { WhpSamplingPlanTaskTestConfirm confirm = whpSamplingPlanTaskTestConfirmService.selectById(id); //查询结果公式 WhpTestItemWorkingCurve curve = whpTestItemWorkingCurveService.selectByTestItemId(confirm.getTestItemId()); if (curve.getKpi_id() != null) { // MPoint mPoint = mPointService.selectById(curve.getKpi_id()); if (mPoint != null) { confirm.setWorkCurveName(mPoint.getExp()); } } WhpSamplingPlanTaskTestConfirmVo vo = new WhpSamplingPlanTaskTestConfirmVo(); BeanUtils.copyProperties(confirm, vo); //查询 关联测点信息 List whpTestItemWorkingCurves = workingCurveService.selectListByItem(confirm.getTestItemId(), "1"); if (whpTestItemWorkingCurves != null && whpTestItemWorkingCurves.size() > 0) { for (WhpTestItemWorkingCurveVo item : whpTestItemWorkingCurves) { String sql = " where plan_code= '" + confirm.getPlanCode() + "' and working_curve_id ='" + item.getId() + "' AND sample_code is NULL"; List taskItemCurveList = whpTaskItemCurveService.selectListByWhere(sql); //若保存值不为空 则 替换为最新值 if (taskItemCurveList != null && taskItemCurveList.size() > 0) { item.setTaskitemCureid(taskItemCurveList.get(0).getId()); if (item.getMPoint().getNumtail() != null && item.getMPoint().getNumtail() != "") { // item.setDefault_value(taskItemCurveList.get(0).getCalculated_value().setScale(Integer.valueOf(item.getMPoint().getNumtail()), BigDecimal.ROUND_HALF_UP)); // item.setDefault_value(NumberUtil.roundHalfEven(taskItemCurveList.get(0).getCalculated_value(), Integer.parseInt(String.valueOf(item.getMPoint().getNumtail())))); item.setDefault_value(taskItemCurveList.get(0).getCalculated_value()); } else { item.setDefault_value(taskItemCurveList.get(0).getCalculated_value()); } } } } vo.setContantworkingCurveVoslist(whpTestItemWorkingCurves); // HashMap hashMap=new HashMap(); // JSONArray json = JSONArray.fromObject(voList); // String result = "{\"total\":" + pi.getTotal() + ",\"rows\":" + json + "}"; //表头 List tablelist = new ArrayList(); List list = workingCurveService.selectListByItem(confirm.getTestItemId(), "0,2,3"); if (list != null && list.size() > 0) { for (int i = 0; i < list.size(); i++) { WhpTestItemWorkingCurveVo curveVo = list.get(i); TableHeader header = new TableHeader(); if (curveVo.getFormulatype().equals("0")) { header.setField(curveVo.getName()); header.setTitle(curveVo.getName()); header.setAlign("center"); header.setValign("middle"); } else { header.setField(curveVo.getMPoint().getMpointcode()); header.setTitle(curveVo.getMPoint().getParmname()); header.setAlign("center"); header.setValign("middle"); } tablelist.add(header); } } JSONArray json = JSONArray.fromObject(tablelist); if (vo.getConfirmDate() == null || vo.getConfirmDate() == "") { vo.setConfirmUserName(""); } model.addAttribute("bean", vo); model.addAttribute("plan", whpSamplingPlanService.selectById(confirm.getPlanId())); // model.addAttribute("workCurveDropDown", ""); model.addAttribute("equipmentDropDown", JSON.toJSONString(whpEquipmentService.equipmentDropDownList())); model.addAttribute("itemMethodDropDown", JSON.toJSONString(whpTestMethodService.testMethodDropDownList(confirm.getTestItemId()))); model.addAttribute("tableheaders", json); // model.addAttribute("bean", confirm); // model.addAttribute("plan", whpSamplingPlanService.selectById(confirm.getPlanId())); model.addAttribute("confirmStatusDropDown", SamplingPlanTaskTestConfirmStatusEnum.getAll4JSON()); return "whp/test/WhpSamplingPlanTaskTestConfirmViewTest"; } /** * 批量接单 * * @Author: 李晨 * @Date: 2023/1/5 **/ @RequestMapping("/acceptBatch.do") @ResponseBody @Transactional(rollbackFor = Exception.class) public Result dodels(HttpServletRequest request, Model model, @RequestParam(value = "ids") String ids) { String[] idArr = ids.split(","); for (String id : idArr) { accept(request, id); } return Result.success(); } /** * 页面跳转：开始检测弹窗 * * @Author: 李晨 * @Date: 2023/1/5 **/ @RequestMapping("/showTest.do") public String showTest(HttpServletRequest request, Model model, String id ) { WhpSamplingPlanTaskTestConfirm whpSamplingPlanTaskTestConfirm = whpSamplingPlanTaskTestConfirmService.selectById(id); //查询结果公式 WhpTestItemWorkingCurve curve = whpTestItemWorkingCurveService.selectByTestItemId(whpSamplingPlanTaskTestConfirm.getTestItemId()); if (curve.getKpi_id() != null) { // MPoint mPoint = mPointService.selectById(curve.getKpi_id()); if (mPoint != null) { whpSamplingPlanTaskTestConfirm.setWorkCurveName(mPoint.getExp()); } } WhpSamplingPlanTaskTestConfirmVo vo = new WhpSamplingPlanTaskTestConfirmVo(); BeanUtils.copyProperties(whpSamplingPlanTaskTestConfirm, vo); //查询 关联测点信息 List whpTestItemWorkingCurves = workingCurveService.selectListByItem(whpSamplingPlanTaskTestConfirm.getTestItemId(), "1"); if (whpTestItemWorkingCurves != null && whpTestItemWorkingCurves.size() > 0) { // 查询是否 有常量 项目值 for (WhpTestItemWorkingCurveVo item : whpTestItemWorkingCurves) { String sql = " where plan_code= '" + whpSamplingPlanTaskTestConfirm.getPlanCode() + "' and working_curve_id ='" + item.getId() + "' AND sample_code is NULL"; List taskItemCurveList = whpTaskItemCurveService.selectListByWhere(sql); //若保存值不为空 则 替换为最新值 if (taskItemCurveList != null && taskItemCurveList.size() > 0) { item.setTaskitemCureid(taskItemCurveList.get(0).getId()); if (item.getMPoint().getNumtail() != null && item.getMPoint().getNumtail() != "") { //item.setDefault_value(taskItemCurveList.get(0).getCalculated_value().setScale(Integer.valueOf(item.getMPoint().getNumtail()), BigDecimal.ROUND_HALF_UP)); // BigDecimal bigDecimal = NumberUtil.roundHalfEven(taskItemCurveList.get(0).getCalculated_value(), Integer.parseInt(String.valueOf(item.getMPoint().getNumtail()))); // item.setDefault_value(NumberUtil.roundHalfEven(taskItemCurveList.get(0).getCalculated_value(), Integer.parseInt(String.valueOf(item.getMPoint().getNumtail())))); item.setDefault_value(taskItemCurveList.get(0).getCalculated_value()); // BigDecimal calculated_value = new BigDecimal(5.203012); // item.setDefault_value(calculated_value); } else { item.setDefault_value(taskItemCurveList.get(0).getCalculated_value()); } } } } vo.setContantworkingCurveVoslist(whpTestItemWorkingCurves); // HashMap hashMap=new HashMap(); // JSONArray json = JSONArray.fromObject(voList); // String result = "{\"total\":" + pi.getTotal() + ",\"rows\":" + json + "}"; //表头 List tablelist = new ArrayList(); // 使用试剂为空，查询检测项目数据进行默认值赋值 if (vo.getReagent() == null) { // 检测项目 WhpTestItem whpTestItem = whpTestItemService.selectById(whpSamplingPlanTaskTestConfirm.getTestItemId()); vo.setReagent(whpTestItem.getReagent()); } List list = workingCurveService.selectListByItem(whpSamplingPlanTaskTestConfirm.getTestItemId(), "0,2,3"); if (list != null && list.size() > 0) { for (int i = 0; i < list.size(); i++) { WhpTestItemWorkingCurveVo curveVo = list.get(i); TableHeader header = new TableHeader(); if (curveVo.getFormulatype().equals("0")) { header.setField(curveVo.getName()); header.setTitle(curveVo.getName()); header.setAlign("center"); header.setValign("middle"); } else { header.setField(curveVo.getMPoint().getMpointcode()); String parmname = curveVo.getMPoint().getParmname(); if (parmname.contains("(")) { parmname = parmname.substring(0, parmname.indexOf("(")); } if (parmname.contains("（")) { parmname = parmname.substring(0, parmname.indexOf("（")); } header.setTitle(parmname); header.setAlign("center"); header.setValign("middle"); } tablelist.add(header); } } JSONArray json = JSONArray.fromObject(tablelist); model.addAttribute("bean", vo); model.addAttribute("plan", whpSamplingPlanService.selectById(whpSamplingPlanTaskTestConfirm.getPlanId())); // model.addAttribute("workCurveDropDown", ""); WhpTestItem testItem = whpTestItemService.selectById(vo.getTestItemId()); if (testItem.getEquipmentId() != null) { String equids = testItem.getEquipmentId().replaceAll(",", "','"); String sql = " where status = 1 and id in ('" + equids + "')"; model.addAttribute("equipmentDropDown", JSON.toJSONString(whpEquipmentService.equipmentDropDownListByWhere(sql))); } else { model.addAttribute("equipmentDropDown", ""); } // List enumJsonObjects = whpTestMethodService.testMethodDropDownList(whpSamplingPlanTaskTestConfirm.getTestItemId()); model.addAttribute("itemMethodDropDown", JSON.toJSONString(enumJsonObjects)); model.addAttribute("tableheaders", json); return "whp/test/WhpSamplingPlanTaskTestConfirmEditTest"; // return "whp/test/WhpSamplingPlanTaskTestConfirmViewTest"; } /** * 检测任务 检测画面数据 **/ @RequestMapping("/getWhpTestItemWorkingCurves.do") public String getWhpTestItemWorkingCurves(HttpServletRequest request, Model model) { String id = request.getParameter("id"); WhpSamplingPlanTaskTestConfirm whpSamplingPlanTaskTestConfirm = whpSamplingPlanTaskTestConfirmService.selectById(id); //查询结果公式 WhpTestItemWorkingCurve curve = whpTestItemWorkingCurveService.selectByTestItemId(whpSamplingPlanTaskTestConfirm.getTestItemId()); if (curve.getKpi_id() != null) { // MPoint mPoint = mPointService.selectById(curve.getKpi_id()); if (mPoint != null) { whpSamplingPlanTaskTestConfirm.setWorkCurveName(mPoint.getExp()); } } WhpSamplingPlanTaskTestConfirmVo vo = new WhpSamplingPlanTaskTestConfirmVo(); BeanUtils.copyProperties(whpSamplingPlanTaskTestConfirm, vo); //查询 关联测点信息 List whpTestItemWorkingCurves = workingCurveService.selectListByItem(whpSamplingPlanTaskTestConfirm.getTestItemId(), "1"); if (whpTestItemWorkingCurves != null && whpTestItemWorkingCurves.size() > 0) { // 查询是否 有常量 项目值 for (WhpTestItemWorkingCurveVo item : whpTestItemWorkingCurves) { String sql = " where plan_code= '" + whpSamplingPlanTaskTestConfirm.getPlanCode() + "' and working_curve_id ='" + item.getId() + "' AND sample_code is NULL"; List taskItemCurveList = whpTaskItemCurveService.selectListByWhere(sql); //若保存值不为空 则 替换为最新值 if (taskItemCurveList != null && taskItemCurveList.size() > 0) { item.setTaskitemCureid(taskItemCurveList.get(0).getId()); if (item.getMPoint().getNumtail() != null && item.getMPoint().getNumtail() != "") { //item.setDefault_value(taskItemCurveList.get(0).getCalculated_value().setScale(Integer.valueOf(item.getMPoint().getNumtail()), BigDecimal.ROUND_HALF_UP)); // item.setDefault_value(NumberUtil.roundHalfEven(taskItemCurveList.get(0).getCalculated_value(), Integer.parseInt(String.valueOf(item.getMPoint().getNumtail())))); item.setDefault_value(taskItemCurveList.get(0).getCalculated_value()); } else { item.setDefault_value(taskItemCurveList.get(0).getCalculated_value()); } } } } vo.setContantworkingCurveVoslist(whpTestItemWorkingCurves); // WhpTestItem testItem = whpTestItemService.selectById(vo.getTestItemId()); // if (testItem.getEquipmentId() != null) { // String equids = testItem.getEquipmentId().replaceAll(",", "','"); // String sql = " where status = 1 and id in ('" + equids + "')"; // model.addAttribute("equipmentDropDown", JSON.toJSONString(whpEquipmentService.equipmentDropDownListByWhere(sql))); // } String json = JSON.toJSONString(vo); model.addAttribute("result", json); return "result"; } /** * 检测任务 检测画面数据-仪器 **/ @RequestMapping("/getInstrumentData.do") public String getInstrumentData(HttpServletRequest request, Model model) { String id = request.getParameter("id"); WhpTestItem testItem = whpTestItemService.selectById(id); if (testItem.getEquipmentId() != null) { String equids = testItem.getEquipmentId().replaceAll(",", "','"); String sql = " where status = 1 and id in ('" + equids + "')"; model.addAttribute("result", JSON.toJSONString(whpEquipmentService.equipmentDropDownListByWhere(sql))); } else { model.addAttribute("result", ""); } return "result"; } /** * 检测任务 检测画面数据-方法依据 **/ @RequestMapping("/getMethodBasis.do") public String getMethodBasis(HttpServletRequest request, Model model) { String id = request.getParameter("id"); WhpSamplingPlanTaskTestConfirm whpSamplingPlanTaskTestConfirm = whpSamplingPlanTaskTestConfirmService.selectById(id); model.addAttribute("result", JSON.toJSONString(whpTestMethodService.testMethodDropDownList(whpSamplingPlanTaskTestConfirm.getTestItemId()))); return "result"; } /** * 检测任务数据 **/ @RequestMapping("/getListypByheaders.do") public String getListypByheaders(HttpServletRequest request, Model model) { String id = request.getParameter("id"); WhpSamplingPlanTaskTestConfirm whpSamplingPlanTaskTestConfirm = whpSamplingPlanTaskTestConfirmService.selectById(id); List tablelist = new ArrayList(); List list = workingCurveService.selectListByItem(whpSamplingPlanTaskTestConfirm.getTestItemId(), "0,2,3"); if (list != null && list.size() > 0) { for (int i = 0; i < list.size(); i++) { WhpTestItemWorkingCurveVo curveVo = list.get(i); TableHeader header = new TableHeader(); if (curveVo.getFormulatype().equals("0")) { header.setField(curveVo.getName()); header.setTitle(curveVo.getName()); header.setAlign("center"); header.setValign("middle"); } else { header.setField(curveVo.getMPoint().getMpointcode()); header.setTitle(curveVo.getMPoint().getParmname()); header.setAlign("center"); header.setValign("middle"); } tablelist.add(header); } } JSONArray json = JSONArray.fromObject(tablelist); model.addAttribute("result", json); return "result"; } /** * 检测任务数据 **/ @RequestMapping("/syncSamplingPlanTask.do") public String syncSamplingPlanTask(HttpServletRequest request, Model model) { whpSamplingPlanTaskTestConfirmService.syncSamplingPlanTask(); return "result"; } } \ No newline at end of file +package com.sipai.controller.whp.test; 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.enums.EnumJsonObject; import com.sipai.entity.enums.whp.SamplingPlanTaskTestConfirmStatusEnum; import com.sipai.entity.enums.whp.SamplingPlanTaskTestItemStatusEnum; import com.sipai.entity.enums.whp.TableHeader; import com.sipai.entity.scada.MPoint; import com.sipai.entity.user.User; import com.sipai.entity.whp.baseinfo.WhpTestItem; import com.sipai.entity.whp.baseinfo.WhpTestItemWorkingCurve; import com.sipai.entity.whp.baseinfo.WhpTestItemWorkingCurveVo; import com.sipai.entity.whp.test.*; import com.sipai.service.scada.MPointService; import com.sipai.service.whp.baseinfo.*; import com.sipai.service.whp.plan.WhpSamplingPlanService; import com.sipai.service.whp.plan.WhpSamplingPlanTaskService; import com.sipai.service.whp.test.WhpSamplingPlanTaskTestConfirmService; import com.sipai.service.whp.test.WhpSamplingPlanTaskTestItemService; import com.sipai.service.whp.test.WhpTaskItemCurveService; import net.sf.json.JSONArray; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Controller; import org.springframework.transaction.annotation.Transactional; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.servlet.ModelAndView; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import java.util.ArrayList; import java.util.List; import java.util.UUID; /** * 计划单检测项目分组信息Controller类 * * @Author: 李晨 * @Date: 2023/1/5 **/ @Controller @RequestMapping("/whp/test/WhpSamplingPlanTaskTestConfirm") public class WhpSamplingPlanTaskTestConfirmController { @Resource private WhpSamplingPlanService whpSamplingPlanService; @Resource private WhpSamplingPlanTaskTestConfirmService whpSamplingPlanTaskTestConfirmService; @Resource private WhpSampleTypeService sampleTypeService; @Resource private WhpSamplingPlanTaskTestItemService whpSamplingPlanTaskTestItemService; @Resource private WhpTestItemWorkingCurveService whpTestItemWorkingCurveService; @Resource private WhpEquipmentService whpEquipmentService; @Resource private WhpTestItemWorkingCurveService workingCurveService; @Resource private MPointService mPointService; @Resource private WhpTaskItemCurveService whpTaskItemCurveService; @Resource private WhpTestMethodService whpTestMethodService; @Resource private WhpTestItemService whpTestItemService; @Resource private WhpSamplingPlanTaskService whpSamplingPlanTaskService; /** * 页面跳转：我的任务 * * @Author: 李晨 * @Date: 2023/1/5 **/ @RequestMapping("/showListForTestTask.do") public String showListForTestTask(HttpServletRequest request, Model model ) { User cu = (User) request.getSession().getAttribute("cu"); //登录人id model.addAttribute("loginUserId", cu.getId()); //采样类型 model.addAttribute("sampleTypeDropDown", JSON.toJSONString(sampleTypeService.dropDownList())); //我的任务任务状态 model.addAttribute("StatusDropDown", SamplingPlanTaskTestConfirmStatusEnum.getAll4JsonWithInTask()); return "whp/test/WhpSamplingPlanTaskTestTask"; } /** * 页面跳转：检验任务管理 * * @Author: 李晨 * @Date: 2023/1/5 **/ @RequestMapping("/showListForTestConfirm.do") public String showListForTestConfirm(HttpServletRequest request, Model model ) { User cu = (User) request.getSession().getAttribute("cu"); //登录人id model.addAttribute("loginUserId", cu.getId()); //采样类型 model.addAttribute("sampleTypeDropDown", JSON.toJSONString(sampleTypeService.dropDownList())); //我的任务任务状态 model.addAttribute("StatusDropDown", SamplingPlanTaskTestConfirmStatusEnum.getAll4JsonWithInCONFIRM()); return "whp/test/WhpSamplingPlanTaskConfirmList"; } /** * 检测项目下拉 * * @Author: 李晨 * @Date: 2023/1/5 **/ @RequestMapping("/TestItemTree.do") @ResponseBody public Result dosave(HttpServletRequest request, String testItemName ) { WhpSamplingPlanTaskTestConfirmQuery query = new WhpSamplingPlanTaskTestConfirmQuery(); User cu = (User) request.getSession().getAttribute("cu"); //query.setDeptId(cu.getPid()); query.setLikeString(testItemName); return Result.success(whpSamplingPlanTaskTestConfirmService.testItemTree(query)); } /** * 获取列表 * * @Author: 李晨 * @Date: 2023/1/5 **/ @RequestMapping("/getList.do") public ModelAndView getList(HttpServletRequest request, Model model, @RequestParam(value = "page", required = false, defaultValue = "1") Integer page, @RequestParam(value = "rows", required = false, defaultValue = "10") Integer rows, @RequestParam(value = "sort", required = false) String sort, @RequestParam(value = "order", required = false) String order, WhpSamplingPlanTaskTestConfirmQuery query ) { String whereStr = ""; User cu = (User) request.getSession().getAttribute("cu"); String user_unitId = cu.getPid(); //获取检验任务管理下 人员对应部门的 检测项目 String testItemIds = ""; List WhpTestItem_list = whpTestItemService.selectListByWhere(" where dept_ids like '%" + user_unitId + "%' "); if (WhpTestItem_list != null && WhpTestItem_list.size() > 0) { for (int i = 0; i < WhpTestItem_list.size(); i++) { testItemIds += WhpTestItem_list.get(i).getId() + ","; } } if (testItemIds.length() > 0) { // testItemIds = testItemIds.replaceAll(",", "','"); testItemIds = "'"+testItemIds.replace(",","','")+"'"; }else{ testItemIds = ""; } // Sy打打 stem.out.println(testItemIds);,'2093a295-b9ff-4f41-9118-32af3f3a4746" query.setTestItemIds(testItemIds); PageHelper.startPage(page, rows); List list = whpSamplingPlanTaskTestConfirmService.queryList(query); List voList = new ArrayList<>(); // 编辑列表需要的字段 for (WhpSamplingPlanTaskTestConfirm item : list) { WhpSamplingPlanTaskTestConfirmVo vo = new WhpSamplingPlanTaskTestConfirmVo(); BeanUtils.copyProperties(item, vo); // 此处加工Vo数据 vo.setStatusName(whpSamplingPlanTaskTestConfirmService.writeStatusString(item)); vo.setSamplingTaskNumber(whpSamplingPlanTaskTestItemService.countByConfirmId(item.getId())); if (item.getConfirmDate() == null || item.getConfirmDate() == "") { vo.setConfirmUserName(""); } voList.add(vo); } PageInfo pi = new PageInfo<>(list); JSONArray json = JSONArray.fromObject(voList); String result = "{\"total\":" + pi.getTotal() + ",\"rows\":" + json + "}"; model.addAttribute("result", result); return new ModelAndView("result"); } /** * 获取列表 * * @Author: 李晨 * @Date: 2023/1/5 **/ @RequestMapping("/getIndexTaskList.do") public ModelAndView getIndexTaskList(HttpServletRequest request, Model model, @RequestParam(value = "page", required = false, defaultValue = "1") Integer page, @RequestParam(value = "rows", required = false, defaultValue = "10") Integer rows, @RequestParam(value = "sort", required = false) String sort, @RequestParam(value = "order", required = false) String order, WhpSamplingPlanTaskTestConfirmQuery query ) { User cu = (User) request.getSession().getAttribute("cu"); query.setTestUserId(cu.getId()); query.setStatus(SamplingPlanTaskTestConfirmStatusEnum.TEST.getId()); PageHelper.startPage(page, rows); List list = whpSamplingPlanTaskTestConfirmService.queryList(query); List voList = new ArrayList<>(); // 编辑列表需要的字段 for (WhpSamplingPlanTaskTestConfirm item : list) { WhpSamplingPlanTaskTestConfirmVo vo = new WhpSamplingPlanTaskTestConfirmVo(); BeanUtils.copyProperties(item, vo); // 此处加工Vo数据 vo.setStatusName(whpSamplingPlanTaskTestConfirmService.writeIndexStatusString(item)); vo.setSamplingTaskNumber(whpSamplingPlanTaskTestItemService.countByConfirmId(item.getId())); voList.add(vo); } PageInfo pi = new PageInfo<>(list); JSONArray json = JSONArray.fromObject(voList); String result = "{\"total\":" + pi.getTotal() + ",\"rows\":" + json + "}"; model.addAttribute("result", result); return new ModelAndView("result"); } /** * 保存检测结果 * * @Author: 李晨 * @Date: 2023/1/5 **/ @RequestMapping("/update.do") @ResponseBody public Result doupdate(HttpServletRequest request, Model model, WhpSamplingPlanTaskTestConfirmVo bean ) { User cu = (User) request.getSession().getAttribute("cu"); List contantlist = bean.getContantCurvelist(); if (bean.getContantCurvelist() != null) { for (int i = 0; i < contantlist.size(); i++) { WhpTaskItemCurve taskItemCurve = contantlist.get(i); if (taskItemCurve.getId() != null && !taskItemCurve.getId().equals("")) { WhpTaskItemCurve whpTaskItemCurve = contantlist.get(0); whpTaskItemCurveService.update(contantlist.get(0)); /* WhpTestItemWorkingCurve whpTestItemWorkingCurve = new WhpTestItemWorkingCurve(); whpTestItemWorkingCurve.setId(taskItemCurve.getWorking_curve_id()); whpTestItemWorkingCurve.setDefault_value(taskItemCurve.getCalculated_value()); whpTestItemWorkingCurveService.update(whpTestItemWorkingCurve);*/ } else { taskItemCurve.setId(UUID.randomUUID().toString()); taskItemCurve.setPlan_code(bean.getPlanCode()); whpTaskItemCurveService.save(taskItemCurve); } } } whpSamplingPlanTaskTestConfirmService.update(bean); return Result.success(); } /** * 保存提交检测结果 *

* 2023.8.30 更新为 提交即复核完成 * * @Author: 李晨 * @Date: 2023/1/5 **/ @RequestMapping("/submit.do") @ResponseBody @Transactional(rollbackFor = Exception.class) public Result submit(HttpServletRequest request, Model model, WhpSamplingPlanTaskTestConfirm bean ) { User cu = (User) request.getSession().getAttribute("cu"); // bean.setStatus(SamplingPlanTaskTestConfirmStatusEnum.CONFIRM.getId()); // bean.setStatus(SamplingPlanTaskTestConfirmStatusEnum.AUDIT.getId()); whpSamplingPlanTaskTestConfirmService.update(bean); /* WhpSamplingPlanTaskTestItem testItem = new WhpSamplingPlanTaskTestItem(); testItem.setTestConfirmId(bean.getId()); testItem.setStatus(SamplingPlanTaskTestItemStatusEnum.CONFIRM.getId());*/ WhpSamplingPlanTaskTestConfirm confirm = whpSamplingPlanTaskTestConfirmService.selectById(bean.getId()); // 检测完成提交 复核信息填写 confirm.setConfirmUserId(confirm.getTestUserId()); confirm.setConfirmUserName(confirm.getTestUserName()); confirm.setConfirmDate(confirm.getTestDate()); confirm.setStatus(SamplingPlanTaskTestConfirmStatusEnum.AUDIT.getId()); whpSamplingPlanTaskTestConfirmService.update(confirm); //更新检测项目 复核完成 WhpSamplingPlanTaskTestItem testItem = new WhpSamplingPlanTaskTestItem(); testItem.setTestConfirmId(bean.getId()); testItem.setStatus(SamplingPlanTaskTestItemStatusEnum.AUDIT.getId()); whpSamplingPlanTaskTestItemService.updateStatusByConfirmId(testItem); whpSamplingPlanService.isTestConfirmDone(confirm.getPlanId()); return Result.success(); } /** * 保存提交检测复核结果 * * @Author: 李晨 * @Date: 2023/1/5 **/ @RequestMapping("/confirm.do") @ResponseBody @Transactional(rollbackFor = Exception.class) public Result confirm(HttpServletRequest request, Model model, WhpSamplingPlanTaskTestConfirmVo bean ) { User cu = (User) request.getSession().getAttribute("cu"); List contantlist = bean.getContantCurvelist(); if (contantlist != null) { for (int i = 0; i < contantlist.size(); i++) { WhpTaskItemCurve taskItemCurve = contantlist.get(i); if (taskItemCurve.getId() != null && !taskItemCurve.getId().equals("")) { whpTaskItemCurveService.update(contantlist.get(0)); } else { taskItemCurve.setId(UUID.randomUUID().toString()); taskItemCurve.setPlan_code(bean.getPlanCode()); whpTaskItemCurveService.save(taskItemCurve); } } } if (bean.getStatus() != SamplingPlanTaskTestConfirmStatusEnum.BACK_FROM_CONFIRM.getId()) { bean.setStatus(SamplingPlanTaskTestConfirmStatusEnum.AUDIT.getId()); WhpSamplingPlanTaskTestConfirm confirm = whpSamplingPlanTaskTestConfirmService.selectById(bean.getId()); whpSamplingPlanService.isTestConfirmDone(confirm.getPlanId()); WhpSamplingPlanTaskTestItem testItem = new WhpSamplingPlanTaskTestItem(); testItem.setTestConfirmId(bean.getId()); testItem.setStatus(SamplingPlanTaskTestItemStatusEnum.AUDIT.getId()); whpSamplingPlanTaskTestItemService.updateStatusByConfirmId(testItem); } whpSamplingPlanTaskTestConfirmService.update(bean); return Result.success(); } /** * 页面跳转：接单弹窗 * * @Author: 李晨 * @Date: 2023/1/5 **/ @RequestMapping("/acceptShow.do") public String doedit(HttpServletRequest request, Model model, String id ) { WhpSamplingPlanTaskTestConfirm bean = whpSamplingPlanTaskTestConfirmService.selectById(id); WhpSamplingPlanTaskTestConfirmVo vo = new WhpSamplingPlanTaskTestConfirmVo(); BeanUtils.copyProperties(bean, vo); vo.setSamplingTaskNumber(whpSamplingPlanTaskTestItemService.countByConfirmId(bean.getId())); model.addAttribute("bean", vo); return "whp/test/WhpSamplingPlanTaskTestConfirmEditAccept"; } /** * 页面跳转：监测数据复核弹窗 * * @Author: 李晨 * @Date: 2023/1/5 **/ @RequestMapping("/confirmShow.do") public String confirmShow(HttpServletRequest request, Model model, String id ) { WhpSamplingPlanTaskTestConfirm whpSamplingPlanTaskTestConfirm = whpSamplingPlanTaskTestConfirmService.selectById(id); //查询结果公式 WhpTestItemWorkingCurve curve = whpTestItemWorkingCurveService.selectByTestItemId(whpSamplingPlanTaskTestConfirm.getTestItemId()); if (curve.getKpi_id() != null) { // MPoint mPoint = mPointService.selectById(curve.getKpi_id()); if (mPoint != null) { whpSamplingPlanTaskTestConfirm.setWorkCurveName(mPoint.getExp()); } } WhpSamplingPlanTaskTestConfirmVo vo = new WhpSamplingPlanTaskTestConfirmVo(); BeanUtils.copyProperties(whpSamplingPlanTaskTestConfirm, vo); //查询 关联测点信息 List whpTestItemWorkingCurves = workingCurveService.selectListByItem(whpSamplingPlanTaskTestConfirm.getTestItemId(), "1"); if (whpTestItemWorkingCurves != null && whpTestItemWorkingCurves.size() > 0) { for (WhpTestItemWorkingCurveVo item : whpTestItemWorkingCurves) { String sql = " where plan_code= '" + whpSamplingPlanTaskTestConfirm.getPlanCode() + "' and working_curve_id ='" + item.getId() + "' AND sample_code is NULL"; List taskItemCurveList = whpTaskItemCurveService.selectListByWhere(sql); //若保存值不为空 则 替换为最新值 if (taskItemCurveList != null && taskItemCurveList.size() > 0) { item.setTaskitemCureid(taskItemCurveList.get(0).getId()); item.setDefault_value(taskItemCurveList.get(0).getCalculated_value()); } if (item.getMPoint() != null && item.getMPoint().getNumtail() != null) { //item.setDefault_value(item.getDefault_value().setScale(Integer.parseInt(item.getMPoint().getNumtail()),BigDecimal.ROUND_HALF_UP)); // item.setDefault_value(NumberUtil.roundHalfEven(item.getDefault_value(), Integer.parseInt(String.valueOf(item.getMPoint().getNumtail())))); item.setDefault_value(item.getDefault_value()); } } } vo.setContantworkingCurveVoslist(whpTestItemWorkingCurves); // HashMap hashMap=new HashMap(); // JSONArray json = JSONArray.fromObject(voList); // String result = "{\"total\":" + pi.getTotal() + ",\"rows\":" + json + "}"; //表头 List tablelist = new ArrayList(); List list = workingCurveService.selectListByItem(whpSamplingPlanTaskTestConfirm.getTestItemId(), "0,2,3"); if (list != null && list.size() > 0) { for (int i = 0; i < list.size(); i++) { WhpTestItemWorkingCurveVo curveVo = list.get(i); TableHeader header = new TableHeader(); if (curveVo.getFormulatype().equals("0")) { header.setField(curveVo.getName()); header.setTitle(curveVo.getName()); header.setAlign("center"); header.setValign("middle"); } else { header.setField(curveVo.getMPoint().getMpointcode()); String parmname = curveVo.getMPoint().getParmname(); if (parmname.contains("(")) { parmname = parmname.substring(0, parmname.indexOf("(")); } if (parmname.contains("（")) { parmname = parmname.substring(0, parmname.indexOf("（")); } header.setTitle(parmname); header.setAlign("center"); header.setValign("middle"); } tablelist.add(header); } } JSONArray json = JSONArray.fromObject(tablelist); model.addAttribute("itemMethodDropDown", JSON.toJSONString(whpTestMethodService.testMethodDropDownList(whpSamplingPlanTaskTestConfirm.getTestItemId()))); model.addAttribute("tableheaders", json); model.addAttribute("confirmStatusDropDown", SamplingPlanTaskTestConfirmStatusEnum.getIsConfirm4JSON()); model.addAttribute("bean", vo); return "whp/test/WhpSamplingPlanTaskTestConfirmEditConfirm"; } /** * 接单 * * @Author: 李晨 * @Date: 2023/1/5 **/ @RequestMapping("/accept.do") @ResponseBody @Transactional(rollbackFor = Exception.class) public Result accept(HttpServletRequest request, String id ) { User cu = (User) request.getSession().getAttribute("cu"); WhpSamplingPlanTaskTestConfirm bean = new WhpSamplingPlanTaskTestConfirm(); bean.setId(id); bean.setStatus(SamplingPlanTaskTestConfirmStatusEnum.TEST.getId()); bean.setTestUserId(cu.getId()); bean.setTestUserName(cu.getCaption()); whpSamplingPlanTaskTestConfirmService.update(bean); WhpSamplingPlanTaskTestItem testItem = new WhpSamplingPlanTaskTestItem(); testItem.setTestConfirmId(id); testItem.setStatus(SamplingPlanTaskTestItemStatusEnum.TEST.getId()); whpSamplingPlanTaskTestItemService.updateStatusByConfirmId(testItem); return Result.success(); } /** * 撤销 * * @Author: 李晨 * @Date: 2023/1/5 **/ @RequestMapping("/back.do") @ResponseBody @Transactional(rollbackFor = Exception.class) public Result back(HttpServletRequest request, String id ) { User cu = (User) request.getSession().getAttribute("cu"); WhpSamplingPlanTaskTestConfirm bean = new WhpSamplingPlanTaskTestConfirm(); bean.setId(id); bean.setStatus(SamplingPlanTaskTestConfirmStatusEnum.WAIT.getId()); bean.setTestUserId(""); bean.setTestUserName(""); whpSamplingPlanTaskTestConfirmService.update(bean); WhpSamplingPlanTaskTestItem testItem = new WhpSamplingPlanTaskTestItem(); testItem.setTestConfirmId(id); testItem.setStatus(SamplingPlanTaskTestItemStatusEnum.WAIT.getId()); whpSamplingPlanTaskTestItemService.updateStatusByConfirmId(testItem); return Result.success(); } /** * 页面跳转：检测任务浏览页面 * * @Author: 李晨 * @Date: 2023/1/5 **/ @RequestMapping("/view.do") public String view(HttpServletRequest request, Model model, String id ) { WhpSamplingPlanTaskTestConfirm confirm = whpSamplingPlanTaskTestConfirmService.selectById(id); //查询结果公式 WhpTestItemWorkingCurve curve = whpTestItemWorkingCurveService.selectByTestItemId(confirm.getTestItemId()); if (curve.getKpi_id() != null) { // MPoint mPoint = mPointService.selectById(curve.getKpi_id()); if (mPoint != null) { confirm.setWorkCurveName(mPoint.getExp()); } } WhpSamplingPlanTaskTestConfirmVo vo = new WhpSamplingPlanTaskTestConfirmVo(); BeanUtils.copyProperties(confirm, vo); //查询 关联测点信息 List whpTestItemWorkingCurves = workingCurveService.selectListByItem(confirm.getTestItemId(), "1"); if (whpTestItemWorkingCurves != null && whpTestItemWorkingCurves.size() > 0) { for (WhpTestItemWorkingCurveVo item : whpTestItemWorkingCurves) { String sql = " where plan_code= '" + confirm.getPlanCode() + "' and working_curve_id ='" + item.getId() + "' AND sample_code is NULL"; List taskItemCurveList = whpTaskItemCurveService.selectListByWhere(sql); //若保存值不为空 则 替换为最新值 if (taskItemCurveList != null && taskItemCurveList.size() > 0) { item.setTaskitemCureid(taskItemCurveList.get(0).getId()); if (item.getMPoint().getNumtail() != null && item.getMPoint().getNumtail() != "") { // item.setDefault_value(taskItemCurveList.get(0).getCalculated_value().setScale(Integer.valueOf(item.getMPoint().getNumtail()), BigDecimal.ROUND_HALF_UP)); // item.setDefault_value(NumberUtil.roundHalfEven(taskItemCurveList.get(0).getCalculated_value(), Integer.parseInt(String.valueOf(item.getMPoint().getNumtail())))); item.setDefault_value(taskItemCurveList.get(0).getCalculated_value()); } else { item.setDefault_value(taskItemCurveList.get(0).getCalculated_value()); } } } } vo.setContantworkingCurveVoslist(whpTestItemWorkingCurves); // HashMap hashMap=new HashMap(); // JSONArray json = JSONArray.fromObject(voList); // String result = "{\"total\":" + pi.getTotal() + ",\"rows\":" + json + "}"; //表头 List tablelist = new ArrayList(); List list = workingCurveService.selectListByItem(confirm.getTestItemId(), "0,2,3"); if (list != null && list.size() > 0) { for (int i = 0; i < list.size(); i++) { WhpTestItemWorkingCurveVo curveVo = list.get(i); TableHeader header = new TableHeader(); if (curveVo.getFormulatype().equals("0")) { header.setField(curveVo.getName()); header.setTitle(curveVo.getName()); header.setAlign("center"); header.setValign("middle"); } else { header.setField(curveVo.getMPoint().getMpointcode()); header.setTitle(curveVo.getMPoint().getParmname()); header.setAlign("center"); header.setValign("middle"); } tablelist.add(header); } } JSONArray json = JSONArray.fromObject(tablelist); if (vo.getConfirmDate() == null || vo.getConfirmDate() == "") { vo.setConfirmUserName(""); } model.addAttribute("bean", vo); model.addAttribute("plan", whpSamplingPlanService.selectById(confirm.getPlanId())); // model.addAttribute("workCurveDropDown", ""); model.addAttribute("equipmentDropDown", JSON.toJSONString(whpEquipmentService.equipmentDropDownList())); model.addAttribute("itemMethodDropDown", JSON.toJSONString(whpTestMethodService.testMethodDropDownList(confirm.getTestItemId()))); model.addAttribute("tableheaders", json); // model.addAttribute("bean", confirm); // model.addAttribute("plan", whpSamplingPlanService.selectById(confirm.getPlanId())); model.addAttribute("confirmStatusDropDown", SamplingPlanTaskTestConfirmStatusEnum.getAll4JSON()); return "whp/test/WhpSamplingPlanTaskTestConfirmViewTest"; } /** * 批量接单 * * @Author: 李晨 * @Date: 2023/1/5 **/ @RequestMapping("/acceptBatch.do") @ResponseBody @Transactional(rollbackFor = Exception.class) public Result dodels(HttpServletRequest request, Model model, @RequestParam(value = "ids") String ids) { String[] idArr = ids.split(","); for (String id : idArr) { accept(request, id); } return Result.success(); } /** * 页面跳转：开始检测弹窗 * * @Author: 李晨 * @Date: 2023/1/5 **/ @RequestMapping("/showTest.do") public String showTest(HttpServletRequest request, Model model, String id ) { WhpSamplingPlanTaskTestConfirm whpSamplingPlanTaskTestConfirm = whpSamplingPlanTaskTestConfirmService.selectById(id); //查询结果公式 WhpTestItemWorkingCurve curve = whpTestItemWorkingCurveService.selectByTestItemId(whpSamplingPlanTaskTestConfirm.getTestItemId()); if (curve.getKpi_id() != null) { // MPoint mPoint = mPointService.selectById(curve.getKpi_id()); if (mPoint != null) { whpSamplingPlanTaskTestConfirm.setWorkCurveName(mPoint.getExp()); } } WhpSamplingPlanTaskTestConfirmVo vo = new WhpSamplingPlanTaskTestConfirmVo(); BeanUtils.copyProperties(whpSamplingPlanTaskTestConfirm, vo); //查询 关联测点信息 List whpTestItemWorkingCurves = workingCurveService.selectListByItem(whpSamplingPlanTaskTestConfirm.getTestItemId(), "1"); if (whpTestItemWorkingCurves != null && whpTestItemWorkingCurves.size() > 0) { // 查询是否 有常量 项目值 for (WhpTestItemWorkingCurveVo item : whpTestItemWorkingCurves) { String sql = " where plan_code= '" + whpSamplingPlanTaskTestConfirm.getPlanCode() + "' and working_curve_id ='" + item.getId() + "' AND sample_code is NULL"; List taskItemCurveList = whpTaskItemCurveService.selectListByWhere(sql); //若保存值不为空 则 替换为最新值 if (taskItemCurveList != null && taskItemCurveList.size() > 0) { item.setTaskitemCureid(taskItemCurveList.get(0).getId()); if (item.getMPoint().getNumtail() != null && item.getMPoint().getNumtail() != "") { //item.setDefault_value(taskItemCurveList.get(0).getCalculated_value().setScale(Integer.valueOf(item.getMPoint().getNumtail()), BigDecimal.ROUND_HALF_UP)); // BigDecimal bigDecimal = NumberUtil.roundHalfEven(taskItemCurveList.get(0).getCalculated_value(), Integer.parseInt(String.valueOf(item.getMPoint().getNumtail()))); // item.setDefault_value(NumberUtil.roundHalfEven(taskItemCurveList.get(0).getCalculated_value(), Integer.parseInt(String.valueOf(item.getMPoint().getNumtail())))); item.setDefault_value(taskItemCurveList.get(0).getCalculated_value()); // BigDecimal calculated_value = new BigDecimal(5.203012); // item.setDefault_value(calculated_value); } else { item.setDefault_value(taskItemCurveList.get(0).getCalculated_value()); } } } } vo.setContantworkingCurveVoslist(whpTestItemWorkingCurves); // HashMap hashMap=new HashMap(); // JSONArray json = JSONArray.fromObject(voList); // String result = "{\"total\":" + pi.getTotal() + ",\"rows\":" + json + "}"; //表头 List tablelist = new ArrayList(); // 使用试剂为空，查询检测项目数据进行默认值赋值 if (vo.getReagent() == null) { // 检测项目 WhpTestItem whpTestItem = whpTestItemService.selectById(whpSamplingPlanTaskTestConfirm.getTestItemId()); vo.setReagent(whpTestItem.getReagent()); } List list = workingCurveService.selectListByItem(whpSamplingPlanTaskTestConfirm.getTestItemId(), "0,2,3"); if (list != null && list.size() > 0) { for (int i = 0; i < list.size(); i++) { WhpTestItemWorkingCurveVo curveVo = list.get(i); TableHeader header = new TableHeader(); if (curveVo.getFormulatype().equals("0")) { header.setField(curveVo.getName()); header.setTitle(curveVo.getName()); header.setAlign("center"); header.setValign("middle"); } else { header.setField(curveVo.getMPoint().getMpointcode()); String parmname = curveVo.getMPoint().getParmname(); if (parmname.contains("(")) { parmname = parmname.substring(0, parmname.indexOf("(")); } if (parmname.contains("（")) { parmname = parmname.substring(0, parmname.indexOf("（")); } header.setTitle(parmname); header.setAlign("center"); header.setValign("middle"); } tablelist.add(header); } } JSONArray json = JSONArray.fromObject(tablelist); model.addAttribute("bean", vo); model.addAttribute("plan", whpSamplingPlanService.selectById(whpSamplingPlanTaskTestConfirm.getPlanId())); // model.addAttribute("workCurveDropDown", ""); WhpTestItem testItem = whpTestItemService.selectById(vo.getTestItemId()); if (testItem.getEquipmentId() != null) { String equids = testItem.getEquipmentId().replaceAll(",", "','"); String sql = " where status = 1 and id in ('" + equids + "')"; model.addAttribute("equipmentDropDown", JSON.toJSONString(whpEquipmentService.equipmentDropDownListByWhere(sql))); } else { model.addAttribute("equipmentDropDown", ""); } // List enumJsonObjects = whpTestMethodService.testMethodDropDownList(whpSamplingPlanTaskTestConfirm.getTestItemId()); model.addAttribute("itemMethodDropDown", JSON.toJSONString(enumJsonObjects)); model.addAttribute("tableheaders", json); return "whp/test/WhpSamplingPlanTaskTestConfirmEditTest"; // return "whp/test/WhpSamplingPlanTaskTestConfirmViewTest"; } /** * 检测任务 检测画面数据 **/ @RequestMapping("/getWhpTestItemWorkingCurves.do") public String getWhpTestItemWorkingCurves(HttpServletRequest request, Model model) { String id = request.getParameter("id"); WhpSamplingPlanTaskTestConfirm whpSamplingPlanTaskTestConfirm = whpSamplingPlanTaskTestConfirmService.selectById(id); //查询结果公式 WhpTestItemWorkingCurve curve = whpTestItemWorkingCurveService.selectByTestItemId(whpSamplingPlanTaskTestConfirm.getTestItemId()); if (curve.getKpi_id() != null) { // MPoint mPoint = mPointService.selectById(curve.getKpi_id()); if (mPoint != null) { whpSamplingPlanTaskTestConfirm.setWorkCurveName(mPoint.getExp()); } } WhpSamplingPlanTaskTestConfirmVo vo = new WhpSamplingPlanTaskTestConfirmVo(); BeanUtils.copyProperties(whpSamplingPlanTaskTestConfirm, vo); //查询 关联测点信息 List whpTestItemWorkingCurves = workingCurveService.selectListByItem(whpSamplingPlanTaskTestConfirm.getTestItemId(), "1"); if (whpTestItemWorkingCurves != null && whpTestItemWorkingCurves.size() > 0) { // 查询是否 有常量 项目值 for (WhpTestItemWorkingCurveVo item : whpTestItemWorkingCurves) { String sql = " where plan_code= '" + whpSamplingPlanTaskTestConfirm.getPlanCode() + "' and working_curve_id ='" + item.getId() + "' AND sample_code is NULL"; List taskItemCurveList = whpTaskItemCurveService.selectListByWhere(sql); //若保存值不为空 则 替换为最新值 if (taskItemCurveList != null && taskItemCurveList.size() > 0) { item.setTaskitemCureid(taskItemCurveList.get(0).getId()); if (item.getMPoint().getNumtail() != null && item.getMPoint().getNumtail() != "") { //item.setDefault_value(taskItemCurveList.get(0).getCalculated_value().setScale(Integer.valueOf(item.getMPoint().getNumtail()), BigDecimal.ROUND_HALF_UP)); // item.setDefault_value(NumberUtil.roundHalfEven(taskItemCurveList.get(0).getCalculated_value(), Integer.parseInt(String.valueOf(item.getMPoint().getNumtail())))); item.setDefault_value(taskItemCurveList.get(0).getCalculated_value()); } else { item.setDefault_value(taskItemCurveList.get(0).getCalculated_value()); } } } } vo.setContantworkingCurveVoslist(whpTestItemWorkingCurves); // WhpTestItem testItem = whpTestItemService.selectById(vo.getTestItemId()); // if (testItem.getEquipmentId() != null) { // String equids = testItem.getEquipmentId().replaceAll(",", "','"); // String sql = " where status = 1 and id in ('" + equids + "')"; // model.addAttribute("equipmentDropDown", JSON.toJSONString(whpEquipmentService.equipmentDropDownListByWhere(sql))); // } String json = JSON.toJSONString(vo); model.addAttribute("result", json); return "result"; } /** * 检测任务 检测画面数据-仪器 **/ @RequestMapping("/getInstrumentData.do") public String getInstrumentData(HttpServletRequest request, Model model) { String id = request.getParameter("id"); WhpTestItem testItem = whpTestItemService.selectById(id); if (testItem.getEquipmentId() != null) { String equids = testItem.getEquipmentId().replaceAll(",", "','"); String sql = " where status = 1 and id in ('" + equids + "')"; model.addAttribute("result", JSON.toJSONString(whpEquipmentService.equipmentDropDownListByWhere(sql))); } else { model.addAttribute("result", ""); } return "result"; } /** * 检测任务 检测画面数据-方法依据 **/ @RequestMapping("/getMethodBasis.do") public String getMethodBasis(HttpServletRequest request, Model model) { String id = request.getParameter("id"); WhpSamplingPlanTaskTestConfirm whpSamplingPlanTaskTestConfirm = whpSamplingPlanTaskTestConfirmService.selectById(id); model.addAttribute("result", JSON.toJSONString(whpTestMethodService.testMethodDropDownList(whpSamplingPlanTaskTestConfirm.getTestItemId()))); return "result"; } /** * 检测任务数据 **/ @RequestMapping("/getListypByheaders.do") public String getListypByheaders(HttpServletRequest request, Model model) { String id = request.getParameter("id"); WhpSamplingPlanTaskTestConfirm whpSamplingPlanTaskTestConfirm = whpSamplingPlanTaskTestConfirmService.selectById(id); List tablelist = new ArrayList(); List list = workingCurveService.selectListByItem(whpSamplingPlanTaskTestConfirm.getTestItemId(), "0,2,3"); if (list != null && list.size() > 0) { for (int i = 0; i < list.size(); i++) { WhpTestItemWorkingCurveVo curveVo = list.get(i); TableHeader header = new TableHeader(); if (curveVo.getFormulatype().equals("0")) { header.setField(curveVo.getName()); header.setTitle(curveVo.getName()); header.setAlign("center"); header.setValign("middle"); } else { header.setField(curveVo.getMPoint().getMpointcode()); header.setTitle(curveVo.getMPoint().getParmname()); header.setAlign("center"); header.setValign("middle"); } tablelist.add(header); } } JSONArray json = JSONArray.fromObject(tablelist); model.addAttribute("result", json); return "result"; } /** * 检测任务数据 **/ @RequestMapping("/syncSamplingPlanTask.do") public String syncSamplingPlanTask(HttpServletRequest request, Model model) { whpSamplingPlanTaskTestConfirmService.syncSamplingPlanTask(); return "result"; } } \ No newline at end of file diff --git a/src/main/java/com/sipai/controller/whp/test/WhpSamplingPlanTaskTestItemController.java b/src/main/java/com/sipai/controller/whp/test/WhpSamplingPlanTaskTestItemController.java index c788deed..f26d3443 100644 --- a/src/main/java/com/sipai/controller/whp/test/WhpSamplingPlanTaskTestItemController.java +++ b/src/main/java/com/sipai/controller/whp/test/WhpSamplingPlanTaskTestItemController.java @@ -3,7 +3,6 @@ package com.sipai.controller.whp.test; import cn.hutool.core.util.NumberUtil; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; -import com.singularsys.jep.functions.Str; import com.sipai.controller.exception.BizCheckException; import com.sipai.entity.base.Result; import com.sipai.entity.enums.whp.*; @@ -11,9 +10,7 @@ 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.whp.baseinfo.WhpTestItemWorkingCurve; import com.sipai.entity.whp.baseinfo.WhpTestItemWorkingCurveVo; -import com.sipai.entity.whp.plan.WhpSamplingPlanQuery; import com.sipai.entity.whp.plan.WhpSamplingPlanTask; import com.sipai.entity.whp.plan.WhpSamplingPlanTaskQuery; import com.sipai.entity.whp.test.*; @@ -29,12 +26,10 @@ import com.sipai.service.whp.test.WhpTaskItemCurveService; import com.sipai.tools.CommUtil; import net.sf.json.JSONArray; import net.sf.json.JSONObject; -import org.apache.axis2.databinding.types.soapencoding.Decimal; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Controller; import org.springframework.transaction.annotation.Transactional; 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.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; diff --git a/src/main/java/com/sipai/controller/whp/test/WhpTaskItemCurveController.java b/src/main/java/com/sipai/controller/whp/test/WhpTaskItemCurveController.java index 402bbf69..2081d13c 100644 --- a/src/main/java/com/sipai/controller/whp/test/WhpTaskItemCurveController.java +++ b/src/main/java/com/sipai/controller/whp/test/WhpTaskItemCurveController.java @@ -1 +1 @@ -package com.sipai.controller.whp.test; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.sipai.entity.base.Result; import com.sipai.controller.exception.BizCheckException; import com.sipai.entity.whp.baseinfo.WhpTestItemWorkingCurve; import com.sipai.entity.whp.test.*; import com.sipai.entity.user.User; import com.sipai.service.whp.baseinfo.WhpTestItemWorkingCurveService; import com.sipai.service.whp.test.*; import com.sipai.entity.base.Result; import com.sipai.service.user.UserService; import com.sipai.tools.DateUtil; import net.sf.json.JSONArray; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Controller; import org.springframework.transaction.annotation.Transactional; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.servlet.ModelAndView; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.UUID; import java.util.stream.Collectors; /** * 方法依据Controller类 * * @Author: zxq * @Date: 2023/05/15 **/ @Controller @RequestMapping("/whp/test/WhpTaskItemCurve") public class WhpTaskItemCurveController { @Resource private WhpTaskItemCurveService whpTaskItemCurveService; @Resource private WhpTestItemWorkingCurveService whpTestItemWorkingCurveService; /** * 页面跳转：列表页面 * * @Author: zxq * @Date: 2023/05/15 **/ @RequestMapping("/showList.do") public String showList(HttpServletRequest request, Model model ) { User cu = (User) request.getSession().getAttribute("cu"); return "whp/test/WhpTaskItemCurveList"; } /** * 获取列表 * * @Author: zxq * @Date: 2023/05/15 **/ @RequestMapping("/getList.do") public ModelAndView getList(HttpServletRequest request, Model model, @RequestParam(value = "page", required = false, defaultValue = "1") Integer page, @RequestParam(value = "rows", required = false, defaultValue = "10") Integer rows, @RequestParam(value = "sort", required = false) String sort, @RequestParam(value = "order", required = false) String order, WhpTaskItemCurveQuery query ) { User cu = (User) request.getSession().getAttribute("cu"); PageHelper.startPage(page, rows); List list = whpTaskItemCurveService.queryList(query); List voList = new ArrayList<>(); // 编辑列表需要的字段 for (WhpTaskItemCurve item : list) { WhpTaskItemCurveVo vo = new WhpTaskItemCurveVo(); BeanUtils.copyProperties(item, vo); // 此处加工Vo数据 } PageInfo pi = new PageInfo<>(list); JSONArray json = JSONArray.fromObject(voList); String result = "{\"total\":" + pi.getTotal() + ",\"rows\":" + json + "}"; model.addAttribute("result", result); return new ModelAndView("result"); } /** * 页面跳转：新增页面 * * @Author: zxq * @Date: 2023/05/15 **/ @RequestMapping("/add.do") public String doadd(HttpServletRequest request, Model model ) { return "whp/test/WhpTaskItemCurveAdd"; } /** * 新增 * * @Author: zxq * @Date: 2023/05/15 **/ @RequestMapping("/save.do") @ResponseBody public Result dosave(HttpServletRequest request, Model model, WhpTaskItemCurve bean ) throws BizCheckException { User cu = (User) request.getSession().getAttribute("cu"); whpTaskItemCurveService.bizCheck(bean); whpTaskItemCurveService.save(bean); return Result.success(); } /** * 页面跳转：编辑页面 * * @Author: zxq * @Date: 2023/05/15 **/ @RequestMapping("/edit.do") public String doedit(HttpServletRequest request, Model model, String id ) { WhpTaskItemCurve whpTaskItemCurve = whpTaskItemCurveService.selectById(id); model.addAttribute("bean", whpTaskItemCurve); return "whp/test/WhpTaskItemCurveEdit"; } /** * 更新 * * @Author: zxq * @Date: 2023/05/15 **/ @RequestMapping("/update.do") @ResponseBody public Result doupdate(HttpServletRequest request, Model model, WhpTaskItemCurve bean ) throws BizCheckException { User cu = (User) request.getSession().getAttribute("cu"); whpTaskItemCurveService.bizCheck(bean); if(bean.getId()!=null&&bean.getId()!="") { whpTaskItemCurveService.update(bean); }else{ String sql = " where plan_code= '" + bean.getPlan_code() + "' and working_curve_id ='" + bean.getWorking_curve_id() + "' AND sample_code is NULL"; List taskItemCurveList = whpTaskItemCurveService.selectListByWhere(sql); if(taskItemCurveList!=null&&taskItemCurveList.size()>0) { bean.setId(taskItemCurveList.get(0).getId()); whpTaskItemCurveService.update(bean); /*WhpTestItemWorkingCurve whpTestItemWorkingCurve = new WhpTestItemWorkingCurve(); whpTestItemWorkingCurve.setId(bean.getWorking_curve_id()); whpTestItemWorkingCurve.setDefault_value(bean.getCalculated_value()); whpTestItemWorkingCurveService.update(whpTestItemWorkingCurve);*/ }else{ whpTaskItemCurveService.save(bean); } } return Result.success(); } /** * 批量删除 * * @Author: zxq * @Date: 2023/05/15 **/ @RequestMapping("/deletes.do") @ResponseBody public Result dodels(HttpServletRequest request, Model model, @RequestParam(value = "ids") String ids) { ids = ids.replace(",", "','"); whpTaskItemCurveService.deleteByWhere("where id in ('" + ids + "')"); return Result.success(); } } \ No newline at end of file +package com.sipai.controller.whp.test; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.sipai.controller.exception.BizCheckException; import com.sipai.entity.base.Result; import com.sipai.entity.user.User; import com.sipai.entity.whp.test.WhpTaskItemCurve; import com.sipai.entity.whp.test.WhpTaskItemCurveQuery; import com.sipai.entity.whp.test.WhpTaskItemCurveVo; import com.sipai.service.whp.baseinfo.WhpTestItemWorkingCurveService; import com.sipai.service.whp.test.WhpTaskItemCurveService; import net.sf.json.JSONArray; import org.springframework.beans.BeanUtils; 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.bind.annotation.ResponseBody; import org.springframework.web.servlet.ModelAndView; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import java.util.ArrayList; import java.util.List; /** * 方法依据Controller类 * * @Author: zxq * @Date: 2023/05/15 **/ @Controller @RequestMapping("/whp/test/WhpTaskItemCurve") public class WhpTaskItemCurveController { @Resource private WhpTaskItemCurveService whpTaskItemCurveService; @Resource private WhpTestItemWorkingCurveService whpTestItemWorkingCurveService; /** * 页面跳转：列表页面 * * @Author: zxq * @Date: 2023/05/15 **/ @RequestMapping("/showList.do") public String showList(HttpServletRequest request, Model model ) { User cu = (User) request.getSession().getAttribute("cu"); return "whp/test/WhpTaskItemCurveList"; } /** * 获取列表 * * @Author: zxq * @Date: 2023/05/15 **/ @RequestMapping("/getList.do") public ModelAndView getList(HttpServletRequest request, Model model, @RequestParam(value = "page", required = false, defaultValue = "1") Integer page, @RequestParam(value = "rows", required = false, defaultValue = "10") Integer rows, @RequestParam(value = "sort", required = false) String sort, @RequestParam(value = "order", required = false) String order, WhpTaskItemCurveQuery query ) { User cu = (User) request.getSession().getAttribute("cu"); PageHelper.startPage(page, rows); List list = whpTaskItemCurveService.queryList(query); List voList = new ArrayList<>(); // 编辑列表需要的字段 for (WhpTaskItemCurve item : list) { WhpTaskItemCurveVo vo = new WhpTaskItemCurveVo(); BeanUtils.copyProperties(item, vo); // 此处加工Vo数据 } PageInfo pi = new PageInfo<>(list); JSONArray json = JSONArray.fromObject(voList); String result = "{\"total\":" + pi.getTotal() + ",\"rows\":" + json + "}"; model.addAttribute("result", result); return new ModelAndView("result"); } /** * 页面跳转：新增页面 * * @Author: zxq * @Date: 2023/05/15 **/ @RequestMapping("/add.do") public String doadd(HttpServletRequest request, Model model ) { return "whp/test/WhpTaskItemCurveAdd"; } /** * 新增 * * @Author: zxq * @Date: 2023/05/15 **/ @RequestMapping("/save.do") @ResponseBody public Result dosave(HttpServletRequest request, Model model, WhpTaskItemCurve bean ) throws BizCheckException { User cu = (User) request.getSession().getAttribute("cu"); whpTaskItemCurveService.bizCheck(bean); whpTaskItemCurveService.save(bean); return Result.success(); } /** * 页面跳转：编辑页面 * * @Author: zxq * @Date: 2023/05/15 **/ @RequestMapping("/edit.do") public String doedit(HttpServletRequest request, Model model, String id ) { WhpTaskItemCurve whpTaskItemCurve = whpTaskItemCurveService.selectById(id); model.addAttribute("bean", whpTaskItemCurve); return "whp/test/WhpTaskItemCurveEdit"; } /** * 更新 * * @Author: zxq * @Date: 2023/05/15 **/ @RequestMapping("/update.do") @ResponseBody public Result doupdate(HttpServletRequest request, Model model, WhpTaskItemCurve bean ) throws BizCheckException { User cu = (User) request.getSession().getAttribute("cu"); whpTaskItemCurveService.bizCheck(bean); if(bean.getId()!=null&&bean.getId()!="") { whpTaskItemCurveService.update(bean); }else{ String sql = " where plan_code= '" + bean.getPlan_code() + "' and working_curve_id ='" + bean.getWorking_curve_id() + "' AND sample_code is NULL"; List taskItemCurveList = whpTaskItemCurveService.selectListByWhere(sql); if(taskItemCurveList!=null&&taskItemCurveList.size()>0) { bean.setId(taskItemCurveList.get(0).getId()); whpTaskItemCurveService.update(bean); /*WhpTestItemWorkingCurve whpTestItemWorkingCurve = new WhpTestItemWorkingCurve(); whpTestItemWorkingCurve.setId(bean.getWorking_curve_id()); whpTestItemWorkingCurve.setDefault_value(bean.getCalculated_value()); whpTestItemWorkingCurveService.update(whpTestItemWorkingCurve);*/ }else{ whpTaskItemCurveService.save(bean); } } return Result.success(); } /** * 批量删除 * * @Author: zxq * @Date: 2023/05/15 **/ @RequestMapping("/deletes.do") @ResponseBody public Result dodels(HttpServletRequest request, Model model, @RequestParam(value = "ids") String ids) { ids = ids.replace(",", "','"); whpTaskItemCurveService.deleteByWhere("where id in ('" + ids + "')"); return Result.success(); } } \ No newline at end of file diff --git a/src/main/java/com/sipai/controller/work/AutoAlertController.java b/src/main/java/com/sipai/controller/work/AutoAlertController.java index 689d5c10..8c6eab70 100644 --- a/src/main/java/com/sipai/controller/work/AutoAlertController.java +++ b/src/main/java/com/sipai/controller/work/AutoAlertController.java @@ -1,18 +1,12 @@ package com.sipai.controller.work; -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Calendar; -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 com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import com.sipai.entity.user.User; +import com.sipai.entity.work.AutoAlert; +import com.sipai.service.work.AutoAlertService; +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,14 +14,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.info.Select2; -import com.sipai.entity.user.User; -import com.sipai.entity.work.AutoAlert; -import com.sipai.service.work.AutoAlertService; -import com.sipai.tools.CommString; -import com.sipai.tools.CommUtil; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import java.util.List; @Controller diff --git a/src/main/java/com/sipai/controller/work/CameraController.java b/src/main/java/com/sipai/controller/work/CameraController.java index 08c499ff..ac7f99e3 100644 --- a/src/main/java/com/sipai/controller/work/CameraController.java +++ b/src/main/java/com/sipai/controller/work/CameraController.java @@ -6,6 +6,7 @@ import com.sipai.entity.equipment.EquipmentCardCamera; import com.sipai.entity.hqconfig.HQAlarmRecord; import com.sipai.entity.scada.MPoint; import com.sipai.entity.user.User; +import com.sipai.entity.work.AreaManage; import com.sipai.entity.work.Camera; import com.sipai.entity.work.CameraFile; import com.sipai.service.base.CommonFileService; @@ -13,12 +14,10 @@ import com.sipai.service.equipment.EquipmentCardCameraService; import com.sipai.service.hqconfig.HQAlarmRecordService; import com.sipai.service.scada.MPointService; import com.sipai.service.user.UnitService; -import com.sipai.entity.work.AreaManage; import com.sipai.service.work.AreaManageService; import com.sipai.service.work.CameraDetailService; import com.sipai.service.work.CameraFileService; import com.sipai.service.work.CameraService; -import com.sipai.tools.CommString; import com.sipai.tools.CommUtil; import net.sf.json.JSONArray; import net.sf.json.JSONObject; @@ -43,7 +42,8 @@ import java.net.HttpURLConnection; import java.net.MalformedURLException; import java.net.URL; import java.net.URLConnection; -import java.util.*; +import java.util.Date; +import java.util.List; @Controller @RequestMapping("/work/camera") diff --git a/src/main/java/com/sipai/controller/work/CameraDetailController.java b/src/main/java/com/sipai/controller/work/CameraDetailController.java index b39e70a0..edc9fc51 100644 --- a/src/main/java/com/sipai/controller/work/CameraDetailController.java +++ b/src/main/java/com/sipai/controller/work/CameraDetailController.java @@ -2,42 +2,21 @@ package com.sipai.controller.work; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; -import com.sipai.entity.equipment.EquipmentCardCamera; -import com.sipai.entity.scada.MPoint; import com.sipai.entity.user.User; -import com.sipai.entity.work.Camera; import com.sipai.entity.work.CameraDetail; -import com.sipai.entity.work.CameraFile; -import com.sipai.service.base.CommonFileService; -import com.sipai.service.equipment.EquipmentCardCameraService; -import com.sipai.service.scada.MPointService; -import com.sipai.service.user.UnitService; import com.sipai.service.work.CameraDetailService; -import com.sipai.service.work.CameraFileService; import com.sipai.service.work.CameraService; import com.sipai.tools.CommUtil; import net.sf.json.JSONArray; -import net.sf.json.JSONObject; -import org.apache.commons.io.IOUtils; 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.bind.annotation.ResponseBody; import org.springframework.web.servlet.ModelAndView; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.io.ByteArrayInputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.net.HttpURLConnection; -import java.net.MalformedURLException; -import java.net.URL; -import java.net.URLConnection; import java.util.List; @Controller diff --git a/src/main/java/com/sipai/controller/work/CameraNVRController.java b/src/main/java/com/sipai/controller/work/CameraNVRController.java index f7bf0994..15aeb980 100644 --- a/src/main/java/com/sipai/controller/work/CameraNVRController.java +++ b/src/main/java/com/sipai/controller/work/CameraNVRController.java @@ -6,7 +6,6 @@ import com.github.pagehelper.PageInfo; import com.sipai.entity.user.User; import com.sipai.entity.work.CameraNVR; import com.sipai.service.work.CameraNVRService; -import com.sipai.tools.CommUtil; import net.sf.json.JSONArray; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; diff --git a/src/main/java/com/sipai/controller/work/GetSSOldOPMData.java b/src/main/java/com/sipai/controller/work/GetSSOldOPMData.java index e102cb5b..6fa3fb72 100644 --- a/src/main/java/com/sipai/controller/work/GetSSOldOPMData.java +++ b/src/main/java/com/sipai/controller/work/GetSSOldOPMData.java @@ -1,29 +1,18 @@ package com.sipai.controller.work; -import java.math.BigDecimal; -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Calendar; -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 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.scada.MPoint; import com.sipai.entity.scada.MPointHistory; import com.sipai.service.scada.MPointHistoryService; import com.sipai.service.scada.MPointService; import com.sipai.tools.SpringContextUtil; +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.servlet.http.HttpServletRequest; +import java.math.BigDecimal; +import java.util.List; @Controller diff --git a/src/main/java/com/sipai/controller/work/GroupContentController.java b/src/main/java/com/sipai/controller/work/GroupContentController.java index a6232a56..c462ad20 100644 --- a/src/main/java/com/sipai/controller/work/GroupContentController.java +++ b/src/main/java/com/sipai/controller/work/GroupContentController.java @@ -1,24 +1,20 @@ package com.sipai.controller.work; -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.alibaba.fastjson.JSONObject; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import com.sipai.entity.base.Result; import com.sipai.entity.scada.MPoint; +import com.sipai.entity.user.User; +import com.sipai.entity.work.GroupContent; import com.sipai.entity.work.GroupContentForm; import com.sipai.entity.work.GroupContentFormData; -import com.sipai.entity.work.GroupDetail; import com.sipai.service.scada.MPointService; import com.sipai.service.work.GroupContentFormDataService; import com.sipai.service.work.GroupContentFormService; -import com.sipai.service.work.GroupDetailService; +import com.sipai.service.work.GroupContentService; +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; @@ -26,13 +22,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.user.User; -import com.sipai.entity.work.GroupContent; -import com.sipai.service.work.GroupContentService; -import com.sipai.tools.CommUtil; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import java.util.List; @Controller diff --git a/src/main/java/com/sipai/controller/work/GroupContentFormController.java b/src/main/java/com/sipai/controller/work/GroupContentFormController.java index 67e86901..93af85ae 100644 --- a/src/main/java/com/sipai/controller/work/GroupContentFormController.java +++ b/src/main/java/com/sipai/controller/work/GroupContentFormController.java @@ -1,17 +1,11 @@ package com.sipai.controller.work; -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.work.GroupDetail; -import com.sipai.service.work.GroupDetailService; +import com.sipai.entity.base.Result; +import com.sipai.entity.user.User; +import com.sipai.entity.work.GroupContentForm; +import com.sipai.service.work.GroupContentFormService; +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; @@ -19,13 +13,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.user.User; -import com.sipai.entity.work.GroupContentForm; -import com.sipai.service.work.GroupContentFormService; -import com.sipai.tools.CommUtil; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import java.util.List; @Controller diff --git a/src/main/java/com/sipai/controller/work/GroupController.java b/src/main/java/com/sipai/controller/work/GroupController.java index fd44a95a..266fcd50 100644 --- a/src/main/java/com/sipai/controller/work/GroupController.java +++ b/src/main/java/com/sipai/controller/work/GroupController.java @@ -1,33 +1,29 @@ package com.sipai.controller.work; -import java.util.List; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -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.RequestParam; -import org.springframework.web.servlet.ModelAndView; - import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; 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.user.UnitService; import com.sipai.service.work.GroupMemberService; import com.sipai.service.work.GroupService; 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.HttpSession; +import java.util.List; @Controller diff --git a/src/main/java/com/sipai/controller/work/GroupDetailController.java b/src/main/java/com/sipai/controller/work/GroupDetailController.java index 90bf73d6..6c72339d 100644 --- a/src/main/java/com/sipai/controller/work/GroupDetailController.java +++ b/src/main/java/com/sipai/controller/work/GroupDetailController.java @@ -1,18 +1,16 @@ package com.sipai.controller.work; -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.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import com.sipai.entity.base.Result; import com.sipai.entity.info.Select2; +import com.sipai.entity.user.User; +import com.sipai.entity.work.GroupDetail; import com.sipai.entity.work.GroupType; +import com.sipai.service.work.GroupDetailService; import com.sipai.service.work.GroupTypeService; +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,13 +18,12 @@ 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.user.User; -import com.sipai.entity.work.GroupDetail; -import com.sipai.service.work.GroupDetailService; -import com.sipai.tools.CommUtil; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; @Controller @RequestMapping("/work/groupDetail") diff --git a/src/main/java/com/sipai/controller/work/GroupManageController.java b/src/main/java/com/sipai/controller/work/GroupManageController.java index 84285efc..a0129fa6 100644 --- a/src/main/java/com/sipai/controller/work/GroupManageController.java +++ b/src/main/java/com/sipai/controller/work/GroupManageController.java @@ -1,33 +1,24 @@ package com.sipai.controller.work; -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Calendar; -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 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.info.Select2; import com.sipai.entity.user.User; import com.sipai.entity.work.GroupManage; import com.sipai.service.work.GroupManageService; -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.text.SimpleDateFormat; +import java.util.*; /** * 暂时弃用 diff --git a/src/main/java/com/sipai/controller/work/GroupTimeController.java b/src/main/java/com/sipai/controller/work/GroupTimeController.java index c35b7c41..471c38f1 100644 --- a/src/main/java/com/sipai/controller/work/GroupTimeController.java +++ b/src/main/java/com/sipai/controller/work/GroupTimeController.java @@ -1,20 +1,20 @@ package com.sipai.controller.work; -import java.util.ArrayList; -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.base.Result; import com.sipai.entity.info.Select2; +import com.sipai.entity.user.User; import com.sipai.entity.work.GroupDetail; +import com.sipai.entity.work.GroupTime; import com.sipai.entity.work.Scheduling; import com.sipai.service.user.UserService; import com.sipai.service.work.GroupDetailService; +import com.sipai.service.work.GroupTimeService; import com.sipai.service.work.SchedulingService; +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; @@ -22,13 +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.base.Result; -import com.sipai.entity.user.User; -import com.sipai.entity.work.GroupTime; -import com.sipai.service.work.GroupTimeService; -import com.sipai.tools.CommUtil; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import java.util.ArrayList; +import java.util.List; /** * 班次管理 diff --git a/src/main/java/com/sipai/controller/work/GroupTypeController.java b/src/main/java/com/sipai/controller/work/GroupTypeController.java index f4c139d9..8b741c02 100644 --- a/src/main/java/com/sipai/controller/work/GroupTypeController.java +++ b/src/main/java/com/sipai/controller/work/GroupTypeController.java @@ -1,18 +1,16 @@ package com.sipai.controller.work; -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.alibaba.fastjson.JSONObject; +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.entity.work.GroupDetail; +import com.sipai.entity.work.GroupType; import com.sipai.service.work.GroupDetailService; +import com.sipai.service.work.GroupTypeService; +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,13 +18,12 @@ 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.user.User; -import com.sipai.entity.work.GroupType; -import com.sipai.service.work.GroupTypeService; -import com.sipai.tools.CommUtil; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; @Controller diff --git a/src/main/java/com/sipai/controller/work/KPIPointController.java b/src/main/java/com/sipai/controller/work/KPIPointController.java index b83c38a4..775dc4be 100644 --- a/src/main/java/com/sipai/controller/work/KPIPointController.java +++ b/src/main/java/com/sipai/controller/work/KPIPointController.java @@ -1,33 +1,8 @@ package com.sipai.controller.work; -import java.math.BigDecimal; -import java.text.DecimalFormat; -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Calendar; -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.HttpSession; - -import com.sipai.entity.base.Result; -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 org.springframework.web.util.JavaScriptUtils; - import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; +import com.sipai.entity.base.Result; import com.sipai.entity.scada.MPoint; import com.sipai.entity.scada.MPoint4APP; import com.sipai.entity.user.Company; @@ -43,6 +18,20 @@ import com.sipai.service.work.KPIPointProfessorService; import com.sipai.service.work.KPIPointService; 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 javax.servlet.http.HttpSession; +import java.util.HashMap; +import java.util.List; +import java.util.Map; @Controller diff --git a/src/main/java/com/sipai/controller/work/LargerScreenController.java b/src/main/java/com/sipai/controller/work/LargerScreenController.java index 2f62d4a8..2805c897 100644 --- a/src/main/java/com/sipai/controller/work/LargerScreenController.java +++ b/src/main/java/com/sipai/controller/work/LargerScreenController.java @@ -1,20 +1,5 @@ package com.sipai.controller.work; -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 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 com.sipai.entity.scada.MPoint; import com.sipai.entity.scada.MPointHistory; import com.sipai.entity.work.LagerScreenConfigure; @@ -27,6 +12,18 @@ import com.sipai.service.work.LagerScreenConfigureDetailService; import com.sipai.service.work.LagerScreenConfigureService; import com.sipai.service.work.LagerScreenDataService; 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.servlet.ModelAndView; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import java.math.BigDecimal; +import java.text.DecimalFormat; +import java.util.List; @Controller diff --git a/src/main/java/com/sipai/controller/work/MPointFormulaAutoHourController.java b/src/main/java/com/sipai/controller/work/MPointFormulaAutoHourController.java index 55779afc..0337ac7c 100644 --- a/src/main/java/com/sipai/controller/work/MPointFormulaAutoHourController.java +++ b/src/main/java/com/sipai/controller/work/MPointFormulaAutoHourController.java @@ -1,13 +1,12 @@ package com.sipai.controller.work; -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.MPointFormulaAutoHour; +import com.sipai.entity.user.User; +import com.sipai.service.scada.MPointFormulaAutoHourService; +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,13 +14,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.scada.MPointFormulaAutoHour; -import com.sipai.entity.user.User; -import com.sipai.service.scada.MPointFormulaAutoHourService; -import com.sipai.tools.CommString; -import com.sipai.tools.CommUtil; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import java.util.List; @Controller @RequestMapping("/work/mPointFormulaAutoHour") diff --git a/src/main/java/com/sipai/controller/work/MPointFormulaController.java b/src/main/java/com/sipai/controller/work/MPointFormulaController.java index 0be4d4a0..5fbf4180 100644 --- a/src/main/java/com/sipai/controller/work/MPointFormulaController.java +++ b/src/main/java/com/sipai/controller/work/MPointFormulaController.java @@ -1,17 +1,15 @@ package com.sipai.controller.work; -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.scada.MPointFormula; import com.sipai.entity.scada.MPointHistory; import com.sipai.entity.scada.MPointPropSource; +import com.sipai.entity.user.User; +import com.sipai.service.scada.MPointFormulaService; import com.sipai.service.scada.MPointPropSourceService; +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; @@ -19,13 +17,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.scada.MPointFormula; -import com.sipai.entity.user.User; -import com.sipai.service.scada.MPointFormulaService; -import com.sipai.tools.CommString; -import com.sipai.tools.CommUtil; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import java.util.HashMap; +import java.util.List; @Controller @RequestMapping("/work/mPointFormula") diff --git a/src/main/java/com/sipai/controller/work/MPointFormulaDenominatorController.java b/src/main/java/com/sipai/controller/work/MPointFormulaDenominatorController.java index 0ea22460..7affce18 100644 --- a/src/main/java/com/sipai/controller/work/MPointFormulaDenominatorController.java +++ b/src/main/java/com/sipai/controller/work/MPointFormulaDenominatorController.java @@ -1,13 +1,12 @@ package com.sipai.controller.work; -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.MPointFormulaDenominator; +import com.sipai.entity.user.User; +import com.sipai.service.scada.MPointFormulaDenominatorService; +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,13 +14,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.scada.MPointFormulaDenominator; -import com.sipai.entity.user.User; -import com.sipai.service.scada.MPointFormulaDenominatorService; -import com.sipai.tools.CommString; -import com.sipai.tools.CommUtil; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import java.util.List; @Controller @RequestMapping("/work/mPointFormulaDenominator") diff --git a/src/main/java/com/sipai/controller/work/MPointHisChangeDataController.java b/src/main/java/com/sipai/controller/work/MPointHisChangeDataController.java index ee4d1140..f2c39845 100644 --- a/src/main/java/com/sipai/controller/work/MPointHisChangeDataController.java +++ b/src/main/java/com/sipai/controller/work/MPointHisChangeDataController.java @@ -1,14 +1,13 @@ package com.sipai.controller.work; -import java.util.List; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; - -import com.sipai.entity.data.DataCleaningHistory; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import com.sipai.entity.user.User; +import com.sipai.entity.work.MPointHisChangeData; import com.sipai.service.data.DataCleaningHistoryService; +import com.sipai.service.work.MPointHisChangeDataService; +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,12 +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.work.MPointHisChangeData; -import com.sipai.entity.user.User; -import com.sipai.service.work.MPointHisChangeDataService; -import com.sipai.tools.CommUtil; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import java.util.List; @Controller @RequestMapping("/work/mPointHisChangeData") diff --git a/src/main/java/com/sipai/controller/work/MPointPropController.java b/src/main/java/com/sipai/controller/work/MPointPropController.java index 205d944f..a133defe 100644 --- a/src/main/java/com/sipai/controller/work/MPointPropController.java +++ b/src/main/java/com/sipai/controller/work/MPointPropController.java @@ -1,22 +1,23 @@ package com.sipai.controller.work; -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.*; -import java.util.regex.Pattern; - -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.singularsys.jep.Jep; import com.sipai.entity.base.Result; import com.sipai.entity.enums.TimeUnitEnum; +import com.sipai.entity.scada.MPoint; +import com.sipai.entity.scada.MPointProp; +import com.sipai.entity.scada.MPointPropSource; +import com.sipai.entity.scada.MPointPropTarget; +import com.sipai.entity.user.Company; +import com.sipai.entity.user.User; import com.sipai.service.scada.*; import com.sipai.service.score.LibraryMPointPropService; +import com.sipai.service.user.UnitService; import com.sipai.service.user.UserService; +import com.sipai.tools.CommUtil; import net.sf.json.JSONArray; - import org.apache.log4j.Logger; import org.elasticsearch.index.query.BoolQueryBuilder; import org.elasticsearch.index.query.QueryBuilders; @@ -26,16 +27,12 @@ import org.springframework.ui.Model; import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.ModelAndView; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; -import com.sipai.entity.scada.MPoint; -import com.sipai.entity.scada.MPointProp; -import com.sipai.entity.scada.MPointPropSource; -import com.sipai.entity.scada.MPointPropTarget; -import com.sipai.entity.user.Company; -import com.sipai.entity.user.User; -import com.sipai.service.user.UnitService; -import com.sipai.tools.CommUtil; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.*; +import java.util.regex.Pattern; @Controller @RequestMapping("/work/mPointProp") diff --git a/src/main/java/com/sipai/controller/work/ModbusFigController.java b/src/main/java/com/sipai/controller/work/ModbusFigController.java index 8b1f39e0..7041c5b6 100644 --- a/src/main/java/com/sipai/controller/work/ModbusFigController.java +++ b/src/main/java/com/sipai/controller/work/ModbusFigController.java @@ -1,21 +1,5 @@ package com.sipai.controller.work; -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.apache.axis2.AxisFault; -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.serotonin.modbus4j.sero.util.queue.ByteQueue; @@ -25,7 +9,18 @@ import com.sipai.entity.work.ModbusRecord; import com.sipai.service.work.ModbusFigService; import com.sipai.service.work.ModbusRecordService; import com.sipai.tools.CommUtil; -import com.sipai.webservice.client.user.UserClient; +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.List; @Controller diff --git a/src/main/java/com/sipai/controller/work/ModbusInterfaceController.java b/src/main/java/com/sipai/controller/work/ModbusInterfaceController.java index bc890084..113d5132 100644 --- a/src/main/java/com/sipai/controller/work/ModbusInterfaceController.java +++ b/src/main/java/com/sipai/controller/work/ModbusInterfaceController.java @@ -4,10 +4,7 @@ import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.sipai.entity.base.Result; import com.sipai.entity.work.ModbusInterface; -import com.sipai.service.work.ModbusConfigService; import com.sipai.service.work.ModbusInterfaceService; -import com.sipai.service.work.ModbusPointService; -import com.sipai.tools.CommUtil; import com.sipai.tools.ModbusUtils; import io.swagger.annotations.*; import net.sf.json.JSONArray; diff --git a/src/main/java/com/sipai/controller/work/ModbusPointController.java b/src/main/java/com/sipai/controller/work/ModbusPointController.java index 2a303cd5..56155d4f 100644 --- a/src/main/java/com/sipai/controller/work/ModbusPointController.java +++ b/src/main/java/com/sipai/controller/work/ModbusPointController.java @@ -3,7 +3,6 @@ package com.sipai.controller.work; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.sipai.entity.base.Result; -import com.sipai.entity.enums.AbnormityStatusEnum; import com.sipai.entity.enums.ModbusRegisterTypeEnum; import com.sipai.entity.enums.ModbusTypeEnum; import com.sipai.entity.work.ModbusPoint; @@ -11,7 +10,6 @@ import com.sipai.service.work.ModbusPointService; import com.sipai.tools.CommUtil; import io.swagger.annotations.*; import net.sf.json.JSONArray; -import org.springframework.security.access.method.P; import org.springframework.ui.Model; import org.springframework.util.CollectionUtils; import org.springframework.web.bind.annotation.*; diff --git a/src/main/java/com/sipai/controller/work/PersonalMpCollectionController.java b/src/main/java/com/sipai/controller/work/PersonalMpCollectionController.java index a5100b79..992139f8 100644 --- a/src/main/java/com/sipai/controller/work/PersonalMpCollectionController.java +++ b/src/main/java/com/sipai/controller/work/PersonalMpCollectionController.java @@ -1,25 +1,16 @@ package com.sipai.controller.work; -import java.util.List; +import com.sipai.entity.scada.PersonalMpCollection; +import com.sipai.service.scada.PersonalMpCollectionService; +import com.sipai.service.user.UserService; +import com.sipai.tools.CommUtil; +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 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.user.ProcessSection; -import com.sipai.entity.user.User; -import com.sipai.entity.scada.PersonalMpCollection; -import com.sipai.service.user.ProcessSectionService; -import com.sipai.service.user.UnitService; -import com.sipai.service.user.UserService; -import com.sipai.service.scada.PersonalMpCollectionService; -import com.sipai.service.work.ScadaPicService; -import com.sipai.tools.CommUtil; +import java.util.List; @Controller diff --git a/src/main/java/com/sipai/controller/work/ProductionIndexDataController.java b/src/main/java/com/sipai/controller/work/ProductionIndexDataController.java index 9eeba92b..7d00f3e1 100644 --- a/src/main/java/com/sipai/controller/work/ProductionIndexDataController.java +++ b/src/main/java/com/sipai/controller/work/ProductionIndexDataController.java @@ -1,76 +1,36 @@ package com.sipai.controller.work; -import java.io.ByteArrayInputStream; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileOutputStream; -import java.io.IOException; -import java.math.BigDecimal; -import java.math.BigInteger; -import java.text.DecimalFormat; -import java.text.SimpleDateFormat; -import java.util.*; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - +import com.sipai.entity.base.Result; +import com.sipai.entity.scada.MPoint; +import com.sipai.entity.scada.MPointHistory; +import com.sipai.entity.user.User; +import com.sipai.entity.work.ProductionIndexData; +import com.sipai.entity.work.ProductionIndexPlanNameConfigure; +import com.sipai.entity.work.ProductionIndexPlanNameData; +import com.sipai.service.scada.MPointHistoryService; +import com.sipai.service.scada.MPointService; +import com.sipai.service.work.ProductionIndexDataService; +import com.sipai.service.work.ProductionIndexPlanNameConfigureService; +import com.sipai.service.work.ProductionIndexPlanNameDataService; +import com.sipai.tools.CommUtil; import net.sf.json.JSONArray; import net.sf.json.JSONObject; - -import org.apache.poi.xwpf.model.XWPFHeaderFooterPolicy; -import org.apache.poi.xwpf.usermodel.ParagraphAlignment; -import org.apache.poi.xwpf.usermodel.XWPFDocument; -import org.apache.poi.xwpf.usermodel.XWPFParagraph; -import org.apache.poi.xwpf.usermodel.XWPFRun; -import org.apache.poi.xwpf.usermodel.XWPFStyle; -import org.apache.poi.xwpf.usermodel.XWPFStyles; -import org.apache.poi.xwpf.usermodel.XWPFTable; -import org.apache.poi.xwpf.usermodel.XWPFTableRow; -import org.apache.xmlbeans.XmlException; -import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTDecimalNumber; -import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTOnOff; -import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTP; -import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTPPr; -import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTR; -import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTSectPr; -import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTShd; -import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTString; -import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTStyle; -import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTStyles; -import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTTblWidth; -import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTText; -import org.openxmlformats.schemas.wordprocessingml.x2006.main.STShd; -import org.openxmlformats.schemas.wordprocessingml.x2006.main.STStyleType; -import org.openxmlformats.schemas.wordprocessingml.x2006.main.STTblWidth; 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.controller.base.PoiUtils; -import com.sipai.entity.base.Result; -import com.sipai.entity.efficiency.EfficiencyOverviewMpConfigure; -import com.sipai.entity.maintenance.LibraryFaultBloc; -import com.sipai.entity.scada.MPoint; -import com.sipai.entity.scada.MPointHistory; -import com.sipai.entity.user.User; -import com.sipai.entity.work.ProductionIndexPlanNameConfigure; -import com.sipai.entity.work.ProductionIndexData; -import com.sipai.entity.work.ProductionIndexPlanNameData; -import com.sipai.service.work.ProductionIndexPlanNameConfigureService; -import com.sipai.service.scada.MPointHistoryService; -import com.sipai.service.scada.MPointService; -import com.sipai.service.work.ProductionIndexDataService; -import com.sipai.service.work.ProductionIndexPlanNameDataService; -import com.sipai.tools.CommUtil; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import java.math.BigDecimal; +import java.text.DecimalFormat; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; +import java.util.List; import static com.sipai.entity.enums.DayValueEnum.AVG_VALUE; -import static com.sipai.entity.enums.DayValueEnum.MONTH_VALUE; @Controller @RequestMapping("/work/productionIndexData") diff --git a/src/main/java/com/sipai/controller/work/ProductionIndexPlanNameConfigureController.java b/src/main/java/com/sipai/controller/work/ProductionIndexPlanNameConfigureController.java index 2d72a611..0c0f41b9 100644 --- a/src/main/java/com/sipai/controller/work/ProductionIndexPlanNameConfigureController.java +++ b/src/main/java/com/sipai/controller/work/ProductionIndexPlanNameConfigureController.java @@ -1,20 +1,12 @@ package com.sipai.controller.work; -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.user.User; +import com.sipai.entity.work.ProductionIndexPlanNameConfigure; +import com.sipai.service.work.ProductionIndexPlanNameConfigureService; +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,15 +14,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.EfficiencyOverviewMpConfigure; -import com.sipai.entity.user.User; -import com.sipai.entity.work.ProductionIndexPlanNameConfigure; -import com.sipai.entity.work.WordAnalysisReportStructure; -import com.sipai.service.work.ProductionIndexPlanNameConfigureService; -import com.sipai.tools.CommUtil; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import java.util.List; @Controller @RequestMapping("/work/productionIndexPlanNameConfigure") diff --git a/src/main/java/com/sipai/controller/work/ProductionIndexPlanNameDataController.java b/src/main/java/com/sipai/controller/work/ProductionIndexPlanNameDataController.java index 21a96288..a2616111 100644 --- a/src/main/java/com/sipai/controller/work/ProductionIndexPlanNameDataController.java +++ b/src/main/java/com/sipai/controller/work/ProductionIndexPlanNameDataController.java @@ -1,21 +1,16 @@ package com.sipai.controller.work; -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 com.sipai.entity.base.Result; +import com.sipai.entity.user.User; +import com.sipai.entity.work.ProductionIndexPlanNameConfigure; +import com.sipai.entity.work.ProductionIndexPlanNameData; +import com.sipai.entity.work.ProductionIndexPlanNameDataHis; +import com.sipai.service.work.ProductionIndexPlanNameConfigureService; +import com.sipai.service.work.ProductionIndexPlanNameDataHisService; +import com.sipai.service.work.ProductionIndexPlanNameDataService; +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; @@ -25,22 +20,13 @@ import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartRequest; import org.springframework.web.servlet.ModelAndView; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; -import com.itextpdf.text.log.SysoCounter; -import com.sipai.entity.base.Result; -import com.sipai.entity.efficiency.EfficiencyOverviewMpConfigure; -import com.sipai.entity.equipment.EquipmentCard; -import com.sipai.entity.maintenance.LibraryFaultBloc; -import com.sipai.entity.user.User; -import com.sipai.entity.work.ProductionIndexData; -import com.sipai.entity.work.ProductionIndexPlanNameConfigure; -import com.sipai.entity.work.ProductionIndexPlanNameData; -import com.sipai.entity.work.ProductionIndexPlanNameDataHis; -import com.sipai.service.work.ProductionIndexPlanNameConfigureService; -import com.sipai.service.work.ProductionIndexPlanNameDataHisService; -import com.sipai.service.work.ProductionIndexPlanNameDataService; -import com.sipai.tools.CommUtil; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.HashMap; +import java.util.List; +import java.util.Map; @Controller @RequestMapping("/work/productionIndexPlanNameData") diff --git a/src/main/java/com/sipai/controller/work/ProductionIndexPlanNameDataHisController.java b/src/main/java/com/sipai/controller/work/ProductionIndexPlanNameDataHisController.java index 6c0fc52b..d647fa29 100644 --- a/src/main/java/com/sipai/controller/work/ProductionIndexPlanNameDataHisController.java +++ b/src/main/java/com/sipai/controller/work/ProductionIndexPlanNameDataHisController.java @@ -1,23 +1,20 @@ package com.sipai.controller.work; -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.user.User; +import com.sipai.entity.work.ProductionIndexPlanNameDataHis; +import com.sipai.service.work.ProductionIndexPlanNameDataHisService; 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 com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; -import com.sipai.entity.work.ProductionIndexPlanNameDataHis; -import com.sipai.entity.user.User; -import com.sipai.service.work.ProductionIndexPlanNameDataHisService; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import java.util.List; @Controller @RequestMapping("/work/productionIndexPlanNameDataHis") diff --git a/src/main/java/com/sipai/controller/work/ProductionIndexWorkOrderController.java b/src/main/java/com/sipai/controller/work/ProductionIndexWorkOrderController.java index c5f0e8c7..6d8dfe66 100644 --- a/src/main/java/com/sipai/controller/work/ProductionIndexWorkOrderController.java +++ b/src/main/java/com/sipai/controller/work/ProductionIndexWorkOrderController.java @@ -1,53 +1,25 @@ package com.sipai.controller.work; -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.user.User; +import com.sipai.entity.work.ProductionIndexWorkOrder; +import com.sipai.service.user.UserService; +import com.sipai.service.work.ProductionIndexPlanNameConfigureService; +import com.sipai.service.work.ProductionIndexWorkOrderService; +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.work.ProductionIndexPlanNameConfigure; -import com.sipai.entity.work.ProductionIndexWorkOrder; -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.work.ProductionIndexPlanNameConfigureService; -import com.sipai.service.work.ProductionIndexWorkOrderService; -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("/work/productionIndexWorkOrder") diff --git a/src/main/java/com/sipai/controller/work/PythonModelController.java b/src/main/java/com/sipai/controller/work/PythonModelController.java index 2918b688..76d43980 100644 --- a/src/main/java/com/sipai/controller/work/PythonModelController.java +++ b/src/main/java/com/sipai/controller/work/PythonModelController.java @@ -16,7 +16,6 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import java.io.BufferedReader; import java.io.InputStreamReader; -import java.util.HashMap; @Controller @RequestMapping("/work/pythonModel") diff --git a/src/main/java/com/sipai/controller/work/ReadAWriteUtil.java b/src/main/java/com/sipai/controller/work/ReadAWriteUtil.java index 6a9b2576..6f4afbbc 100644 --- a/src/main/java/com/sipai/controller/work/ReadAWriteUtil.java +++ b/src/main/java/com/sipai/controller/work/ReadAWriteUtil.java @@ -2,29 +2,15 @@ package com.sipai.controller.work; //import com.battery.bean.CommunityExceptionRecord; -import javax.annotation.Resource; -import org.aspectj.weaver.patterns.ThisOrTargetAnnotationPointcut; -import org.springframework.stereotype.Controller; - -import com.serotonin.modbus4j.ModbusFactory; -import com.serotonin.modbus4j.ModbusMaster; -import com.serotonin.modbus4j.exception.ModbusInitException; -import com.serotonin.modbus4j.exception.ModbusTransportException; -import com.serotonin.modbus4j.ip.IpParameters; -import com.serotonin.modbus4j.msg.ModbusRequest; -import com.serotonin.modbus4j.msg.ModbusResponse; -import com.serotonin.modbus4j.msg.ReadHoldingRegistersRequest; -import com.serotonin.modbus4j.msg.WriteRegistersRequest; -import com.serotonin.modbus4j.msg.WriteRegistersResponse; +import com.serotonin.modbus4j.ModbusFactory; +import com.serotonin.modbus4j.ModbusMaster; +import com.serotonin.modbus4j.exception.ModbusInitException; +import com.serotonin.modbus4j.exception.ModbusTransportException; +import com.serotonin.modbus4j.ip.IpParameters; +import com.serotonin.modbus4j.msg.*; import com.serotonin.modbus4j.sero.util.queue.ByteQueue; -import com.sipai.entity.user.User; -import com.sipai.entity.work.ModbusRecord; -import com.sipai.service.work.ModbusFigService; -import com.sipai.service.work.ModbusRecordService; -import com.sipai.tools.CommUtil; - public class ReadAWriteUtil { static ModbusMaster tcpMasterr; //读写使用不同的ModbusMaster，防止同时操作时候出乱 diff --git a/src/main/java/com/sipai/controller/work/ScadaAlarmController.java b/src/main/java/com/sipai/controller/work/ScadaAlarmController.java index 1db3c1a2..22e277cb 100644 --- a/src/main/java/com/sipai/controller/work/ScadaAlarmController.java +++ b/src/main/java/com/sipai/controller/work/ScadaAlarmController.java @@ -1,21 +1,6 @@ package com.sipai.controller.work; -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 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.ScadaAlarm; @@ -24,6 +9,18 @@ import com.sipai.entity.user.User; import com.sipai.service.scada.ScadaAlarmService; 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.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; +import java.util.Map; @Controller diff --git a/src/main/java/com/sipai/controller/work/ScadaPicController.java b/src/main/java/com/sipai/controller/work/ScadaPicController.java index 12cf7743..58c49c28 100644 --- a/src/main/java/com/sipai/controller/work/ScadaPicController.java +++ b/src/main/java/com/sipai/controller/work/ScadaPicController.java @@ -1,27 +1,5 @@ package com.sipai.controller.work; -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Date; -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.JSONArray; -import net.sf.json.JSONObject; - -import org.activiti.engine.TaskService; -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.bind.annotation.ResponseBody; -import org.springframework.web.servlet.ModelAndView; - import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.sipai.entity.base.CommonFile; @@ -32,31 +10,32 @@ import com.sipai.entity.user.Company; import com.sipai.entity.user.ProcessSection; import com.sipai.entity.user.Unit; import com.sipai.entity.user.User; -import com.sipai.entity.work.Camera; -import com.sipai.entity.work.KPIPointProfessor; -import com.sipai.entity.work.ScadaPic; -import com.sipai.entity.work.ScadaPic_EM; -import com.sipai.entity.work.ScadaPic_MPoint; -import com.sipai.entity.work.ScadaPic_MPoint_Expression; -import com.sipai.entity.work.ScadaPic_ProcessSection; -import com.sipai.entity.work.ScadaPic_Txt; +import com.sipai.entity.work.*; import com.sipai.service.activiti.WorkflowTraceService; import com.sipai.service.base.CommonFileService; import com.sipai.service.maintenance.MaintenanceDetailService; import com.sipai.service.scada.ScadaAlarmService; import com.sipai.service.user.ProcessSectionService; import com.sipai.service.user.UnitService; -import com.sipai.service.work.CameraService; -import com.sipai.service.work.GroupManageService; -import com.sipai.service.work.KPIPointProfessorService; -import com.sipai.service.work.ScadaPicService; -import com.sipai.service.work.ScadaPic_EMService; -import com.sipai.service.work.ScadaPic_MPointService; -import com.sipai.service.work.ScadaPic_MPoint_ExpressionService; -import com.sipai.service.work.ScadaPic_ProcessSectionService; -import com.sipai.service.work.ScadaPic_TxtService; +import com.sipai.service.work.*; 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.bind.annotation.ResponseBody; +import org.springframework.web.servlet.ModelAndView; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpSession; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; diff --git a/src/main/java/com/sipai/controller/work/SchedulingController.java b/src/main/java/com/sipai/controller/work/SchedulingController.java index 830d45d3..e4be6e7d 100644 --- a/src/main/java/com/sipai/controller/work/SchedulingController.java +++ b/src/main/java/com/sipai/controller/work/SchedulingController.java @@ -1,31 +1,23 @@ package com.sipai.controller.work; -import java.io.IOException; -import java.io.UnsupportedEncodingException; -import java.math.BigDecimal; -import java.nio.charset.StandardCharsets; -import java.text.SimpleDateFormat; -import java.util.*; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; - +import com.github.pagehelper.PageInfo; import com.sipai.entity.base.Result; import com.sipai.entity.scada.MPoint; import com.sipai.entity.scada.MPointHistory; import com.sipai.entity.timeefficiency.PatrolModel; +import com.sipai.entity.timeefficiency.PatrolType; +import com.sipai.entity.user.User; import com.sipai.entity.work.*; import com.sipai.service.scada.MPointHistoryService; import com.sipai.service.scada.MPointService; import com.sipai.service.timeefficiency.PatrolModelService; +import com.sipai.service.user.UnitService; import com.sipai.service.user.UserService; import com.sipai.service.work.*; +import com.sipai.tools.CommUtil; import com.sipai.tools.GroupManage; 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; @@ -35,14 +27,15 @@ import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartRequest; import org.springframework.web.servlet.ModelAndView; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; -import com.sipai.entity.timeefficiency.PatrolType; -import com.sipai.entity.user.Unit; -import com.sipai.entity.user.User; -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 javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.math.BigDecimal; +import java.text.SimpleDateFormat; +import java.util.HashMap; +import java.util.List; +import java.util.Map; @Controller diff --git a/src/main/java/com/sipai/controller/work/SchedulingReplaceJobController.java b/src/main/java/com/sipai/controller/work/SchedulingReplaceJobController.java index d10d3f5c..d7627482 100644 --- a/src/main/java/com/sipai/controller/work/SchedulingReplaceJobController.java +++ b/src/main/java/com/sipai/controller/work/SchedulingReplaceJobController.java @@ -1,26 +1,23 @@ package com.sipai.controller.work; -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.work.Scheduling; +import com.sipai.entity.work.SchedulingReplaceJob; +import com.sipai.service.work.SchedulingReplaceJobService; import com.sipai.service.work.SchedulingService; 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 com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; -import com.sipai.entity.work.SchedulingReplaceJob; -import com.sipai.service.work.SchedulingReplaceJobService; import org.springframework.web.servlet.ModelAndView; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import java.util.List; + @Controller @RequestMapping("/work/schedulingReplaceJob") public class SchedulingReplaceJobController { diff --git a/src/main/java/com/sipai/controller/work/SendDataService_Hour.java b/src/main/java/com/sipai/controller/work/SendDataService_Hour.java index 8b334870..46eb7746 100644 --- a/src/main/java/com/sipai/controller/work/SendDataService_Hour.java +++ b/src/main/java/com/sipai/controller/work/SendDataService_Hour.java @@ -1,20 +1,15 @@ package com.sipai.controller.work; -import java.sql.ResultSet; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.RequestMapping; - import com.sipai.entity.scada.DataSummary; -import com.sipai.entity.scada.MPoint; import com.sipai.entity.user.Company; import com.sipai.service.company.CompanyService; import com.sipai.service.scada.DataSummaryService; -import com.sipai.service.scada.MPointService; import com.sipai.tools.CommUtil; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; + +import javax.annotation.Resource; +import java.util.List; @Controller @RequestMapping("/work/dataSummary") diff --git a/src/main/java/com/sipai/controller/work/SpeechRecognitionController.java b/src/main/java/com/sipai/controller/work/SpeechRecognitionController.java index 2446c4ff..763fdbfb 100644 --- a/src/main/java/com/sipai/controller/work/SpeechRecognitionController.java +++ b/src/main/java/com/sipai/controller/work/SpeechRecognitionController.java @@ -1,34 +1,30 @@ package com.sipai.controller.work; -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.List; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; - +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; import com.sipai.entity.scada.MPoint; import com.sipai.entity.scada.MPointHistory; +import com.sipai.entity.work.SpeechRecognition; import com.sipai.entity.work.SpeechRecognitionMpRespond; import com.sipai.service.scada.MPointHistoryService; import com.sipai.service.scada.MPointService; import com.sipai.service.work.SpeechRecognitionMpRespondService; +import com.sipai.service.work.SpeechRecognitionService; import com.sipai.tools.ChangeToPinYinJP; 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 com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; -import com.singularsys.jep.functions.Add; -import com.sipai.entity.work.SpeechRecognition; -import com.sipai.service.work.SpeechRecognitionService; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.List; +import java.util.regex.Matcher; +import java.util.regex.Pattern; @Controller @RequestMapping("/work/speechRecognition") diff --git a/src/main/java/com/sipai/controller/work/WordAnalysisReportContentController.java b/src/main/java/com/sipai/controller/work/WordAnalysisReportContentController.java index b350d4f1..54fb4c93 100644 --- a/src/main/java/com/sipai/controller/work/WordAnalysisReportContentController.java +++ b/src/main/java/com/sipai/controller/work/WordAnalysisReportContentController.java @@ -1,12 +1,13 @@ package com.sipai.controller.work; -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.user.User; +import com.sipai.entity.work.WordAnalysisReportContent; +import com.sipai.service.work.WordAnalysisReportContentService; +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,13 +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.work.WordAnalysisReportContent; -import com.sipai.entity.base.Result; -import com.sipai.entity.user.User; -import com.sipai.service.work.WordAnalysisReportContentService; -import com.sipai.tools.CommUtil; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import java.util.List; @Controller @RequestMapping("/work/wordAnalysisReportContent") diff --git a/src/main/java/com/sipai/controller/work/WordAnalysisReportContentCurveAxisController.java b/src/main/java/com/sipai/controller/work/WordAnalysisReportContentCurveAxisController.java index b2c3ebd3..882e5ae3 100644 --- a/src/main/java/com/sipai/controller/work/WordAnalysisReportContentCurveAxisController.java +++ b/src/main/java/com/sipai/controller/work/WordAnalysisReportContentCurveAxisController.java @@ -1,12 +1,13 @@ package com.sipai.controller.work; -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.user.User; +import com.sipai.entity.work.WordAnalysisReportContentCurveAxis; +import com.sipai.service.work.WordAnalysisReportContentCurveAxisService; +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,13 +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.work.WordAnalysisReportContentCurveAxis; -import com.sipai.entity.base.Result; -import com.sipai.entity.user.User; -import com.sipai.service.work.WordAnalysisReportContentCurveAxisService; -import com.sipai.tools.CommUtil; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import java.util.List; @Controller @RequestMapping("/work/wordAnalysisReportContentCurveAxis") diff --git a/src/main/java/com/sipai/controller/work/WordAnalysisReportContentCurveController.java b/src/main/java/com/sipai/controller/work/WordAnalysisReportContentCurveController.java index 26b3a237..77a69a36 100644 --- a/src/main/java/com/sipai/controller/work/WordAnalysisReportContentCurveController.java +++ b/src/main/java/com/sipai/controller/work/WordAnalysisReportContentCurveController.java @@ -1,12 +1,13 @@ package com.sipai.controller.work; -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.user.User; +import com.sipai.entity.work.WordAnalysisReportContentCurve; +import com.sipai.service.work.WordAnalysisReportContentCurveService; +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,13 +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.work.WordAnalysisReportContentCurve; -import com.sipai.entity.base.Result; -import com.sipai.entity.user.User; -import com.sipai.service.work.WordAnalysisReportContentCurveService; -import com.sipai.tools.CommUtil; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import java.util.List; @Controller @RequestMapping("/work/wordAnalysisReportContentCurve") diff --git a/src/main/java/com/sipai/controller/work/WordAnalysisReportContentFormController.java b/src/main/java/com/sipai/controller/work/WordAnalysisReportContentFormController.java index 6b95c299..9893fd19 100644 --- a/src/main/java/com/sipai/controller/work/WordAnalysisReportContentFormController.java +++ b/src/main/java/com/sipai/controller/work/WordAnalysisReportContentFormController.java @@ -1,12 +1,11 @@ package com.sipai.controller.work; -import java.util.List; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; - +import com.sipai.entity.base.Result; +import com.sipai.entity.user.User; +import com.sipai.entity.work.WordAnalysisReportContentForm; +import com.sipai.service.work.WordAnalysisReportContentFormService; +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,13 +13,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.work.WordAnalysisReportContentForm; -import com.sipai.entity.base.Result; -import com.sipai.entity.user.User; -import com.sipai.service.work.WordAnalysisReportContentFormService; -import com.sipai.tools.CommUtil; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import java.util.List; @Controller @RequestMapping("/work/wordAnalysisReportContentForm") diff --git a/src/main/java/com/sipai/controller/work/WordAnalysisReportRecordController.java b/src/main/java/com/sipai/controller/work/WordAnalysisReportRecordController.java index 45a47883..853faffb 100644 --- a/src/main/java/com/sipai/controller/work/WordAnalysisReportRecordController.java +++ b/src/main/java/com/sipai/controller/work/WordAnalysisReportRecordController.java @@ -1,19 +1,17 @@ package com.sipai.controller.work; -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.base.Result; +import com.sipai.entity.scada.MPointHistory; import com.sipai.entity.user.Unit; +import com.sipai.entity.user.User; +import com.sipai.entity.work.*; +import com.sipai.service.scada.MPointHistoryService; import com.sipai.service.user.UnitService; +import com.sipai.service.work.*; +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; @@ -21,27 +19,13 @@ 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.itextpdf.text.log.SysoCounter; -import com.sipai.entity.work.WordAnalysisReportContent; -import com.sipai.entity.work.WordAnalysisReportContentCurve; -import com.sipai.entity.work.WordAnalysisReportContentForm; -import com.sipai.entity.work.WordAnalysisReportFormData; -import com.sipai.entity.work.WordAnalysisReportRecord; -import com.sipai.entity.work.WordAnalysisReportStructure; -import com.sipai.entity.work.WordAnalysisReportText; -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.work.WordAnalysisReportContentFormService; -import com.sipai.service.work.WordAnalysisReportContentService; -import com.sipai.service.work.WordAnalysisReportFormDataService; -import com.sipai.service.work.WordAnalysisReportRecordService; -import com.sipai.service.work.WordAnalysisReportStructureService; -import com.sipai.service.work.WordAnalysisReportTextService; -import com.sipai.tools.CommUtil; +import javax.annotation.Resource; +import javax.script.ScriptEngine; +import javax.script.ScriptEngineManager; +import javax.script.ScriptException; +import javax.servlet.http.HttpServletRequest; +import java.io.File; +import java.util.List; @Controller @RequestMapping("/work/wordAnalysisReportRecord") diff --git a/src/main/java/com/sipai/controller/work/WordAnalysisReportStructureController.java b/src/main/java/com/sipai/controller/work/WordAnalysisReportStructureController.java index 6a15b903..d2854eec 100644 --- a/src/main/java/com/sipai/controller/work/WordAnalysisReportStructureController.java +++ b/src/main/java/com/sipai/controller/work/WordAnalysisReportStructureController.java @@ -1,13 +1,24 @@ package com.sipai.controller.work; -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.OutputStream; -import java.math.BigDecimal; -import java.math.BigInteger; -import java.text.DecimalFormat; -import java.util.List; +import com.sipai.controller.base.PoiUtils; +import com.sipai.entity.base.Result; +import com.sipai.entity.scada.MPoint; +import com.sipai.entity.scada.MPointHistory; +import com.sipai.entity.user.User; +import com.sipai.entity.work.*; +import com.sipai.service.scada.MPointHistoryService; +import com.sipai.service.scada.MPointService; +import com.sipai.service.work.*; +import com.sipai.tools.CommUtil; +import net.sf.json.JSONArray; +import org.apache.poi.xwpf.usermodel.*; +import org.apache.xmlbeans.XmlException; +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 sun.misc.BASE64Decoder; import javax.annotation.Resource; import javax.script.ScriptEngine; @@ -15,41 +26,13 @@ import javax.script.ScriptEngineManager; import javax.script.ScriptException; import javax.servlet.ServletInputStream; import javax.servlet.http.HttpServletRequest; - -import com.sipai.entity.work.*; -import com.sipai.service.work.*; -import net.sf.json.JSONArray; - -import org.apache.poi.xwpf.usermodel.BreakType; -import org.apache.poi.xwpf.usermodel.ParagraphAlignment; -import org.apache.poi.xwpf.usermodel.XWPFDocument; -import org.apache.poi.xwpf.usermodel.XWPFParagraph; -import org.apache.poi.xwpf.usermodel.XWPFRun; -import org.apache.poi.xwpf.usermodel.XWPFTable; -import org.apache.poi.xwpf.usermodel.XWPFTableRow; -import org.apache.xmlbeans.XmlException; -import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTTblWidth; -import org.openxmlformats.schemas.wordprocessingml.x2006.main.STTblWidth; -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.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; -import com.itextpdf.text.log.SysoCounter; -import com.sipai.controller.base.PoiUtils; -import com.sipai.entity.base.Result; -import com.sipai.entity.scada.MPoint; -import com.sipai.entity.scada.MPointHistory; -import com.sipai.entity.user.User; -import com.sipai.service.scada.MPointHistoryService; -import com.sipai.service.scada.MPointService; -import com.sipai.tools.CommUtil; - -import sun.misc.BASE64Decoder; -import sun.misc.BASE64Encoder; +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.OutputStream; +import java.math.BigDecimal; +import java.text.DecimalFormat; +import java.util.List; @SuppressWarnings({"restriction", "unused"}) @Controller diff --git a/src/main/java/com/sipai/controller/workorder/OverhaulController.java b/src/main/java/com/sipai/controller/workorder/OverhaulController.java index d495f9e3..6fb0f1a5 100644 --- a/src/main/java/com/sipai/controller/workorder/OverhaulController.java +++ b/src/main/java/com/sipai/controller/workorder/OverhaulController.java @@ -4,17 +4,17 @@ import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.sipai.entity.business.BusinessUnitAudit; import com.sipai.entity.equipment.EquipmentStopRecord; -import com.sipai.entity.workorder.Overhaul; import com.sipai.entity.user.Company; import com.sipai.entity.user.User; +import com.sipai.entity.workorder.Overhaul; import com.sipai.entity.workorder.OverhaulStatistics; import com.sipai.service.activiti.WorkflowProcessDefinitionService; import com.sipai.service.equipment.EquipmentStopRecordService; import com.sipai.service.maintenance.EquipmentPlanTypeService; -import com.sipai.service.workorder.OverhaulItemEquipmentService; -import com.sipai.service.workorder.OverhaulService; import com.sipai.service.user.UnitService; import com.sipai.service.user.UserService; +import com.sipai.service.workorder.OverhaulItemEquipmentService; +import com.sipai.service.workorder.OverhaulService; import com.sipai.tools.CommUtil; import net.sf.json.JSONArray; import org.activiti.engine.RuntimeService; diff --git a/src/main/java/com/sipai/controller/workorder/OverhaulItemContentController.java b/src/main/java/com/sipai/controller/workorder/OverhaulItemContentController.java index 331347a3..fedebca6 100644 --- a/src/main/java/com/sipai/controller/workorder/OverhaulItemContentController.java +++ b/src/main/java/com/sipai/controller/workorder/OverhaulItemContentController.java @@ -3,8 +3,8 @@ package com.sipai.controller.workorder; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.sipai.entity.base.Result; -import com.sipai.entity.workorder.OverhaulItemContent; import com.sipai.entity.user.User; +import com.sipai.entity.workorder.OverhaulItemContent; import com.sipai.service.workorder.OverhaulItemContentService; import com.sipai.tools.CommUtil; import net.sf.json.JSONArray; diff --git a/src/main/java/com/sipai/controller/workorder/OverhaulItemEquipmentController.java b/src/main/java/com/sipai/controller/workorder/OverhaulItemEquipmentController.java index 81b08ea5..12de3513 100644 --- a/src/main/java/com/sipai/controller/workorder/OverhaulItemEquipmentController.java +++ b/src/main/java/com/sipai/controller/workorder/OverhaulItemEquipmentController.java @@ -1,21 +1,17 @@ package com.sipai.controller.workorder; -import com.alibaba.druid.sql.visitor.functions.If; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.sipai.entity.activiti.ActivitiCommStr; -import com.sipai.entity.activiti.ProcessType; import com.sipai.entity.base.Result; import com.sipai.entity.business.BusinessUnitAudit; -import com.sipai.entity.business.BusinessUnitHandle; import com.sipai.entity.business.BusinessUnitRecord; import com.sipai.entity.maintenance.EquipmentPlan; import com.sipai.entity.user.Company; +import com.sipai.entity.user.User; import com.sipai.entity.workorder.Overhaul; import com.sipai.entity.workorder.OverhaulItemEquipment; -import com.sipai.entity.user.User; import com.sipai.entity.workorder.OverhaulStatistics; -import com.sipai.service.activiti.WorkflowProcessDefinitionService; import com.sipai.service.activiti.WorkflowService; import com.sipai.service.maintenance.EquipmentPlanService; import com.sipai.service.user.UnitService; @@ -27,15 +23,11 @@ import com.sipai.tools.CommUtil; import net.sf.json.JSONArray; import org.activiti.engine.RuntimeService; import org.activiti.engine.TaskService; -import org.activiti.engine.impl.pvm.process.ActivityImpl; -import org.activiti.engine.runtime.ProcessInstance; -import org.activiti.engine.runtime.ProcessInstanceQuery; import org.activiti.engine.task.Task; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.ModelAttribute; -import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.servlet.ModelAndView; diff --git a/src/main/java/com/sipai/controller/workorder/OverhaulItemProjectController.java b/src/main/java/com/sipai/controller/workorder/OverhaulItemProjectController.java index 2ba6d3ff..4a987bee 100644 --- a/src/main/java/com/sipai/controller/workorder/OverhaulItemProjectController.java +++ b/src/main/java/com/sipai/controller/workorder/OverhaulItemProjectController.java @@ -5,7 +5,7 @@ import com.github.pagehelper.PageInfo; import com.sipai.entity.base.Result; import com.sipai.entity.business.BusinessUnitAudit; import com.sipai.entity.business.BusinessUnitHandle; -import com.sipai.entity.maintenance.*; +import com.sipai.entity.maintenance.MaintenanceCommString; import com.sipai.entity.user.Company; import com.sipai.entity.user.User; import com.sipai.entity.workorder.OverhaulItemContent; @@ -16,17 +16,15 @@ import com.sipai.service.activiti.WorkflowProcessDefinitionService; import com.sipai.service.activiti.WorkflowService; import com.sipai.service.business.BusinessUnitAuditService; import com.sipai.service.business.BusinessUnitHandleService; +import com.sipai.service.user.UnitService; import com.sipai.service.workorder.OverhaulItemContentService; import com.sipai.service.workorder.OverhaulItemProjectService; import com.sipai.service.workorder.OverhaulTypeService; import com.sipai.service.workorder.WorkorderAchievementService; -import com.sipai.service.user.UnitService; 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.impl.pvm.process.ActivityImpl; @@ -42,8 +40,9 @@ import org.springframework.web.servlet.ModelAndView; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; - -import java.util.*; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** * 大修分项-项目 diff --git a/src/main/java/com/sipai/controller/workorder/OverhaulTypeController.java b/src/main/java/com/sipai/controller/workorder/OverhaulTypeController.java index e1b9cac6..da1335ad 100644 --- a/src/main/java/com/sipai/controller/workorder/OverhaulTypeController.java +++ b/src/main/java/com/sipai/controller/workorder/OverhaulTypeController.java @@ -2,10 +2,8 @@ package com.sipai.controller.workorder; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; -import com.sipai.entity.maintenance.EquipmentPlanType; -import com.sipai.entity.workorder.OverhaulType; -import com.sipai.entity.user.Company; import com.sipai.entity.user.User; +import com.sipai.entity.workorder.OverhaulType; import com.sipai.service.workorder.OverhaulTypeService; import com.sipai.tools.CommString; import com.sipai.tools.CommUtil; @@ -17,6 +15,7 @@ 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; diff --git a/src/main/java/com/sipai/controller/workorder/WorkorderAchievementController.java b/src/main/java/com/sipai/controller/workorder/WorkorderAchievementController.java index 75e35711..c467e2f9 100644 --- a/src/main/java/com/sipai/controller/workorder/WorkorderAchievementController.java +++ b/src/main/java/com/sipai/controller/workorder/WorkorderAchievementController.java @@ -1,38 +1,35 @@ package com.sipai.controller.workorder; -import java.io.IOException; -import java.util.*; - -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.timeefficiency.PatrolRecord; import com.sipai.entity.user.Unit; +import com.sipai.entity.user.User; import com.sipai.entity.work.GroupDetail; import com.sipai.entity.workorder.*; import com.sipai.service.timeefficiency.PatrolRecordService; import com.sipai.service.user.UnitService; +import com.sipai.service.user.UserService; import com.sipai.service.work.GroupDetailService; import com.sipai.service.workorder.WorkorderAchievementOrderService; +import com.sipai.service.workorder.WorkorderAchievementService; import com.sipai.service.workorder.WorkorderDetailService; +import com.sipai.tools.CommUtil; import io.swagger.annotations.*; import net.sf.json.JSONArray; import net.sf.json.JSONObject; - import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.*; 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.user.User; -import com.sipai.service.workorder.WorkorderAchievementService; -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.IOException; +import java.util.*; /** * 工单绩效 diff --git a/src/main/java/com/sipai/controller/workorder/WorkorderConsumeController.java b/src/main/java/com/sipai/controller/workorder/WorkorderConsumeController.java index ea728ebf..578a8999 100644 --- a/src/main/java/com/sipai/controller/workorder/WorkorderConsumeController.java +++ b/src/main/java/com/sipai/controller/workorder/WorkorderConsumeController.java @@ -1,32 +1,27 @@ package com.sipai.controller.workorder; -import java.math.BigDecimal; -import java.util.List; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; - -import com.sipai.entity.workorder.WorkorderRepairContent; -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.dao.sparepart.ConsumeDetailDao; import com.sipai.entity.base.Result; -import com.sipai.entity.sparepart.OutStockRecordDetail; import com.sipai.entity.user.User; import com.sipai.entity.workorder.WorkorderConsume; import com.sipai.service.sparepart.ConsumeDetailService; import com.sipai.service.sparepart.OutStockRecordDetailService; import com.sipai.service.workorder.WorkorderConsumeService; 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.math.BigDecimal; +import java.util.List; @Controller @RequestMapping("/workorder/workorderConsume") diff --git a/src/main/java/com/sipai/controller/workorder/WorkorderDetailController.java b/src/main/java/com/sipai/controller/workorder/WorkorderDetailController.java index 8fa9c92e..d28d0a71 100644 --- a/src/main/java/com/sipai/controller/workorder/WorkorderDetailController.java +++ b/src/main/java/com/sipai/controller/workorder/WorkorderDetailController.java @@ -1,21 +1,28 @@ package com.sipai.controller.workorder; -import java.io.IOException; -import java.text.SimpleDateFormat; -import java.util.*; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - import com.alibaba.fastjson.JSONObject; -import com.sipai.entity.accident.Roast; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import com.sipai.entity.activiti.WorkTask; import com.sipai.entity.base.Result; -import com.sipai.entity.maintenance.*; +import com.sipai.entity.business.BusinessUnit; +import com.sipai.entity.business.BusinessUnitAudit; +import com.sipai.entity.business.BusinessUnitHandle; +import com.sipai.entity.business.BusinessUnitRecord; +import com.sipai.entity.maintenance.Abnormity; +import com.sipai.entity.user.Company; +import com.sipai.entity.user.Unit; +import com.sipai.entity.user.User; import com.sipai.entity.work.GroupDetail; +import com.sipai.entity.workorder.WorkorderDetail; +import com.sipai.service.activiti.WorkflowProcessDefinitionService; +import com.sipai.service.activiti.WorkflowService; +import com.sipai.service.business.BusinessUnitAuditService; +import com.sipai.service.business.BusinessUnitHandleService; import com.sipai.service.maintenance.AbnormityService; import com.sipai.service.maintenance.EquipmentPlanMainYearService; import com.sipai.service.maintenance.MaintenanceDetailService; +import com.sipai.service.user.UnitService; import com.sipai.service.user.UserService; import com.sipai.service.work.GroupDetailService; import com.sipai.service.workorder.WorkorderDetailService; @@ -23,7 +30,6 @@ import com.sipai.service.workorder.WorkorderRepairContentService; import com.sipai.tools.*; import io.swagger.annotations.*; import net.sf.json.JSONArray; - import org.activiti.engine.RuntimeService; import org.activiti.engine.TaskService; import org.activiti.engine.history.HistoricTaskInstance; @@ -33,25 +39,18 @@ import org.activiti.engine.task.Task; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; -import org.springframework.web.bind.annotation.*; +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.sipai.entity.activiti.WorkTask; -import com.sipai.entity.business.BusinessUnit; -import com.sipai.entity.business.BusinessUnitAudit; -import com.sipai.entity.business.BusinessUnitHandle; -import com.sipai.entity.business.BusinessUnitRecord; -import com.sipai.entity.user.Company; -import com.sipai.entity.user.Unit; -import com.sipai.entity.user.User; -import com.sipai.entity.workorder.WorkorderDetail; -import com.sipai.service.activiti.WorkflowProcessDefinitionService; -import com.sipai.service.activiti.WorkflowService; -import com.sipai.service.business.BusinessUnitAuditService; -import com.sipai.service.business.BusinessUnitHandleService; -import com.sipai.service.user.UnitService; +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("/workorder/workorderDetail") diff --git a/src/main/java/com/sipai/controller/workorder/WorkorderRepairContentController.java b/src/main/java/com/sipai/controller/workorder/WorkorderRepairContentController.java index 0230781b..1d1141e1 100644 --- a/src/main/java/com/sipai/controller/workorder/WorkorderRepairContentController.java +++ b/src/main/java/com/sipai/controller/workorder/WorkorderRepairContentController.java @@ -1,21 +1,5 @@ package com.sipai.controller.workorder; -import java.util.List; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; - -import com.sipai.service.workorder.WorkorderDetailService; -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.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; @@ -32,9 +16,22 @@ import com.sipai.service.equipment.EquipmentCardService; import com.sipai.service.maintenance.LibraryFaultBlocService; import com.sipai.service.maintenance.LibraryRepairBlocService; import com.sipai.service.user.UnitService; +import com.sipai.service.workorder.WorkorderDetailService; import com.sipai.service.workorder.WorkorderRepairContentService; 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.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("/workorder/workorderRepairContent") diff --git a/src/main/java/com/sipai/dao/Listener/ListenerHisDao.java b/src/main/java/com/sipai/dao/Listener/ListenerHisDao.java index 0e4d186b..6adf421b 100644 --- a/src/main/java/com/sipai/dao/Listener/ListenerHisDao.java +++ b/src/main/java/com/sipai/dao/Listener/ListenerHisDao.java @@ -2,7 +2,6 @@ package com.sipai.dao.Listener; import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.Listener.ListenerHis; -import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; import java.util.List; diff --git a/src/main/java/com/sipai/dao/Listener/ListenerInterfaceDao.java b/src/main/java/com/sipai/dao/Listener/ListenerInterfaceDao.java index 780c6234..c0e866eb 100644 --- a/src/main/java/com/sipai/dao/Listener/ListenerInterfaceDao.java +++ b/src/main/java/com/sipai/dao/Listener/ListenerInterfaceDao.java @@ -2,11 +2,8 @@ package com.sipai.dao.Listener; import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.Listener.ListenerInterface; -import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; -import java.util.List; - @Repository public class ListenerInterfaceDao extends CommDaoImpl { diff --git a/src/main/java/com/sipai/dao/Listener/ListenerPointDao.java b/src/main/java/com/sipai/dao/Listener/ListenerPointDao.java index 6c7dafe1..4ad8d530 100644 --- a/src/main/java/com/sipai/dao/Listener/ListenerPointDao.java +++ b/src/main/java/com/sipai/dao/Listener/ListenerPointDao.java @@ -2,11 +2,8 @@ package com.sipai.dao.Listener; import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.Listener.ListenerPoint; -import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; -import java.util.List; - @Repository public class ListenerPointDao extends CommDaoImpl { diff --git a/src/main/java/com/sipai/dao/accident/AccidentDao.java b/src/main/java/com/sipai/dao/accident/AccidentDao.java index e9cb19ac..6e410d66 100644 --- a/src/main/java/com/sipai/dao/accident/AccidentDao.java +++ b/src/main/java/com/sipai/dao/accident/AccidentDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.accident; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.accident.Accident; +import org.springframework.stereotype.Repository; @Repository public class AccidentDao extends CommDaoImpl { diff --git a/src/main/java/com/sipai/dao/accident/AccidentTypeDao.java b/src/main/java/com/sipai/dao/accident/AccidentTypeDao.java index fa2f7300..abe84914 100644 --- a/src/main/java/com/sipai/dao/accident/AccidentTypeDao.java +++ b/src/main/java/com/sipai/dao/accident/AccidentTypeDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.accident; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.accident.AccidentType; +import org.springframework.stereotype.Repository; @Repository public class AccidentTypeDao extends CommDaoImpl { diff --git a/src/main/java/com/sipai/dao/accident/ReasonableAdviceDao.java b/src/main/java/com/sipai/dao/accident/ReasonableAdviceDao.java index 98245683..5a2819a4 100644 --- a/src/main/java/com/sipai/dao/accident/ReasonableAdviceDao.java +++ b/src/main/java/com/sipai/dao/accident/ReasonableAdviceDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.accident; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.accident.ReasonableAdvice; +import org.springframework.stereotype.Repository; @Repository public class ReasonableAdviceDao extends CommDaoImpl { diff --git a/src/main/java/com/sipai/dao/accident/RoastDao.java b/src/main/java/com/sipai/dao/accident/RoastDao.java index 3637e965..b880ee74 100644 --- a/src/main/java/com/sipai/dao/accident/RoastDao.java +++ b/src/main/java/com/sipai/dao/accident/RoastDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.accident; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.accident.Roast; +import org.springframework.stereotype.Repository; @Repository public class RoastDao extends CommDaoImpl { diff --git a/src/main/java/com/sipai/dao/achievement/AcceptanceModelDao.java b/src/main/java/com/sipai/dao/achievement/AcceptanceModelDao.java index de101e43..03244cca 100644 --- a/src/main/java/com/sipai/dao/achievement/AcceptanceModelDao.java +++ b/src/main/java/com/sipai/dao/achievement/AcceptanceModelDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.achievement; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.achievement.AcceptanceModel; +import org.springframework.stereotype.Repository; @Repository public class AcceptanceModelDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/achievement/AcceptanceModelDataDao.java b/src/main/java/com/sipai/dao/achievement/AcceptanceModelDataDao.java index 825ae24e..9e28c256 100644 --- a/src/main/java/com/sipai/dao/achievement/AcceptanceModelDataDao.java +++ b/src/main/java/com/sipai/dao/achievement/AcceptanceModelDataDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.achievement; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.achievement.AcceptanceModelData; +import org.springframework.stereotype.Repository; @Repository public class AcceptanceModelDataDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/achievement/AcceptanceModelMPointDao.java b/src/main/java/com/sipai/dao/achievement/AcceptanceModelMPointDao.java index e7c5a9b3..68549fc2 100644 --- a/src/main/java/com/sipai/dao/achievement/AcceptanceModelMPointDao.java +++ b/src/main/java/com/sipai/dao/achievement/AcceptanceModelMPointDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.achievement; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.achievement.AcceptanceModelMPoint; +import org.springframework.stereotype.Repository; @Repository public class AcceptanceModelMPointDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/achievement/AcceptanceModelOutputDao.java b/src/main/java/com/sipai/dao/achievement/AcceptanceModelOutputDao.java index d30f89c4..8e240b4d 100644 --- a/src/main/java/com/sipai/dao/achievement/AcceptanceModelOutputDao.java +++ b/src/main/java/com/sipai/dao/achievement/AcceptanceModelOutputDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.achievement; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.achievement.AcceptanceModelOutput; +import org.springframework.stereotype.Repository; @Repository public class AcceptanceModelOutputDao extends CommDaoImpl { diff --git a/src/main/java/com/sipai/dao/achievement/AcceptanceModelOutputDataDao.java b/src/main/java/com/sipai/dao/achievement/AcceptanceModelOutputDataDao.java index 3b25d196..67ae2047 100644 --- a/src/main/java/com/sipai/dao/achievement/AcceptanceModelOutputDataDao.java +++ b/src/main/java/com/sipai/dao/achievement/AcceptanceModelOutputDataDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.achievement; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.achievement.AcceptanceModelOutputData; +import org.springframework.stereotype.Repository; @Repository public class AcceptanceModelOutputDataDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/achievement/AcceptanceModelRecordDao.java b/src/main/java/com/sipai/dao/achievement/AcceptanceModelRecordDao.java index 93b6571e..728c2478 100644 --- a/src/main/java/com/sipai/dao/achievement/AcceptanceModelRecordDao.java +++ b/src/main/java/com/sipai/dao/achievement/AcceptanceModelRecordDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.achievement; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.achievement.AcceptanceModelRecord; +import org.springframework.stereotype.Repository; @Repository public class AcceptanceModelRecordDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/achievement/AcceptanceModelTextDao.java b/src/main/java/com/sipai/dao/achievement/AcceptanceModelTextDao.java index 7578ec28..853bd894 100644 --- a/src/main/java/com/sipai/dao/achievement/AcceptanceModelTextDao.java +++ b/src/main/java/com/sipai/dao/achievement/AcceptanceModelTextDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.achievement; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.achievement.AcceptanceModelText; +import org.springframework.stereotype.Repository; @Repository public class AcceptanceModelTextDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/achievement/AcceptanceModelTextDataDao.java b/src/main/java/com/sipai/dao/achievement/AcceptanceModelTextDataDao.java index 583666f1..ca34cb9b 100644 --- a/src/main/java/com/sipai/dao/achievement/AcceptanceModelTextDataDao.java +++ b/src/main/java/com/sipai/dao/achievement/AcceptanceModelTextDataDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.achievement; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.achievement.AcceptanceModelTextData; +import org.springframework.stereotype.Repository; @Repository public class AcceptanceModelTextDataDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/activiti/LeaveDao.java b/src/main/java/com/sipai/dao/activiti/LeaveDao.java index 5b753d71..a15d538f 100644 --- a/src/main/java/com/sipai/dao/activiti/LeaveDao.java +++ b/src/main/java/com/sipai/dao/activiti/LeaveDao.java @@ -1,11 +1,8 @@ package com.sipai.dao.activiti; -import org.springframework.stereotype.Component; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.activiti.Leave; -import com.sipai.entity.work.Group; +import org.springframework.stereotype.Repository; /** * 请假实体管理接口 diff --git a/src/main/java/com/sipai/dao/activiti/ModelNodeJobDao.java b/src/main/java/com/sipai/dao/activiti/ModelNodeJobDao.java index 7135f00c..93fc8254 100644 --- a/src/main/java/com/sipai/dao/activiti/ModelNodeJobDao.java +++ b/src/main/java/com/sipai/dao/activiti/ModelNodeJobDao.java @@ -1,11 +1,9 @@ package com.sipai.dao.activiti; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; - import com.sipai.entity.activiti.ModelNodeJob; +import org.springframework.stereotype.Repository; /** diff --git a/src/main/java/com/sipai/dao/activiti/OEProcessDao.java b/src/main/java/com/sipai/dao/activiti/OEProcessDao.java index 50570c08..7421b7d2 100644 --- a/src/main/java/com/sipai/dao/activiti/OEProcessDao.java +++ b/src/main/java/com/sipai/dao/activiti/OEProcessDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.activiti; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.activiti.OEProcess; +import org.springframework.stereotype.Repository; @Repository public class OEProcessDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/administration/IndexClassDao.java b/src/main/java/com/sipai/dao/administration/IndexClassDao.java index 09b27534..cc2bd33d 100644 --- a/src/main/java/com/sipai/dao/administration/IndexClassDao.java +++ b/src/main/java/com/sipai/dao/administration/IndexClassDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.administration; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.administration.IndexClass; +import org.springframework.stereotype.Repository; @Repository public class IndexClassDao extends CommDaoImpl{ public IndexClassDao(){ diff --git a/src/main/java/com/sipai/dao/administration/IndexCycleDao.java b/src/main/java/com/sipai/dao/administration/IndexCycleDao.java index a3a94c9f..8493b078 100644 --- a/src/main/java/com/sipai/dao/administration/IndexCycleDao.java +++ b/src/main/java/com/sipai/dao/administration/IndexCycleDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.administration; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.administration.IndexCycle; +import org.springframework.stereotype.Repository; @Repository public class IndexCycleDao extends CommDaoImpl{ public IndexCycleDao(){ diff --git a/src/main/java/com/sipai/dao/administration/IndexDao.java b/src/main/java/com/sipai/dao/administration/IndexDao.java index a81552c8..5288b417 100644 --- a/src/main/java/com/sipai/dao/administration/IndexDao.java +++ b/src/main/java/com/sipai/dao/administration/IndexDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.administration; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.administration.Index; +import org.springframework.stereotype.Repository; @Repository public class IndexDao extends CommDaoImpl{ public IndexDao(){ diff --git a/src/main/java/com/sipai/dao/administration/IndexWorkDao.java b/src/main/java/com/sipai/dao/administration/IndexWorkDao.java index 63b1674c..61f19c8c 100644 --- a/src/main/java/com/sipai/dao/administration/IndexWorkDao.java +++ b/src/main/java/com/sipai/dao/administration/IndexWorkDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.administration; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.administration.IndexWork; +import org.springframework.stereotype.Repository; @Repository public class IndexWorkDao extends CommDaoImpl{ public IndexWorkDao(){ diff --git a/src/main/java/com/sipai/dao/administration/OrganizationClassDao.java b/src/main/java/com/sipai/dao/administration/OrganizationClassDao.java index ac53bef9..8d76302f 100644 --- a/src/main/java/com/sipai/dao/administration/OrganizationClassDao.java +++ b/src/main/java/com/sipai/dao/administration/OrganizationClassDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.administration; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.administration.OrganizationClass; +import org.springframework.stereotype.Repository; @Repository public class OrganizationClassDao extends CommDaoImpl{ public OrganizationClassDao(){ diff --git a/src/main/java/com/sipai/dao/administration/OrganizationDao.java b/src/main/java/com/sipai/dao/administration/OrganizationDao.java index 29053544..49243afa 100644 --- a/src/main/java/com/sipai/dao/administration/OrganizationDao.java +++ b/src/main/java/com/sipai/dao/administration/OrganizationDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.administration; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.administration.Organization; +import org.springframework.stereotype.Repository; @Repository public class OrganizationDao extends CommDaoImpl{ public OrganizationDao(){ diff --git a/src/main/java/com/sipai/dao/administration/TemporaryDao.java b/src/main/java/com/sipai/dao/administration/TemporaryDao.java index 1e1ae235..24984bd0 100644 --- a/src/main/java/com/sipai/dao/administration/TemporaryDao.java +++ b/src/main/java/com/sipai/dao/administration/TemporaryDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.administration; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.administration.Temporary; +import org.springframework.stereotype.Repository; @Repository public class TemporaryDao extends CommDaoImpl{ public TemporaryDao(){ diff --git a/src/main/java/com/sipai/dao/alarm/AlarmConditionDao.java b/src/main/java/com/sipai/dao/alarm/AlarmConditionDao.java index 270bce93..e27b4d91 100644 --- a/src/main/java/com/sipai/dao/alarm/AlarmConditionDao.java +++ b/src/main/java/com/sipai/dao/alarm/AlarmConditionDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.alarm; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.alarm.AlarmCondition; +import org.springframework.stereotype.Repository; @Repository public class AlarmConditionDao extends CommDaoImpl{ public AlarmConditionDao(){ diff --git a/src/main/java/com/sipai/dao/alarm/AlarmInformationDao.java b/src/main/java/com/sipai/dao/alarm/AlarmInformationDao.java index f601e99f..db4b887f 100644 --- a/src/main/java/com/sipai/dao/alarm/AlarmInformationDao.java +++ b/src/main/java/com/sipai/dao/alarm/AlarmInformationDao.java @@ -1,14 +1,13 @@ package com.sipai.dao.alarm; +import com.sipai.dao.base.CommDaoImpl; +import com.sipai.entity.alarm.AlarmInformation; +import org.springframework.stereotype.Repository; + import java.util.HashMap; import java.util.List; import java.util.Map; -import org.springframework.stereotype.Repository; - -import com.sipai.dao.base.CommDaoImpl; -import com.sipai.entity.alarm.AlarmInformation; - @Repository public class AlarmInformationDao extends CommDaoImpl{ public AlarmInformationDao(){ diff --git a/src/main/java/com/sipai/dao/alarm/AlarmLevelsConfigDao.java b/src/main/java/com/sipai/dao/alarm/AlarmLevelsConfigDao.java index e14d5894..f5a9a39d 100644 --- a/src/main/java/com/sipai/dao/alarm/AlarmLevelsConfigDao.java +++ b/src/main/java/com/sipai/dao/alarm/AlarmLevelsConfigDao.java @@ -1,13 +1,9 @@ package com.sipai.dao.alarm; import com.sipai.dao.base.CommDaoImpl; -import com.sipai.entity.alarm.AlarmLevels; import com.sipai.entity.alarm.AlarmLevelsConfig; import org.springframework.stereotype.Repository; -import java.util.HashMap; -import java.util.Map; - @Repository public class AlarmLevelsConfigDao extends CommDaoImpl{ public AlarmLevelsConfigDao(){ diff --git a/src/main/java/com/sipai/dao/alarm/AlarmLevelsDao.java b/src/main/java/com/sipai/dao/alarm/AlarmLevelsDao.java index ede5d792..d726de32 100644 --- a/src/main/java/com/sipai/dao/alarm/AlarmLevelsDao.java +++ b/src/main/java/com/sipai/dao/alarm/AlarmLevelsDao.java @@ -1,12 +1,11 @@ package com.sipai.dao.alarm; -import java.util.HashMap; -import java.util.Map; - -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.alarm.AlarmLevels; +import org.springframework.stereotype.Repository; + +import java.util.HashMap; +import java.util.Map; @Repository public class AlarmLevelsDao extends CommDaoImpl{ public AlarmLevelsDao(){ diff --git a/src/main/java/com/sipai/dao/alarm/AlarmMoldDao.java b/src/main/java/com/sipai/dao/alarm/AlarmMoldDao.java index c96a3d76..7d1a9a2a 100644 --- a/src/main/java/com/sipai/dao/alarm/AlarmMoldDao.java +++ b/src/main/java/com/sipai/dao/alarm/AlarmMoldDao.java @@ -1,12 +1,11 @@ package com.sipai.dao.alarm; -import java.util.HashMap; -import java.util.Map; - -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.alarm.AlarmMold; +import org.springframework.stereotype.Repository; + +import java.util.HashMap; +import java.util.Map; @Repository public class AlarmMoldDao extends CommDaoImpl{ public AlarmMoldDao(){ diff --git a/src/main/java/com/sipai/dao/alarm/AlarmPointDao.java b/src/main/java/com/sipai/dao/alarm/AlarmPointDao.java index e0f7a55d..46b6db0d 100644 --- a/src/main/java/com/sipai/dao/alarm/AlarmPointDao.java +++ b/src/main/java/com/sipai/dao/alarm/AlarmPointDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.alarm; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.alarm.AlarmPoint; +import org.springframework.stereotype.Repository; import java.util.HashMap; import java.util.List; diff --git a/src/main/java/com/sipai/dao/alarm/AlarmPointRiskLevelDao.java b/src/main/java/com/sipai/dao/alarm/AlarmPointRiskLevelDao.java index 67cbc0fe..22865d1b 100644 --- a/src/main/java/com/sipai/dao/alarm/AlarmPointRiskLevelDao.java +++ b/src/main/java/com/sipai/dao/alarm/AlarmPointRiskLevelDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.alarm; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.alarm.AlarmPointRiskLevel; +import org.springframework.stereotype.Repository; @Repository public class AlarmPointRiskLevelDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/alarm/AlarmRecordDao.java b/src/main/java/com/sipai/dao/alarm/AlarmRecordDao.java index 77e5990f..27013151 100644 --- a/src/main/java/com/sipai/dao/alarm/AlarmRecordDao.java +++ b/src/main/java/com/sipai/dao/alarm/AlarmRecordDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.alarm; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.alarm.AlarmRecord; +import org.springframework.stereotype.Repository; @Repository public class AlarmRecordDao extends CommDaoImpl{ public AlarmRecordDao(){ diff --git a/src/main/java/com/sipai/dao/alarm/AlarmSolutionDao.java b/src/main/java/com/sipai/dao/alarm/AlarmSolutionDao.java index 75c0193c..38203dd7 100644 --- a/src/main/java/com/sipai/dao/alarm/AlarmSolutionDao.java +++ b/src/main/java/com/sipai/dao/alarm/AlarmSolutionDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.alarm; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.alarm.AlarmSolution; +import org.springframework.stereotype.Repository; @Repository public class AlarmSolutionDao extends CommDaoImpl{ public AlarmSolutionDao(){ diff --git a/src/main/java/com/sipai/dao/alarm/AlarmSubscribeDao.java b/src/main/java/com/sipai/dao/alarm/AlarmSubscribeDao.java index 176b0a3f..88d37d94 100644 --- a/src/main/java/com/sipai/dao/alarm/AlarmSubscribeDao.java +++ b/src/main/java/com/sipai/dao/alarm/AlarmSubscribeDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.alarm; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.alarm.AlarmSubscribe; +import org.springframework.stereotype.Repository; import java.util.HashMap; import java.util.List; diff --git a/src/main/java/com/sipai/dao/alarm/AlarmTypeDao.java b/src/main/java/com/sipai/dao/alarm/AlarmTypeDao.java index 3629a6b5..cd34c621 100644 --- a/src/main/java/com/sipai/dao/alarm/AlarmTypeDao.java +++ b/src/main/java/com/sipai/dao/alarm/AlarmTypeDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.alarm; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.alarm.AlarmType; +import org.springframework.stereotype.Repository; @Repository public class AlarmTypeDao extends CommDaoImpl{ public AlarmTypeDao(){ diff --git a/src/main/java/com/sipai/dao/app/AppDataConfigureDao.java b/src/main/java/com/sipai/dao/app/AppDataConfigureDao.java index 0b034d1a..0cb0596c 100644 --- a/src/main/java/com/sipai/dao/app/AppDataConfigureDao.java +++ b/src/main/java/com/sipai/dao/app/AppDataConfigureDao.java @@ -1,11 +1,10 @@ package com.sipai.dao.app; -import java.util.List; - -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.app.AppDataConfigure; +import org.springframework.stereotype.Repository; + +import java.util.List; @Repository public class AppDataConfigureDao extends CommDaoImpl{ public AppDataConfigureDao(){ diff --git a/src/main/java/com/sipai/dao/app/AppHomePageDataDao.java b/src/main/java/com/sipai/dao/app/AppHomePageDataDao.java index ec6913f3..61844b7e 100644 --- a/src/main/java/com/sipai/dao/app/AppHomePageDataDao.java +++ b/src/main/java/com/sipai/dao/app/AppHomePageDataDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.app; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.app.AppHomePageData; +import org.springframework.stereotype.Repository; @Repository public class AppHomePageDataDao extends CommDaoImpl{ public AppHomePageDataDao(){ diff --git a/src/main/java/com/sipai/dao/app/AppMenuitemDao.java b/src/main/java/com/sipai/dao/app/AppMenuitemDao.java index 3d412b73..1c2ab241 100644 --- a/src/main/java/com/sipai/dao/app/AppMenuitemDao.java +++ b/src/main/java/com/sipai/dao/app/AppMenuitemDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.app; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.app.AppMenuitem; +import org.springframework.stereotype.Repository; @Repository public class AppMenuitemDao extends CommDaoImpl{ public AppMenuitemDao(){ diff --git a/src/main/java/com/sipai/dao/app/AppProductMonitorDao.java b/src/main/java/com/sipai/dao/app/AppProductMonitorDao.java index aabe2632..073a4110 100644 --- a/src/main/java/com/sipai/dao/app/AppProductMonitorDao.java +++ b/src/main/java/com/sipai/dao/app/AppProductMonitorDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.app; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.app.AppProductMonitor; +import org.springframework.stereotype.Repository; @Repository public class AppProductMonitorDao extends CommDaoImpl{ public AppProductMonitorDao(){ diff --git a/src/main/java/com/sipai/dao/app/AppProductMonitorMpDao.java b/src/main/java/com/sipai/dao/app/AppProductMonitorMpDao.java index 73eab731..36b5ea66 100644 --- a/src/main/java/com/sipai/dao/app/AppProductMonitorMpDao.java +++ b/src/main/java/com/sipai/dao/app/AppProductMonitorMpDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.app; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.app.AppProductMonitorMp; +import org.springframework.stereotype.Repository; @Repository public class AppProductMonitorMpDao extends CommDaoImpl{ public AppProductMonitorMpDao(){ diff --git a/src/main/java/com/sipai/dao/app/AppRoleMenuDao.java b/src/main/java/com/sipai/dao/app/AppRoleMenuDao.java index 0c9e537b..f7a51b13 100644 --- a/src/main/java/com/sipai/dao/app/AppRoleMenuDao.java +++ b/src/main/java/com/sipai/dao/app/AppRoleMenuDao.java @@ -1,13 +1,10 @@ package com.sipai.dao.app; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.app.AppRoleMenu; +import org.springframework.stereotype.Repository; -import java.util.HashMap; import java.util.List; -import java.util.Map; @Repository public class AppRoleMenuDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/base/BasicComponentsDao.java b/src/main/java/com/sipai/dao/base/BasicComponentsDao.java index fcf79a7f..3292e4d7 100644 --- a/src/main/java/com/sipai/dao/base/BasicComponentsDao.java +++ b/src/main/java/com/sipai/dao/base/BasicComponentsDao.java @@ -1,11 +1,7 @@ package com.sipai.dao.base; -import java.util.List; - -import org.springframework.stereotype.Repository; - -import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.base.BasicComponents; +import org.springframework.stereotype.Repository; @Repository public class BasicComponentsDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/base/BasicConfigureDao.java b/src/main/java/com/sipai/dao/base/BasicConfigureDao.java index 3796ea1e..935eaa8e 100644 --- a/src/main/java/com/sipai/dao/base/BasicConfigureDao.java +++ b/src/main/java/com/sipai/dao/base/BasicConfigureDao.java @@ -1,11 +1,7 @@ package com.sipai.dao.base; -import java.util.List; - -import org.springframework.stereotype.Repository; - -import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.base.BasicConfigure; +import org.springframework.stereotype.Repository; @Repository public class BasicConfigureDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/base/BasicHomePageDao.java b/src/main/java/com/sipai/dao/base/BasicHomePageDao.java index 218da988..c7937d7d 100644 --- a/src/main/java/com/sipai/dao/base/BasicHomePageDao.java +++ b/src/main/java/com/sipai/dao/base/BasicHomePageDao.java @@ -1,11 +1,7 @@ package com.sipai.dao.base; -import java.util.List; - -import org.springframework.stereotype.Repository; - -import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.base.BasicHomePage; +import org.springframework.stereotype.Repository; @Repository public class BasicHomePageDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/base/CommDaoImpl.java b/src/main/java/com/sipai/dao/base/CommDaoImpl.java index 4b5bb112..4516daef 100644 --- a/src/main/java/com/sipai/dao/base/CommDaoImpl.java +++ b/src/main/java/com/sipai/dao/base/CommDaoImpl.java @@ -1,14 +1,13 @@ package com.sipai.dao.base; -import java.math.BigDecimal; -import java.util.List; - -import javax.annotation.Resource; - import org.apache.ibatis.session.SqlSession; import org.apache.ibatis.session.SqlSessionFactory; import org.springframework.stereotype.Repository; +import javax.annotation.Resource; +import java.math.BigDecimal; +import java.util.List; + @Repository public class CommDaoImpl implements CommDao { @Resource diff --git a/src/main/java/com/sipai/dao/base/CommDaoImplERP.java b/src/main/java/com/sipai/dao/base/CommDaoImplERP.java index c1d46545..56699c38 100644 --- a/src/main/java/com/sipai/dao/base/CommDaoImplERP.java +++ b/src/main/java/com/sipai/dao/base/CommDaoImplERP.java @@ -1,14 +1,13 @@ package com.sipai.dao.base; -import java.math.BigDecimal; -import java.util.List; - -import javax.annotation.Resource; - import org.apache.ibatis.session.SqlSession; import org.apache.ibatis.session.SqlSessionFactory; import org.springframework.stereotype.Repository; +import javax.annotation.Resource; +import java.math.BigDecimal; +import java.util.List; + @Repository public class CommDaoImplERP implements CommDao { @Resource diff --git a/src/main/java/com/sipai/dao/base/CommDaoImplScada.java b/src/main/java/com/sipai/dao/base/CommDaoImplScada.java index 1147e5e0..562b3788 100644 --- a/src/main/java/com/sipai/dao/base/CommDaoImplScada.java +++ b/src/main/java/com/sipai/dao/base/CommDaoImplScada.java @@ -1,14 +1,13 @@ package com.sipai.dao.base; -import java.math.BigDecimal; -import java.util.List; - -import javax.annotation.Resource; - import org.apache.ibatis.session.SqlSession; import org.apache.ibatis.session.SqlSessionFactory; import org.springframework.stereotype.Repository; +import javax.annotation.Resource; +import java.math.BigDecimal; +import java.util.List; + @Repository public class CommDaoImplScada implements CommDao { @Resource diff --git a/src/main/java/com/sipai/dao/base/CommonFileDao.java b/src/main/java/com/sipai/dao/base/CommonFileDao.java index 0bb271dd..0b4aed39 100644 --- a/src/main/java/com/sipai/dao/base/CommonFileDao.java +++ b/src/main/java/com/sipai/dao/base/CommonFileDao.java @@ -1,15 +1,12 @@ package com.sipai.dao.base; +import com.sipai.entity.base.CommonFile; +import org.springframework.stereotype.Repository; + import java.lang.reflect.Field; -import java.lang.reflect.Method; import java.util.HashMap; import java.util.List; import java.util.Map; - -import org.springframework.stereotype.Repository; - -import com.sipai.entity.base.CommonFile; -import com.sipai.entity.scada.MPointHistory; @Repository public class CommonFileDao extends CommDaoImpl { diff --git a/src/main/java/com/sipai/dao/base/MainPageDao.java b/src/main/java/com/sipai/dao/base/MainPageDao.java index 1757deb6..3fcf3617 100644 --- a/src/main/java/com/sipai/dao/base/MainPageDao.java +++ b/src/main/java/com/sipai/dao/base/MainPageDao.java @@ -1,11 +1,7 @@ package com.sipai.dao.base; -import java.util.List; - -import org.springframework.stereotype.Repository; - -import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.base.MainPage; +import org.springframework.stereotype.Repository; @Repository public class MainPageDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/base/MainPageTypeDao.java b/src/main/java/com/sipai/dao/base/MainPageTypeDao.java index 0111e935..5850dc62 100644 --- a/src/main/java/com/sipai/dao/base/MainPageTypeDao.java +++ b/src/main/java/com/sipai/dao/base/MainPageTypeDao.java @@ -1,11 +1,7 @@ package com.sipai.dao.base; -import java.util.List; - -import org.springframework.stereotype.Repository; - -import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.base.MainPageType; +import org.springframework.stereotype.Repository; @Repository public class MainPageTypeDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/base/MainPageTypeUserDao.java b/src/main/java/com/sipai/dao/base/MainPageTypeUserDao.java index dd4b7f3e..453bac12 100644 --- a/src/main/java/com/sipai/dao/base/MainPageTypeUserDao.java +++ b/src/main/java/com/sipai/dao/base/MainPageTypeUserDao.java @@ -1,10 +1,8 @@ package com.sipai.dao.base; -import org.springframework.stereotype.Repository; - -import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.base.MainPageTypeUser; +import org.springframework.stereotype.Repository; @Repository public class MainPageTypeUserDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/bim/BIMCurrencyDao.java b/src/main/java/com/sipai/dao/bim/BIMCurrencyDao.java index 4e4a2bf5..358e87f1 100644 --- a/src/main/java/com/sipai/dao/bim/BIMCurrencyDao.java +++ b/src/main/java/com/sipai/dao/bim/BIMCurrencyDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.bim; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.bim.BIMCurrency; +import org.springframework.stereotype.Repository; @Repository public class BIMCurrencyDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/bim/BimRouteDataDao.java b/src/main/java/com/sipai/dao/bim/BimRouteDataDao.java index 4dfd06d4..f5f57d18 100644 --- a/src/main/java/com/sipai/dao/bim/BimRouteDataDao.java +++ b/src/main/java/com/sipai/dao/bim/BimRouteDataDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.bim; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.bim.BimRouteData; +import org.springframework.stereotype.Repository; @Repository public class BimRouteDataDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/bim/BimRouteEqDataDao.java b/src/main/java/com/sipai/dao/bim/BimRouteEqDataDao.java index 2510954c..e3fd1e5c 100644 --- a/src/main/java/com/sipai/dao/bim/BimRouteEqDataDao.java +++ b/src/main/java/com/sipai/dao/bim/BimRouteEqDataDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.bim; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.bim.BimRouteEqData; +import org.springframework.stereotype.Repository; @Repository public class BimRouteEqDataDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/bot/BotDao.java b/src/main/java/com/sipai/dao/bot/BotDao.java index afc5ec72..fb833db6 100644 --- a/src/main/java/com/sipai/dao/bot/BotDao.java +++ b/src/main/java/com/sipai/dao/bot/BotDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.bot; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.bot.Bot; +import org.springframework.stereotype.Repository; @Repository public class BotDao extends CommDaoImpl{ public BotDao(){ diff --git a/src/main/java/com/sipai/dao/business/BusinessUnitAuditDao.java b/src/main/java/com/sipai/dao/business/BusinessUnitAuditDao.java index 5121069b..85fe6f83 100644 --- a/src/main/java/com/sipai/dao/business/BusinessUnitAuditDao.java +++ b/src/main/java/com/sipai/dao/business/BusinessUnitAuditDao.java @@ -1,10 +1,8 @@ package com.sipai.dao.business; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; -import com.sipai.entity.business.BusinessUnit; import com.sipai.entity.business.BusinessUnitAudit; +import org.springframework.stereotype.Repository; @Repository public class BusinessUnitAuditDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/business/BusinessUnitDao.java b/src/main/java/com/sipai/dao/business/BusinessUnitDao.java index 0c9b1f45..46dc54f9 100644 --- a/src/main/java/com/sipai/dao/business/BusinessUnitDao.java +++ b/src/main/java/com/sipai/dao/business/BusinessUnitDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.business; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.business.BusinessUnit; +import org.springframework.stereotype.Repository; @Repository public class BusinessUnitDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/business/BusinessUnitDeptApplyDao.java b/src/main/java/com/sipai/dao/business/BusinessUnitDeptApplyDao.java index 4677b67d..9306532c 100644 --- a/src/main/java/com/sipai/dao/business/BusinessUnitDeptApplyDao.java +++ b/src/main/java/com/sipai/dao/business/BusinessUnitDeptApplyDao.java @@ -1,11 +1,8 @@ package com.sipai.dao.business; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; -import com.sipai.entity.business.BusinessUnit; import com.sipai.entity.business.BusinessUnitDeptApply; -import com.sipai.entity.business.BusinessUnitHandle; +import org.springframework.stereotype.Repository; @Repository public class BusinessUnitDeptApplyDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/business/BusinessUnitHandleDao.java b/src/main/java/com/sipai/dao/business/BusinessUnitHandleDao.java index 273bbb61..0b4e8560 100644 --- a/src/main/java/com/sipai/dao/business/BusinessUnitHandleDao.java +++ b/src/main/java/com/sipai/dao/business/BusinessUnitHandleDao.java @@ -1,12 +1,10 @@ package com.sipai.dao.business; -import java.util.List; - +import com.sipai.dao.base.CommDaoImpl; +import com.sipai.entity.business.BusinessUnitHandle; import org.springframework.stereotype.Repository; -import com.sipai.dao.base.CommDaoImpl; -import com.sipai.entity.business.BusinessUnit; -import com.sipai.entity.business.BusinessUnitHandle; +import java.util.List; @Repository public class BusinessUnitHandleDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/business/BusinessUnitHandleDetailDao.java b/src/main/java/com/sipai/dao/business/BusinessUnitHandleDetailDao.java index 2875fea9..a638cbbe 100644 --- a/src/main/java/com/sipai/dao/business/BusinessUnitHandleDetailDao.java +++ b/src/main/java/com/sipai/dao/business/BusinessUnitHandleDetailDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.business; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.business.BusinessUnitHandleDetail; +import org.springframework.stereotype.Repository; @Repository public class BusinessUnitHandleDetailDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/business/BusinessUnitInquiryDao.java b/src/main/java/com/sipai/dao/business/BusinessUnitInquiryDao.java index 470ef641..fea3c1e3 100644 --- a/src/main/java/com/sipai/dao/business/BusinessUnitInquiryDao.java +++ b/src/main/java/com/sipai/dao/business/BusinessUnitInquiryDao.java @@ -1,11 +1,8 @@ package com.sipai.dao.business; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; -import com.sipai.entity.business.BusinessUnit; -import com.sipai.entity.business.BusinessUnitHandle; import com.sipai.entity.business.BusinessUnitInquiry; +import org.springframework.stereotype.Repository; @Repository public class BusinessUnitInquiryDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/business/BusinessUnitIssueDao.java b/src/main/java/com/sipai/dao/business/BusinessUnitIssueDao.java index c482cc0a..6b6a2c6e 100644 --- a/src/main/java/com/sipai/dao/business/BusinessUnitIssueDao.java +++ b/src/main/java/com/sipai/dao/business/BusinessUnitIssueDao.java @@ -1,10 +1,8 @@ package com.sipai.dao.business; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; -import com.sipai.entity.business.BusinessUnit; import com.sipai.entity.business.BusinessUnitIssue; +import org.springframework.stereotype.Repository; @Repository public class BusinessUnitIssueDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/command/EmergencyConfigureDao.java b/src/main/java/com/sipai/dao/command/EmergencyConfigureDao.java index 530e6eb4..0c929913 100644 --- a/src/main/java/com/sipai/dao/command/EmergencyConfigureDao.java +++ b/src/main/java/com/sipai/dao/command/EmergencyConfigureDao.java @@ -1,12 +1,10 @@ package com.sipai.dao.command; -import java.util.List; - -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.command.EmergencyConfigure; -import com.sipai.entity.command.EmergencyConfigureInfo; +import org.springframework.stereotype.Repository; + +import java.util.List; @Repository diff --git a/src/main/java/com/sipai/dao/command/EmergencyConfigureDetailDao.java b/src/main/java/com/sipai/dao/command/EmergencyConfigureDetailDao.java index 91ba734c..7eee6fb4 100644 --- a/src/main/java/com/sipai/dao/command/EmergencyConfigureDetailDao.java +++ b/src/main/java/com/sipai/dao/command/EmergencyConfigureDetailDao.java @@ -1,7 +1,8 @@ package com.sipai.dao.command; + import com.sipai.dao.base.CommDaoImpl; -import org.springframework.stereotype.Repository; import com.sipai.entity.command.EmergencyConfigureDetail; +import org.springframework.stereotype.Repository; @Repository public class EmergencyConfigureDetailDao extends CommDaoImpl { diff --git a/src/main/java/com/sipai/dao/command/EmergencyConfigureInfoDao.java b/src/main/java/com/sipai/dao/command/EmergencyConfigureInfoDao.java index bc06e0c5..f5c3843f 100644 --- a/src/main/java/com/sipai/dao/command/EmergencyConfigureInfoDao.java +++ b/src/main/java/com/sipai/dao/command/EmergencyConfigureInfoDao.java @@ -1,11 +1,10 @@ package com.sipai.dao.command; -import java.util.List; - -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.command.EmergencyConfigureInfo; +import org.springframework.stereotype.Repository; + +import java.util.List; @Repository public class EmergencyConfigureInfoDao extends CommDaoImpl { diff --git a/src/main/java/com/sipai/dao/command/EmergencyConfigureWorkOrderDao.java b/src/main/java/com/sipai/dao/command/EmergencyConfigureWorkOrderDao.java index d1f12cf4..39fbc913 100644 --- a/src/main/java/com/sipai/dao/command/EmergencyConfigureWorkOrderDao.java +++ b/src/main/java/com/sipai/dao/command/EmergencyConfigureWorkOrderDao.java @@ -1,15 +1,10 @@ package com.sipai.dao.command; -import java.util.List; - +import com.sipai.dao.base.CommDaoImpl; +import com.sipai.entity.command.EmergencyConfigureWorkOrder; import org.springframework.stereotype.Repository; - - -import com.sipai.dao.base.CommDaoImpl; -import com.sipai.entity.command.EmergencyConfigure; -import com.sipai.entity.command.EmergencyConfigureWorkOrder; -import com.sipai.entity.command.EmergencyRecords; +import java.util.List; @Repository public class EmergencyConfigureWorkOrderDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/command/EmergencyConfigurefileDao.java b/src/main/java/com/sipai/dao/command/EmergencyConfigurefileDao.java index 77e32ae6..3edd39bd 100644 --- a/src/main/java/com/sipai/dao/command/EmergencyConfigurefileDao.java +++ b/src/main/java/com/sipai/dao/command/EmergencyConfigurefileDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.command; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.command.EmergencyConfigurefile; +import org.springframework.stereotype.Repository; @Repository diff --git a/src/main/java/com/sipai/dao/command/EmergencyRecordsDao.java b/src/main/java/com/sipai/dao/command/EmergencyRecordsDao.java index c1823afc..2915b810 100644 --- a/src/main/java/com/sipai/dao/command/EmergencyRecordsDao.java +++ b/src/main/java/com/sipai/dao/command/EmergencyRecordsDao.java @@ -1,12 +1,10 @@ package com.sipai.dao.command; -import java.util.List; - +import com.sipai.dao.base.CommDaoImpl; +import com.sipai.entity.command.EmergencyRecords; import org.springframework.stereotype.Repository; -import com.sipai.dao.base.CommDaoImpl; -import com.sipai.entity.command.EmergencyConfigure; -import com.sipai.entity.command.EmergencyRecords; +import java.util.List; @Repository diff --git a/src/main/java/com/sipai/dao/command/EmergencyRecordsDetailDao.java b/src/main/java/com/sipai/dao/command/EmergencyRecordsDetailDao.java index f60eab85..8fa2198b 100644 --- a/src/main/java/com/sipai/dao/command/EmergencyRecordsDetailDao.java +++ b/src/main/java/com/sipai/dao/command/EmergencyRecordsDetailDao.java @@ -1,12 +1,10 @@ package com.sipai.dao.command; -import java.util.List; - +import com.sipai.dao.base.CommDaoImpl; +import com.sipai.entity.command.EmergencyRecordsDetail; import org.springframework.stereotype.Repository; -import com.sipai.dao.base.CommDaoImpl; -import com.sipai.entity.command.EmergencyConfigureInfo; -import com.sipai.entity.command.EmergencyRecordsDetail; +import java.util.List; @Repository public class EmergencyRecordsDetailDao extends CommDaoImpl { diff --git a/src/main/java/com/sipai/dao/command/EmergencyRecordsWorkOrderDao.java b/src/main/java/com/sipai/dao/command/EmergencyRecordsWorkOrderDao.java index 40687c42..c0e31bbd 100644 --- a/src/main/java/com/sipai/dao/command/EmergencyRecordsWorkOrderDao.java +++ b/src/main/java/com/sipai/dao/command/EmergencyRecordsWorkOrderDao.java @@ -1,12 +1,10 @@ package com.sipai.dao.command; -import java.util.List; - +import com.sipai.dao.base.CommDaoImpl; +import com.sipai.entity.command.EmergencyRecordsWorkOrder; import org.springframework.stereotype.Repository; -import com.sipai.dao.base.CommDaoImpl; -import com.sipai.entity.command.EmergencyConfigure; -import com.sipai.entity.command.EmergencyRecordsWorkOrder; +import java.util.List; @Repository public class EmergencyRecordsWorkOrderDao extends CommDaoImpl { diff --git a/src/main/java/com/sipai/dao/cqbyt/CqbytSampleValueDao.java b/src/main/java/com/sipai/dao/cqbyt/CqbytSampleValueDao.java index a6e4c039..d8650964 100644 --- a/src/main/java/com/sipai/dao/cqbyt/CqbytSampleValueDao.java +++ b/src/main/java/com/sipai/dao/cqbyt/CqbytSampleValueDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.cqbyt; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.cqbyt.CqbytSampleValue; +import org.springframework.stereotype.Repository; @Repository public class CqbytSampleValueDao extends CommDaoImpl { diff --git a/src/main/java/com/sipai/dao/cqbyt/CqbytVISITOUTINDATADao.java b/src/main/java/com/sipai/dao/cqbyt/CqbytVISITOUTINDATADao.java index 89739314..14231b7e 100644 --- a/src/main/java/com/sipai/dao/cqbyt/CqbytVISITOUTINDATADao.java +++ b/src/main/java/com/sipai/dao/cqbyt/CqbytVISITOUTINDATADao.java @@ -1,9 +1,8 @@ package com.sipai.dao.cqbyt; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.cqbyt.CqbytVISITOUTINDATA; +import org.springframework.stereotype.Repository; @Repository public class CqbytVISITOUTINDATADao extends CommDaoImpl { diff --git a/src/main/java/com/sipai/dao/cqbyt/KpiAnalysisDao.java b/src/main/java/com/sipai/dao/cqbyt/KpiAnalysisDao.java index 109b8600..b60935e5 100644 --- a/src/main/java/com/sipai/dao/cqbyt/KpiAnalysisDao.java +++ b/src/main/java/com/sipai/dao/cqbyt/KpiAnalysisDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.cqbyt; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.cqbyt.KpiAnalysis; +import org.springframework.stereotype.Repository; @Repository public class KpiAnalysisDao extends CommDaoImpl { diff --git a/src/main/java/com/sipai/dao/cqbyt/TestReportDao.java b/src/main/java/com/sipai/dao/cqbyt/TestReportDao.java index 48c18353..e47738cd 100644 --- a/src/main/java/com/sipai/dao/cqbyt/TestReportDao.java +++ b/src/main/java/com/sipai/dao/cqbyt/TestReportDao.java @@ -2,7 +2,6 @@ package com.sipai.dao.cqbyt; import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.cqbyt.TestReport; -import java.util.List; import org.springframework.stereotype.Repository; @Repository diff --git a/src/main/java/com/sipai/dao/cqbyt/TestReportDetailsDao.java b/src/main/java/com/sipai/dao/cqbyt/TestReportDetailsDao.java index 7f30945b..cde3274c 100644 --- a/src/main/java/com/sipai/dao/cqbyt/TestReportDetailsDao.java +++ b/src/main/java/com/sipai/dao/cqbyt/TestReportDetailsDao.java @@ -2,7 +2,6 @@ package com.sipai.dao.cqbyt; import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.cqbyt.TestReportDetails; -import java.util.List; import org.springframework.stereotype.Repository; @Repository diff --git a/src/main/java/com/sipai/dao/cqbyt/YtsjDao.java b/src/main/java/com/sipai/dao/cqbyt/YtsjDao.java index 1adf8d50..5357825a 100644 --- a/src/main/java/com/sipai/dao/cqbyt/YtsjDao.java +++ b/src/main/java/com/sipai/dao/cqbyt/YtsjDao.java @@ -2,9 +2,10 @@ package com.sipai.dao.cqbyt; import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.cqbyt.Ytsj; -import java.util.List; import org.springframework.stereotype.Repository; +import java.util.List; + @Repository public class YtsjDao extends CommDaoImpl { public YtsjDao() { diff --git a/src/main/java/com/sipai/dao/data/CurveMpointDao.java b/src/main/java/com/sipai/dao/data/CurveMpointDao.java index f86b7236..e090a4db 100644 --- a/src/main/java/com/sipai/dao/data/CurveMpointDao.java +++ b/src/main/java/com/sipai/dao/data/CurveMpointDao.java @@ -1,11 +1,8 @@ package com.sipai.dao.data; -import java.util.List; - -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.data.CurveMpoint; +import org.springframework.stereotype.Repository; @Repository public class CurveMpointDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/data/CurveRemarkDao.java b/src/main/java/com/sipai/dao/data/CurveRemarkDao.java index 4d13c915..892447ed 100644 --- a/src/main/java/com/sipai/dao/data/CurveRemarkDao.java +++ b/src/main/java/com/sipai/dao/data/CurveRemarkDao.java @@ -1,11 +1,8 @@ package com.sipai.dao.data; -import java.util.List; - -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.data.CurveRemark; +import org.springframework.stereotype.Repository; @Repository public class CurveRemarkDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/data/CurveRemarkFileDao.java b/src/main/java/com/sipai/dao/data/CurveRemarkFileDao.java index 36b194ee..12bfb150 100644 --- a/src/main/java/com/sipai/dao/data/CurveRemarkFileDao.java +++ b/src/main/java/com/sipai/dao/data/CurveRemarkFileDao.java @@ -1,11 +1,8 @@ package com.sipai.dao.data; -import java.util.List; - -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.data.CurveRemarkFile; +import org.springframework.stereotype.Repository; @Repository public class CurveRemarkFileDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/data/DataCleaningConditionDao.java b/src/main/java/com/sipai/dao/data/DataCleaningConditionDao.java index 7500dbfb..9ae500f9 100644 --- a/src/main/java/com/sipai/dao/data/DataCleaningConditionDao.java +++ b/src/main/java/com/sipai/dao/data/DataCleaningConditionDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.data; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.data.DataCleaningCondition; +import org.springframework.stereotype.Repository; @Repository public class DataCleaningConditionDao extends CommDaoImpl { diff --git a/src/main/java/com/sipai/dao/data/DataCleaningConfigureDao.java b/src/main/java/com/sipai/dao/data/DataCleaningConfigureDao.java index 86b53700..2f70c619 100644 --- a/src/main/java/com/sipai/dao/data/DataCleaningConfigureDao.java +++ b/src/main/java/com/sipai/dao/data/DataCleaningConfigureDao.java @@ -1,10 +1,8 @@ package com.sipai.dao.data; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; -import com.sipai.entity.data.DataSource; import com.sipai.entity.data.DataCleaningConfigure; +import org.springframework.stereotype.Repository; @Repository public class DataCleaningConfigureDao extends CommDaoImpl { diff --git a/src/main/java/com/sipai/dao/data/DataCleaningHistoryDao.java b/src/main/java/com/sipai/dao/data/DataCleaningHistoryDao.java index 7d97ad73..569693f7 100644 --- a/src/main/java/com/sipai/dao/data/DataCleaningHistoryDao.java +++ b/src/main/java/com/sipai/dao/data/DataCleaningHistoryDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.data; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.data.DataCleaningHistory; +import org.springframework.stereotype.Repository; @Repository public class DataCleaningHistoryDao extends CommDaoImpl { diff --git a/src/main/java/com/sipai/dao/data/DataCleaningPointDao.java b/src/main/java/com/sipai/dao/data/DataCleaningPointDao.java index 36b7cbcd..031572ad 100644 --- a/src/main/java/com/sipai/dao/data/DataCleaningPointDao.java +++ b/src/main/java/com/sipai/dao/data/DataCleaningPointDao.java @@ -1,10 +1,8 @@ package com.sipai.dao.data; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; -import com.sipai.entity.data.DataSource; import com.sipai.entity.data.DataCleaningPoint; +import org.springframework.stereotype.Repository; @Repository public class DataCleaningPointDao extends CommDaoImpl { diff --git a/src/main/java/com/sipai/dao/data/DataCurveDao.java b/src/main/java/com/sipai/dao/data/DataCurveDao.java index 7d3b2ae0..91d47db1 100644 --- a/src/main/java/com/sipai/dao/data/DataCurveDao.java +++ b/src/main/java/com/sipai/dao/data/DataCurveDao.java @@ -1,11 +1,8 @@ package com.sipai.dao.data; -import java.util.List; - -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.data.DataCurve; +import org.springframework.stereotype.Repository; @Repository public class DataCurveDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/data/XServerDao.java b/src/main/java/com/sipai/dao/data/XServerDao.java index 2e425f3b..7a171142 100644 --- a/src/main/java/com/sipai/dao/data/XServerDao.java +++ b/src/main/java/com/sipai/dao/data/XServerDao.java @@ -1,10 +1,8 @@ package com.sipai.dao.data; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; -import com.sipai.entity.data.DataSource; import com.sipai.entity.data.XServer; +import org.springframework.stereotype.Repository; @Repository public class XServerDao extends CommDaoImpl { diff --git a/src/main/java/com/sipai/dao/document/DataDao.java b/src/main/java/com/sipai/dao/document/DataDao.java index b4fbd7bc..8829bbfd 100644 --- a/src/main/java/com/sipai/dao/document/DataDao.java +++ b/src/main/java/com/sipai/dao/document/DataDao.java @@ -1,11 +1,10 @@ package com.sipai.dao.document; -import java.util.List; - -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.document.Data; +import org.springframework.stereotype.Repository; + +import java.util.List; @Repository public class DataDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/document/DocFileRelationDao.java b/src/main/java/com/sipai/dao/document/DocFileRelationDao.java index ec52a77c..797fe1e7 100644 --- a/src/main/java/com/sipai/dao/document/DocFileRelationDao.java +++ b/src/main/java/com/sipai/dao/document/DocFileRelationDao.java @@ -1,11 +1,8 @@ package com.sipai.dao.document; -import java.util.List; - -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.document.DocFileRelation; +import org.springframework.stereotype.Repository; @Repository public class DocFileRelationDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/efficiency/ConstituteConfigureDao.java b/src/main/java/com/sipai/dao/efficiency/ConstituteConfigureDao.java index 1ad5948d..99d61280 100644 --- a/src/main/java/com/sipai/dao/efficiency/ConstituteConfigureDao.java +++ b/src/main/java/com/sipai/dao/efficiency/ConstituteConfigureDao.java @@ -1,11 +1,8 @@ package com.sipai.dao.efficiency; -import java.util.List; - -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.efficiency.ConstituteConfigure; +import org.springframework.stereotype.Repository; @Repository public class ConstituteConfigureDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/efficiency/ConstituteConfigureDetailDao.java b/src/main/java/com/sipai/dao/efficiency/ConstituteConfigureDetailDao.java index 7c08f88d..a9b6bcbb 100644 --- a/src/main/java/com/sipai/dao/efficiency/ConstituteConfigureDetailDao.java +++ b/src/main/java/com/sipai/dao/efficiency/ConstituteConfigureDetailDao.java @@ -1,11 +1,8 @@ package com.sipai.dao.efficiency; -import java.util.List; - -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.efficiency.ConstituteConfigureDetail; +import org.springframework.stereotype.Repository; @Repository public class ConstituteConfigureDetailDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/efficiency/ConstituteConfigureSchemeDao.java b/src/main/java/com/sipai/dao/efficiency/ConstituteConfigureSchemeDao.java index 1ef5505c..afdb7590 100644 --- a/src/main/java/com/sipai/dao/efficiency/ConstituteConfigureSchemeDao.java +++ b/src/main/java/com/sipai/dao/efficiency/ConstituteConfigureSchemeDao.java @@ -1,10 +1,9 @@ package com.sipai.dao.efficiency; +import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.efficiency.ConstituteConfigureScheme; import org.springframework.stereotype.Repository; -import com.sipai.dao.base.CommDaoImpl; - @Repository public class ConstituteConfigureSchemeDao extends CommDaoImpl{ public ConstituteConfigureSchemeDao() { diff --git a/src/main/java/com/sipai/dao/efficiency/EfficiencyOverviewConfigureAssemblyDao.java b/src/main/java/com/sipai/dao/efficiency/EfficiencyOverviewConfigureAssemblyDao.java index 42c2fb50..fbdf1352 100644 --- a/src/main/java/com/sipai/dao/efficiency/EfficiencyOverviewConfigureAssemblyDao.java +++ b/src/main/java/com/sipai/dao/efficiency/EfficiencyOverviewConfigureAssemblyDao.java @@ -1,12 +1,8 @@ package com.sipai.dao.efficiency; -import java.util.List; - -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; -import com.sipai.entity.efficiency.EfficiencyOverviewConfigure; import com.sipai.entity.efficiency.EfficiencyOverviewConfigureAssembly; +import org.springframework.stereotype.Repository; @Repository public class EfficiencyOverviewConfigureAssemblyDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/efficiency/EfficiencyOverviewConfigureDao.java b/src/main/java/com/sipai/dao/efficiency/EfficiencyOverviewConfigureDao.java index 784a33a4..dbca7006 100644 --- a/src/main/java/com/sipai/dao/efficiency/EfficiencyOverviewConfigureDao.java +++ b/src/main/java/com/sipai/dao/efficiency/EfficiencyOverviewConfigureDao.java @@ -1,11 +1,8 @@ package com.sipai.dao.efficiency; -import java.util.List; - -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.efficiency.EfficiencyOverviewConfigure; +import org.springframework.stereotype.Repository; @Repository public class EfficiencyOverviewConfigureDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/efficiency/EfficiencyOverviewMpConfigureDao.java b/src/main/java/com/sipai/dao/efficiency/EfficiencyOverviewMpConfigureDao.java index 67b6afdb..d784bd0c 100644 --- a/src/main/java/com/sipai/dao/efficiency/EfficiencyOverviewMpConfigureDao.java +++ b/src/main/java/com/sipai/dao/efficiency/EfficiencyOverviewMpConfigureDao.java @@ -1,11 +1,8 @@ package com.sipai.dao.efficiency; -import java.util.List; - -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.efficiency.EfficiencyOverviewMpConfigure; +import org.springframework.stereotype.Repository; @Repository public class EfficiencyOverviewMpConfigureDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/efficiency/EfficiencyStatisticsDao.java b/src/main/java/com/sipai/dao/efficiency/EfficiencyStatisticsDao.java index 27801ffa..2e419d38 100644 --- a/src/main/java/com/sipai/dao/efficiency/EfficiencyStatisticsDao.java +++ b/src/main/java/com/sipai/dao/efficiency/EfficiencyStatisticsDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.efficiency; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.efficiency.EfficiencyStatistics; +import org.springframework.stereotype.Repository; @Repository public class EfficiencyStatisticsDao extends CommDaoImpl { diff --git a/src/main/java/com/sipai/dao/efficiency/WaterSpreadDataConfigureDao.java b/src/main/java/com/sipai/dao/efficiency/WaterSpreadDataConfigureDao.java index 3e888e3b..8a8439f1 100644 --- a/src/main/java/com/sipai/dao/efficiency/WaterSpreadDataConfigureDao.java +++ b/src/main/java/com/sipai/dao/efficiency/WaterSpreadDataConfigureDao.java @@ -1,11 +1,8 @@ package com.sipai.dao.efficiency; -import java.util.List; - -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.efficiency.WaterSpreadDataConfigure; +import org.springframework.stereotype.Repository; @Repository public class WaterSpreadDataConfigureDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/equipment/AssetClassDao.java b/src/main/java/com/sipai/dao/equipment/AssetClassDao.java index 24e8a8fe..b548f502 100644 --- a/src/main/java/com/sipai/dao/equipment/AssetClassDao.java +++ b/src/main/java/com/sipai/dao/equipment/AssetClassDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.equipment; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.equipment.AssetClass; +import org.springframework.stereotype.Repository; @Repository public class AssetClassDao extends CommDaoImpl{ public AssetClassDao() { diff --git a/src/main/java/com/sipai/dao/equipment/CharacteristicDao.java b/src/main/java/com/sipai/dao/equipment/CharacteristicDao.java index 9806fe63..75586265 100644 --- a/src/main/java/com/sipai/dao/equipment/CharacteristicDao.java +++ b/src/main/java/com/sipai/dao/equipment/CharacteristicDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.equipment; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.equipment.Characteristic; +import org.springframework.stereotype.Repository; @Repository public class CharacteristicDao extends CommDaoImpl{ public CharacteristicDao() { diff --git a/src/main/java/com/sipai/dao/equipment/EquipmentAcceptanceApplyDao.java b/src/main/java/com/sipai/dao/equipment/EquipmentAcceptanceApplyDao.java index be5e882b..f97aff00 100644 --- a/src/main/java/com/sipai/dao/equipment/EquipmentAcceptanceApplyDao.java +++ b/src/main/java/com/sipai/dao/equipment/EquipmentAcceptanceApplyDao.java @@ -1,7 +1,8 @@ package com.sipai.dao.equipment; -import org.springframework.stereotype.Repository; + import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.equipment.EquipmentAcceptanceApply; +import org.springframework.stereotype.Repository; @Repository public class EquipmentAcceptanceApplyDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/equipment/EquipmentAcceptanceApplyDetailDao.java b/src/main/java/com/sipai/dao/equipment/EquipmentAcceptanceApplyDetailDao.java index ca277028..55ef33c3 100644 --- a/src/main/java/com/sipai/dao/equipment/EquipmentAcceptanceApplyDetailDao.java +++ b/src/main/java/com/sipai/dao/equipment/EquipmentAcceptanceApplyDetailDao.java @@ -1,10 +1,8 @@ package com.sipai.dao.equipment; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; -import com.sipai.entity.equipment.EquipmentAcceptanceApply; import com.sipai.entity.equipment.EquipmentAcceptanceApplyDetail; +import org.springframework.stereotype.Repository; @Repository public class EquipmentAcceptanceApplyDetailDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/equipment/EquipmentAccidentDao.java b/src/main/java/com/sipai/dao/equipment/EquipmentAccidentDao.java index e65a5061..95b518ac 100644 --- a/src/main/java/com/sipai/dao/equipment/EquipmentAccidentDao.java +++ b/src/main/java/com/sipai/dao/equipment/EquipmentAccidentDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.equipment; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.equipment.EquipmentAccident; +import org.springframework.stereotype.Repository; @Repository diff --git a/src/main/java/com/sipai/dao/equipment/EquipmentAccidentDetailDao.java b/src/main/java/com/sipai/dao/equipment/EquipmentAccidentDetailDao.java index 6cd4bf7d..f5226090 100644 --- a/src/main/java/com/sipai/dao/equipment/EquipmentAccidentDetailDao.java +++ b/src/main/java/com/sipai/dao/equipment/EquipmentAccidentDetailDao.java @@ -1,8 +1,8 @@ package com.sipai.dao.equipment; -import org.springframework.stereotype.Repository; import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.equipment.EquipmentAccidentDetail; +import org.springframework.stereotype.Repository; @Repository public class EquipmentAccidentDetailDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/equipment/EquipmentArrangementDao.java b/src/main/java/com/sipai/dao/equipment/EquipmentArrangementDao.java index 9eb5f258..33ae719e 100644 --- a/src/main/java/com/sipai/dao/equipment/EquipmentArrangementDao.java +++ b/src/main/java/com/sipai/dao/equipment/EquipmentArrangementDao.java @@ -1,12 +1,10 @@ package com.sipai.dao.equipment; -import java.util.List; - -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.equipment.EquipmentArrangement; -import com.sipai.entity.equipment.EquipmentCard; +import org.springframework.stereotype.Repository; + +import java.util.List; @Repository public class EquipmentArrangementDao extends CommDaoImpl{ public EquipmentArrangementDao() { diff --git a/src/main/java/com/sipai/dao/equipment/EquipmentBelongDao.java b/src/main/java/com/sipai/dao/equipment/EquipmentBelongDao.java index 613a79b0..b10fae6e 100644 --- a/src/main/java/com/sipai/dao/equipment/EquipmentBelongDao.java +++ b/src/main/java/com/sipai/dao/equipment/EquipmentBelongDao.java @@ -1,11 +1,10 @@ package com.sipai.dao.equipment; -import java.util.List; - -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.equipment.EquipmentBelong; +import org.springframework.stereotype.Repository; + +import java.util.List; @Repository public class EquipmentBelongDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/equipment/EquipmentCardCameraDao.java b/src/main/java/com/sipai/dao/equipment/EquipmentCardCameraDao.java index 3c985b0d..62c5eff3 100644 --- a/src/main/java/com/sipai/dao/equipment/EquipmentCardCameraDao.java +++ b/src/main/java/com/sipai/dao/equipment/EquipmentCardCameraDao.java @@ -1,11 +1,8 @@ package com.sipai.dao.equipment; -import java.util.List; - -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.equipment.EquipmentCardCamera; +import org.springframework.stereotype.Repository; @Repository public class EquipmentCardCameraDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/equipment/EquipmentCardDao.java b/src/main/java/com/sipai/dao/equipment/EquipmentCardDao.java index 5ded9730..8abdfcb1 100644 --- a/src/main/java/com/sipai/dao/equipment/EquipmentCardDao.java +++ b/src/main/java/com/sipai/dao/equipment/EquipmentCardDao.java @@ -1,11 +1,10 @@ package com.sipai.dao.equipment; -import java.util.List; - -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.equipment.EquipmentCard; +import org.springframework.stereotype.Repository; + +import java.util.List; @Repository public class EquipmentCardDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/equipment/EquipmentCardLinksDao.java b/src/main/java/com/sipai/dao/equipment/EquipmentCardLinksDao.java index 89089887..159c938b 100644 --- a/src/main/java/com/sipai/dao/equipment/EquipmentCardLinksDao.java +++ b/src/main/java/com/sipai/dao/equipment/EquipmentCardLinksDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.equipment; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.equipment.EquipmentCardLinks; +import org.springframework.stereotype.Repository; @Repository public class EquipmentCardLinksDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/equipment/EquipmentCardLinksParameterDao.java b/src/main/java/com/sipai/dao/equipment/EquipmentCardLinksParameterDao.java index 14533f19..432d6750 100644 --- a/src/main/java/com/sipai/dao/equipment/EquipmentCardLinksParameterDao.java +++ b/src/main/java/com/sipai/dao/equipment/EquipmentCardLinksParameterDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.equipment; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.equipment.EquipmentCardLinksParameter; +import org.springframework.stereotype.Repository; @Repository public class EquipmentCardLinksParameterDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/equipment/EquipmentCardPropDao.java b/src/main/java/com/sipai/dao/equipment/EquipmentCardPropDao.java index 73ad29da..f6c52e0a 100644 --- a/src/main/java/com/sipai/dao/equipment/EquipmentCardPropDao.java +++ b/src/main/java/com/sipai/dao/equipment/EquipmentCardPropDao.java @@ -1,12 +1,11 @@ package com.sipai.dao.equipment; -import java.util.List; - -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.equipment.EquipmentAge; import com.sipai.entity.equipment.EquipmentCardProp; +import org.springframework.stereotype.Repository; + +import java.util.List; @Repository public class EquipmentCardPropDao extends CommDaoImpl{ public EquipmentCardPropDao() { diff --git a/src/main/java/com/sipai/dao/equipment/EquipmentClassDao.java b/src/main/java/com/sipai/dao/equipment/EquipmentClassDao.java index 644a79bd..d9e2a71a 100644 --- a/src/main/java/com/sipai/dao/equipment/EquipmentClassDao.java +++ b/src/main/java/com/sipai/dao/equipment/EquipmentClassDao.java @@ -1,12 +1,11 @@ package com.sipai.dao.equipment; -import java.util.List; - -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.equipment.EquipmentCard; import com.sipai.entity.equipment.EquipmentClass; +import org.springframework.stereotype.Repository; + +import java.util.List; @Repository public class EquipmentClassDao extends CommDaoImpl{ public EquipmentClassDao() { diff --git a/src/main/java/com/sipai/dao/equipment/EquipmentClassPropDao.java b/src/main/java/com/sipai/dao/equipment/EquipmentClassPropDao.java index 594d8423..50953779 100644 --- a/src/main/java/com/sipai/dao/equipment/EquipmentClassPropDao.java +++ b/src/main/java/com/sipai/dao/equipment/EquipmentClassPropDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.equipment; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.equipment.EquipmentClassProp; +import org.springframework.stereotype.Repository; @Repository public class EquipmentClassPropDao extends CommDaoImpl{ public EquipmentClassPropDao() { diff --git a/src/main/java/com/sipai/dao/equipment/EquipmentCodeDao.java b/src/main/java/com/sipai/dao/equipment/EquipmentCodeDao.java index c8857e2b..f9367344 100644 --- a/src/main/java/com/sipai/dao/equipment/EquipmentCodeDao.java +++ b/src/main/java/com/sipai/dao/equipment/EquipmentCodeDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.equipment; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.equipment.EquipmentCode; +import org.springframework.stereotype.Repository; @Repository public class EquipmentCodeDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/equipment/EquipmentCodeLibraryDao.java b/src/main/java/com/sipai/dao/equipment/EquipmentCodeLibraryDao.java index 108afbc2..5f2f73a4 100644 --- a/src/main/java/com/sipai/dao/equipment/EquipmentCodeLibraryDao.java +++ b/src/main/java/com/sipai/dao/equipment/EquipmentCodeLibraryDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.equipment; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.equipment.EquipmentCodeLibrary; +import org.springframework.stereotype.Repository; @Repository public class EquipmentCodeLibraryDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/equipment/EquipmentCodeRuleDao.java b/src/main/java/com/sipai/dao/equipment/EquipmentCodeRuleDao.java index 0aa4e564..52c07a6b 100644 --- a/src/main/java/com/sipai/dao/equipment/EquipmentCodeRuleDao.java +++ b/src/main/java/com/sipai/dao/equipment/EquipmentCodeRuleDao.java @@ -1,10 +1,9 @@ package com.sipai.dao.equipment; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.equipment.DynamicCodeCondition; import com.sipai.entity.equipment.EquipmentCodeRule; +import org.springframework.stereotype.Repository; @Repository public class EquipmentCodeRuleDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/equipment/EquipmentDialinDao.java b/src/main/java/com/sipai/dao/equipment/EquipmentDialinDao.java index 82d8a14d..5a949eea 100644 --- a/src/main/java/com/sipai/dao/equipment/EquipmentDialinDao.java +++ b/src/main/java/com/sipai/dao/equipment/EquipmentDialinDao.java @@ -1,12 +1,8 @@ package com.sipai.dao.equipment; -import java.util.List; - -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.equipment.EquipmentDialin; -import com.sipai.entity.equipment.EquipmentDialinVO; +import org.springframework.stereotype.Repository; @Repository public class EquipmentDialinDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/equipment/EquipmentFileDao.java b/src/main/java/com/sipai/dao/equipment/EquipmentFileDao.java index 5d9ff9f9..9d615ece 100644 --- a/src/main/java/com/sipai/dao/equipment/EquipmentFileDao.java +++ b/src/main/java/com/sipai/dao/equipment/EquipmentFileDao.java @@ -1,10 +1,8 @@ package com.sipai.dao.equipment; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; -import com.sipai.entity.equipment.EquipmentClass; import com.sipai.entity.equipment.EquipmentFile; +import org.springframework.stereotype.Repository; @Repository public class EquipmentFileDao extends CommDaoImpl{ public EquipmentFileDao() { diff --git a/src/main/java/com/sipai/dao/equipment/EquipmentFittingsDao.java b/src/main/java/com/sipai/dao/equipment/EquipmentFittingsDao.java index baf472ce..24440042 100644 --- a/src/main/java/com/sipai/dao/equipment/EquipmentFittingsDao.java +++ b/src/main/java/com/sipai/dao/equipment/EquipmentFittingsDao.java @@ -1,12 +1,10 @@ package com.sipai.dao.equipment; -import java.util.List; - -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.equipment.EquipmentFittings; -import com.sipai.entity.report.DrainageDataomprehensiveTable; +import org.springframework.stereotype.Repository; + +import java.util.List; @Repository public class EquipmentFittingsDao extends CommDaoImpl{ public EquipmentFittingsDao() { diff --git a/src/main/java/com/sipai/dao/equipment/EquipmentIncreaseValueDao.java b/src/main/java/com/sipai/dao/equipment/EquipmentIncreaseValueDao.java index 827e47be..04c51696 100644 --- a/src/main/java/com/sipai/dao/equipment/EquipmentIncreaseValueDao.java +++ b/src/main/java/com/sipai/dao/equipment/EquipmentIncreaseValueDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.equipment; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.equipment.EquipmentIncreaseValue; +import org.springframework.stereotype.Repository; @Repository public class EquipmentIncreaseValueDao extends CommDaoImpl{ public EquipmentIncreaseValueDao() { diff --git a/src/main/java/com/sipai/dao/equipment/EquipmentLevelDao.java b/src/main/java/com/sipai/dao/equipment/EquipmentLevelDao.java index 063fd327..5cd4a46f 100644 --- a/src/main/java/com/sipai/dao/equipment/EquipmentLevelDao.java +++ b/src/main/java/com/sipai/dao/equipment/EquipmentLevelDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.equipment; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.equipment.EquipmentLevel; +import org.springframework.stereotype.Repository; @Repository public class EquipmentLevelDao extends CommDaoImpl{ public EquipmentLevelDao() { diff --git a/src/main/java/com/sipai/dao/equipment/EquipmentLoseApplyDao.java b/src/main/java/com/sipai/dao/equipment/EquipmentLoseApplyDao.java index 6f26d786..b6fb44fe 100644 --- a/src/main/java/com/sipai/dao/equipment/EquipmentLoseApplyDao.java +++ b/src/main/java/com/sipai/dao/equipment/EquipmentLoseApplyDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.equipment; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.equipment.EquipmentLoseApply; +import org.springframework.stereotype.Repository; @Repository diff --git a/src/main/java/com/sipai/dao/equipment/EquipmentLoseApplyDetailDao.java b/src/main/java/com/sipai/dao/equipment/EquipmentLoseApplyDetailDao.java index cc127ead..69ff68b8 100644 --- a/src/main/java/com/sipai/dao/equipment/EquipmentLoseApplyDetailDao.java +++ b/src/main/java/com/sipai/dao/equipment/EquipmentLoseApplyDetailDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.equipment; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.equipment.EquipmentLoseApplyDetail; +import org.springframework.stereotype.Repository; @Repository public class EquipmentLoseApplyDetailDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/equipment/EquipmentMaintainDao.java b/src/main/java/com/sipai/dao/equipment/EquipmentMaintainDao.java index 86571fcc..c5aab76a 100644 --- a/src/main/java/com/sipai/dao/equipment/EquipmentMaintainDao.java +++ b/src/main/java/com/sipai/dao/equipment/EquipmentMaintainDao.java @@ -1,14 +1,11 @@ package com.sipai.dao.equipment; - -import java.util.List; - +import com.sipai.dao.base.CommDaoImpl; +import com.sipai.entity.equipment.EquipmentMaintain; import org.springframework.stereotype.Repository; -import com.sipai.dao.base.CommDaoImpl; -import com.sipai.entity.equipment.EquipmentCard; -import com.sipai.entity.equipment.EquipmentMaintain; +import java.util.List; @Repository diff --git a/src/main/java/com/sipai/dao/equipment/EquipmentParamsetDao.java b/src/main/java/com/sipai/dao/equipment/EquipmentParamsetDao.java index b11fc381..116919c7 100644 --- a/src/main/java/com/sipai/dao/equipment/EquipmentParamsetDao.java +++ b/src/main/java/com/sipai/dao/equipment/EquipmentParamsetDao.java @@ -1,13 +1,11 @@ package com.sipai.dao.equipment; -import java.util.List; - -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.equipment.EquipmentParamSetVO; import com.sipai.entity.equipment.EquipmentParamset; -import com.sipai.entity.equipment.EquipmentParamsetDetail; +import org.springframework.stereotype.Repository; + +import java.util.List; @Repository diff --git a/src/main/java/com/sipai/dao/equipment/EquipmentParamsetDetailDao.java b/src/main/java/com/sipai/dao/equipment/EquipmentParamsetDetailDao.java index 685e070f..db6bd98c 100644 --- a/src/main/java/com/sipai/dao/equipment/EquipmentParamsetDetailDao.java +++ b/src/main/java/com/sipai/dao/equipment/EquipmentParamsetDetailDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.equipment; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.equipment.EquipmentParamsetDetail; +import org.springframework.stereotype.Repository; @Repository public class EquipmentParamsetDetailDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/equipment/EquipmentParamsetStatusEvaluationDao.java b/src/main/java/com/sipai/dao/equipment/EquipmentParamsetStatusEvaluationDao.java index 2cb9476e..72f022e1 100644 --- a/src/main/java/com/sipai/dao/equipment/EquipmentParamsetStatusEvaluationDao.java +++ b/src/main/java/com/sipai/dao/equipment/EquipmentParamsetStatusEvaluationDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.equipment; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.equipment.EquipmentParamsetStatusEvaluation; +import org.springframework.stereotype.Repository; @Repository public class EquipmentParamsetStatusEvaluationDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/equipment/EquipmentParamsetValueDao.java b/src/main/java/com/sipai/dao/equipment/EquipmentParamsetValueDao.java index 5cb05d36..b99c6822 100644 --- a/src/main/java/com/sipai/dao/equipment/EquipmentParamsetValueDao.java +++ b/src/main/java/com/sipai/dao/equipment/EquipmentParamsetValueDao.java @@ -1,10 +1,8 @@ package com.sipai.dao.equipment; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; -import com.sipai.entity.equipment.EquipmentParamsetDetail; import com.sipai.entity.equipment.EquipmentParamsetValue; +import org.springframework.stereotype.Repository; @Repository public class EquipmentParamsetValueDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/equipment/EquipmentPointDao.java b/src/main/java/com/sipai/dao/equipment/EquipmentPointDao.java index 1e486364..6f5ff017 100644 --- a/src/main/java/com/sipai/dao/equipment/EquipmentPointDao.java +++ b/src/main/java/com/sipai/dao/equipment/EquipmentPointDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.equipment; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.equipment.EquipmentPoint; +import org.springframework.stereotype.Repository; @Repository diff --git a/src/main/java/com/sipai/dao/equipment/EquipmentRepairPlanDao.java b/src/main/java/com/sipai/dao/equipment/EquipmentRepairPlanDao.java index 8f190af0..8b815e0b 100644 --- a/src/main/java/com/sipai/dao/equipment/EquipmentRepairPlanDao.java +++ b/src/main/java/com/sipai/dao/equipment/EquipmentRepairPlanDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.equipment; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.equipment.EquipmentRepairPlan; +import org.springframework.stereotype.Repository; @Repository public class EquipmentRepairPlanDao extends CommDaoImpl{ public EquipmentRepairPlanDao() { diff --git a/src/main/java/com/sipai/dao/equipment/EquipmentSaleApplyDao.java b/src/main/java/com/sipai/dao/equipment/EquipmentSaleApplyDao.java index 18eb3322..097cc8a9 100644 --- a/src/main/java/com/sipai/dao/equipment/EquipmentSaleApplyDao.java +++ b/src/main/java/com/sipai/dao/equipment/EquipmentSaleApplyDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.equipment; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.equipment.EquipmentSaleApply; +import org.springframework.stereotype.Repository; @Repository public class EquipmentSaleApplyDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/equipment/EquipmentSaleApplyDetailDao.java b/src/main/java/com/sipai/dao/equipment/EquipmentSaleApplyDetailDao.java index e6e337e4..f793286d 100644 --- a/src/main/java/com/sipai/dao/equipment/EquipmentSaleApplyDetailDao.java +++ b/src/main/java/com/sipai/dao/equipment/EquipmentSaleApplyDetailDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.equipment; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.equipment.EquipmentSaleApplyDetail; +import org.springframework.stereotype.Repository; @Repository diff --git a/src/main/java/com/sipai/dao/equipment/EquipmentScrapApplyDao.java b/src/main/java/com/sipai/dao/equipment/EquipmentScrapApplyDao.java index d0e9166b..3afbf1e1 100644 --- a/src/main/java/com/sipai/dao/equipment/EquipmentScrapApplyDao.java +++ b/src/main/java/com/sipai/dao/equipment/EquipmentScrapApplyDao.java @@ -1,12 +1,11 @@ package com.sipai.dao.equipment; -import java.util.List; - -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.equipment.EquipmentScrapApply; import com.sipai.entity.equipment.EquipmentScrapApplyCollect; +import org.springframework.stereotype.Repository; + +import java.util.List; diff --git a/src/main/java/com/sipai/dao/equipment/EquipmentScrapApplyDetailDao.java b/src/main/java/com/sipai/dao/equipment/EquipmentScrapApplyDetailDao.java index 38968ee8..2aff174e 100644 --- a/src/main/java/com/sipai/dao/equipment/EquipmentScrapApplyDetailDao.java +++ b/src/main/java/com/sipai/dao/equipment/EquipmentScrapApplyDetailDao.java @@ -1,10 +1,8 @@ package com.sipai.dao.equipment; -import com.sipai.entity.equipment.EquipmentScrapApply; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.equipment.EquipmentScrapApplyDetail; +import org.springframework.stereotype.Repository; import java.util.List; diff --git a/src/main/java/com/sipai/dao/equipment/EquipmentSpecificationDao.java b/src/main/java/com/sipai/dao/equipment/EquipmentSpecificationDao.java index 48735e94..b6831807 100644 --- a/src/main/java/com/sipai/dao/equipment/EquipmentSpecificationDao.java +++ b/src/main/java/com/sipai/dao/equipment/EquipmentSpecificationDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.equipment; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.equipment.EquipmentSpecification; +import org.springframework.stereotype.Repository; @Repository public class EquipmentSpecificationDao extends CommDaoImpl{ public EquipmentSpecificationDao() { diff --git a/src/main/java/com/sipai/dao/equipment/EquipmentStatisticsDao.java b/src/main/java/com/sipai/dao/equipment/EquipmentStatisticsDao.java index cbeb0141..86b9beb0 100644 --- a/src/main/java/com/sipai/dao/equipment/EquipmentStatisticsDao.java +++ b/src/main/java/com/sipai/dao/equipment/EquipmentStatisticsDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.equipment; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.equipment.EquipmentStatistics; +import org.springframework.stereotype.Repository; @Repository public class EquipmentStatisticsDao extends CommDaoImpl{ public EquipmentStatisticsDao() { diff --git a/src/main/java/com/sipai/dao/equipment/EquipmentStatusManagementDao.java b/src/main/java/com/sipai/dao/equipment/EquipmentStatusManagementDao.java index a0f757e4..b545d9ef 100644 --- a/src/main/java/com/sipai/dao/equipment/EquipmentStatusManagementDao.java +++ b/src/main/java/com/sipai/dao/equipment/EquipmentStatusManagementDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.equipment; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.equipment.EquipmentStatusManagement; +import org.springframework.stereotype.Repository; @Repository public class EquipmentStatusManagementDao extends CommDaoImpl{ public EquipmentStatusManagementDao() { diff --git a/src/main/java/com/sipai/dao/equipment/EquipmentStopRecordDao.java b/src/main/java/com/sipai/dao/equipment/EquipmentStopRecordDao.java index 9dd69755..5ffc71ba 100644 --- a/src/main/java/com/sipai/dao/equipment/EquipmentStopRecordDao.java +++ b/src/main/java/com/sipai/dao/equipment/EquipmentStopRecordDao.java @@ -1,12 +1,10 @@ package com.sipai.dao.equipment; -import java.util.List; - -import org.springframework.stereotype.Repository; - -import com.itextpdf.text.pdf.PdfStructTreeController.returnType; import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.equipment.EquipmentStopRecord; +import org.springframework.stereotype.Repository; + +import java.util.List; @Repository public class EquipmentStopRecordDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/equipment/EquipmentStopRecordDetailDao.java b/src/main/java/com/sipai/dao/equipment/EquipmentStopRecordDetailDao.java index 5f4cde78..9390077f 100644 --- a/src/main/java/com/sipai/dao/equipment/EquipmentStopRecordDetailDao.java +++ b/src/main/java/com/sipai/dao/equipment/EquipmentStopRecordDetailDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.equipment; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.equipment.EquipmentStopRecordDetail; +import org.springframework.stereotype.Repository; @Repository diff --git a/src/main/java/com/sipai/dao/equipment/EquipmentTransfersApplyDao.java b/src/main/java/com/sipai/dao/equipment/EquipmentTransfersApplyDao.java index 18265521..bceb569f 100644 --- a/src/main/java/com/sipai/dao/equipment/EquipmentTransfersApplyDao.java +++ b/src/main/java/com/sipai/dao/equipment/EquipmentTransfersApplyDao.java @@ -1,14 +1,11 @@ package com.sipai.dao.equipment; -import java.util.List; - -import javax.mail.Session; - -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.equipment.EquipmentTransfersApply; import com.sipai.entity.equipment.EquipmentTransfersApplyCollect; +import org.springframework.stereotype.Repository; + +import java.util.List; diff --git a/src/main/java/com/sipai/dao/equipment/EquipmentTransfersApplyDetailDao.java b/src/main/java/com/sipai/dao/equipment/EquipmentTransfersApplyDetailDao.java index 7d5823da..90c87779 100644 --- a/src/main/java/com/sipai/dao/equipment/EquipmentTransfersApplyDetailDao.java +++ b/src/main/java/com/sipai/dao/equipment/EquipmentTransfersApplyDetailDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.equipment; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.equipment.EquipmentTransfersApplyDetail; +import org.springframework.stereotype.Repository; @Repository public class EquipmentTransfersApplyDetailDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/equipment/EquipmentTypeNumberDao.java b/src/main/java/com/sipai/dao/equipment/EquipmentTypeNumberDao.java index 35e38f23..8f3e4131 100644 --- a/src/main/java/com/sipai/dao/equipment/EquipmentTypeNumberDao.java +++ b/src/main/java/com/sipai/dao/equipment/EquipmentTypeNumberDao.java @@ -1,11 +1,10 @@ package com.sipai.dao.equipment; -import java.util.List; - -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.equipment.EquipmentTypeNumber; +import org.springframework.stereotype.Repository; + +import java.util.List; @Repository public class EquipmentTypeNumberDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/equipment/EquipmentUseAgeDao.java b/src/main/java/com/sipai/dao/equipment/EquipmentUseAgeDao.java index ede9663d..22a34376 100644 --- a/src/main/java/com/sipai/dao/equipment/EquipmentUseAgeDao.java +++ b/src/main/java/com/sipai/dao/equipment/EquipmentUseAgeDao.java @@ -1,10 +1,8 @@ package com.sipai.dao.equipment; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; -import com.sipai.entity.equipment.EquipmentTypeNumber; import com.sipai.entity.equipment.EquipmentUseAge; +import org.springframework.stereotype.Repository; @Repository public class EquipmentUseAgeDao extends CommDaoImpl{ public EquipmentUseAgeDao() { diff --git a/src/main/java/com/sipai/dao/equipment/FacilitiesCardDao.java b/src/main/java/com/sipai/dao/equipment/FacilitiesCardDao.java index ab6d7a39..ec57ca34 100644 --- a/src/main/java/com/sipai/dao/equipment/FacilitiesCardDao.java +++ b/src/main/java/com/sipai/dao/equipment/FacilitiesCardDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.equipment; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.equipment.FacilitiesCard; +import org.springframework.stereotype.Repository; @Repository public class FacilitiesCardDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/equipment/FacilitiesClassDao.java b/src/main/java/com/sipai/dao/equipment/FacilitiesClassDao.java index b025d130..3cfb710f 100644 --- a/src/main/java/com/sipai/dao/equipment/FacilitiesClassDao.java +++ b/src/main/java/com/sipai/dao/equipment/FacilitiesClassDao.java @@ -1,8 +1,8 @@ package com.sipai.dao.equipment; -import org.springframework.stereotype.Repository; import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.equipment.FacilitiesClass; +import org.springframework.stereotype.Repository; @Repository public class FacilitiesClassDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/equipment/GeographyAreaDao.java b/src/main/java/com/sipai/dao/equipment/GeographyAreaDao.java index 922066e6..4c42d264 100644 --- a/src/main/java/com/sipai/dao/equipment/GeographyAreaDao.java +++ b/src/main/java/com/sipai/dao/equipment/GeographyAreaDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.equipment; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.equipment.GeographyArea; +import org.springframework.stereotype.Repository; @Repository public class GeographyAreaDao extends CommDaoImpl{ public GeographyAreaDao() { diff --git a/src/main/java/com/sipai/dao/equipment/MaintenancePlanDao.java b/src/main/java/com/sipai/dao/equipment/MaintenancePlanDao.java index a1cfd8c4..c6062a48 100644 --- a/src/main/java/com/sipai/dao/equipment/MaintenancePlanDao.java +++ b/src/main/java/com/sipai/dao/equipment/MaintenancePlanDao.java @@ -1,10 +1,8 @@ package com.sipai.dao.equipment; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; -import com.sipai.entity.equipment.EquipmentClass; import com.sipai.entity.equipment.MaintenancePlan; +import org.springframework.stereotype.Repository; @Repository public class MaintenancePlanDao extends CommDaoImpl{ public MaintenancePlanDao() { diff --git a/src/main/java/com/sipai/dao/equipment/SpecialEquipmentDao.java b/src/main/java/com/sipai/dao/equipment/SpecialEquipmentDao.java index cea30e23..20c72c90 100644 --- a/src/main/java/com/sipai/dao/equipment/SpecialEquipmentDao.java +++ b/src/main/java/com/sipai/dao/equipment/SpecialEquipmentDao.java @@ -1,12 +1,8 @@ package com.sipai.dao.equipment; -import java.util.List; - -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; -import com.sipai.entity.equipment.EquipmentArrangement; import com.sipai.entity.equipment.SpecialEquipment; +import org.springframework.stereotype.Repository; @Repository public class SpecialEquipmentDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/evaluation/EvaluationCriterionDao.java b/src/main/java/com/sipai/dao/evaluation/EvaluationCriterionDao.java index f08eca5d..364a7396 100644 --- a/src/main/java/com/sipai/dao/evaluation/EvaluationCriterionDao.java +++ b/src/main/java/com/sipai/dao/evaluation/EvaluationCriterionDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.evaluation; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.evaluation.EvaluationCriterion; +import org.springframework.stereotype.Repository; @Repository public class EvaluationCriterionDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/evaluation/EvaluationIndexDao.java b/src/main/java/com/sipai/dao/evaluation/EvaluationIndexDao.java index 99e6bac2..b1c62cb2 100644 --- a/src/main/java/com/sipai/dao/evaluation/EvaluationIndexDao.java +++ b/src/main/java/com/sipai/dao/evaluation/EvaluationIndexDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.evaluation; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.evaluation.EvaluationIndex; +import org.springframework.stereotype.Repository; @Repository public class EvaluationIndexDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/evaluation/EvaluationIndexDayDao.java b/src/main/java/com/sipai/dao/evaluation/EvaluationIndexDayDao.java index a4e3bd2b..5418d85e 100644 --- a/src/main/java/com/sipai/dao/evaluation/EvaluationIndexDayDao.java +++ b/src/main/java/com/sipai/dao/evaluation/EvaluationIndexDayDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.evaluation; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.evaluation.EvaluationIndexDay; +import org.springframework.stereotype.Repository; @Repository public class EvaluationIndexDayDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/evaluation/EvaluationIndexMDao.java b/src/main/java/com/sipai/dao/evaluation/EvaluationIndexMDao.java index f674ed34..b133d6ff 100644 --- a/src/main/java/com/sipai/dao/evaluation/EvaluationIndexMDao.java +++ b/src/main/java/com/sipai/dao/evaluation/EvaluationIndexMDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.evaluation; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.evaluation.EvaluationIndexM; +import org.springframework.stereotype.Repository; @Repository public class EvaluationIndexMDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/evaluation/EvaluationIndexMontDao.java b/src/main/java/com/sipai/dao/evaluation/EvaluationIndexMontDao.java index ec3cd71c..81c94481 100644 --- a/src/main/java/com/sipai/dao/evaluation/EvaluationIndexMontDao.java +++ b/src/main/java/com/sipai/dao/evaluation/EvaluationIndexMontDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.evaluation; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.evaluation.EvaluationIndexMonth; +import org.springframework.stereotype.Repository; @Repository public class EvaluationIndexMontDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/evaluation/EvaluationIndexYDao.java b/src/main/java/com/sipai/dao/evaluation/EvaluationIndexYDao.java index 282f8670..76952eb6 100644 --- a/src/main/java/com/sipai/dao/evaluation/EvaluationIndexYDao.java +++ b/src/main/java/com/sipai/dao/evaluation/EvaluationIndexYDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.evaluation; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.evaluation.EvaluationIndexY; +import org.springframework.stereotype.Repository; @Repository public class EvaluationIndexYDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/evaluation/EvaluationIndexYearDao.java b/src/main/java/com/sipai/dao/evaluation/EvaluationIndexYearDao.java index da445242..b709f3f1 100644 --- a/src/main/java/com/sipai/dao/evaluation/EvaluationIndexYearDao.java +++ b/src/main/java/com/sipai/dao/evaluation/EvaluationIndexYearDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.evaluation; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.evaluation.EvaluationIndexYear; +import org.springframework.stereotype.Repository; @Repository public class EvaluationIndexYearDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/fangzhen/FangZhenHeadUIDao.java b/src/main/java/com/sipai/dao/fangzhen/FangZhenHeadUIDao.java index 3215d038..53ba4cb2 100644 --- a/src/main/java/com/sipai/dao/fangzhen/FangZhenHeadUIDao.java +++ b/src/main/java/com/sipai/dao/fangzhen/FangZhenHeadUIDao.java @@ -1,7 +1,6 @@ package com.sipai.dao.fangzhen; import com.sipai.dao.base.CommDaoImpl; -import com.sipai.entity.fangzhen.FangZhenEquipment; import com.sipai.entity.fangzhen.FangZhenHeadUI; import org.springframework.stereotype.Repository; diff --git a/src/main/java/com/sipai/dao/fangzhen/FangZhenStationDao.java b/src/main/java/com/sipai/dao/fangzhen/FangZhenStationDao.java index 7f317583..7ba6e0b6 100644 --- a/src/main/java/com/sipai/dao/fangzhen/FangZhenStationDao.java +++ b/src/main/java/com/sipai/dao/fangzhen/FangZhenStationDao.java @@ -1,7 +1,6 @@ package com.sipai.dao.fangzhen; import com.sipai.dao.base.CommDaoImpl; -import com.sipai.entity.fangzhen.FangZhenPipe; import com.sipai.entity.fangzhen.FangZhenStation; import org.springframework.stereotype.Repository; diff --git a/src/main/java/com/sipai/dao/fangzhen/FangZhenWaterDao.java b/src/main/java/com/sipai/dao/fangzhen/FangZhenWaterDao.java index a568146f..1e27cd8d 100644 --- a/src/main/java/com/sipai/dao/fangzhen/FangZhenWaterDao.java +++ b/src/main/java/com/sipai/dao/fangzhen/FangZhenWaterDao.java @@ -1,7 +1,6 @@ package com.sipai.dao.fangzhen; import com.sipai.dao.base.CommDaoImpl; -import com.sipai.entity.fangzhen.FangZhenStation; import com.sipai.entity.fangzhen.FangZhenWater; import org.springframework.stereotype.Repository; diff --git a/src/main/java/com/sipai/dao/fangzhen/FangZhenXeomaDao.java b/src/main/java/com/sipai/dao/fangzhen/FangZhenXeomaDao.java index b7660513..274edcea 100644 --- a/src/main/java/com/sipai/dao/fangzhen/FangZhenXeomaDao.java +++ b/src/main/java/com/sipai/dao/fangzhen/FangZhenXeomaDao.java @@ -1,7 +1,6 @@ package com.sipai.dao.fangzhen; import com.sipai.dao.base.CommDaoImpl; -import com.sipai.entity.fangzhen.FangZhenWater; import com.sipai.entity.fangzhen.FangZhenXeoma; import org.springframework.stereotype.Repository; diff --git a/src/main/java/com/sipai/dao/finance/FinanceEquipmentDeptInfoDao.java b/src/main/java/com/sipai/dao/finance/FinanceEquipmentDeptInfoDao.java index a0331f5c..9a57e42b 100644 --- a/src/main/java/com/sipai/dao/finance/FinanceEquipmentDeptInfoDao.java +++ b/src/main/java/com/sipai/dao/finance/FinanceEquipmentDeptInfoDao.java @@ -1,8 +1,8 @@ package com.sipai.dao.finance; -import org.springframework.stereotype.Repository; import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.finance.FinanceEquipmentDeptInfo; +import org.springframework.stereotype.Repository; @Repository diff --git a/src/main/java/com/sipai/dao/fwk/MenunumberDao.java b/src/main/java/com/sipai/dao/fwk/MenunumberDao.java index 4dd57373..0e450dac 100644 --- a/src/main/java/com/sipai/dao/fwk/MenunumberDao.java +++ b/src/main/java/com/sipai/dao/fwk/MenunumberDao.java @@ -1,11 +1,10 @@ package com.sipai.dao.fwk; -import java.util.List; - -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.fwk.Menunumber; +import org.springframework.stereotype.Repository; + +import java.util.List; @Repository public class MenunumberDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/fwk/UserToMenuDao.java b/src/main/java/com/sipai/dao/fwk/UserToMenuDao.java index 98673832..7a289c5b 100644 --- a/src/main/java/com/sipai/dao/fwk/UserToMenuDao.java +++ b/src/main/java/com/sipai/dao/fwk/UserToMenuDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.fwk; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.fwk.UserToMenu; +import org.springframework.stereotype.Repository; @Repository public class UserToMenuDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/fwk/WeatherHistoryDao.java b/src/main/java/com/sipai/dao/fwk/WeatherHistoryDao.java index a67260a5..8001d709 100644 --- a/src/main/java/com/sipai/dao/fwk/WeatherHistoryDao.java +++ b/src/main/java/com/sipai/dao/fwk/WeatherHistoryDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.fwk; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.fwk.WeatherHistory; +import org.springframework.stereotype.Repository; @Repository public class WeatherHistoryDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/hqconfig/HQAlarmRecordDao.java b/src/main/java/com/sipai/dao/hqconfig/HQAlarmRecordDao.java index b18d547a..b848b7ae 100644 --- a/src/main/java/com/sipai/dao/hqconfig/HQAlarmRecordDao.java +++ b/src/main/java/com/sipai/dao/hqconfig/HQAlarmRecordDao.java @@ -2,7 +2,6 @@ package com.sipai.dao.hqconfig; import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.hqconfig.HQAlarmRecord; -import com.sipai.entity.timeefficiency.PatrolRecord; import org.springframework.stereotype.Repository; import java.util.HashMap; diff --git a/src/main/java/com/sipai/dao/hqconfig/RiskLevelDao.java b/src/main/java/com/sipai/dao/hqconfig/RiskLevelDao.java index 943d6819..a5fb14ef 100644 --- a/src/main/java/com/sipai/dao/hqconfig/RiskLevelDao.java +++ b/src/main/java/com/sipai/dao/hqconfig/RiskLevelDao.java @@ -1,11 +1,10 @@ package com.sipai.dao.hqconfig; -import java.util.List; - -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.hqconfig.RiskLevel; +import org.springframework.stereotype.Repository; + +import java.util.List; @Repository public class RiskLevelDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/hqconfig/WorkModelDao.java b/src/main/java/com/sipai/dao/hqconfig/WorkModelDao.java index 7ab62961..55f989ab 100644 --- a/src/main/java/com/sipai/dao/hqconfig/WorkModelDao.java +++ b/src/main/java/com/sipai/dao/hqconfig/WorkModelDao.java @@ -1,11 +1,10 @@ package com.sipai.dao.hqconfig; -import java.util.List; - -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.hqconfig.WorkModel; +import org.springframework.stereotype.Repository; + +import java.util.List; @Repository public class WorkModelDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/info/InfoDao.java b/src/main/java/com/sipai/dao/info/InfoDao.java index 913bbf3d..0461368d 100644 --- a/src/main/java/com/sipai/dao/info/InfoDao.java +++ b/src/main/java/com/sipai/dao/info/InfoDao.java @@ -1,11 +1,10 @@ package com.sipai.dao.info; -import java.util.List; - -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.info.Info; +import org.springframework.stereotype.Repository; + +import java.util.List; @Repository public class InfoDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/info/InfoRecvDao.java b/src/main/java/com/sipai/dao/info/InfoRecvDao.java index d73e5b2c..5a876e40 100644 --- a/src/main/java/com/sipai/dao/info/InfoRecvDao.java +++ b/src/main/java/com/sipai/dao/info/InfoRecvDao.java @@ -1,10 +1,9 @@ package com.sipai.dao.info; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.info.InfoRecv; +import org.springframework.stereotype.Repository; @Repository public class InfoRecvDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/jsyw/JsywCompanyDao.java b/src/main/java/com/sipai/dao/jsyw/JsywCompanyDao.java index 176fedfb..f68fdb29 100644 --- a/src/main/java/com/sipai/dao/jsyw/JsywCompanyDao.java +++ b/src/main/java/com/sipai/dao/jsyw/JsywCompanyDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.jsyw; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.jsyw.JsywCompany; +import org.springframework.stereotype.Repository; @Repository public class JsywCompanyDao extends CommDaoImpl { diff --git a/src/main/java/com/sipai/dao/jsyw/JsywPointDao.java b/src/main/java/com/sipai/dao/jsyw/JsywPointDao.java index 46b379d9..b88d36fe 100644 --- a/src/main/java/com/sipai/dao/jsyw/JsywPointDao.java +++ b/src/main/java/com/sipai/dao/jsyw/JsywPointDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.jsyw; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.jsyw.JsywPoint; +import org.springframework.stereotype.Repository; @Repository public class JsywPointDao extends CommDaoImpl { diff --git a/src/main/java/com/sipai/dao/kpi/KpiPlanDetailDao.java b/src/main/java/com/sipai/dao/kpi/KpiPlanDetailDao.java index 9df7e490..2ca2fe01 100644 --- a/src/main/java/com/sipai/dao/kpi/KpiPlanDetailDao.java +++ b/src/main/java/com/sipai/dao/kpi/KpiPlanDetailDao.java @@ -1,7 +1,6 @@ package com.sipai.dao.kpi; import com.sipai.dao.base.CommDaoImpl; -import com.sipai.entity.kpi.KpiPlan; import com.sipai.entity.kpi.KpiPlanDetail; import org.springframework.stereotype.Repository; diff --git a/src/main/java/com/sipai/dao/maintenance/AbnormityDao.java b/src/main/java/com/sipai/dao/maintenance/AbnormityDao.java index 633261b7..26062017 100644 --- a/src/main/java/com/sipai/dao/maintenance/AbnormityDao.java +++ b/src/main/java/com/sipai/dao/maintenance/AbnormityDao.java @@ -1,14 +1,13 @@ package com.sipai.dao.maintenance; +import com.sipai.dao.base.CommDaoImpl; +import com.sipai.entity.maintenance.Abnormity; +import org.springframework.stereotype.Repository; + import java.util.HashMap; import java.util.List; import java.util.Map; -import org.springframework.stereotype.Repository; - -import com.sipai.dao.base.CommDaoImpl; -import com.sipai.entity.maintenance.Abnormity; - @Repository public class AbnormityDao extends CommDaoImpl{ public AbnormityDao() { diff --git a/src/main/java/com/sipai/dao/maintenance/AnticorrosiveLibraryDao.java b/src/main/java/com/sipai/dao/maintenance/AnticorrosiveLibraryDao.java index d8d7f805..fab5b9a5 100644 --- a/src/main/java/com/sipai/dao/maintenance/AnticorrosiveLibraryDao.java +++ b/src/main/java/com/sipai/dao/maintenance/AnticorrosiveLibraryDao.java @@ -1,8 +1,8 @@ package com.sipai.dao.maintenance; -import org.springframework.stereotype.Repository; import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.maintenance.AnticorrosiveLibrary; +import org.springframework.stereotype.Repository; @Repository public class AnticorrosiveLibraryDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/maintenance/AnticorrosiveLibraryEquipmentDao.java b/src/main/java/com/sipai/dao/maintenance/AnticorrosiveLibraryEquipmentDao.java index 6c2e34b5..6089b0eb 100644 --- a/src/main/java/com/sipai/dao/maintenance/AnticorrosiveLibraryEquipmentDao.java +++ b/src/main/java/com/sipai/dao/maintenance/AnticorrosiveLibraryEquipmentDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.maintenance; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.maintenance.AnticorrosiveLibraryEquipment; +import org.springframework.stereotype.Repository; @Repository public class AnticorrosiveLibraryEquipmentDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/maintenance/AnticorrosiveLibraryMaterialDao.java b/src/main/java/com/sipai/dao/maintenance/AnticorrosiveLibraryMaterialDao.java index 4086d904..4561bd15 100644 --- a/src/main/java/com/sipai/dao/maintenance/AnticorrosiveLibraryMaterialDao.java +++ b/src/main/java/com/sipai/dao/maintenance/AnticorrosiveLibraryMaterialDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.maintenance; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.maintenance.AnticorrosiveLibraryMaterial; +import org.springframework.stereotype.Repository; @Repository public class AnticorrosiveLibraryMaterialDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/maintenance/AnticorrosiveMaterialDao.java b/src/main/java/com/sipai/dao/maintenance/AnticorrosiveMaterialDao.java index 5bc11bb4..e749c0f2 100644 --- a/src/main/java/com/sipai/dao/maintenance/AnticorrosiveMaterialDao.java +++ b/src/main/java/com/sipai/dao/maintenance/AnticorrosiveMaterialDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.maintenance; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.maintenance.AnticorrosiveMaterial; +import org.springframework.stereotype.Repository; @Repository public class AnticorrosiveMaterialDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/maintenance/EquipmentPlanDao.java b/src/main/java/com/sipai/dao/maintenance/EquipmentPlanDao.java index 0e8ec1e5..3e94c1b9 100644 --- a/src/main/java/com/sipai/dao/maintenance/EquipmentPlanDao.java +++ b/src/main/java/com/sipai/dao/maintenance/EquipmentPlanDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.maintenance; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.maintenance.EquipmentPlan; +import org.springframework.stereotype.Repository; import java.util.List; diff --git a/src/main/java/com/sipai/dao/maintenance/EquipmentPlanEquDao.java b/src/main/java/com/sipai/dao/maintenance/EquipmentPlanEquDao.java index f950c8b4..aedd4362 100644 --- a/src/main/java/com/sipai/dao/maintenance/EquipmentPlanEquDao.java +++ b/src/main/java/com/sipai/dao/maintenance/EquipmentPlanEquDao.java @@ -1,8 +1,8 @@ package com.sipai.dao.maintenance; -import org.springframework.stereotype.Repository; import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.maintenance.EquipmentPlanEqu; +import org.springframework.stereotype.Repository; import java.util.List; diff --git a/src/main/java/com/sipai/dao/maintenance/EquipmentPlanMainYearDao.java b/src/main/java/com/sipai/dao/maintenance/EquipmentPlanMainYearDao.java index a05e5b7a..dd4ce99b 100644 --- a/src/main/java/com/sipai/dao/maintenance/EquipmentPlanMainYearDao.java +++ b/src/main/java/com/sipai/dao/maintenance/EquipmentPlanMainYearDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.maintenance; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.maintenance.EquipmentPlanMainYear; +import org.springframework.stereotype.Repository; import java.util.List; diff --git a/src/main/java/com/sipai/dao/maintenance/EquipmentPlanMainYearDetailDao.java b/src/main/java/com/sipai/dao/maintenance/EquipmentPlanMainYearDetailDao.java index 831d8f0f..12a0dfca 100644 --- a/src/main/java/com/sipai/dao/maintenance/EquipmentPlanMainYearDetailDao.java +++ b/src/main/java/com/sipai/dao/maintenance/EquipmentPlanMainYearDetailDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.maintenance; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.maintenance.EquipmentPlanMainYearDetail; +import org.springframework.stereotype.Repository; @Repository public class EquipmentPlanMainYearDetailDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/maintenance/EquipmentPlanTypeDao.java b/src/main/java/com/sipai/dao/maintenance/EquipmentPlanTypeDao.java index 90077ef7..3deef23d 100644 --- a/src/main/java/com/sipai/dao/maintenance/EquipmentPlanTypeDao.java +++ b/src/main/java/com/sipai/dao/maintenance/EquipmentPlanTypeDao.java @@ -1,13 +1,8 @@ package com.sipai.dao.maintenance; -import com.sipai.entity.maintenance.LibraryRepairBloc; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.maintenance.EquipmentPlanType; - -import java.util.HashMap; -import java.util.List; +import org.springframework.stereotype.Repository; @Repository public class EquipmentPlanTypeDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/maintenance/FaultLibraryDao.java b/src/main/java/com/sipai/dao/maintenance/FaultLibraryDao.java index 1b8c26a4..afa7eb31 100644 --- a/src/main/java/com/sipai/dao/maintenance/FaultLibraryDao.java +++ b/src/main/java/com/sipai/dao/maintenance/FaultLibraryDao.java @@ -1,10 +1,8 @@ package com.sipai.dao.maintenance; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.maintenance.FaultLibrary; -import com.sipai.entity.user.Menu; +import org.springframework.stereotype.Repository; @Repository public class FaultLibraryDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/maintenance/LibraryAddResetProjectBizDao.java b/src/main/java/com/sipai/dao/maintenance/LibraryAddResetProjectBizDao.java index 14ced177..3340c725 100644 --- a/src/main/java/com/sipai/dao/maintenance/LibraryAddResetProjectBizDao.java +++ b/src/main/java/com/sipai/dao/maintenance/LibraryAddResetProjectBizDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.maintenance; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.maintenance.LibraryAddResetProjectBiz; +import org.springframework.stereotype.Repository; @Repository public class LibraryAddResetProjectBizDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/maintenance/LibraryAddResetProjectBlocDao.java b/src/main/java/com/sipai/dao/maintenance/LibraryAddResetProjectBlocDao.java index 7b4956a9..44925966 100644 --- a/src/main/java/com/sipai/dao/maintenance/LibraryAddResetProjectBlocDao.java +++ b/src/main/java/com/sipai/dao/maintenance/LibraryAddResetProjectBlocDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.maintenance; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.maintenance.LibraryAddResetProjectBloc; +import org.springframework.stereotype.Repository; @Repository public class LibraryAddResetProjectBlocDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/maintenance/LibraryAddResetProjectDao.java b/src/main/java/com/sipai/dao/maintenance/LibraryAddResetProjectDao.java index 3fcc1299..ef8565f4 100644 --- a/src/main/java/com/sipai/dao/maintenance/LibraryAddResetProjectDao.java +++ b/src/main/java/com/sipai/dao/maintenance/LibraryAddResetProjectDao.java @@ -1,9 +1,10 @@ package com.sipai.dao.maintenance; -import java.util.List; -import org.springframework.stereotype.Repository; import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.maintenance.LibraryAddResetProject; +import org.springframework.stereotype.Repository; + +import java.util.List; @Repository public class LibraryAddResetProjectDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/maintenance/LibraryFaultBlocDao.java b/src/main/java/com/sipai/dao/maintenance/LibraryFaultBlocDao.java index 2925efa3..e36d5869 100644 --- a/src/main/java/com/sipai/dao/maintenance/LibraryFaultBlocDao.java +++ b/src/main/java/com/sipai/dao/maintenance/LibraryFaultBlocDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.maintenance; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.maintenance.LibraryFaultBloc; +import org.springframework.stereotype.Repository; @Repository public class LibraryFaultBlocDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/maintenance/LibraryMaintainCarDao.java b/src/main/java/com/sipai/dao/maintenance/LibraryMaintainCarDao.java index f04a9d81..193d531e 100644 --- a/src/main/java/com/sipai/dao/maintenance/LibraryMaintainCarDao.java +++ b/src/main/java/com/sipai/dao/maintenance/LibraryMaintainCarDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.maintenance; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.maintenance.LibraryMaintainCar; +import org.springframework.stereotype.Repository; @Repository public class LibraryMaintainCarDao extends CommDaoImpl{ public LibraryMaintainCarDao() { diff --git a/src/main/java/com/sipai/dao/maintenance/LibraryMaintainCarDetailDao.java b/src/main/java/com/sipai/dao/maintenance/LibraryMaintainCarDetailDao.java index 1f581733..bd0733b0 100644 --- a/src/main/java/com/sipai/dao/maintenance/LibraryMaintainCarDetailDao.java +++ b/src/main/java/com/sipai/dao/maintenance/LibraryMaintainCarDetailDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.maintenance; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.maintenance.LibraryMaintainCarDetail; +import org.springframework.stereotype.Repository; @Repository public class LibraryMaintainCarDetailDao extends CommDaoImpl{ public LibraryMaintainCarDetailDao() { diff --git a/src/main/java/com/sipai/dao/maintenance/LibraryMaintenanceCommonContentDao.java b/src/main/java/com/sipai/dao/maintenance/LibraryMaintenanceCommonContentDao.java index c66f257b..b36c4f95 100644 --- a/src/main/java/com/sipai/dao/maintenance/LibraryMaintenanceCommonContentDao.java +++ b/src/main/java/com/sipai/dao/maintenance/LibraryMaintenanceCommonContentDao.java @@ -1,12 +1,11 @@ package com.sipai.dao.maintenance; -import java.util.HashMap; -import java.util.List; - -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.maintenance.LibraryMaintenanceCommonContent; +import org.springframework.stereotype.Repository; + +import java.util.HashMap; +import java.util.List; @Repository public class LibraryMaintenanceCommonContentDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/maintenance/LibraryMaintenanceCommonDao.java b/src/main/java/com/sipai/dao/maintenance/LibraryMaintenanceCommonDao.java index d55a300e..994551ef 100644 --- a/src/main/java/com/sipai/dao/maintenance/LibraryMaintenanceCommonDao.java +++ b/src/main/java/com/sipai/dao/maintenance/LibraryMaintenanceCommonDao.java @@ -1,8 +1,8 @@ package com.sipai.dao.maintenance; -import org.springframework.stereotype.Repository; import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.maintenance.LibraryMaintenanceCommon; +import org.springframework.stereotype.Repository; @Repository public class LibraryMaintenanceCommonDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/maintenance/LibraryMaintenanceLubricationDao.java b/src/main/java/com/sipai/dao/maintenance/LibraryMaintenanceLubricationDao.java index 87a0cc68..6b457fe5 100644 --- a/src/main/java/com/sipai/dao/maintenance/LibraryMaintenanceLubricationDao.java +++ b/src/main/java/com/sipai/dao/maintenance/LibraryMaintenanceLubricationDao.java @@ -1,11 +1,10 @@ package com.sipai.dao.maintenance; -import java.util.List; - -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.maintenance.LibraryMaintenanceLubrication; +import org.springframework.stereotype.Repository; + +import java.util.List; @Repository public class LibraryMaintenanceLubricationDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/maintenance/LibraryMaterialQuotaDao.java b/src/main/java/com/sipai/dao/maintenance/LibraryMaterialQuotaDao.java index f59c0257..c66ef382 100644 --- a/src/main/java/com/sipai/dao/maintenance/LibraryMaterialQuotaDao.java +++ b/src/main/java/com/sipai/dao/maintenance/LibraryMaterialQuotaDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.maintenance; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.maintenance.LibraryMaterialQuota; +import org.springframework.stereotype.Repository; @Repository public class LibraryMaterialQuotaDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/maintenance/LibraryOverhaulContentBlocDao.java b/src/main/java/com/sipai/dao/maintenance/LibraryOverhaulContentBlocDao.java index d3effd52..3874666a 100644 --- a/src/main/java/com/sipai/dao/maintenance/LibraryOverhaulContentBlocDao.java +++ b/src/main/java/com/sipai/dao/maintenance/LibraryOverhaulContentBlocDao.java @@ -1,12 +1,11 @@ package com.sipai.dao.maintenance; -import java.util.HashMap; -import java.util.List; - -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.maintenance.LibraryOverhaulContentBloc; +import org.springframework.stereotype.Repository; + +import java.util.HashMap; +import java.util.List; @Repository public class LibraryOverhaulContentBlocDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/maintenance/LibraryOverhaulContentEquBizDao.java b/src/main/java/com/sipai/dao/maintenance/LibraryOverhaulContentEquBizDao.java index 27e9bd19..02219d50 100644 --- a/src/main/java/com/sipai/dao/maintenance/LibraryOverhaulContentEquBizDao.java +++ b/src/main/java/com/sipai/dao/maintenance/LibraryOverhaulContentEquBizDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.maintenance; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.maintenance.LibraryOverhaulContentEquBiz; +import org.springframework.stereotype.Repository; @Repository public class LibraryOverhaulContentEquBizDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/maintenance/LibraryOverhaulContentModelBlocDao.java b/src/main/java/com/sipai/dao/maintenance/LibraryOverhaulContentModelBlocDao.java index f5c7df16..043ad694 100644 --- a/src/main/java/com/sipai/dao/maintenance/LibraryOverhaulContentModelBlocDao.java +++ b/src/main/java/com/sipai/dao/maintenance/LibraryOverhaulContentModelBlocDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.maintenance; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.maintenance.LibraryOverhaulContentModelBloc; +import org.springframework.stereotype.Repository; @Repository public class LibraryOverhaulContentModelBlocDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/maintenance/LibraryOverhaulProjectBlocDao.java b/src/main/java/com/sipai/dao/maintenance/LibraryOverhaulProjectBlocDao.java index 294fe791..6df830a9 100644 --- a/src/main/java/com/sipai/dao/maintenance/LibraryOverhaulProjectBlocDao.java +++ b/src/main/java/com/sipai/dao/maintenance/LibraryOverhaulProjectBlocDao.java @@ -1,8 +1,8 @@ package com.sipai.dao.maintenance; -import org.springframework.stereotype.Repository; import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.maintenance.LibraryOverhaulProjectBloc; +import org.springframework.stereotype.Repository; @Repository public class LibraryOverhaulProjectBlocDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/maintenance/LibraryOverhaulProjectEquBizDao.java b/src/main/java/com/sipai/dao/maintenance/LibraryOverhaulProjectEquBizDao.java index 7c815c6a..22d97d85 100644 --- a/src/main/java/com/sipai/dao/maintenance/LibraryOverhaulProjectEquBizDao.java +++ b/src/main/java/com/sipai/dao/maintenance/LibraryOverhaulProjectEquBizDao.java @@ -1,8 +1,8 @@ package com.sipai.dao.maintenance; -import org.springframework.stereotype.Repository; import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.maintenance.LibraryOverhaulProjectEquBiz; +import org.springframework.stereotype.Repository; @Repository public class LibraryOverhaulProjectEquBizDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/maintenance/LibraryOverhaulProjectModelBlocDao.java b/src/main/java/com/sipai/dao/maintenance/LibraryOverhaulProjectModelBlocDao.java index 2d237c0a..904a96bb 100644 --- a/src/main/java/com/sipai/dao/maintenance/LibraryOverhaulProjectModelBlocDao.java +++ b/src/main/java/com/sipai/dao/maintenance/LibraryOverhaulProjectModelBlocDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.maintenance; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.maintenance.LibraryOverhaulProjectModelBloc; +import org.springframework.stereotype.Repository; @Repository public class LibraryOverhaulProjectModelBlocDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/maintenance/LibraryRepairBlocDao.java b/src/main/java/com/sipai/dao/maintenance/LibraryRepairBlocDao.java index a8313bf7..a1492f99 100644 --- a/src/main/java/com/sipai/dao/maintenance/LibraryRepairBlocDao.java +++ b/src/main/java/com/sipai/dao/maintenance/LibraryRepairBlocDao.java @@ -1,12 +1,11 @@ package com.sipai.dao.maintenance; -import java.util.HashMap; -import java.util.List; - -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.maintenance.LibraryRepairBloc; +import org.springframework.stereotype.Repository; + +import java.util.HashMap; +import java.util.List; @Repository public class LibraryRepairBlocDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/maintenance/LibraryRepairEquBizDao.java b/src/main/java/com/sipai/dao/maintenance/LibraryRepairEquBizDao.java index d2d65607..70a22155 100644 --- a/src/main/java/com/sipai/dao/maintenance/LibraryRepairEquBizDao.java +++ b/src/main/java/com/sipai/dao/maintenance/LibraryRepairEquBizDao.java @@ -1,11 +1,8 @@ package com.sipai.dao.maintenance; -import org.springframework.stereotype.Repository; import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.maintenance.LibraryRepairEquBiz; - -import java.util.HashMap; -import java.util.List; +import org.springframework.stereotype.Repository; @Repository public class LibraryRepairEquBizDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/maintenance/LibraryRepairModelBlocDao.java b/src/main/java/com/sipai/dao/maintenance/LibraryRepairModelBlocDao.java index 2e5b268d..fa0b220f 100644 --- a/src/main/java/com/sipai/dao/maintenance/LibraryRepairModelBlocDao.java +++ b/src/main/java/com/sipai/dao/maintenance/LibraryRepairModelBlocDao.java @@ -1,8 +1,8 @@ package com.sipai.dao.maintenance; -import org.springframework.stereotype.Repository; import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.maintenance.LibraryRepairModelBloc; +import org.springframework.stereotype.Repository; @Repository public class LibraryRepairModelBlocDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/maintenance/MaintainCarDao.java b/src/main/java/com/sipai/dao/maintenance/MaintainCarDao.java index dade9433..46202a6a 100644 --- a/src/main/java/com/sipai/dao/maintenance/MaintainCarDao.java +++ b/src/main/java/com/sipai/dao/maintenance/MaintainCarDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.maintenance; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.maintenance.MaintainCar; +import org.springframework.stereotype.Repository; @Repository public class MaintainCarDao extends CommDaoImpl{ public MaintainCarDao() { diff --git a/src/main/java/com/sipai/dao/maintenance/MaintainDao.java b/src/main/java/com/sipai/dao/maintenance/MaintainDao.java index e7b170a2..2c0edd5c 100644 --- a/src/main/java/com/sipai/dao/maintenance/MaintainDao.java +++ b/src/main/java/com/sipai/dao/maintenance/MaintainDao.java @@ -1,8 +1,8 @@ package com.sipai.dao.maintenance; -import org.springframework.stereotype.Repository; import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.maintenance.Maintain; +import org.springframework.stereotype.Repository; @Repository public class MaintainDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/maintenance/MaintainPlanDao.java b/src/main/java/com/sipai/dao/maintenance/MaintainPlanDao.java index 9cec6583..88e3198a 100644 --- a/src/main/java/com/sipai/dao/maintenance/MaintainPlanDao.java +++ b/src/main/java/com/sipai/dao/maintenance/MaintainPlanDao.java @@ -1,10 +1,8 @@ package com.sipai.dao.maintenance; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.maintenance.MaintainPlan; -import com.sipai.entity.user.Menu; +import org.springframework.stereotype.Repository; @Repository public class MaintainPlanDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/maintenance/MaintainerCompanyDao.java b/src/main/java/com/sipai/dao/maintenance/MaintainerCompanyDao.java index 35744876..3e6136ff 100644 --- a/src/main/java/com/sipai/dao/maintenance/MaintainerCompanyDao.java +++ b/src/main/java/com/sipai/dao/maintenance/MaintainerCompanyDao.java @@ -1,12 +1,8 @@ package com.sipai.dao.maintenance; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; -import com.sipai.entity.maintenance.Maintainer; import com.sipai.entity.maintenance.MaintainerCompany; -import com.sipai.entity.maintenance.Maintenance; -import com.sipai.entity.work.Group; +import org.springframework.stereotype.Repository; @Repository public class MaintainerCompanyDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/maintenance/MaintainerDao.java b/src/main/java/com/sipai/dao/maintenance/MaintainerDao.java index 8cc4778b..c23d4c64 100644 --- a/src/main/java/com/sipai/dao/maintenance/MaintainerDao.java +++ b/src/main/java/com/sipai/dao/maintenance/MaintainerDao.java @@ -1,11 +1,8 @@ package com.sipai.dao.maintenance; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.maintenance.Maintainer; -import com.sipai.entity.maintenance.Maintenance; -import com.sipai.entity.work.Group; +import org.springframework.stereotype.Repository; @Repository public class MaintainerDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/maintenance/MaintainerSelectTypeDao.java b/src/main/java/com/sipai/dao/maintenance/MaintainerSelectTypeDao.java index 190963d7..4eb0c19a 100644 --- a/src/main/java/com/sipai/dao/maintenance/MaintainerSelectTypeDao.java +++ b/src/main/java/com/sipai/dao/maintenance/MaintainerSelectTypeDao.java @@ -1,15 +1,11 @@ package com.sipai.dao.maintenance; -import java.util.List; - -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; -import com.sipai.entity.maintenance.Maintainer; import com.sipai.entity.maintenance.MaintainerSelectType; import com.sipai.entity.maintenance.MaintainerType; -import com.sipai.entity.maintenance.Maintenance; -import com.sipai.entity.work.Group; +import org.springframework.stereotype.Repository; + +import java.util.List; @Repository public class MaintainerSelectTypeDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/maintenance/MaintainerTypeDao.java b/src/main/java/com/sipai/dao/maintenance/MaintainerTypeDao.java index dcbf13dc..513b140d 100644 --- a/src/main/java/com/sipai/dao/maintenance/MaintainerTypeDao.java +++ b/src/main/java/com/sipai/dao/maintenance/MaintainerTypeDao.java @@ -1,11 +1,8 @@ package com.sipai.dao.maintenance; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.maintenance.MaintainerType; -import com.sipai.entity.maintenance.Maintenance; -import com.sipai.entity.work.Group; +import org.springframework.stereotype.Repository; @Repository public class MaintainerTypeDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/maintenance/MaintenanceDao.java b/src/main/java/com/sipai/dao/maintenance/MaintenanceDao.java index fa1ded9f..5d9a3653 100644 --- a/src/main/java/com/sipai/dao/maintenance/MaintenanceDao.java +++ b/src/main/java/com/sipai/dao/maintenance/MaintenanceDao.java @@ -1,13 +1,10 @@ package com.sipai.dao.maintenance; -import java.util.List; - -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.maintenance.Maintenance; -import com.sipai.entity.maintenance.MaintenanceDetail; -import com.sipai.entity.work.Group; +import org.springframework.stereotype.Repository; + +import java.util.List; @Repository public class MaintenanceDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/maintenance/MaintenanceDetailDao.java b/src/main/java/com/sipai/dao/maintenance/MaintenanceDetailDao.java index 374b9fa7..4ebdb895 100644 --- a/src/main/java/com/sipai/dao/maintenance/MaintenanceDetailDao.java +++ b/src/main/java/com/sipai/dao/maintenance/MaintenanceDetailDao.java @@ -1,18 +1,13 @@ package com.sipai.dao.maintenance; +import com.sipai.dao.base.CommDaoImpl; +import com.sipai.entity.maintenance.MaintenanceDetail; +import org.springframework.stereotype.Repository; + import java.util.HashMap; import java.util.List; import java.util.Map; -import com.sipai.entity.timeefficiency.PatrolRecord; -import com.sipai.entity.workorder.WorkorderDetail; -import org.springframework.stereotype.Repository; - -import com.sipai.dao.base.CommDaoImpl; -import com.sipai.entity.maintenance.Maintenance; -import com.sipai.entity.maintenance.MaintenanceDetail; -import com.sipai.entity.work.Group; - @Repository public class MaintenanceDetailDao extends CommDaoImpl{ public MaintenanceDetailDao() { diff --git a/src/main/java/com/sipai/dao/maintenance/MaintenanceEquipmentDao.java b/src/main/java/com/sipai/dao/maintenance/MaintenanceEquipmentDao.java index bd50923e..51ca4ec6 100644 --- a/src/main/java/com/sipai/dao/maintenance/MaintenanceEquipmentDao.java +++ b/src/main/java/com/sipai/dao/maintenance/MaintenanceEquipmentDao.java @@ -1,13 +1,8 @@ package com.sipai.dao.maintenance; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; -import com.sipai.entity.maintenance.Maintainer; -import com.sipai.entity.maintenance.MaintainerCompany; -import com.sipai.entity.maintenance.Maintenance; import com.sipai.entity.maintenance.MaintenanceEquipment; -import com.sipai.entity.work.Group; +import org.springframework.stereotype.Repository; @Repository public class MaintenanceEquipmentDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/maintenance/MaintenanceRecordDao.java b/src/main/java/com/sipai/dao/maintenance/MaintenanceRecordDao.java index b7c87864..e97b9bf8 100644 --- a/src/main/java/com/sipai/dao/maintenance/MaintenanceRecordDao.java +++ b/src/main/java/com/sipai/dao/maintenance/MaintenanceRecordDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.maintenance; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.maintenance.MaintenanceRecord; +import org.springframework.stereotype.Repository; @Repository public class MaintenanceRecordDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/maintenance/PlanRecordAbnormityDao.java b/src/main/java/com/sipai/dao/maintenance/PlanRecordAbnormityDao.java index b3085979..13a24892 100644 --- a/src/main/java/com/sipai/dao/maintenance/PlanRecordAbnormityDao.java +++ b/src/main/java/com/sipai/dao/maintenance/PlanRecordAbnormityDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.maintenance; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.maintenance.PlanRecordAbnormity; +import org.springframework.stereotype.Repository; @Repository public class PlanRecordAbnormityDao extends CommDaoImpl{ public PlanRecordAbnormityDao() { diff --git a/src/main/java/com/sipai/dao/maintenance/RepairCarDao.java b/src/main/java/com/sipai/dao/maintenance/RepairCarDao.java index eb07374e..2a2c0438 100644 --- a/src/main/java/com/sipai/dao/maintenance/RepairCarDao.java +++ b/src/main/java/com/sipai/dao/maintenance/RepairCarDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.maintenance; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.maintenance.RepairCar; +import org.springframework.stereotype.Repository; @Repository public class RepairCarDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/maintenance/RepairDao.java b/src/main/java/com/sipai/dao/maintenance/RepairDao.java index 2894165b..867500d5 100644 --- a/src/main/java/com/sipai/dao/maintenance/RepairDao.java +++ b/src/main/java/com/sipai/dao/maintenance/RepairDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.maintenance; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.maintenance.Repair; +import org.springframework.stereotype.Repository; @Repository public class RepairDao extends CommDaoImpl{ public RepairDao() { diff --git a/src/main/java/com/sipai/dao/maintenance/WorkorderLibraryMaintainDao.java b/src/main/java/com/sipai/dao/maintenance/WorkorderLibraryMaintainDao.java index 6429c37a..3ad18786 100644 --- a/src/main/java/com/sipai/dao/maintenance/WorkorderLibraryMaintainDao.java +++ b/src/main/java/com/sipai/dao/maintenance/WorkorderLibraryMaintainDao.java @@ -1,8 +1,8 @@ package com.sipai.dao.maintenance; -import org.springframework.stereotype.Repository; import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.maintenance.WorkorderLibraryMaintain; +import org.springframework.stereotype.Repository; @Repository public class WorkorderLibraryMaintainDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/msg/EmppAdminDao.java b/src/main/java/com/sipai/dao/msg/EmppAdminDao.java index 9e5318da..60ac7974 100644 --- a/src/main/java/com/sipai/dao/msg/EmppAdminDao.java +++ b/src/main/java/com/sipai/dao/msg/EmppAdminDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.msg; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.msg.EmppAdmin; +import org.springframework.stereotype.Repository; @Repository public class EmppAdminDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/msg/EmppSendDao.java b/src/main/java/com/sipai/dao/msg/EmppSendDao.java index 462d2328..2641757e 100644 --- a/src/main/java/com/sipai/dao/msg/EmppSendDao.java +++ b/src/main/java/com/sipai/dao/msg/EmppSendDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.msg; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.msg.EmppSend; +import org.springframework.stereotype.Repository; @Repository public class EmppSendDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/msg/EmppSendUserDao.java b/src/main/java/com/sipai/dao/msg/EmppSendUserDao.java index 8e444e8a..21afe222 100644 --- a/src/main/java/com/sipai/dao/msg/EmppSendUserDao.java +++ b/src/main/java/com/sipai/dao/msg/EmppSendUserDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.msg; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.msg.EmppSendUser; +import org.springframework.stereotype.Repository; @Repository public class EmppSendUserDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/msg/MsgAlarmlevelDao.java b/src/main/java/com/sipai/dao/msg/MsgAlarmlevelDao.java index 7f49904e..f6b39871 100644 --- a/src/main/java/com/sipai/dao/msg/MsgAlarmlevelDao.java +++ b/src/main/java/com/sipai/dao/msg/MsgAlarmlevelDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.msg; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.msg.MsgAlarmlevel; +import org.springframework.stereotype.Repository; @Repository public class MsgAlarmlevelDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/msg/MsgDao.java b/src/main/java/com/sipai/dao/msg/MsgDao.java index eb4401e4..7897f484 100644 --- a/src/main/java/com/sipai/dao/msg/MsgDao.java +++ b/src/main/java/com/sipai/dao/msg/MsgDao.java @@ -1,11 +1,10 @@ package com.sipai.dao.msg; -import java.util.List; - -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.msg.Msg; +import org.springframework.stereotype.Repository; + +import java.util.List; @Repository public class MsgDao extends CommDaoImpl { diff --git a/src/main/java/com/sipai/dao/msg/MsgRecvDao.java b/src/main/java/com/sipai/dao/msg/MsgRecvDao.java index a49969ab..86f49830 100644 --- a/src/main/java/com/sipai/dao/msg/MsgRecvDao.java +++ b/src/main/java/com/sipai/dao/msg/MsgRecvDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.msg; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.msg.MsgRecv; +import org.springframework.stereotype.Repository; @Repository public class MsgRecvDao extends CommDaoImpl{ public MsgRecvDao() { diff --git a/src/main/java/com/sipai/dao/msg/MsgRoleDao.java b/src/main/java/com/sipai/dao/msg/MsgRoleDao.java index 65b3473a..e02cb96c 100644 --- a/src/main/java/com/sipai/dao/msg/MsgRoleDao.java +++ b/src/main/java/com/sipai/dao/msg/MsgRoleDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.msg; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.msg.MsgRole; +import org.springframework.stereotype.Repository; @Repository public class MsgRoleDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/msg/MsgTypeDao.java b/src/main/java/com/sipai/dao/msg/MsgTypeDao.java index 408e5ba4..d1bdb5d5 100644 --- a/src/main/java/com/sipai/dao/msg/MsgTypeDao.java +++ b/src/main/java/com/sipai/dao/msg/MsgTypeDao.java @@ -1,11 +1,10 @@ package com.sipai.dao.msg; -import java.util.List; - -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.msg.MsgType; +import org.springframework.stereotype.Repository; + +import java.util.List; @Repository public class MsgTypeDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/msg/MsguserDao.java b/src/main/java/com/sipai/dao/msg/MsguserDao.java index 34b96165..f5c398f5 100644 --- a/src/main/java/com/sipai/dao/msg/MsguserDao.java +++ b/src/main/java/com/sipai/dao/msg/MsguserDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.msg; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.msg.Msguser; +import org.springframework.stereotype.Repository; @Repository public class MsguserDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/msg/SmsuserDao.java b/src/main/java/com/sipai/dao/msg/SmsuserDao.java index 5c63d7a7..2ce8c09e 100644 --- a/src/main/java/com/sipai/dao/msg/SmsuserDao.java +++ b/src/main/java/com/sipai/dao/msg/SmsuserDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.msg; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.msg.Smsuser; +import org.springframework.stereotype.Repository; @Repository public class SmsuserDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/process/DataPatrolDao.java b/src/main/java/com/sipai/dao/process/DataPatrolDao.java index 7a40db29..e75d408d 100644 --- a/src/main/java/com/sipai/dao/process/DataPatrolDao.java +++ b/src/main/java/com/sipai/dao/process/DataPatrolDao.java @@ -1,8 +1,8 @@ package com.sipai.dao.process; -import org.springframework.stereotype.Repository; import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.process.DataPatrol; +import org.springframework.stereotype.Repository; @Repository public class DataPatrolDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/process/DataPatrolResultDataDao.java b/src/main/java/com/sipai/dao/process/DataPatrolResultDataDao.java index 8270af2d..67bd860e 100644 --- a/src/main/java/com/sipai/dao/process/DataPatrolResultDataDao.java +++ b/src/main/java/com/sipai/dao/process/DataPatrolResultDataDao.java @@ -1,8 +1,8 @@ package com.sipai.dao.process; -import org.springframework.stereotype.Repository; import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.process.DataPatrolResultData; +import org.springframework.stereotype.Repository; import java.util.HashMap; import java.util.List; diff --git a/src/main/java/com/sipai/dao/process/DataVisualBarChartDao.java b/src/main/java/com/sipai/dao/process/DataVisualBarChartDao.java index bce04de0..8794c170 100644 --- a/src/main/java/com/sipai/dao/process/DataVisualBarChartDao.java +++ b/src/main/java/com/sipai/dao/process/DataVisualBarChartDao.java @@ -1,8 +1,8 @@ package com.sipai.dao.process; -import org.springframework.stereotype.Repository; import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.process.DataVisualBarChart; +import org.springframework.stereotype.Repository; @Repository public class DataVisualBarChartDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/process/DataVisualBarChartSeriesDao.java b/src/main/java/com/sipai/dao/process/DataVisualBarChartSeriesDao.java index 8a349f17..203da8c5 100644 --- a/src/main/java/com/sipai/dao/process/DataVisualBarChartSeriesDao.java +++ b/src/main/java/com/sipai/dao/process/DataVisualBarChartSeriesDao.java @@ -1,8 +1,8 @@ package com.sipai.dao.process; -import org.springframework.stereotype.Repository; import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.process.DataVisualBarChartSeries; +import org.springframework.stereotype.Repository; @Repository public class DataVisualBarChartSeriesDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/process/DataVisualBarChartYAxisDao.java b/src/main/java/com/sipai/dao/process/DataVisualBarChartYAxisDao.java index 661a9502..5592f3a8 100644 --- a/src/main/java/com/sipai/dao/process/DataVisualBarChartYAxisDao.java +++ b/src/main/java/com/sipai/dao/process/DataVisualBarChartYAxisDao.java @@ -1,8 +1,8 @@ package com.sipai.dao.process; -import org.springframework.stereotype.Repository; import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.process.DataVisualBarChartYAxis; +import org.springframework.stereotype.Repository; @Repository public class DataVisualBarChartYAxisDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/process/DataVisualCameraAlarmDao.java b/src/main/java/com/sipai/dao/process/DataVisualCameraAlarmDao.java index a20a8be0..b63f8742 100644 --- a/src/main/java/com/sipai/dao/process/DataVisualCameraAlarmDao.java +++ b/src/main/java/com/sipai/dao/process/DataVisualCameraAlarmDao.java @@ -1,8 +1,8 @@ package com.sipai.dao.process; -import org.springframework.stereotype.Repository; import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.process.DataVisualCameraAlarm; +import org.springframework.stereotype.Repository; @Repository public class DataVisualCameraAlarmDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/process/DataVisualCameraDao.java b/src/main/java/com/sipai/dao/process/DataVisualCameraDao.java index 1dcdaf44..8bc1ae44 100644 --- a/src/main/java/com/sipai/dao/process/DataVisualCameraDao.java +++ b/src/main/java/com/sipai/dao/process/DataVisualCameraDao.java @@ -1,8 +1,8 @@ package com.sipai.dao.process; -import org.springframework.stereotype.Repository; import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.process.DataVisualCamera; +import org.springframework.stereotype.Repository; @Repository public class DataVisualCameraDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/process/DataVisualContentDao.java b/src/main/java/com/sipai/dao/process/DataVisualContentDao.java index b31471e4..60c2334e 100644 --- a/src/main/java/com/sipai/dao/process/DataVisualContentDao.java +++ b/src/main/java/com/sipai/dao/process/DataVisualContentDao.java @@ -1,8 +1,8 @@ package com.sipai.dao.process; -import org.springframework.stereotype.Repository; import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.process.DataVisualContent; +import org.springframework.stereotype.Repository; import java.util.HashMap; import java.util.List; diff --git a/src/main/java/com/sipai/dao/process/DataVisualDateDao.java b/src/main/java/com/sipai/dao/process/DataVisualDateDao.java index 2352cad8..422acd5e 100644 --- a/src/main/java/com/sipai/dao/process/DataVisualDateDao.java +++ b/src/main/java/com/sipai/dao/process/DataVisualDateDao.java @@ -1,8 +1,8 @@ package com.sipai.dao.process; -import org.springframework.stereotype.Repository; import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.process.DataVisualDate; +import org.springframework.stereotype.Repository; @Repository public class DataVisualDateDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/process/DataVisualDateSelectDao.java b/src/main/java/com/sipai/dao/process/DataVisualDateSelectDao.java index 07c92648..c0ea81fa 100644 --- a/src/main/java/com/sipai/dao/process/DataVisualDateSelectDao.java +++ b/src/main/java/com/sipai/dao/process/DataVisualDateSelectDao.java @@ -1,8 +1,8 @@ package com.sipai.dao.process; -import org.springframework.stereotype.Repository; import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.process.DataVisualDateSelect; +import org.springframework.stereotype.Repository; @Repository public class DataVisualDateSelectDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/process/DataVisualEqPointsDao.java b/src/main/java/com/sipai/dao/process/DataVisualEqPointsDao.java index 4ed9b586..1a11cbe7 100644 --- a/src/main/java/com/sipai/dao/process/DataVisualEqPointsDao.java +++ b/src/main/java/com/sipai/dao/process/DataVisualEqPointsDao.java @@ -1,8 +1,8 @@ package com.sipai.dao.process; -import org.springframework.stereotype.Repository; import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.process.DataVisualEqPoints; +import org.springframework.stereotype.Repository; @Repository public class DataVisualEqPointsDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/process/DataVisualFormDao.java b/src/main/java/com/sipai/dao/process/DataVisualFormDao.java index 67525ce3..af261a8f 100644 --- a/src/main/java/com/sipai/dao/process/DataVisualFormDao.java +++ b/src/main/java/com/sipai/dao/process/DataVisualFormDao.java @@ -1,8 +1,8 @@ package com.sipai.dao.process; -import org.springframework.stereotype.Repository; import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.process.DataVisualForm; +import org.springframework.stereotype.Repository; import java.util.HashMap; import java.util.List; diff --git a/src/main/java/com/sipai/dao/process/DataVisualFormShowStyleDao.java b/src/main/java/com/sipai/dao/process/DataVisualFormShowStyleDao.java index d60a98ea..ddfc8813 100644 --- a/src/main/java/com/sipai/dao/process/DataVisualFormShowStyleDao.java +++ b/src/main/java/com/sipai/dao/process/DataVisualFormShowStyleDao.java @@ -1,8 +1,8 @@ package com.sipai.dao.process; -import org.springframework.stereotype.Repository; import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.process.DataVisualFormShowStyle; +import org.springframework.stereotype.Repository; @Repository public class DataVisualFormShowStyleDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/process/DataVisualFormSqlPointDao.java b/src/main/java/com/sipai/dao/process/DataVisualFormSqlPointDao.java index 57a6f7a5..de418ff7 100644 --- a/src/main/java/com/sipai/dao/process/DataVisualFormSqlPointDao.java +++ b/src/main/java/com/sipai/dao/process/DataVisualFormSqlPointDao.java @@ -1,12 +1,8 @@ package com.sipai.dao.process; -import org.springframework.stereotype.Repository; import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.process.DataVisualFormSqlPoint; - -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import org.springframework.stereotype.Repository; @Repository public class DataVisualFormSqlPointDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/process/DataVisualFrameContainerDao.java b/src/main/java/com/sipai/dao/process/DataVisualFrameContainerDao.java index 45ef490f..ec0f3d8d 100644 --- a/src/main/java/com/sipai/dao/process/DataVisualFrameContainerDao.java +++ b/src/main/java/com/sipai/dao/process/DataVisualFrameContainerDao.java @@ -1,10 +1,8 @@ package com.sipai.dao.process; -import java.util.List; - -import org.springframework.stereotype.Repository; import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.process.DataVisualFrameContainer; +import org.springframework.stereotype.Repository; @Repository public class DataVisualFrameContainerDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/process/DataVisualFrameDao.java b/src/main/java/com/sipai/dao/process/DataVisualFrameDao.java index baad0f5a..31c75c83 100644 --- a/src/main/java/com/sipai/dao/process/DataVisualFrameDao.java +++ b/src/main/java/com/sipai/dao/process/DataVisualFrameDao.java @@ -1,11 +1,8 @@ package com.sipai.dao.process; -import java.util.List; - -import org.springframework.stereotype.Repository; import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.process.DataVisualFrame; -import com.sipai.entity.scada.MPoint4APP; +import org.springframework.stereotype.Repository; @Repository public class DataVisualFrameDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/process/DataVisualGaugeChartDao.java b/src/main/java/com/sipai/dao/process/DataVisualGaugeChartDao.java index 1e8edac4..0b9b0fce 100644 --- a/src/main/java/com/sipai/dao/process/DataVisualGaugeChartDao.java +++ b/src/main/java/com/sipai/dao/process/DataVisualGaugeChartDao.java @@ -1,8 +1,8 @@ package com.sipai.dao.process; -import org.springframework.stereotype.Repository; import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.process.DataVisualGaugeChart; +import org.springframework.stereotype.Repository; @Repository public class DataVisualGaugeChartDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/process/DataVisualLineChartDao.java b/src/main/java/com/sipai/dao/process/DataVisualLineChartDao.java index 20929d34..7249a179 100644 --- a/src/main/java/com/sipai/dao/process/DataVisualLineChartDao.java +++ b/src/main/java/com/sipai/dao/process/DataVisualLineChartDao.java @@ -1,8 +1,8 @@ package com.sipai.dao.process; -import org.springframework.stereotype.Repository; import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.process.DataVisualLineChart; +import org.springframework.stereotype.Repository; @Repository public class DataVisualLineChartDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/process/DataVisualLineChartSeriesDao.java b/src/main/java/com/sipai/dao/process/DataVisualLineChartSeriesDao.java index 9727dd54..e426ae96 100644 --- a/src/main/java/com/sipai/dao/process/DataVisualLineChartSeriesDao.java +++ b/src/main/java/com/sipai/dao/process/DataVisualLineChartSeriesDao.java @@ -1,8 +1,8 @@ package com.sipai.dao.process; -import org.springframework.stereotype.Repository; import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.process.DataVisualLineChartSeries; +import org.springframework.stereotype.Repository; @Repository public class DataVisualLineChartSeriesDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/process/DataVisualLineChartYAxisDao.java b/src/main/java/com/sipai/dao/process/DataVisualLineChartYAxisDao.java index 70c72455..0c981b3b 100644 --- a/src/main/java/com/sipai/dao/process/DataVisualLineChartYAxisDao.java +++ b/src/main/java/com/sipai/dao/process/DataVisualLineChartYAxisDao.java @@ -1,8 +1,8 @@ package com.sipai.dao.process; -import org.springframework.stereotype.Repository; import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.process.DataVisualLineChartYAxis; +import org.springframework.stereotype.Repository; @Repository public class DataVisualLineChartYAxisDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/process/DataVisualMPointDao.java b/src/main/java/com/sipai/dao/process/DataVisualMPointDao.java index 5cf18f7f..717f0747 100644 --- a/src/main/java/com/sipai/dao/process/DataVisualMPointDao.java +++ b/src/main/java/com/sipai/dao/process/DataVisualMPointDao.java @@ -1,8 +1,8 @@ package com.sipai.dao.process; -import org.springframework.stereotype.Repository; import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.process.DataVisualMPoint; +import org.springframework.stereotype.Repository; @Repository public class DataVisualMPointDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/process/DataVisualMPointWarehouseDao.java b/src/main/java/com/sipai/dao/process/DataVisualMPointWarehouseDao.java index 5ae722a0..df949f23 100644 --- a/src/main/java/com/sipai/dao/process/DataVisualMPointWarehouseDao.java +++ b/src/main/java/com/sipai/dao/process/DataVisualMPointWarehouseDao.java @@ -1,8 +1,8 @@ package com.sipai.dao.process; -import org.springframework.stereotype.Repository; import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.process.DataVisualMPointWarehouse; +import org.springframework.stereotype.Repository; @Repository public class DataVisualMPointWarehouseDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/process/DataVisualMpViewDao.java b/src/main/java/com/sipai/dao/process/DataVisualMpViewDao.java index 50ea1fc3..5dd82aab 100644 --- a/src/main/java/com/sipai/dao/process/DataVisualMpViewDao.java +++ b/src/main/java/com/sipai/dao/process/DataVisualMpViewDao.java @@ -1,8 +1,8 @@ package com.sipai.dao.process; -import org.springframework.stereotype.Repository; import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.process.DataVisualMpView; +import org.springframework.stereotype.Repository; @Repository public class DataVisualMpViewDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/process/DataVisualPercentChartDao.java b/src/main/java/com/sipai/dao/process/DataVisualPercentChartDao.java index e8e575c4..2e1f08b7 100644 --- a/src/main/java/com/sipai/dao/process/DataVisualPercentChartDao.java +++ b/src/main/java/com/sipai/dao/process/DataVisualPercentChartDao.java @@ -1,8 +1,8 @@ package com.sipai.dao.process; -import org.springframework.stereotype.Repository; import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.process.DataVisualPercentChart; +import org.springframework.stereotype.Repository; @Repository public class DataVisualPercentChartDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/process/DataVisualPersonnelPositioningDao.java b/src/main/java/com/sipai/dao/process/DataVisualPersonnelPositioningDao.java index 3983f9ed..a617e938 100644 --- a/src/main/java/com/sipai/dao/process/DataVisualPersonnelPositioningDao.java +++ b/src/main/java/com/sipai/dao/process/DataVisualPersonnelPositioningDao.java @@ -1,8 +1,8 @@ package com.sipai.dao.process; -import org.springframework.stereotype.Repository; import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.process.DataVisualPersonnelPositioning; +import org.springframework.stereotype.Repository; @Repository public class DataVisualPersonnelPositioningDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/process/DataVisualPieChartDao.java b/src/main/java/com/sipai/dao/process/DataVisualPieChartDao.java index e9185a2e..adbbddd2 100644 --- a/src/main/java/com/sipai/dao/process/DataVisualPieChartDao.java +++ b/src/main/java/com/sipai/dao/process/DataVisualPieChartDao.java @@ -1,8 +1,8 @@ package com.sipai.dao.process; -import org.springframework.stereotype.Repository; import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.process.DataVisualPieChart; +import org.springframework.stereotype.Repository; @Repository public class DataVisualPieChartDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/process/DataVisualPieChartSeriesDao.java b/src/main/java/com/sipai/dao/process/DataVisualPieChartSeriesDao.java index 74eeaf10..9cba1b57 100644 --- a/src/main/java/com/sipai/dao/process/DataVisualPieChartSeriesDao.java +++ b/src/main/java/com/sipai/dao/process/DataVisualPieChartSeriesDao.java @@ -1,8 +1,8 @@ package com.sipai.dao.process; -import org.springframework.stereotype.Repository; import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.process.DataVisualPieChartSeries; +import org.springframework.stereotype.Repository; @Repository public class DataVisualPieChartSeriesDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/process/DataVisualPolarCoordinatesDao.java b/src/main/java/com/sipai/dao/process/DataVisualPolarCoordinatesDao.java index a6da72d0..69e8fbbc 100644 --- a/src/main/java/com/sipai/dao/process/DataVisualPolarCoordinatesDao.java +++ b/src/main/java/com/sipai/dao/process/DataVisualPolarCoordinatesDao.java @@ -1,8 +1,8 @@ package com.sipai.dao.process; -import org.springframework.stereotype.Repository; import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.process.DataVisualPolarCoordinates; +import org.springframework.stereotype.Repository; @Repository public class DataVisualPolarCoordinatesDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/process/DataVisualPolarCoordinatesSeriesDao.java b/src/main/java/com/sipai/dao/process/DataVisualPolarCoordinatesSeriesDao.java index 1b62864f..44d013a2 100644 --- a/src/main/java/com/sipai/dao/process/DataVisualPolarCoordinatesSeriesDao.java +++ b/src/main/java/com/sipai/dao/process/DataVisualPolarCoordinatesSeriesDao.java @@ -1,8 +1,8 @@ package com.sipai.dao.process; -import org.springframework.stereotype.Repository; import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.process.DataVisualPolarCoordinatesSeries; +import org.springframework.stereotype.Repository; @Repository public class DataVisualPolarCoordinatesSeriesDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/process/DataVisualProgressBarChartDao.java b/src/main/java/com/sipai/dao/process/DataVisualProgressBarChartDao.java index 07ca64ef..d454668b 100644 --- a/src/main/java/com/sipai/dao/process/DataVisualProgressBarChartDao.java +++ b/src/main/java/com/sipai/dao/process/DataVisualProgressBarChartDao.java @@ -1,8 +1,8 @@ package com.sipai.dao.process; -import org.springframework.stereotype.Repository; import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.process.DataVisualProgressBarChart; +import org.springframework.stereotype.Repository; @Repository public class DataVisualProgressBarChartDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/process/DataVisualRadarChartAxisDao.java b/src/main/java/com/sipai/dao/process/DataVisualRadarChartAxisDao.java index d722182b..76a7e84f 100644 --- a/src/main/java/com/sipai/dao/process/DataVisualRadarChartAxisDao.java +++ b/src/main/java/com/sipai/dao/process/DataVisualRadarChartAxisDao.java @@ -1,8 +1,8 @@ package com.sipai.dao.process; -import org.springframework.stereotype.Repository; import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.process.DataVisualRadarChartAxis; +import org.springframework.stereotype.Repository; @Repository public class DataVisualRadarChartAxisDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/process/DataVisualRadarChartDao.java b/src/main/java/com/sipai/dao/process/DataVisualRadarChartDao.java index 1f878015..47159119 100644 --- a/src/main/java/com/sipai/dao/process/DataVisualRadarChartDao.java +++ b/src/main/java/com/sipai/dao/process/DataVisualRadarChartDao.java @@ -1,8 +1,8 @@ package com.sipai.dao.process; -import org.springframework.stereotype.Repository; import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.process.DataVisualRadarChart; +import org.springframework.stereotype.Repository; @Repository public class DataVisualRadarChartDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/process/DataVisualRadarChartSeriesDao.java b/src/main/java/com/sipai/dao/process/DataVisualRadarChartSeriesDao.java index 19da5443..e039ee8c 100644 --- a/src/main/java/com/sipai/dao/process/DataVisualRadarChartSeriesDao.java +++ b/src/main/java/com/sipai/dao/process/DataVisualRadarChartSeriesDao.java @@ -1,8 +1,8 @@ package com.sipai.dao.process; -import org.springframework.stereotype.Repository; import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.process.DataVisualRadarChartSeries; +import org.springframework.stereotype.Repository; @Repository public class DataVisualRadarChartSeriesDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/process/DataVisualSelectDao.java b/src/main/java/com/sipai/dao/process/DataVisualSelectDao.java index ec7b81bb..3e33b2a8 100644 --- a/src/main/java/com/sipai/dao/process/DataVisualSelectDao.java +++ b/src/main/java/com/sipai/dao/process/DataVisualSelectDao.java @@ -1,8 +1,8 @@ package com.sipai.dao.process; -import org.springframework.stereotype.Repository; import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.process.DataVisualSelect; +import org.springframework.stereotype.Repository; @Repository public class DataVisualSelectDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/process/DataVisualSuspensionFrameDao.java b/src/main/java/com/sipai/dao/process/DataVisualSuspensionFrameDao.java index bd3bb755..177d83ec 100644 --- a/src/main/java/com/sipai/dao/process/DataVisualSuspensionFrameDao.java +++ b/src/main/java/com/sipai/dao/process/DataVisualSuspensionFrameDao.java @@ -1,8 +1,8 @@ package com.sipai.dao.process; -import org.springframework.stereotype.Repository; import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.process.DataVisualSuspensionFrame; +import org.springframework.stereotype.Repository; @Repository public class DataVisualSuspensionFrameDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/process/DataVisualSvgAlarmDao.java b/src/main/java/com/sipai/dao/process/DataVisualSvgAlarmDao.java index 5efa5cec..35c2f82c 100644 --- a/src/main/java/com/sipai/dao/process/DataVisualSvgAlarmDao.java +++ b/src/main/java/com/sipai/dao/process/DataVisualSvgAlarmDao.java @@ -1,8 +1,8 @@ package com.sipai.dao.process; -import org.springframework.stereotype.Repository; import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.process.DataVisualSvgAlarm; +import org.springframework.stereotype.Repository; @Repository public class DataVisualSvgAlarmDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/process/DataVisualSvgDao.java b/src/main/java/com/sipai/dao/process/DataVisualSvgDao.java index 5eb1da95..29588a5b 100644 --- a/src/main/java/com/sipai/dao/process/DataVisualSvgDao.java +++ b/src/main/java/com/sipai/dao/process/DataVisualSvgDao.java @@ -1,8 +1,8 @@ package com.sipai.dao.process; -import org.springframework.stereotype.Repository; import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.process.DataVisualSvg; +import org.springframework.stereotype.Repository; @Repository public class DataVisualSvgDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/process/DataVisualSwitchDao.java b/src/main/java/com/sipai/dao/process/DataVisualSwitchDao.java index 6cca472b..dd24089b 100644 --- a/src/main/java/com/sipai/dao/process/DataVisualSwitchDao.java +++ b/src/main/java/com/sipai/dao/process/DataVisualSwitchDao.java @@ -1,8 +1,8 @@ package com.sipai.dao.process; -import org.springframework.stereotype.Repository; import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.process.DataVisualSwitch; +import org.springframework.stereotype.Repository; @Repository public class DataVisualSwitchDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/process/DataVisualSwitchPointDao.java b/src/main/java/com/sipai/dao/process/DataVisualSwitchPointDao.java index 3dc10676..c69a6332 100644 --- a/src/main/java/com/sipai/dao/process/DataVisualSwitchPointDao.java +++ b/src/main/java/com/sipai/dao/process/DataVisualSwitchPointDao.java @@ -1,8 +1,8 @@ package com.sipai.dao.process; -import org.springframework.stereotype.Repository; import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.process.DataVisualSwitchPoint; +import org.springframework.stereotype.Repository; @Repository public class DataVisualSwitchPointDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/process/DataVisualTabDao.java b/src/main/java/com/sipai/dao/process/DataVisualTabDao.java index 758b2c6f..9bfe81da 100644 --- a/src/main/java/com/sipai/dao/process/DataVisualTabDao.java +++ b/src/main/java/com/sipai/dao/process/DataVisualTabDao.java @@ -1,11 +1,9 @@ package com.sipai.dao.process; -import java.util.List; - -import org.springframework.stereotype.Repository; import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.process.DataVisualFrame; import com.sipai.entity.process.DataVisualTab; +import org.springframework.stereotype.Repository; @Repository public class DataVisualTabDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/process/DataVisualTaskPointsDao.java b/src/main/java/com/sipai/dao/process/DataVisualTaskPointsDao.java index 40a3f685..a5089116 100644 --- a/src/main/java/com/sipai/dao/process/DataVisualTaskPointsDao.java +++ b/src/main/java/com/sipai/dao/process/DataVisualTaskPointsDao.java @@ -1,8 +1,8 @@ package com.sipai.dao.process; -import org.springframework.stereotype.Repository; import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.process.DataVisualTaskPoints; +import org.springframework.stereotype.Repository; @Repository public class DataVisualTaskPointsDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/process/DataVisualTextDao.java b/src/main/java/com/sipai/dao/process/DataVisualTextDao.java index 76ef652b..2118db21 100644 --- a/src/main/java/com/sipai/dao/process/DataVisualTextDao.java +++ b/src/main/java/com/sipai/dao/process/DataVisualTextDao.java @@ -1,8 +1,8 @@ package com.sipai.dao.process; -import org.springframework.stereotype.Repository; import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.process.DataVisualText; +import org.springframework.stereotype.Repository; @Repository public class DataVisualTextDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/process/DataVisualTextWarehouseDao.java b/src/main/java/com/sipai/dao/process/DataVisualTextWarehouseDao.java index 7dad3305..e58f8349 100644 --- a/src/main/java/com/sipai/dao/process/DataVisualTextWarehouseDao.java +++ b/src/main/java/com/sipai/dao/process/DataVisualTextWarehouseDao.java @@ -1,8 +1,8 @@ package com.sipai.dao.process; -import org.springframework.stereotype.Repository; import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.process.DataVisualTextWarehouse; +import org.springframework.stereotype.Repository; @Repository public class DataVisualTextWarehouseDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/process/DataVisualWeatherDao.java b/src/main/java/com/sipai/dao/process/DataVisualWeatherDao.java index 7676fe96..da20243c 100644 --- a/src/main/java/com/sipai/dao/process/DataVisualWeatherDao.java +++ b/src/main/java/com/sipai/dao/process/DataVisualWeatherDao.java @@ -1,8 +1,8 @@ package com.sipai.dao.process; -import org.springframework.stereotype.Repository; import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.process.DataVisualWeather; +import org.springframework.stereotype.Repository; import java.util.List; diff --git a/src/main/java/com/sipai/dao/process/DecisionExpertBaseDao.java b/src/main/java/com/sipai/dao/process/DecisionExpertBaseDao.java index c9aac5a7..75ed0bcc 100644 --- a/src/main/java/com/sipai/dao/process/DecisionExpertBaseDao.java +++ b/src/main/java/com/sipai/dao/process/DecisionExpertBaseDao.java @@ -1,8 +1,8 @@ package com.sipai.dao.process; -import org.springframework.stereotype.Repository; import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.process.DecisionExpertBase; +import org.springframework.stereotype.Repository; @Repository public class DecisionExpertBaseDao extends CommDaoImpl { diff --git a/src/main/java/com/sipai/dao/process/DecisionExpertBaseTextDao.java b/src/main/java/com/sipai/dao/process/DecisionExpertBaseTextDao.java index 984d6416..c82f97e7 100644 --- a/src/main/java/com/sipai/dao/process/DecisionExpertBaseTextDao.java +++ b/src/main/java/com/sipai/dao/process/DecisionExpertBaseTextDao.java @@ -1,8 +1,8 @@ package com.sipai.dao.process; -import org.springframework.stereotype.Repository; import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.process.DecisionExpertBaseText; +import org.springframework.stereotype.Repository; @Repository public class DecisionExpertBaseTextDao extends CommDaoImpl { diff --git a/src/main/java/com/sipai/dao/process/EquipmentAdjustmentDao.java b/src/main/java/com/sipai/dao/process/EquipmentAdjustmentDao.java index ee3ab009..bff9dd00 100644 --- a/src/main/java/com/sipai/dao/process/EquipmentAdjustmentDao.java +++ b/src/main/java/com/sipai/dao/process/EquipmentAdjustmentDao.java @@ -1,10 +1,9 @@ package com.sipai.dao.process; +import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.process.EquipmentAdjustment; import org.springframework.stereotype.Repository; -import com.sipai.dao.base.CommDaoImpl; - @Repository public class EquipmentAdjustmentDao extends CommDaoImpl { public EquipmentAdjustmentDao(){ diff --git a/src/main/java/com/sipai/dao/process/EquipmentAdjustmentDetailDao.java b/src/main/java/com/sipai/dao/process/EquipmentAdjustmentDetailDao.java index 82a50da9..90b34a3a 100644 --- a/src/main/java/com/sipai/dao/process/EquipmentAdjustmentDetailDao.java +++ b/src/main/java/com/sipai/dao/process/EquipmentAdjustmentDetailDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.process; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.process.EquipmentAdjustmentDetail; +import org.springframework.stereotype.Repository; @Repository public class EquipmentAdjustmentDetailDao extends CommDaoImpl { diff --git a/src/main/java/com/sipai/dao/process/LibraryProcessAdjustmentDao.java b/src/main/java/com/sipai/dao/process/LibraryProcessAdjustmentDao.java index 00fc5b65..74c44f9d 100644 --- a/src/main/java/com/sipai/dao/process/LibraryProcessAdjustmentDao.java +++ b/src/main/java/com/sipai/dao/process/LibraryProcessAdjustmentDao.java @@ -1,8 +1,8 @@ package com.sipai.dao.process; -import org.springframework.stereotype.Repository; import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.process.LibraryProcessAdjustment; +import org.springframework.stereotype.Repository; @Repository public class LibraryProcessAdjustmentDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/process/LibraryProcessManageTypeDao.java b/src/main/java/com/sipai/dao/process/LibraryProcessManageTypeDao.java index b9de335e..c4fae74f 100644 --- a/src/main/java/com/sipai/dao/process/LibraryProcessManageTypeDao.java +++ b/src/main/java/com/sipai/dao/process/LibraryProcessManageTypeDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.process; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.process.LibraryProcessManageType; +import org.springframework.stereotype.Repository; @Repository public class LibraryProcessManageTypeDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/process/LibraryProcessManageWorkOrderDao.java b/src/main/java/com/sipai/dao/process/LibraryProcessManageWorkOrderDao.java index e20619ec..c7fe72b9 100644 --- a/src/main/java/com/sipai/dao/process/LibraryProcessManageWorkOrderDao.java +++ b/src/main/java/com/sipai/dao/process/LibraryProcessManageWorkOrderDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.process; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.process.LibraryProcessManageWorkOrder; +import org.springframework.stereotype.Repository; @Repository public class LibraryProcessManageWorkOrderDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/process/ProcessAdjustmentDao.java b/src/main/java/com/sipai/dao/process/ProcessAdjustmentDao.java index 560cae61..9fc99e2f 100644 --- a/src/main/java/com/sipai/dao/process/ProcessAdjustmentDao.java +++ b/src/main/java/com/sipai/dao/process/ProcessAdjustmentDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.process; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.process.ProcessAdjustment; +import org.springframework.stereotype.Repository; @Repository public class ProcessAdjustmentDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/process/ProcessSectionInformationDao.java b/src/main/java/com/sipai/dao/process/ProcessSectionInformationDao.java index 7d4340fb..128e8622 100644 --- a/src/main/java/com/sipai/dao/process/ProcessSectionInformationDao.java +++ b/src/main/java/com/sipai/dao/process/ProcessSectionInformationDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.process; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.process.ProcessSectionInformation; +import org.springframework.stereotype.Repository; @Repository public class ProcessSectionInformationDao extends CommDaoImpl{ public ProcessSectionInformationDao() { diff --git a/src/main/java/com/sipai/dao/process/ProcessWebsiteDao.java b/src/main/java/com/sipai/dao/process/ProcessWebsiteDao.java index 3faf98a3..eb50ae36 100644 --- a/src/main/java/com/sipai/dao/process/ProcessWebsiteDao.java +++ b/src/main/java/com/sipai/dao/process/ProcessWebsiteDao.java @@ -1,11 +1,8 @@ package com.sipai.dao.process; -import java.util.List; - -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.process.ProcessWebsite; +import org.springframework.stereotype.Repository; @Repository public class ProcessWebsiteDao extends CommDaoImpl{ public ProcessWebsiteDao() { diff --git a/src/main/java/com/sipai/dao/process/RoutineWorkDao.java b/src/main/java/com/sipai/dao/process/RoutineWorkDao.java index 7429479f..c16a8507 100644 --- a/src/main/java/com/sipai/dao/process/RoutineWorkDao.java +++ b/src/main/java/com/sipai/dao/process/RoutineWorkDao.java @@ -2,11 +2,10 @@ package com.sipai.dao.process; import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.process.RoutineWork; +import org.springframework.stereotype.Repository; import java.util.List; -import org.springframework.stereotype.Repository; - @Repository public class RoutineWorkDao extends CommDaoImpl { public RoutineWorkDao() { diff --git a/src/main/java/com/sipai/dao/process/TestIndexManageDao.java b/src/main/java/com/sipai/dao/process/TestIndexManageDao.java index e8b267c5..149eb70e 100644 --- a/src/main/java/com/sipai/dao/process/TestIndexManageDao.java +++ b/src/main/java/com/sipai/dao/process/TestIndexManageDao.java @@ -2,8 +2,6 @@ package com.sipai.dao.process; import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.process.TestIndexManage; - - import org.springframework.stereotype.Repository; @Repository diff --git a/src/main/java/com/sipai/dao/process/TestTaskDao.java b/src/main/java/com/sipai/dao/process/TestTaskDao.java index 1c279fbe..981c55ff 100644 --- a/src/main/java/com/sipai/dao/process/TestTaskDao.java +++ b/src/main/java/com/sipai/dao/process/TestTaskDao.java @@ -2,11 +2,10 @@ package com.sipai.dao.process; import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.process.TestTask; +import org.springframework.stereotype.Repository; import java.util.List; -import org.springframework.stereotype.Repository; - @Repository public class TestTaskDao extends CommDaoImpl { public TestTaskDao() { diff --git a/src/main/java/com/sipai/dao/report/CustomReportDao.java b/src/main/java/com/sipai/dao/report/CustomReportDao.java index ce03f699..c71de4a9 100644 --- a/src/main/java/com/sipai/dao/report/CustomReportDao.java +++ b/src/main/java/com/sipai/dao/report/CustomReportDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.report; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.report.CustomReport; +import org.springframework.stereotype.Repository; import java.util.HashMap; import java.util.List; diff --git a/src/main/java/com/sipai/dao/report/CustomReportMPointDao.java b/src/main/java/com/sipai/dao/report/CustomReportMPointDao.java index 7778e8c0..883906ba 100644 --- a/src/main/java/com/sipai/dao/report/CustomReportMPointDao.java +++ b/src/main/java/com/sipai/dao/report/CustomReportMPointDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.report; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.report.CustomReportMPoint; +import org.springframework.stereotype.Repository; @Repository public class CustomReportMPointDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/report/DrainageDataomprehensiveTableConfigureDao.java b/src/main/java/com/sipai/dao/report/DrainageDataomprehensiveTableConfigureDao.java index 6c3c4a2c..b5e7b54d 100644 --- a/src/main/java/com/sipai/dao/report/DrainageDataomprehensiveTableConfigureDao.java +++ b/src/main/java/com/sipai/dao/report/DrainageDataomprehensiveTableConfigureDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.report; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.report.DrainageDataomprehensiveTableConfigure; +import org.springframework.stereotype.Repository; @Repository public class DrainageDataomprehensiveTableConfigureDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/report/DrainageDataomprehensiveTableDao.java b/src/main/java/com/sipai/dao/report/DrainageDataomprehensiveTableDao.java index 9de8f4a6..99630f8a 100644 --- a/src/main/java/com/sipai/dao/report/DrainageDataomprehensiveTableDao.java +++ b/src/main/java/com/sipai/dao/report/DrainageDataomprehensiveTableDao.java @@ -1,11 +1,10 @@ package com.sipai.dao.report; -import java.util.List; - -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.report.DrainageDataomprehensiveTable; +import org.springframework.stereotype.Repository; + +import java.util.List; @Repository public class DrainageDataomprehensiveTableDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/report/DrainageDataomprehensiveTableMainconfigureDao.java b/src/main/java/com/sipai/dao/report/DrainageDataomprehensiveTableMainconfigureDao.java index e157c9d8..50b6c760 100644 --- a/src/main/java/com/sipai/dao/report/DrainageDataomprehensiveTableMainconfigureDao.java +++ b/src/main/java/com/sipai/dao/report/DrainageDataomprehensiveTableMainconfigureDao.java @@ -1,11 +1,10 @@ package com.sipai.dao.report; -import java.util.List; - -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.report.DrainageDataomprehensiveTableMainconfigure; +import org.springframework.stereotype.Repository; + +import java.util.List; @Repository public class DrainageDataomprehensiveTableMainconfigureDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/report/DrainageDataomprehensiveTableMainconfigureDetailDao.java b/src/main/java/com/sipai/dao/report/DrainageDataomprehensiveTableMainconfigureDetailDao.java index 5b2f31fb..a9ca8f33 100644 --- a/src/main/java/com/sipai/dao/report/DrainageDataomprehensiveTableMainconfigureDetailDao.java +++ b/src/main/java/com/sipai/dao/report/DrainageDataomprehensiveTableMainconfigureDetailDao.java @@ -1,12 +1,10 @@ package com.sipai.dao.report; -import java.util.List; - +import com.sipai.dao.base.CommDaoImpl; +import com.sipai.entity.report.DrainageDataomprehensiveTableMainconfigureDetail; import org.springframework.stereotype.Repository; -import com.sipai.dao.base.CommDaoImpl; -import com.sipai.entity.report.DrainageDataomprehensiveTableMainconfigure; -import com.sipai.entity.report.DrainageDataomprehensiveTableMainconfigureDetail; +import java.util.List; @Repository public class DrainageDataomprehensiveTableMainconfigureDetailDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/report/ReportTemplateDao.java b/src/main/java/com/sipai/dao/report/ReportTemplateDao.java index 27827f61..4951bb29 100644 --- a/src/main/java/com/sipai/dao/report/ReportTemplateDao.java +++ b/src/main/java/com/sipai/dao/report/ReportTemplateDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.report; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.report.ReportTemplate; +import org.springframework.stereotype.Repository; @Repository public class ReportTemplateDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/report/RptCollectModeDao.java b/src/main/java/com/sipai/dao/report/RptCollectModeDao.java index 5e259367..c26084b9 100644 --- a/src/main/java/com/sipai/dao/report/RptCollectModeDao.java +++ b/src/main/java/com/sipai/dao/report/RptCollectModeDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.report; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.report.RptCollectMode; +import org.springframework.stereotype.Repository; @Repository public class RptCollectModeDao extends CommDaoImpl{ public RptCollectModeDao(){ diff --git a/src/main/java/com/sipai/dao/report/RptCreateDao.java b/src/main/java/com/sipai/dao/report/RptCreateDao.java index c7d44b6c..466bde0a 100644 --- a/src/main/java/com/sipai/dao/report/RptCreateDao.java +++ b/src/main/java/com/sipai/dao/report/RptCreateDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.report; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.report.RptCreate; +import org.springframework.stereotype.Repository; @Repository public class RptCreateDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/report/RptDayLogDao.java b/src/main/java/com/sipai/dao/report/RptDayLogDao.java index be49e3bd..5e75ad48 100644 --- a/src/main/java/com/sipai/dao/report/RptDayLogDao.java +++ b/src/main/java/com/sipai/dao/report/RptDayLogDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.report; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.report.RptDayLog; +import org.springframework.stereotype.Repository; @Repository public class RptDayLogDao extends CommDaoImpl { diff --git a/src/main/java/com/sipai/dao/report/RptDayValSetDao.java b/src/main/java/com/sipai/dao/report/RptDayValSetDao.java index 14247c98..7e09341b 100644 --- a/src/main/java/com/sipai/dao/report/RptDayValSetDao.java +++ b/src/main/java/com/sipai/dao/report/RptDayValSetDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.report; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.report.RptDayValSet; +import org.springframework.stereotype.Repository; @Repository public class RptDayValSetDao extends CommDaoImpl { diff --git a/src/main/java/com/sipai/dao/report/RptDeptSetDao.java b/src/main/java/com/sipai/dao/report/RptDeptSetDao.java index 4db704c6..4dadbfbd 100644 --- a/src/main/java/com/sipai/dao/report/RptDeptSetDao.java +++ b/src/main/java/com/sipai/dao/report/RptDeptSetDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.report; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.report.RptDeptSet; +import org.springframework.stereotype.Repository; @Repository public class RptDeptSetDao extends CommDaoImpl { diff --git a/src/main/java/com/sipai/dao/report/RptDeptSetUserDao.java b/src/main/java/com/sipai/dao/report/RptDeptSetUserDao.java index 5581e61a..4a4ffc85 100644 --- a/src/main/java/com/sipai/dao/report/RptDeptSetUserDao.java +++ b/src/main/java/com/sipai/dao/report/RptDeptSetUserDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.report; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.report.RptDeptSetUser; +import org.springframework.stereotype.Repository; @Repository public class RptDeptSetUserDao extends CommDaoImpl { diff --git a/src/main/java/com/sipai/dao/report/RptInfoSetDao.java b/src/main/java/com/sipai/dao/report/RptInfoSetDao.java index 03909ee2..e0339f67 100644 --- a/src/main/java/com/sipai/dao/report/RptInfoSetDao.java +++ b/src/main/java/com/sipai/dao/report/RptInfoSetDao.java @@ -1,8 +1,8 @@ package com.sipai.dao.report; -import org.springframework.stereotype.Repository; import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.report.RptInfoSet; +import org.springframework.stereotype.Repository; @Repository public class RptInfoSetDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/report/RptInfoSetFileDao.java b/src/main/java/com/sipai/dao/report/RptInfoSetFileDao.java index 83738e83..a03b93ee 100644 --- a/src/main/java/com/sipai/dao/report/RptInfoSetFileDao.java +++ b/src/main/java/com/sipai/dao/report/RptInfoSetFileDao.java @@ -1,8 +1,8 @@ package com.sipai.dao.report; -import org.springframework.stereotype.Repository; import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.report.RptInfoSetFile; +import org.springframework.stereotype.Repository; @Repository public class RptInfoSetFileDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/report/RptInfoSetSheetDao.java b/src/main/java/com/sipai/dao/report/RptInfoSetSheetDao.java index 4608a812..99de595c 100644 --- a/src/main/java/com/sipai/dao/report/RptInfoSetSheetDao.java +++ b/src/main/java/com/sipai/dao/report/RptInfoSetSheetDao.java @@ -1,7 +1,6 @@ package com.sipai.dao.report; import com.sipai.dao.base.CommDaoImpl; -import com.sipai.entity.report.RptInfoSetFile; import com.sipai.entity.report.RptInfoSetSheet; import org.springframework.stereotype.Repository; diff --git a/src/main/java/com/sipai/dao/report/RptLogDao.java b/src/main/java/com/sipai/dao/report/RptLogDao.java index 080cf623..986297ea 100644 --- a/src/main/java/com/sipai/dao/report/RptLogDao.java +++ b/src/main/java/com/sipai/dao/report/RptLogDao.java @@ -1,8 +1,8 @@ package com.sipai.dao.report; -import org.springframework.stereotype.Repository; import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.report.RptLog; +import org.springframework.stereotype.Repository; @Repository public class RptLogDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/report/RptMpSetDao.java b/src/main/java/com/sipai/dao/report/RptMpSetDao.java index 98ed3aa6..607a27c2 100644 --- a/src/main/java/com/sipai/dao/report/RptMpSetDao.java +++ b/src/main/java/com/sipai/dao/report/RptMpSetDao.java @@ -1,8 +1,8 @@ package com.sipai.dao.report; -import org.springframework.stereotype.Repository; import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.report.RptMpSet; +import org.springframework.stereotype.Repository; @Repository public class RptMpSetDao extends CommDaoImpl { diff --git a/src/main/java/com/sipai/dao/report/RptSpSetDao.java b/src/main/java/com/sipai/dao/report/RptSpSetDao.java index 28021b38..fd48b196 100644 --- a/src/main/java/com/sipai/dao/report/RptSpSetDao.java +++ b/src/main/java/com/sipai/dao/report/RptSpSetDao.java @@ -1,14 +1,13 @@ package com.sipai.dao.report; +import com.sipai.dao.base.CommDaoImpl; +import com.sipai.entity.report.RptSpSet; +import org.springframework.stereotype.Repository; + import java.util.HashMap; import java.util.List; import java.util.Map; -import org.springframework.stereotype.Repository; - -import com.sipai.dao.base.CommDaoImpl; -import com.sipai.entity.report.RptSpSet; - @Repository public class RptSpSetDao extends CommDaoImpl{ public RptSpSetDao() { diff --git a/src/main/java/com/sipai/dao/report/RptTypeSetDao.java b/src/main/java/com/sipai/dao/report/RptTypeSetDao.java index 3c180efa..d065da23 100644 --- a/src/main/java/com/sipai/dao/report/RptTypeSetDao.java +++ b/src/main/java/com/sipai/dao/report/RptTypeSetDao.java @@ -1,8 +1,8 @@ package com.sipai.dao.report; -import org.springframework.stereotype.Repository; import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.report.RptTypeSet; +import org.springframework.stereotype.Repository; @Repository public class RptTypeSetDao extends CommDaoImpl { diff --git a/src/main/java/com/sipai/dao/report/TemplateTypeDao.java b/src/main/java/com/sipai/dao/report/TemplateTypeDao.java index ae0fd5a5..612af45c 100644 --- a/src/main/java/com/sipai/dao/report/TemplateTypeDao.java +++ b/src/main/java/com/sipai/dao/report/TemplateTypeDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.report; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.report.TemplateType; +import org.springframework.stereotype.Repository; @Repository public class TemplateTypeDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/safety/SafetyCheckDaylyDao.java b/src/main/java/com/sipai/dao/safety/SafetyCheckDaylyDao.java index ef105070..b06996b4 100644 --- a/src/main/java/com/sipai/dao/safety/SafetyCheckDaylyDao.java +++ b/src/main/java/com/sipai/dao/safety/SafetyCheckDaylyDao.java @@ -1,9 +1,9 @@ package com.sipai.dao.safety; import com.sipai.dao.base.CommDaoImpl; +import com.sipai.entity.safety.SafetyCheckDayly; import com.sipai.entity.safety.SafetyCheckDaylyVo; import com.sipai.entity.safety.SafetyCommonQuery; -import com.sipai.entity.safety.SafetyCheckDayly; import org.springframework.stereotype.Repository; import java.util.List; diff --git a/src/main/java/com/sipai/dao/safety/SafetyEducationVisitorDao.java b/src/main/java/com/sipai/dao/safety/SafetyEducationVisitorDao.java index 9d710cef..45e9a7ac 100644 --- a/src/main/java/com/sipai/dao/safety/SafetyEducationVisitorDao.java +++ b/src/main/java/com/sipai/dao/safety/SafetyEducationVisitorDao.java @@ -1,7 +1,6 @@ package com.sipai.dao.safety; import com.sipai.dao.base.CommDaoImpl; -import com.sipai.entity.kpi.KpiApplyBiz; import com.sipai.entity.safety.SafetyCommonQuery; import com.sipai.entity.safety.SafetyEducationVisitor; import org.springframework.stereotype.Repository; diff --git a/src/main/java/com/sipai/dao/safety/SafetyFlowTaskDao.java b/src/main/java/com/sipai/dao/safety/SafetyFlowTaskDao.java index e4c6776a..c545a72c 100644 --- a/src/main/java/com/sipai/dao/safety/SafetyFlowTaskDao.java +++ b/src/main/java/com/sipai/dao/safety/SafetyFlowTaskDao.java @@ -2,7 +2,6 @@ package com.sipai.dao.safety; import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.safety.SafetyFlowTask; -import com.sipai.entity.safety.SafetyCommonQuery; import org.springframework.stereotype.Repository; import java.util.List; diff --git a/src/main/java/com/sipai/dao/safety/SafetyFlowTaskDetailDao.java b/src/main/java/com/sipai/dao/safety/SafetyFlowTaskDetailDao.java index d44e8870..8ac61b1e 100644 --- a/src/main/java/com/sipai/dao/safety/SafetyFlowTaskDetailDao.java +++ b/src/main/java/com/sipai/dao/safety/SafetyFlowTaskDetailDao.java @@ -1,8 +1,8 @@ package com.sipai.dao.safety; import com.sipai.dao.base.CommDaoImpl; -import com.sipai.entity.safety.SafetyFlowTaskDetail; import com.sipai.entity.safety.SafetyCommonQuery; +import com.sipai.entity.safety.SafetyFlowTaskDetail; import org.springframework.stereotype.Repository; import java.util.List; diff --git a/src/main/java/com/sipai/dao/safety/SafetyJobInsideDao.java b/src/main/java/com/sipai/dao/safety/SafetyJobInsideDao.java index 0acc8249..1ac98cc7 100644 --- a/src/main/java/com/sipai/dao/safety/SafetyJobInsideDao.java +++ b/src/main/java/com/sipai/dao/safety/SafetyJobInsideDao.java @@ -2,7 +2,9 @@ package com.sipai.dao.safety; import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.enums.EnumJsonObject; -import com.sipai.entity.safety.*; +import com.sipai.entity.safety.SafetyCommonQuery; +import com.sipai.entity.safety.SafetyJobInside; +import com.sipai.entity.safety.SafetyJobInsideVo; import org.springframework.stereotype.Repository; import java.util.List; diff --git a/src/main/java/com/sipai/dao/scada/DataSummaryDao.java b/src/main/java/com/sipai/dao/scada/DataSummaryDao.java index c990fcff..dac486c9 100644 --- a/src/main/java/com/sipai/dao/scada/DataSummaryDao.java +++ b/src/main/java/com/sipai/dao/scada/DataSummaryDao.java @@ -1,11 +1,8 @@ package com.sipai.dao.scada; -import java.util.List; - -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.scada.DataSummary; +import org.springframework.stereotype.Repository; @Repository public class DataSummaryDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/scada/MPointDao.java b/src/main/java/com/sipai/dao/scada/MPointDao.java index 41ff4d17..8f56e8c2 100644 --- a/src/main/java/com/sipai/dao/scada/MPointDao.java +++ b/src/main/java/com/sipai/dao/scada/MPointDao.java @@ -1,14 +1,13 @@ package com.sipai.dao.scada; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.scada.MPoint; import com.sipai.entity.scada.MPoint4APP; +import org.springframework.stereotype.Repository; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; @Repository public class MPointDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/scada/MPointFormulaDao.java b/src/main/java/com/sipai/dao/scada/MPointFormulaDao.java index b566d930..a9924ba3 100644 --- a/src/main/java/com/sipai/dao/scada/MPointFormulaDao.java +++ b/src/main/java/com/sipai/dao/scada/MPointFormulaDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.scada; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.scada.MPointFormula; +import org.springframework.stereotype.Repository; import java.util.HashMap; import java.util.List; diff --git a/src/main/java/com/sipai/dao/scada/MPointFormulaDenominatorDao.java b/src/main/java/com/sipai/dao/scada/MPointFormulaDenominatorDao.java index c48ebd2b..e99b207a 100644 --- a/src/main/java/com/sipai/dao/scada/MPointFormulaDenominatorDao.java +++ b/src/main/java/com/sipai/dao/scada/MPointFormulaDenominatorDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.scada; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.scada.MPointFormulaDenominator; +import org.springframework.stereotype.Repository; @Repository public class MPointFormulaDenominatorDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/scada/MPointHistoryDao.java b/src/main/java/com/sipai/dao/scada/MPointHistoryDao.java index 9b457b49..6193e091 100644 --- a/src/main/java/com/sipai/dao/scada/MPointHistoryDao.java +++ b/src/main/java/com/sipai/dao/scada/MPointHistoryDao.java @@ -1,22 +1,16 @@ package com.sipai.dao.scada; -import java.math.BigDecimal; +import com.sipai.entity.scada.MPointHistory; +import org.apache.ibatis.session.SqlSession; +import org.apache.ibatis.session.SqlSessionFactory; +import org.springframework.stereotype.Repository; + +import javax.annotation.Resource; import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.annotation.Resource; - -import org.apache.ibatis.session.SqlSession; -import org.apache.ibatis.session.SqlSessionFactory; -import org.apache.poi.ss.formula.functions.T; -import org.springframework.stereotype.Repository; - -import com.sipai.dao.base.CommDaoImplScada; -import com.sipai.entity.scada.MPoint; -import com.sipai.entity.scada.MPointHistory; - @Repository public class MPointHistoryDao { diff --git a/src/main/java/com/sipai/dao/scada/MPointProgrammeDao.java b/src/main/java/com/sipai/dao/scada/MPointProgrammeDao.java index 00580298..f1646bf5 100644 --- a/src/main/java/com/sipai/dao/scada/MPointProgrammeDao.java +++ b/src/main/java/com/sipai/dao/scada/MPointProgrammeDao.java @@ -1,15 +1,9 @@ package com.sipai.dao.scada; -import java.util.List; - -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; -import com.sipai.dao.base.CommDaoImplScada; -import com.sipai.entity.maintenance.MaintainerType; import com.sipai.entity.scada.MPointProgramme; -import com.sipai.entity.work.Camera; +import org.springframework.stereotype.Repository; @Repository public class MPointProgrammeDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/scada/MPointProgrammeDetailDao.java b/src/main/java/com/sipai/dao/scada/MPointProgrammeDetailDao.java index 258981bb..548ffea6 100644 --- a/src/main/java/com/sipai/dao/scada/MPointProgrammeDetailDao.java +++ b/src/main/java/com/sipai/dao/scada/MPointProgrammeDetailDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.scada; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.scada.MPointProgrammeDetail; +import org.springframework.stereotype.Repository; @Repository public class MPointProgrammeDetailDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/scada/MPointPropDao.java b/src/main/java/com/sipai/dao/scada/MPointPropDao.java index 16128364..82a3bff7 100644 --- a/src/main/java/com/sipai/dao/scada/MPointPropDao.java +++ b/src/main/java/com/sipai/dao/scada/MPointPropDao.java @@ -1,12 +1,8 @@ package com.sipai.dao.scada; -import java.util.List; - -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; -import com.sipai.dao.base.CommDaoImplScada; import com.sipai.entity.scada.MPointProp; +import org.springframework.stereotype.Repository; @Repository public class MPointPropDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/scada/MPointPropSourceDao.java b/src/main/java/com/sipai/dao/scada/MPointPropSourceDao.java index 562adf4f..1e2cf88c 100644 --- a/src/main/java/com/sipai/dao/scada/MPointPropSourceDao.java +++ b/src/main/java/com/sipai/dao/scada/MPointPropSourceDao.java @@ -1,13 +1,8 @@ package com.sipai.dao.scada; -import java.util.List; - -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; -import com.sipai.dao.base.CommDaoImplScada; -import com.sipai.entity.scada.MPointProp; import com.sipai.entity.scada.MPointPropSource; +import org.springframework.stereotype.Repository; @Repository public class MPointPropSourceDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/scada/MPointPropTargetDao.java b/src/main/java/com/sipai/dao/scada/MPointPropTargetDao.java index 977331d0..780a670c 100644 --- a/src/main/java/com/sipai/dao/scada/MPointPropTargetDao.java +++ b/src/main/java/com/sipai/dao/scada/MPointPropTargetDao.java @@ -1,11 +1,8 @@ package com.sipai.dao.scada; -import java.util.List; - -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.scada.MPointPropTarget; +import org.springframework.stereotype.Repository; @Repository diff --git a/src/main/java/com/sipai/dao/scada/PersonalMpCollectionDao.java b/src/main/java/com/sipai/dao/scada/PersonalMpCollectionDao.java index 8fb33ebd..7bd4d934 100644 --- a/src/main/java/com/sipai/dao/scada/PersonalMpCollectionDao.java +++ b/src/main/java/com/sipai/dao/scada/PersonalMpCollectionDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.scada; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.scada.PersonalMpCollection; +import org.springframework.stereotype.Repository; @Repository public class PersonalMpCollectionDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/scada/ScadaAlarmDao.java b/src/main/java/com/sipai/dao/scada/ScadaAlarmDao.java index 2d525497..78b489ec 100644 --- a/src/main/java/com/sipai/dao/scada/ScadaAlarmDao.java +++ b/src/main/java/com/sipai/dao/scada/ScadaAlarmDao.java @@ -1,13 +1,12 @@ package com.sipai.dao.scada; -import java.util.HashMap; -import java.util.Map; - -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.scada.ScadaAlarm; +import org.springframework.stereotype.Repository; + +import java.util.HashMap; +import java.util.Map; @Repository public class ScadaAlarmDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/scada/TempReportDao.java b/src/main/java/com/sipai/dao/scada/TempReportDao.java index 54de2602..89a7a510 100644 --- a/src/main/java/com/sipai/dao/scada/TempReportDao.java +++ b/src/main/java/com/sipai/dao/scada/TempReportDao.java @@ -1,18 +1,15 @@ package com.sipai.dao.scada; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import javax.annotation.Resource; - -import com.sipai.tools.CommUtil; +import com.sipai.dao.base.CommDaoImpl; +import com.sipai.entity.scada.TempReport; import org.apache.ibatis.session.SqlSession; import org.apache.ibatis.session.SqlSessionFactory; import org.springframework.stereotype.Repository; -import com.sipai.dao.base.CommDaoImpl; -import com.sipai.entity.scada.TempReport; +import javax.annotation.Resource; +import java.util.HashMap; +import java.util.List; +import java.util.Map; @Repository public class TempReportDao extends CommDaoImpl { diff --git a/src/main/java/com/sipai/dao/schedule/ScheduleJobDao.java b/src/main/java/com/sipai/dao/schedule/ScheduleJobDao.java index 974cc8f8..1e3f2afd 100644 --- a/src/main/java/com/sipai/dao/schedule/ScheduleJobDao.java +++ b/src/main/java/com/sipai/dao/schedule/ScheduleJobDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.schedule; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.schedule.ScheduleJob; +import org.springframework.stereotype.Repository; @Repository public class ScheduleJobDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/schedule/ScheduleJobDetailDao.java b/src/main/java/com/sipai/dao/schedule/ScheduleJobDetailDao.java index 629b6067..a205b985 100644 --- a/src/main/java/com/sipai/dao/schedule/ScheduleJobDetailDao.java +++ b/src/main/java/com/sipai/dao/schedule/ScheduleJobDetailDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.schedule; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.schedule.ScheduleJobDetail; +import org.springframework.stereotype.Repository; @Repository public class ScheduleJobDetailDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/schedule/ScheduleJobTypeDao.java b/src/main/java/com/sipai/dao/schedule/ScheduleJobTypeDao.java index 0727d704..fbd65d08 100644 --- a/src/main/java/com/sipai/dao/schedule/ScheduleJobTypeDao.java +++ b/src/main/java/com/sipai/dao/schedule/ScheduleJobTypeDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.schedule; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.schedule.ScheduleJobType; +import org.springframework.stereotype.Repository; @Repository public class ScheduleJobTypeDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/sparepart/ApplyPurchasePlanDao.java b/src/main/java/com/sipai/dao/sparepart/ApplyPurchasePlanDao.java index 6669f5b7..05cecc65 100644 --- a/src/main/java/com/sipai/dao/sparepart/ApplyPurchasePlanDao.java +++ b/src/main/java/com/sipai/dao/sparepart/ApplyPurchasePlanDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.sparepart; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.sparepart.ApplyPurchasePlan; +import org.springframework.stereotype.Repository; @Repository public class ApplyPurchasePlanDao extends CommDaoImpl { diff --git a/src/main/java/com/sipai/dao/sparepart/ChannelsDao.java b/src/main/java/com/sipai/dao/sparepart/ChannelsDao.java index 8ccbda6c..6b1aa802 100644 --- a/src/main/java/com/sipai/dao/sparepart/ChannelsDao.java +++ b/src/main/java/com/sipai/dao/sparepart/ChannelsDao.java @@ -1,11 +1,8 @@ package com.sipai.dao.sparepart; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; -import com.sipai.entity.sparepart.Goods; -import com.sipai.entity.sparepart.PurchasePlan; import com.sipai.entity.sparepart.Channels; +import org.springframework.stereotype.Repository; @Repository public class ChannelsDao extends CommDaoImpl { diff --git a/src/main/java/com/sipai/dao/sparepart/ConsumeDetailDao.java b/src/main/java/com/sipai/dao/sparepart/ConsumeDetailDao.java index 68313197..cb724968 100644 --- a/src/main/java/com/sipai/dao/sparepart/ConsumeDetailDao.java +++ b/src/main/java/com/sipai/dao/sparepart/ConsumeDetailDao.java @@ -1,11 +1,10 @@ package com.sipai.dao.sparepart; -import java.util.List; - -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.sparepart.ConsumeDetail; +import org.springframework.stereotype.Repository; + +import java.util.List; diff --git a/src/main/java/com/sipai/dao/sparepart/ContractChangeFileDao.java b/src/main/java/com/sipai/dao/sparepart/ContractChangeFileDao.java index b1862199..24601d3c 100644 --- a/src/main/java/com/sipai/dao/sparepart/ContractChangeFileDao.java +++ b/src/main/java/com/sipai/dao/sparepart/ContractChangeFileDao.java @@ -1,11 +1,8 @@ package com.sipai.dao.sparepart; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; -import com.sipai.entity.sparepart.Goods; -import com.sipai.entity.sparepart.PurchasePlan; import com.sipai.entity.sparepart.ContractChangeFile; +import org.springframework.stereotype.Repository; @Repository public class ContractChangeFileDao extends CommDaoImpl { diff --git a/src/main/java/com/sipai/dao/sparepart/ContractClassDao.java b/src/main/java/com/sipai/dao/sparepart/ContractClassDao.java index da66a404..a89c0529 100644 --- a/src/main/java/com/sipai/dao/sparepart/ContractClassDao.java +++ b/src/main/java/com/sipai/dao/sparepart/ContractClassDao.java @@ -1,11 +1,8 @@ package com.sipai.dao.sparepart; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; -import com.sipai.entity.sparepart.Goods; -import com.sipai.entity.sparepart.PurchasePlan; import com.sipai.entity.sparepart.ContractClass; +import org.springframework.stereotype.Repository; @Repository public class ContractClassDao extends CommDaoImpl { diff --git a/src/main/java/com/sipai/dao/sparepart/ContractDao.java b/src/main/java/com/sipai/dao/sparepart/ContractDao.java index 7462bafa..fb628b9c 100644 --- a/src/main/java/com/sipai/dao/sparepart/ContractDao.java +++ b/src/main/java/com/sipai/dao/sparepart/ContractDao.java @@ -1,14 +1,10 @@ package com.sipai.dao.sparepart; -import java.util.List; - +import com.sipai.dao.base.CommDaoImpl; +import com.sipai.entity.sparepart.Contract; import org.springframework.stereotype.Repository; -import com.sipai.dao.base.CommDaoImpl; -import com.sipai.entity.sparepart.Goods; -import com.sipai.entity.sparepart.PurchasePlan; -import com.sipai.entity.equipment.EquipmentCard; -import com.sipai.entity.sparepart.Contract; +import java.util.List; @Repository public class ContractDao extends CommDaoImpl { diff --git a/src/main/java/com/sipai/dao/sparepart/ContractDetailDao.java b/src/main/java/com/sipai/dao/sparepart/ContractDetailDao.java index 725ad9da..ec71c56f 100644 --- a/src/main/java/com/sipai/dao/sparepart/ContractDetailDao.java +++ b/src/main/java/com/sipai/dao/sparepart/ContractDetailDao.java @@ -1,11 +1,8 @@ package com.sipai.dao.sparepart; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; -import com.sipai.entity.sparepart.Goods; -import com.sipai.entity.sparepart.PurchasePlan; import com.sipai.entity.sparepart.ContractDetail; +import org.springframework.stereotype.Repository; @Repository public class ContractDetailDao extends CommDaoImpl { diff --git a/src/main/java/com/sipai/dao/sparepart/ContractDetailInvoiceDao.java b/src/main/java/com/sipai/dao/sparepart/ContractDetailInvoiceDao.java index 84f48602..70e9ed8f 100644 --- a/src/main/java/com/sipai/dao/sparepart/ContractDetailInvoiceDao.java +++ b/src/main/java/com/sipai/dao/sparepart/ContractDetailInvoiceDao.java @@ -1,11 +1,8 @@ package com.sipai.dao.sparepart; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; -import com.sipai.entity.sparepart.Goods; -import com.sipai.entity.sparepart.PurchasePlan; import com.sipai.entity.sparepart.ContractDetailInvoice; +import org.springframework.stereotype.Repository; @Repository public class ContractDetailInvoiceDao extends CommDaoImpl { diff --git a/src/main/java/com/sipai/dao/sparepart/ContractDetailInvoiceFileDao.java b/src/main/java/com/sipai/dao/sparepart/ContractDetailInvoiceFileDao.java index 662ea3c3..d1e75729 100644 --- a/src/main/java/com/sipai/dao/sparepart/ContractDetailInvoiceFileDao.java +++ b/src/main/java/com/sipai/dao/sparepart/ContractDetailInvoiceFileDao.java @@ -1,11 +1,8 @@ package com.sipai.dao.sparepart; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; -import com.sipai.entity.sparepart.Goods; -import com.sipai.entity.sparepart.PurchasePlan; import com.sipai.entity.sparepart.ContractDetailInvoiceFile; +import org.springframework.stereotype.Repository; @Repository public class ContractDetailInvoiceFileDao extends CommDaoImpl { diff --git a/src/main/java/com/sipai/dao/sparepart/ContractDetailPaymentDao.java b/src/main/java/com/sipai/dao/sparepart/ContractDetailPaymentDao.java index 0e61d9d9..ac8d94ee 100644 --- a/src/main/java/com/sipai/dao/sparepart/ContractDetailPaymentDao.java +++ b/src/main/java/com/sipai/dao/sparepart/ContractDetailPaymentDao.java @@ -1,11 +1,8 @@ package com.sipai.dao.sparepart; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; -import com.sipai.entity.sparepart.Goods; -import com.sipai.entity.sparepart.PurchasePlan; import com.sipai.entity.sparepart.ContractDetailPayment; +import org.springframework.stereotype.Repository; @Repository public class ContractDetailPaymentDao extends CommDaoImpl { diff --git a/src/main/java/com/sipai/dao/sparepart/ContractFileDao.java b/src/main/java/com/sipai/dao/sparepart/ContractFileDao.java index 4070bc2f..2475f19e 100644 --- a/src/main/java/com/sipai/dao/sparepart/ContractFileDao.java +++ b/src/main/java/com/sipai/dao/sparepart/ContractFileDao.java @@ -1,11 +1,8 @@ package com.sipai.dao.sparepart; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; -import com.sipai.entity.sparepart.Goods; -import com.sipai.entity.sparepart.PurchasePlan; import com.sipai.entity.sparepart.ContractFile; +import org.springframework.stereotype.Repository; @Repository public class ContractFileDao extends CommDaoImpl { diff --git a/src/main/java/com/sipai/dao/sparepart/ContractTaxRateDao.java b/src/main/java/com/sipai/dao/sparepart/ContractTaxRateDao.java index 93805529..0bd2b05f 100644 --- a/src/main/java/com/sipai/dao/sparepart/ContractTaxRateDao.java +++ b/src/main/java/com/sipai/dao/sparepart/ContractTaxRateDao.java @@ -1,11 +1,8 @@ package com.sipai.dao.sparepart; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; -import com.sipai.entity.sparepart.Goods; -import com.sipai.entity.sparepart.PurchasePlan; import com.sipai.entity.sparepart.ContractTaxRate; +import org.springframework.stereotype.Repository; @Repository public class ContractTaxRateDao extends CommDaoImpl { diff --git a/src/main/java/com/sipai/dao/sparepart/GoodsAcceptanceApplyDetailDao.java b/src/main/java/com/sipai/dao/sparepart/GoodsAcceptanceApplyDetailDao.java index 49ac0dad..3497c756 100644 --- a/src/main/java/com/sipai/dao/sparepart/GoodsAcceptanceApplyDetailDao.java +++ b/src/main/java/com/sipai/dao/sparepart/GoodsAcceptanceApplyDetailDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.sparepart; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.sparepart.GoodsAcceptanceApplyDetail; +import org.springframework.stereotype.Repository; @Repository diff --git a/src/main/java/com/sipai/dao/sparepart/GoodsApplyDao.java b/src/main/java/com/sipai/dao/sparepart/GoodsApplyDao.java index 09b4bd7f..e836841c 100644 --- a/src/main/java/com/sipai/dao/sparepart/GoodsApplyDao.java +++ b/src/main/java/com/sipai/dao/sparepart/GoodsApplyDao.java @@ -1,18 +1,8 @@ package com.sipai.dao.sparepart; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import javax.annotation.Resource; - -import org.apache.ibatis.session.SqlSession; -import org.apache.ibatis.session.SqlSessionFactory; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; -import com.sipai.entity.scada.MPointHistory; import com.sipai.entity.sparepart.GoodsApply; +import org.springframework.stereotype.Repository; @Repository diff --git a/src/main/java/com/sipai/dao/sparepart/GoodsClassDao.java b/src/main/java/com/sipai/dao/sparepart/GoodsClassDao.java index e340bceb..5d066470 100644 --- a/src/main/java/com/sipai/dao/sparepart/GoodsClassDao.java +++ b/src/main/java/com/sipai/dao/sparepart/GoodsClassDao.java @@ -1,10 +1,8 @@ package com.sipai.dao.sparepart; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; -import com.sipai.entity.sparepart.Goods; import com.sipai.entity.sparepart.GoodsClass; +import org.springframework.stereotype.Repository; @Repository public class GoodsClassDao extends CommDaoImpl { diff --git a/src/main/java/com/sipai/dao/sparepart/GoodsDao.java b/src/main/java/com/sipai/dao/sparepart/GoodsDao.java index 1c8697b9..968d8379 100644 --- a/src/main/java/com/sipai/dao/sparepart/GoodsDao.java +++ b/src/main/java/com/sipai/dao/sparepart/GoodsDao.java @@ -1,19 +1,13 @@ package com.sipai.dao.sparepart; +import com.sipai.dao.base.CommDaoImpl; +import com.sipai.entity.sparepart.Goods; +import org.springframework.stereotype.Repository; + import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.annotation.Resource; - -import org.apache.ibatis.session.SqlSession; -import org.apache.ibatis.session.SqlSessionFactory; -import org.springframework.stereotype.Repository; - -import com.sipai.dao.base.CommDaoImpl; -import com.sipai.entity.scada.MPointHistory; -import com.sipai.entity.sparepart.Goods; - @Repository public class GoodsDao extends CommDaoImpl { diff --git a/src/main/java/com/sipai/dao/sparepart/HazardousChemicalsDao.java b/src/main/java/com/sipai/dao/sparepart/HazardousChemicalsDao.java index 71438a41..0718eea6 100644 --- a/src/main/java/com/sipai/dao/sparepart/HazardousChemicalsDao.java +++ b/src/main/java/com/sipai/dao/sparepart/HazardousChemicalsDao.java @@ -1,7 +1,6 @@ package com.sipai.dao.sparepart; import com.sipai.dao.base.CommDaoImpl; -import com.sipai.entity.sparepart.Goods; import com.sipai.entity.sparepart.HazardousChemicals; import org.springframework.stereotype.Repository; diff --git a/src/main/java/com/sipai/dao/sparepart/InStockRecordDao.java b/src/main/java/com/sipai/dao/sparepart/InStockRecordDao.java index 2727c7b7..0b6ff5a0 100644 --- a/src/main/java/com/sipai/dao/sparepart/InStockRecordDao.java +++ b/src/main/java/com/sipai/dao/sparepart/InStockRecordDao.java @@ -1,12 +1,8 @@ package com.sipai.dao.sparepart; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; -import com.sipai.entity.sparepart.Goods; import com.sipai.entity.sparepart.InStockRecord; -import com.sipai.entity.sparepart.PurchasePlan; -import com.sipai.entity.sparepart.Stock; +import org.springframework.stereotype.Repository; @Repository public class InStockRecordDao extends CommDaoImpl { diff --git a/src/main/java/com/sipai/dao/sparepart/InStockRecordDetailDao.java b/src/main/java/com/sipai/dao/sparepart/InStockRecordDetailDao.java index a37f6335..ddb53dba 100644 --- a/src/main/java/com/sipai/dao/sparepart/InStockRecordDetailDao.java +++ b/src/main/java/com/sipai/dao/sparepart/InStockRecordDetailDao.java @@ -1,10 +1,8 @@ package com.sipai.dao.sparepart; -import com.sipai.entity.sparepart.*; -import org.apache.ibatis.annotations.Param; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; +import com.sipai.entity.sparepart.InStockRecordDetail; +import org.springframework.stereotype.Repository; import java.util.List; diff --git a/src/main/java/com/sipai/dao/sparepart/OutStockRecordDao.java b/src/main/java/com/sipai/dao/sparepart/OutStockRecordDao.java index c17065c2..33f1e71c 100644 --- a/src/main/java/com/sipai/dao/sparepart/OutStockRecordDao.java +++ b/src/main/java/com/sipai/dao/sparepart/OutStockRecordDao.java @@ -1,13 +1,8 @@ package com.sipai.dao.sparepart; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; -import com.sipai.entity.sparepart.Goods; -import com.sipai.entity.sparepart.InStockRecord; import com.sipai.entity.sparepart.OutStockRecord; -import com.sipai.entity.sparepart.PurchasePlan; -import com.sipai.entity.sparepart.Stock; +import org.springframework.stereotype.Repository; @Repository public class OutStockRecordDao extends CommDaoImpl { diff --git a/src/main/java/com/sipai/dao/sparepart/OutStockRecordDetailDao.java b/src/main/java/com/sipai/dao/sparepart/OutStockRecordDetailDao.java index a8bb1d2c..446c31bf 100644 --- a/src/main/java/com/sipai/dao/sparepart/OutStockRecordDetailDao.java +++ b/src/main/java/com/sipai/dao/sparepart/OutStockRecordDetailDao.java @@ -1,14 +1,8 @@ package com.sipai.dao.sparepart; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; -import com.sipai.entity.sparepart.Goods; -import com.sipai.entity.sparepart.InStockRecord; -import com.sipai.entity.sparepart.InStockRecordDetail; import com.sipai.entity.sparepart.OutStockRecordDetail; -import com.sipai.entity.sparepart.PurchasePlan; -import com.sipai.entity.sparepart.Stock; +import org.springframework.stereotype.Repository; import java.util.List; diff --git a/src/main/java/com/sipai/dao/sparepart/PerformanceDao.java b/src/main/java/com/sipai/dao/sparepart/PerformanceDao.java index ee8a6f93..d08e686a 100644 --- a/src/main/java/com/sipai/dao/sparepart/PerformanceDao.java +++ b/src/main/java/com/sipai/dao/sparepart/PerformanceDao.java @@ -1,11 +1,8 @@ package com.sipai.dao.sparepart; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; -import com.sipai.entity.sparepart.Goods; -import com.sipai.entity.sparepart.PurchasePlan; import com.sipai.entity.sparepart.Performance; +import org.springframework.stereotype.Repository; @Repository public class PerformanceDao extends CommDaoImpl { diff --git a/src/main/java/com/sipai/dao/sparepart/PurchaseDetailDao.java b/src/main/java/com/sipai/dao/sparepart/PurchaseDetailDao.java index 111db3d5..58ac440a 100644 --- a/src/main/java/com/sipai/dao/sparepart/PurchaseDetailDao.java +++ b/src/main/java/com/sipai/dao/sparepart/PurchaseDetailDao.java @@ -1,11 +1,8 @@ package com.sipai.dao.sparepart; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; -import com.sipai.entity.sparepart.Goods; import com.sipai.entity.sparepart.PurchaseDetail; -import com.sipai.entity.sparepart.PurchasePlan; +import org.springframework.stereotype.Repository; @Repository public class PurchaseDetailDao extends CommDaoImpl { diff --git a/src/main/java/com/sipai/dao/sparepart/PurchaseMethodsDao.java b/src/main/java/com/sipai/dao/sparepart/PurchaseMethodsDao.java index 4aa89acf..08050e30 100644 --- a/src/main/java/com/sipai/dao/sparepart/PurchaseMethodsDao.java +++ b/src/main/java/com/sipai/dao/sparepart/PurchaseMethodsDao.java @@ -1,11 +1,8 @@ package com.sipai.dao.sparepart; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; -import com.sipai.entity.sparepart.Goods; -import com.sipai.entity.sparepart.PurchasePlan; import com.sipai.entity.sparepart.PurchaseMethods; +import org.springframework.stereotype.Repository; @Repository public class PurchaseMethodsDao extends CommDaoImpl { diff --git a/src/main/java/com/sipai/dao/sparepart/PurchasePlanDao.java b/src/main/java/com/sipai/dao/sparepart/PurchasePlanDao.java index e02a2aaa..04147c61 100644 --- a/src/main/java/com/sipai/dao/sparepart/PurchasePlanDao.java +++ b/src/main/java/com/sipai/dao/sparepart/PurchasePlanDao.java @@ -1,10 +1,8 @@ package com.sipai.dao.sparepart; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; -import com.sipai.entity.sparepart.Goods; import com.sipai.entity.sparepart.PurchasePlan; +import org.springframework.stereotype.Repository; @Repository public class PurchasePlanDao extends CommDaoImpl { diff --git a/src/main/java/com/sipai/dao/sparepart/PurchaseRecordDao.java b/src/main/java/com/sipai/dao/sparepart/PurchaseRecordDao.java index 5a3a3c30..b5f59249 100644 --- a/src/main/java/com/sipai/dao/sparepart/PurchaseRecordDao.java +++ b/src/main/java/com/sipai/dao/sparepart/PurchaseRecordDao.java @@ -1,11 +1,8 @@ package com.sipai.dao.sparepart; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; -import com.sipai.entity.sparepart.Goods; -import com.sipai.entity.sparepart.PurchasePlan; import com.sipai.entity.sparepart.PurchaseRecord; +import org.springframework.stereotype.Repository; @Repository diff --git a/src/main/java/com/sipai/dao/sparepart/PurchaseRecordDetailDao.java b/src/main/java/com/sipai/dao/sparepart/PurchaseRecordDetailDao.java index 42f9d52e..12e6dda8 100644 --- a/src/main/java/com/sipai/dao/sparepart/PurchaseRecordDetailDao.java +++ b/src/main/java/com/sipai/dao/sparepart/PurchaseRecordDetailDao.java @@ -1,10 +1,8 @@ package com.sipai.dao.sparepart; -import com.sipai.entity.sparepart.PurchaseRecord; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.sparepart.PurchaseRecordDetail; +import org.springframework.stereotype.Repository; import java.util.List; diff --git a/src/main/java/com/sipai/dao/sparepart/PurposeDao.java b/src/main/java/com/sipai/dao/sparepart/PurposeDao.java index 7c9160a4..9633a82f 100644 --- a/src/main/java/com/sipai/dao/sparepart/PurposeDao.java +++ b/src/main/java/com/sipai/dao/sparepart/PurposeDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.sparepart; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.sparepart.Purpose; +import org.springframework.stereotype.Repository; @Repository public class PurposeDao extends CommDaoImpl { diff --git a/src/main/java/com/sipai/dao/sparepart/QualificationTypeDao.java b/src/main/java/com/sipai/dao/sparepart/QualificationTypeDao.java index 2d067d17..141cda6e 100644 --- a/src/main/java/com/sipai/dao/sparepart/QualificationTypeDao.java +++ b/src/main/java/com/sipai/dao/sparepart/QualificationTypeDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.sparepart; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.sparepart.QualificationType; +import org.springframework.stereotype.Repository; @Repository public class QualificationTypeDao extends CommDaoImpl { diff --git a/src/main/java/com/sipai/dao/sparepart/QualificationType_copyDao.java b/src/main/java/com/sipai/dao/sparepart/QualificationType_copyDao.java index 8367e221..2b113b8c 100644 --- a/src/main/java/com/sipai/dao/sparepart/QualificationType_copyDao.java +++ b/src/main/java/com/sipai/dao/sparepart/QualificationType_copyDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.sparepart; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.sparepart.QualificationType_copy; +import org.springframework.stereotype.Repository; @Repository public class QualificationType_copyDao extends CommDaoImpl { diff --git a/src/main/java/com/sipai/dao/sparepart/RawMaterialDao.java b/src/main/java/com/sipai/dao/sparepart/RawMaterialDao.java index e2799056..cf129842 100644 --- a/src/main/java/com/sipai/dao/sparepart/RawMaterialDao.java +++ b/src/main/java/com/sipai/dao/sparepart/RawMaterialDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.sparepart; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.sparepart.RawMaterial; +import org.springframework.stereotype.Repository; @Repository public class RawMaterialDao extends CommDaoImpl { diff --git a/src/main/java/com/sipai/dao/sparepart/RawMaterialDetailDao.java b/src/main/java/com/sipai/dao/sparepart/RawMaterialDetailDao.java index f6428756..446830a4 100644 --- a/src/main/java/com/sipai/dao/sparepart/RawMaterialDetailDao.java +++ b/src/main/java/com/sipai/dao/sparepart/RawMaterialDetailDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.sparepart; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.sparepart.RawMaterialDetail; +import org.springframework.stereotype.Repository; @Repository public class RawMaterialDetailDao extends CommDaoImpl { diff --git a/src/main/java/com/sipai/dao/sparepart/ReturnStockRecordDao.java b/src/main/java/com/sipai/dao/sparepart/ReturnStockRecordDao.java index 26dd9575..3fcccca1 100644 --- a/src/main/java/com/sipai/dao/sparepart/ReturnStockRecordDao.java +++ b/src/main/java/com/sipai/dao/sparepart/ReturnStockRecordDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.sparepart; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.sparepart.ReturnStockRecord; +import org.springframework.stereotype.Repository; @Repository public class ReturnStockRecordDao extends CommDaoImpl { diff --git a/src/main/java/com/sipai/dao/sparepart/ReturnStockRecordDetailDao.java b/src/main/java/com/sipai/dao/sparepart/ReturnStockRecordDetailDao.java index 2fe48cd5..2dc5b349 100644 --- a/src/main/java/com/sipai/dao/sparepart/ReturnStockRecordDetailDao.java +++ b/src/main/java/com/sipai/dao/sparepart/ReturnStockRecordDetailDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.sparepart; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.sparepart.ReturnStockRecordDetail; +import org.springframework.stereotype.Repository; @Repository public class ReturnStockRecordDetailDao extends CommDaoImpl { diff --git a/src/main/java/com/sipai/dao/sparepart/ScoreDao.java b/src/main/java/com/sipai/dao/sparepart/ScoreDao.java index 7f728bb2..0f96ebbd 100644 --- a/src/main/java/com/sipai/dao/sparepart/ScoreDao.java +++ b/src/main/java/com/sipai/dao/sparepart/ScoreDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.sparepart; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.sparepart.Score; +import org.springframework.stereotype.Repository; @Repository public class ScoreDao extends CommDaoImpl { diff --git a/src/main/java/com/sipai/dao/sparepart/Score_copyDao.java b/src/main/java/com/sipai/dao/sparepart/Score_copyDao.java index 33b86a7c..b94a45f3 100644 --- a/src/main/java/com/sipai/dao/sparepart/Score_copyDao.java +++ b/src/main/java/com/sipai/dao/sparepart/Score_copyDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.sparepart; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.sparepart.Score_copy; +import org.springframework.stereotype.Repository; @Repository public class Score_copyDao extends CommDaoImpl { diff --git a/src/main/java/com/sipai/dao/sparepart/SewageDao.java b/src/main/java/com/sipai/dao/sparepart/SewageDao.java index 5129dfae..2494acfc 100644 --- a/src/main/java/com/sipai/dao/sparepart/SewageDao.java +++ b/src/main/java/com/sipai/dao/sparepart/SewageDao.java @@ -1,11 +1,10 @@ package com.sipai.dao.sparepart; -import java.util.List; - -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.sparepart.Sewage; +import org.springframework.stereotype.Repository; + +import java.util.List; @Repository public class SewageDao extends CommDaoImpl { diff --git a/src/main/java/com/sipai/dao/sparepart/SewageInputDao.java b/src/main/java/com/sipai/dao/sparepart/SewageInputDao.java index 5398f626..d00c8d15 100644 --- a/src/main/java/com/sipai/dao/sparepart/SewageInputDao.java +++ b/src/main/java/com/sipai/dao/sparepart/SewageInputDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.sparepart; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.sparepart.SewageInput; +import org.springframework.stereotype.Repository; @Repository public class SewageInputDao extends CommDaoImpl { diff --git a/src/main/java/com/sipai/dao/sparepart/StockCheckDao.java b/src/main/java/com/sipai/dao/sparepart/StockCheckDao.java index 29229edf..6afce8c9 100644 --- a/src/main/java/com/sipai/dao/sparepart/StockCheckDao.java +++ b/src/main/java/com/sipai/dao/sparepart/StockCheckDao.java @@ -1,12 +1,8 @@ package com.sipai.dao.sparepart; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; -import com.sipai.entity.sparepart.Goods; -import com.sipai.entity.sparepart.PurchasePlan; -import com.sipai.entity.sparepart.Stock; import com.sipai.entity.sparepart.StockCheck; +import org.springframework.stereotype.Repository; @Repository public class StockCheckDao extends CommDaoImpl { diff --git a/src/main/java/com/sipai/dao/sparepart/StockCheckDetailDao.java b/src/main/java/com/sipai/dao/sparepart/StockCheckDetailDao.java index 0b1abc85..6dbb74ad 100644 --- a/src/main/java/com/sipai/dao/sparepart/StockCheckDetailDao.java +++ b/src/main/java/com/sipai/dao/sparepart/StockCheckDetailDao.java @@ -1,12 +1,8 @@ package com.sipai.dao.sparepart; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; -import com.sipai.entity.sparepart.Goods; -import com.sipai.entity.sparepart.PurchasePlan; -import com.sipai.entity.sparepart.Stock; import com.sipai.entity.sparepart.StockCheckDetail; +import org.springframework.stereotype.Repository; @Repository public class StockCheckDetailDao extends CommDaoImpl { diff --git a/src/main/java/com/sipai/dao/sparepart/StockDao.java b/src/main/java/com/sipai/dao/sparepart/StockDao.java index 4caa44ff..52402b55 100644 --- a/src/main/java/com/sipai/dao/sparepart/StockDao.java +++ b/src/main/java/com/sipai/dao/sparepart/StockDao.java @@ -1,13 +1,10 @@ package com.sipai.dao.sparepart; -import java.util.List; - +import com.sipai.dao.base.CommDaoImpl; +import com.sipai.entity.sparepart.Stock; import org.springframework.stereotype.Repository; -import com.sipai.dao.base.CommDaoImpl; -import com.sipai.entity.sparepart.Goods; -import com.sipai.entity.sparepart.PurchasePlan; -import com.sipai.entity.sparepart.Stock; +import java.util.List; @Repository public class StockDao extends CommDaoImpl { diff --git a/src/main/java/com/sipai/dao/sparepart/StockTransfersApplyDetailDao.java b/src/main/java/com/sipai/dao/sparepart/StockTransfersApplyDetailDao.java index 1f0afb42..0a41a893 100644 --- a/src/main/java/com/sipai/dao/sparepart/StockTransfersApplyDetailDao.java +++ b/src/main/java/com/sipai/dao/sparepart/StockTransfersApplyDetailDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.sparepart; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.sparepart.StockTransfersApplyDetail; +import org.springframework.stereotype.Repository; @Repository public class StockTransfersApplyDetailDao extends CommDaoImpl { diff --git a/src/main/java/com/sipai/dao/sparepart/SubscribeDao.java b/src/main/java/com/sipai/dao/sparepart/SubscribeDao.java index 5584f37c..673a386c 100644 --- a/src/main/java/com/sipai/dao/sparepart/SubscribeDao.java +++ b/src/main/java/com/sipai/dao/sparepart/SubscribeDao.java @@ -1,11 +1,8 @@ package com.sipai.dao.sparepart; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; -import com.sipai.entity.sparepart.Goods; -import com.sipai.entity.sparepart.PurchasePlan; import com.sipai.entity.sparepart.Subscribe; +import org.springframework.stereotype.Repository; @Repository public class SubscribeDao extends CommDaoImpl { diff --git a/src/main/java/com/sipai/dao/sparepart/SubscribeDetailDao.java b/src/main/java/com/sipai/dao/sparepart/SubscribeDetailDao.java index 32004302..32c689ef 100644 --- a/src/main/java/com/sipai/dao/sparepart/SubscribeDetailDao.java +++ b/src/main/java/com/sipai/dao/sparepart/SubscribeDetailDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.sparepart; -import com.sipai.entity.sparepart.*; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; +import com.sipai.entity.sparepart.SubscribeDetail; +import org.springframework.stereotype.Repository; import java.util.List; diff --git a/src/main/java/com/sipai/dao/sparepart/SupplierClassDao.java b/src/main/java/com/sipai/dao/sparepart/SupplierClassDao.java index dfea4748..db3704f0 100644 --- a/src/main/java/com/sipai/dao/sparepart/SupplierClassDao.java +++ b/src/main/java/com/sipai/dao/sparepart/SupplierClassDao.java @@ -1,10 +1,8 @@ package com.sipai.dao.sparepart; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; -import com.sipai.entity.sparepart.Goods; import com.sipai.entity.sparepart.SupplierClass; +import org.springframework.stereotype.Repository; @Repository public class SupplierClassDao extends CommDaoImpl { diff --git a/src/main/java/com/sipai/dao/sparepart/SupplierClass_copyDao.java b/src/main/java/com/sipai/dao/sparepart/SupplierClass_copyDao.java index a44321d5..d38dab56 100644 --- a/src/main/java/com/sipai/dao/sparepart/SupplierClass_copyDao.java +++ b/src/main/java/com/sipai/dao/sparepart/SupplierClass_copyDao.java @@ -1,10 +1,8 @@ package com.sipai.dao.sparepart; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; - import com.sipai.entity.sparepart.SupplierClass_copy; +import org.springframework.stereotype.Repository; @Repository public class SupplierClass_copyDao extends CommDaoImpl { diff --git a/src/main/java/com/sipai/dao/sparepart/SupplierDao.java b/src/main/java/com/sipai/dao/sparepart/SupplierDao.java index e065ded1..3b7584b2 100644 --- a/src/main/java/com/sipai/dao/sparepart/SupplierDao.java +++ b/src/main/java/com/sipai/dao/sparepart/SupplierDao.java @@ -1,10 +1,8 @@ package com.sipai.dao.sparepart; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; -import com.sipai.entity.sparepart.Goods; import com.sipai.entity.sparepart.Supplier; +import org.springframework.stereotype.Repository; @Repository public class SupplierDao extends CommDaoImpl { diff --git a/src/main/java/com/sipai/dao/sparepart/SupplierQualificationDao.java b/src/main/java/com/sipai/dao/sparepart/SupplierQualificationDao.java index 326486f9..3f46ff42 100644 --- a/src/main/java/com/sipai/dao/sparepart/SupplierQualificationDao.java +++ b/src/main/java/com/sipai/dao/sparepart/SupplierQualificationDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.sparepart; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.sparepart.SupplierQualification; +import org.springframework.stereotype.Repository; @Repository public class SupplierQualificationDao extends CommDaoImpl { diff --git a/src/main/java/com/sipai/dao/sparepart/SupplierQualification_copyDao.java b/src/main/java/com/sipai/dao/sparepart/SupplierQualification_copyDao.java index 827968f6..8f129cfd 100644 --- a/src/main/java/com/sipai/dao/sparepart/SupplierQualification_copyDao.java +++ b/src/main/java/com/sipai/dao/sparepart/SupplierQualification_copyDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.sparepart; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.sparepart.SupplierQualification_copy; +import org.springframework.stereotype.Repository; @Repository public class SupplierQualification_copyDao extends CommDaoImpl { diff --git a/src/main/java/com/sipai/dao/sparepart/SupplierQualification_fileDao.java b/src/main/java/com/sipai/dao/sparepart/SupplierQualification_fileDao.java index 0afccc97..c9ef52f4 100644 --- a/src/main/java/com/sipai/dao/sparepart/SupplierQualification_fileDao.java +++ b/src/main/java/com/sipai/dao/sparepart/SupplierQualification_fileDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.sparepart; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.sparepart.SupplierQualification_file; +import org.springframework.stereotype.Repository; @Repository public class SupplierQualification_fileDao extends CommDaoImpl { diff --git a/src/main/java/com/sipai/dao/sparepart/Supplier_copyDao.java b/src/main/java/com/sipai/dao/sparepart/Supplier_copyDao.java index 5eff22e9..ca9c3190 100644 --- a/src/main/java/com/sipai/dao/sparepart/Supplier_copyDao.java +++ b/src/main/java/com/sipai/dao/sparepart/Supplier_copyDao.java @@ -1,10 +1,8 @@ package com.sipai.dao.sparepart; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; - import com.sipai.entity.sparepart.Supplier_copy; +import org.springframework.stereotype.Repository; @Repository public class Supplier_copyDao extends CommDaoImpl { diff --git a/src/main/java/com/sipai/dao/sparepart/WarehouseDao.java b/src/main/java/com/sipai/dao/sparepart/WarehouseDao.java index e00a3ee2..066dc620 100644 --- a/src/main/java/com/sipai/dao/sparepart/WarehouseDao.java +++ b/src/main/java/com/sipai/dao/sparepart/WarehouseDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.sparepart; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.sparepart.Warehouse; +import org.springframework.stereotype.Repository; @Repository public class WarehouseDao extends CommDaoImpl { diff --git a/src/main/java/com/sipai/dao/sparepart/WarrantyPeriodDao.java b/src/main/java/com/sipai/dao/sparepart/WarrantyPeriodDao.java index c048fb89..6ff74b7d 100644 --- a/src/main/java/com/sipai/dao/sparepart/WarrantyPeriodDao.java +++ b/src/main/java/com/sipai/dao/sparepart/WarrantyPeriodDao.java @@ -1,11 +1,8 @@ package com.sipai.dao.sparepart; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; -import com.sipai.entity.sparepart.Goods; -import com.sipai.entity.sparepart.PurchasePlan; import com.sipai.entity.sparepart.WarrantyPeriod; +import org.springframework.stereotype.Repository; @Repository public class WarrantyPeriodDao extends CommDaoImpl { diff --git a/src/main/java/com/sipai/dao/structure/StructureCardDao.java b/src/main/java/com/sipai/dao/structure/StructureCardDao.java index 631f296f..a79652c0 100644 --- a/src/main/java/com/sipai/dao/structure/StructureCardDao.java +++ b/src/main/java/com/sipai/dao/structure/StructureCardDao.java @@ -1,15 +1,11 @@ package com.sipai.dao.structure; -import java.util.List; - -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; -import com.sipai.entity.scada.MPoint4APP; import com.sipai.entity.structure.Structure; import com.sipai.entity.structure.StructureCard; -import com.sipai.entity.user.ProcessSection; -import com.sipai.entity.user.User; +import org.springframework.stereotype.Repository; + +import java.util.List; @Repository public class StructureCardDao extends CommDaoImpl{ public StructureCardDao() { diff --git a/src/main/java/com/sipai/dao/structure/StructureCardPictureDao.java b/src/main/java/com/sipai/dao/structure/StructureCardPictureDao.java index 40585c47..a6958f3a 100644 --- a/src/main/java/com/sipai/dao/structure/StructureCardPictureDao.java +++ b/src/main/java/com/sipai/dao/structure/StructureCardPictureDao.java @@ -1,11 +1,10 @@ package com.sipai.dao.structure; -import java.util.List; - -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.structure.StructureCardPicture; +import org.springframework.stereotype.Repository; + +import java.util.List; @Repository public class StructureCardPictureDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/structure/StructureCardPictureRouteDao.java b/src/main/java/com/sipai/dao/structure/StructureCardPictureRouteDao.java index 775f2936..4975cc29 100644 --- a/src/main/java/com/sipai/dao/structure/StructureCardPictureRouteDao.java +++ b/src/main/java/com/sipai/dao/structure/StructureCardPictureRouteDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.structure; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.structure.StructureCardPictureRoute; +import org.springframework.stereotype.Repository; @Repository public class StructureCardPictureRouteDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/structure/StructureCardPictureRoutePointdetailDao.java b/src/main/java/com/sipai/dao/structure/StructureCardPictureRoutePointdetailDao.java index f61a5e34..e88e88fe 100644 --- a/src/main/java/com/sipai/dao/structure/StructureCardPictureRoutePointdetailDao.java +++ b/src/main/java/com/sipai/dao/structure/StructureCardPictureRoutePointdetailDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.structure; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.structure.StructureCardPictureRoutePointdetail; +import org.springframework.stereotype.Repository; @Repository public class StructureCardPictureRoutePointdetailDao extends CommDaoImpl { diff --git a/src/main/java/com/sipai/dao/structure/StructureClassDao.java b/src/main/java/com/sipai/dao/structure/StructureClassDao.java index 3d793ee8..cab60be0 100644 --- a/src/main/java/com/sipai/dao/structure/StructureClassDao.java +++ b/src/main/java/com/sipai/dao/structure/StructureClassDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.structure; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.structure.StructureClass; +import org.springframework.stereotype.Repository; @Repository public class StructureClassDao extends CommDaoImpl{ public StructureClassDao() { diff --git a/src/main/java/com/sipai/dao/teacher/TeacherFileDao.java b/src/main/java/com/sipai/dao/teacher/TeacherFileDao.java index 5b67cf7c..f51febcb 100644 --- a/src/main/java/com/sipai/dao/teacher/TeacherFileDao.java +++ b/src/main/java/com/sipai/dao/teacher/TeacherFileDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.teacher; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.teacher.TeacherFile; +import org.springframework.stereotype.Repository; @Repository public class TeacherFileDao extends CommDaoImpl{ public TeacherFileDao() { diff --git a/src/main/java/com/sipai/dao/teacher/TeachertypeDao.java b/src/main/java/com/sipai/dao/teacher/TeachertypeDao.java index 20f0c871..667daa72 100644 --- a/src/main/java/com/sipai/dao/teacher/TeachertypeDao.java +++ b/src/main/java/com/sipai/dao/teacher/TeachertypeDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.teacher; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.teacher.Teachertype; +import org.springframework.stereotype.Repository; @Repository public class TeachertypeDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/timeefficiency/ClockinRecordDao.java b/src/main/java/com/sipai/dao/timeefficiency/ClockinRecordDao.java index c39601df..faf9d75e 100644 --- a/src/main/java/com/sipai/dao/timeefficiency/ClockinRecordDao.java +++ b/src/main/java/com/sipai/dao/timeefficiency/ClockinRecordDao.java @@ -1,12 +1,10 @@ package com.sipai.dao.timeefficiency; -import java.util.List; - -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.timeefficiency.ClockinRecord; -import com.sipai.entity.timeefficiency.PatrolArea; +import org.springframework.stereotype.Repository; + +import java.util.List; @Repository public class ClockinRecordDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/timeefficiency/EfficiencyProcessDao.java b/src/main/java/com/sipai/dao/timeefficiency/EfficiencyProcessDao.java index 521b1d53..2b9a35f9 100644 --- a/src/main/java/com/sipai/dao/timeefficiency/EfficiencyProcessDao.java +++ b/src/main/java/com/sipai/dao/timeefficiency/EfficiencyProcessDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.timeefficiency; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.timeefficiency.EfficiencyProcess; +import org.springframework.stereotype.Repository; @Repository public class EfficiencyProcessDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/timeefficiency/ElectricityPriceDao.java b/src/main/java/com/sipai/dao/timeefficiency/ElectricityPriceDao.java index 95c0b8d9..e152ebd5 100644 --- a/src/main/java/com/sipai/dao/timeefficiency/ElectricityPriceDao.java +++ b/src/main/java/com/sipai/dao/timeefficiency/ElectricityPriceDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.timeefficiency; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.timeefficiency.ElectricityPrice; +import org.springframework.stereotype.Repository; @Repository public class ElectricityPriceDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/timeefficiency/ElectricityPriceDetailDao.java b/src/main/java/com/sipai/dao/timeefficiency/ElectricityPriceDetailDao.java index 06cc74a2..9ba80a51 100644 --- a/src/main/java/com/sipai/dao/timeefficiency/ElectricityPriceDetailDao.java +++ b/src/main/java/com/sipai/dao/timeefficiency/ElectricityPriceDetailDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.timeefficiency; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.timeefficiency.ElectricityPriceDetail; +import org.springframework.stereotype.Repository; @Repository public class ElectricityPriceDetailDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/timeefficiency/PatrolAreaDao.java b/src/main/java/com/sipai/dao/timeefficiency/PatrolAreaDao.java index c6f99304..3c003a52 100644 --- a/src/main/java/com/sipai/dao/timeefficiency/PatrolAreaDao.java +++ b/src/main/java/com/sipai/dao/timeefficiency/PatrolAreaDao.java @@ -1,11 +1,10 @@ package com.sipai.dao.timeefficiency; -import java.util.List; - -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.timeefficiency.PatrolArea; +import org.springframework.stereotype.Repository; + +import java.util.List; @Repository public class PatrolAreaDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/timeefficiency/PatrolAreaFloorDao.java b/src/main/java/com/sipai/dao/timeefficiency/PatrolAreaFloorDao.java index 95169b68..03a1891c 100644 --- a/src/main/java/com/sipai/dao/timeefficiency/PatrolAreaFloorDao.java +++ b/src/main/java/com/sipai/dao/timeefficiency/PatrolAreaFloorDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.timeefficiency; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.timeefficiency.PatrolAreaFloor; +import org.springframework.stereotype.Repository; @Repository public class PatrolAreaFloorDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/timeefficiency/PatrolAreaProcessSectionDao.java b/src/main/java/com/sipai/dao/timeefficiency/PatrolAreaProcessSectionDao.java index 7d941365..4e5342cc 100644 --- a/src/main/java/com/sipai/dao/timeefficiency/PatrolAreaProcessSectionDao.java +++ b/src/main/java/com/sipai/dao/timeefficiency/PatrolAreaProcessSectionDao.java @@ -1,11 +1,10 @@ package com.sipai.dao.timeefficiency; -import java.util.List; - -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.timeefficiency.PatrolAreaProcessSection; +import org.springframework.stereotype.Repository; + +import java.util.List; @Repository public class PatrolAreaProcessSectionDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/timeefficiency/PatrolContentsDao.java b/src/main/java/com/sipai/dao/timeefficiency/PatrolContentsDao.java index 977982c2..ab2dad04 100644 --- a/src/main/java/com/sipai/dao/timeefficiency/PatrolContentsDao.java +++ b/src/main/java/com/sipai/dao/timeefficiency/PatrolContentsDao.java @@ -1,12 +1,8 @@ package com.sipai.dao.timeefficiency; -import com.sipai.entity.timeefficiency.PatrolPoint; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.timeefficiency.PatrolContents; - -import java.util.List; +import org.springframework.stereotype.Repository; @Repository public class PatrolContentsDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/timeefficiency/PatrolContentsPlanDao.java b/src/main/java/com/sipai/dao/timeefficiency/PatrolContentsPlanDao.java index f8f809d7..aa494706 100644 --- a/src/main/java/com/sipai/dao/timeefficiency/PatrolContentsPlanDao.java +++ b/src/main/java/com/sipai/dao/timeefficiency/PatrolContentsPlanDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.timeefficiency; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.timeefficiency.PatrolContentsPlan; +import org.springframework.stereotype.Repository; @Repository public class PatrolContentsPlanDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/timeefficiency/PatrolContentsRecordDao.java b/src/main/java/com/sipai/dao/timeefficiency/PatrolContentsRecordDao.java index d5d7cd17..807fd3c9 100644 --- a/src/main/java/com/sipai/dao/timeefficiency/PatrolContentsRecordDao.java +++ b/src/main/java/com/sipai/dao/timeefficiency/PatrolContentsRecordDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.timeefficiency; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.timeefficiency.PatrolContentsRecord; +import org.springframework.stereotype.Repository; @Repository public class PatrolContentsRecordDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/timeefficiency/PatrolContentsStandardDao.java b/src/main/java/com/sipai/dao/timeefficiency/PatrolContentsStandardDao.java index 5a755afc..d75a52d7 100644 --- a/src/main/java/com/sipai/dao/timeefficiency/PatrolContentsStandardDao.java +++ b/src/main/java/com/sipai/dao/timeefficiency/PatrolContentsStandardDao.java @@ -1,12 +1,10 @@ package com.sipai.dao.timeefficiency; -import java.util.List; - +import com.sipai.dao.base.CommDaoImpl; +import com.sipai.entity.timeefficiency.PatrolContentsStandard; import org.springframework.stereotype.Repository; -import com.sipai.dao.base.CommDaoImpl; -import com.sipai.entity.maintenance.LibraryMaintenanceLubrication; -import com.sipai.entity.timeefficiency.PatrolContentsStandard; +import java.util.List; @Repository public class PatrolContentsStandardDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/timeefficiency/PatrolMeasurePointPlanDao.java b/src/main/java/com/sipai/dao/timeefficiency/PatrolMeasurePointPlanDao.java index 4a45291c..2ab9b59a 100644 --- a/src/main/java/com/sipai/dao/timeefficiency/PatrolMeasurePointPlanDao.java +++ b/src/main/java/com/sipai/dao/timeefficiency/PatrolMeasurePointPlanDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.timeefficiency; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.timeefficiency.PatrolMeasurePointPlan; +import org.springframework.stereotype.Repository; @Repository public class PatrolMeasurePointPlanDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/timeefficiency/PatrolMeasurePointRecordDao.java b/src/main/java/com/sipai/dao/timeefficiency/PatrolMeasurePointRecordDao.java index 1ae65885..af33407b 100644 --- a/src/main/java/com/sipai/dao/timeefficiency/PatrolMeasurePointRecordDao.java +++ b/src/main/java/com/sipai/dao/timeefficiency/PatrolMeasurePointRecordDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.timeefficiency; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.timeefficiency.PatrolMeasurePointRecord; +import org.springframework.stereotype.Repository; @Repository public class PatrolMeasurePointRecordDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/timeefficiency/PatrolModelDao.java b/src/main/java/com/sipai/dao/timeefficiency/PatrolModelDao.java index 636c91fc..e8378a2a 100644 --- a/src/main/java/com/sipai/dao/timeefficiency/PatrolModelDao.java +++ b/src/main/java/com/sipai/dao/timeefficiency/PatrolModelDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.timeefficiency; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.timeefficiency.PatrolModel; +import org.springframework.stereotype.Repository; @Repository public class PatrolModelDao extends CommDaoImpl{ public PatrolModelDao(){ diff --git a/src/main/java/com/sipai/dao/timeefficiency/PatrolPlanDao.java b/src/main/java/com/sipai/dao/timeefficiency/PatrolPlanDao.java index 4619694b..fe382eaf 100644 --- a/src/main/java/com/sipai/dao/timeefficiency/PatrolPlanDao.java +++ b/src/main/java/com/sipai/dao/timeefficiency/PatrolPlanDao.java @@ -1,12 +1,8 @@ package com.sipai.dao.timeefficiency; -import java.util.List; - -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.timeefficiency.PatrolPlan; -import com.sipai.entity.work.Group; +import org.springframework.stereotype.Repository; @Repository public class PatrolPlanDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/timeefficiency/PatrolPlanDeptDao.java b/src/main/java/com/sipai/dao/timeefficiency/PatrolPlanDeptDao.java index 45318478..dd1ab51b 100644 --- a/src/main/java/com/sipai/dao/timeefficiency/PatrolPlanDeptDao.java +++ b/src/main/java/com/sipai/dao/timeefficiency/PatrolPlanDeptDao.java @@ -1,12 +1,8 @@ package com.sipai.dao.timeefficiency; -import java.util.List; - -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.timeefficiency.PatrolPlanDept; -import com.sipai.entity.work.Group; +import org.springframework.stereotype.Repository; @Repository public class PatrolPlanDeptDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/timeefficiency/PatrolPlanPatrolCameraDao.java b/src/main/java/com/sipai/dao/timeefficiency/PatrolPlanPatrolCameraDao.java index b618338b..21366801 100644 --- a/src/main/java/com/sipai/dao/timeefficiency/PatrolPlanPatrolCameraDao.java +++ b/src/main/java/com/sipai/dao/timeefficiency/PatrolPlanPatrolCameraDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.timeefficiency; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.timeefficiency.PatrolPlanPatrolCamera; +import org.springframework.stereotype.Repository; @Repository public class PatrolPlanPatrolCameraDao extends CommDaoImpl{ public PatrolPlanPatrolCameraDao(){ diff --git a/src/main/java/com/sipai/dao/timeefficiency/PatrolPlanPatrolEquipmentDao.java b/src/main/java/com/sipai/dao/timeefficiency/PatrolPlanPatrolEquipmentDao.java index 9c3ed209..7e423c26 100644 --- a/src/main/java/com/sipai/dao/timeefficiency/PatrolPlanPatrolEquipmentDao.java +++ b/src/main/java/com/sipai/dao/timeefficiency/PatrolPlanPatrolEquipmentDao.java @@ -1,13 +1,8 @@ package com.sipai.dao.timeefficiency; -import java.util.List; - -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.timeefficiency.PatrolPlanPatrolEquipment; -import com.sipai.entity.timeefficiency.PatrolPlanPatrolPoint; -import com.sipai.entity.timeefficiency.PatrolPoint; +import org.springframework.stereotype.Repository; @Repository public class PatrolPlanPatrolEquipmentDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/timeefficiency/PatrolPlanPatrolPointDao.java b/src/main/java/com/sipai/dao/timeefficiency/PatrolPlanPatrolPointDao.java index 471022cd..fdc08690 100644 --- a/src/main/java/com/sipai/dao/timeefficiency/PatrolPlanPatrolPointDao.java +++ b/src/main/java/com/sipai/dao/timeefficiency/PatrolPlanPatrolPointDao.java @@ -1,12 +1,8 @@ package com.sipai.dao.timeefficiency; -import java.util.List; - -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.timeefficiency.PatrolPlanPatrolPoint; -import com.sipai.entity.timeefficiency.PatrolPoint; +import org.springframework.stereotype.Repository; @Repository public class PatrolPlanPatrolPointDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/timeefficiency/PatrolPointCameraDao.java b/src/main/java/com/sipai/dao/timeefficiency/PatrolPointCameraDao.java index d1623ed2..1319a36a 100644 --- a/src/main/java/com/sipai/dao/timeefficiency/PatrolPointCameraDao.java +++ b/src/main/java/com/sipai/dao/timeefficiency/PatrolPointCameraDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.timeefficiency; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.timeefficiency.PatrolPointCamera; +import org.springframework.stereotype.Repository; @Repository public class PatrolPointCameraDao extends CommDaoImpl{ public PatrolPointCameraDao(){ diff --git a/src/main/java/com/sipai/dao/timeefficiency/PatrolPointDao.java b/src/main/java/com/sipai/dao/timeefficiency/PatrolPointDao.java index 404f4210..1a5829db 100644 --- a/src/main/java/com/sipai/dao/timeefficiency/PatrolPointDao.java +++ b/src/main/java/com/sipai/dao/timeefficiency/PatrolPointDao.java @@ -1,12 +1,10 @@ package com.sipai.dao.timeefficiency; -import java.util.List; - -import com.sipai.entity.timeefficiency.PatrolContents; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.timeefficiency.PatrolPoint; +import org.springframework.stereotype.Repository; + +import java.util.List; @Repository public class PatrolPointDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/timeefficiency/PatrolPointEquipmentCardDao.java b/src/main/java/com/sipai/dao/timeefficiency/PatrolPointEquipmentCardDao.java index 0656b19a..3d909a71 100644 --- a/src/main/java/com/sipai/dao/timeefficiency/PatrolPointEquipmentCardDao.java +++ b/src/main/java/com/sipai/dao/timeefficiency/PatrolPointEquipmentCardDao.java @@ -1,11 +1,10 @@ package com.sipai.dao.timeefficiency; -import java.util.List; - -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.timeefficiency.PatrolPointEquipmentCard; +import org.springframework.stereotype.Repository; + +import java.util.List; @Repository public class PatrolPointEquipmentCardDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/timeefficiency/PatrolPointFileDao.java b/src/main/java/com/sipai/dao/timeefficiency/PatrolPointFileDao.java index 36384a5c..764effdb 100644 --- a/src/main/java/com/sipai/dao/timeefficiency/PatrolPointFileDao.java +++ b/src/main/java/com/sipai/dao/timeefficiency/PatrolPointFileDao.java @@ -1,11 +1,8 @@ package com.sipai.dao.timeefficiency; -import java.util.List; - -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.timeefficiency.PatrolPointFile; +import org.springframework.stereotype.Repository; @Repository public class PatrolPointFileDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/timeefficiency/PatrolPointMeasurePointDao.java b/src/main/java/com/sipai/dao/timeefficiency/PatrolPointMeasurePointDao.java index 44fd9fcf..40d9b0ff 100644 --- a/src/main/java/com/sipai/dao/timeefficiency/PatrolPointMeasurePointDao.java +++ b/src/main/java/com/sipai/dao/timeefficiency/PatrolPointMeasurePointDao.java @@ -1,11 +1,10 @@ package com.sipai.dao.timeefficiency; -import java.util.List; - -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.timeefficiency.PatrolPointMeasurePoint; +import org.springframework.stereotype.Repository; + +import java.util.List; @Repository public class PatrolPointMeasurePointDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/timeefficiency/PatrolRecordCollectionDao.java b/src/main/java/com/sipai/dao/timeefficiency/PatrolRecordCollectionDao.java index 28bfe6f4..c591516d 100644 --- a/src/main/java/com/sipai/dao/timeefficiency/PatrolRecordCollectionDao.java +++ b/src/main/java/com/sipai/dao/timeefficiency/PatrolRecordCollectionDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.timeefficiency; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.timeefficiency.PatrolRecordCollection; +import org.springframework.stereotype.Repository; @Repository public class PatrolRecordCollectionDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/timeefficiency/PatrolRecordDao.java b/src/main/java/com/sipai/dao/timeefficiency/PatrolRecordDao.java index f276d934..c726c247 100644 --- a/src/main/java/com/sipai/dao/timeefficiency/PatrolRecordDao.java +++ b/src/main/java/com/sipai/dao/timeefficiency/PatrolRecordDao.java @@ -1,15 +1,14 @@ package com.sipai.dao.timeefficiency; +import com.sipai.dao.base.CommDaoImpl; +import com.sipai.entity.timeefficiency.PatrolRecord; +import org.springframework.stereotype.Repository; + import java.util.HashMap; import java.util.List; import java.util.Map; -import org.springframework.stereotype.Repository; - -import com.sipai.dao.base.CommDaoImpl; -import com.sipai.entity.timeefficiency.PatrolRecord; - @Repository public class PatrolRecordDao extends CommDaoImpl { public PatrolRecordDao() { diff --git a/src/main/java/com/sipai/dao/timeefficiency/PatrolRecordDeptDao.java b/src/main/java/com/sipai/dao/timeefficiency/PatrolRecordDeptDao.java index 44e4a201..5f3474a1 100644 --- a/src/main/java/com/sipai/dao/timeefficiency/PatrolRecordDeptDao.java +++ b/src/main/java/com/sipai/dao/timeefficiency/PatrolRecordDeptDao.java @@ -1,7 +1,6 @@ package com.sipai.dao.timeefficiency; import com.sipai.dao.base.CommDaoImpl; -import com.sipai.entity.timeefficiency.PatrolPlanDept; import com.sipai.entity.timeefficiency.PatrolRecordDept; import org.springframework.stereotype.Repository; diff --git a/src/main/java/com/sipai/dao/timeefficiency/PatrolRecordPatrolCameraDao.java b/src/main/java/com/sipai/dao/timeefficiency/PatrolRecordPatrolCameraDao.java index b99396cb..e5265739 100644 --- a/src/main/java/com/sipai/dao/timeefficiency/PatrolRecordPatrolCameraDao.java +++ b/src/main/java/com/sipai/dao/timeefficiency/PatrolRecordPatrolCameraDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.timeefficiency; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.timeefficiency.PatrolRecordPatrolCamera; +import org.springframework.stereotype.Repository; @Repository public class PatrolRecordPatrolCameraDao extends CommDaoImpl{ public PatrolRecordPatrolCameraDao(){ diff --git a/src/main/java/com/sipai/dao/timeefficiency/PatrolRecordPatrolEquipmentDao.java b/src/main/java/com/sipai/dao/timeefficiency/PatrolRecordPatrolEquipmentDao.java index 4c58d383..38d6f8af 100644 --- a/src/main/java/com/sipai/dao/timeefficiency/PatrolRecordPatrolEquipmentDao.java +++ b/src/main/java/com/sipai/dao/timeefficiency/PatrolRecordPatrolEquipmentDao.java @@ -1,14 +1,13 @@ package com.sipai.dao.timeefficiency; +import com.sipai.dao.base.CommDaoImpl; +import com.sipai.entity.timeefficiency.PatrolRecordPatrolEquipment; +import org.springframework.stereotype.Repository; + import java.util.HashMap; import java.util.List; import java.util.Map; -import com.sipai.entity.timeefficiency.*; -import org.springframework.stereotype.Repository; - -import com.sipai.dao.base.CommDaoImpl; - @Repository public class PatrolRecordPatrolEquipmentDao extends CommDaoImpl{ public PatrolRecordPatrolEquipmentDao() { diff --git a/src/main/java/com/sipai/dao/timeefficiency/PatrolRecordPatrolPointDao.java b/src/main/java/com/sipai/dao/timeefficiency/PatrolRecordPatrolPointDao.java index 51576434..547c3b53 100644 --- a/src/main/java/com/sipai/dao/timeefficiency/PatrolRecordPatrolPointDao.java +++ b/src/main/java/com/sipai/dao/timeefficiency/PatrolRecordPatrolPointDao.java @@ -1,10 +1,9 @@ package com.sipai.dao.timeefficiency; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.timeefficiency.PatrolRecordPatrolPoint; +import org.springframework.stereotype.Repository; @Repository public class PatrolRecordPatrolPointDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/timeefficiency/PatrolRecordPatrolRouteDao.java b/src/main/java/com/sipai/dao/timeefficiency/PatrolRecordPatrolRouteDao.java index cc908543..2aba1698 100644 --- a/src/main/java/com/sipai/dao/timeefficiency/PatrolRecordPatrolRouteDao.java +++ b/src/main/java/com/sipai/dao/timeefficiency/PatrolRecordPatrolRouteDao.java @@ -1,11 +1,9 @@ package com.sipai.dao.timeefficiency; -import com.sipai.entity.timeefficiency.PatrolRecord; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.timeefficiency.PatrolRecordPatrolRoute; +import org.springframework.stereotype.Repository; import java.util.HashMap; import java.util.List; diff --git a/src/main/java/com/sipai/dao/timeefficiency/PatrolRecordViolationRecordDao.java b/src/main/java/com/sipai/dao/timeefficiency/PatrolRecordViolationRecordDao.java index 270c5bb1..e48147a8 100644 --- a/src/main/java/com/sipai/dao/timeefficiency/PatrolRecordViolationRecordDao.java +++ b/src/main/java/com/sipai/dao/timeefficiency/PatrolRecordViolationRecordDao.java @@ -1,12 +1,8 @@ package com.sipai.dao.timeefficiency; -import java.util.List; - -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; -import com.sipai.entity.timeefficiency.PatrolRecord; import com.sipai.entity.timeefficiency.PatrolRecordViolationRecord; +import org.springframework.stereotype.Repository; @Repository diff --git a/src/main/java/com/sipai/dao/timeefficiency/PatrolRouteDao.java b/src/main/java/com/sipai/dao/timeefficiency/PatrolRouteDao.java index 9ce998fb..bba38704 100644 --- a/src/main/java/com/sipai/dao/timeefficiency/PatrolRouteDao.java +++ b/src/main/java/com/sipai/dao/timeefficiency/PatrolRouteDao.java @@ -1,8 +1,8 @@ package com.sipai.dao.timeefficiency; -import org.springframework.stereotype.Repository; import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.timeefficiency.PatrolRoute; +import org.springframework.stereotype.Repository; @Repository public class PatrolRouteDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/timeefficiency/ViolationRecordCountDao.java b/src/main/java/com/sipai/dao/timeefficiency/ViolationRecordCountDao.java index 9929575a..fed2d3f0 100644 --- a/src/main/java/com/sipai/dao/timeefficiency/ViolationRecordCountDao.java +++ b/src/main/java/com/sipai/dao/timeefficiency/ViolationRecordCountDao.java @@ -1,14 +1,10 @@ package com.sipai.dao.timeefficiency; -import java.util.List; - -import org.apache.ibatis.session.SqlSession; +import com.sipai.dao.base.CommDaoImpl; +import com.sipai.entity.timeefficiency.ViolationRecordCount; import org.springframework.stereotype.Repository; -import com.sipai.dao.base.CommDaoImpl; -import com.sipai.entity.base.CommonFile; -import com.sipai.entity.timeefficiency.PatrolRecordViolationRecord; -import com.sipai.entity.timeefficiency.ViolationRecordCount; +import java.util.List; @Repository public class ViolationRecordCountDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/timeefficiency/WorkRecordDao.java b/src/main/java/com/sipai/dao/timeefficiency/WorkRecordDao.java index cb19ff34..8d839183 100644 --- a/src/main/java/com/sipai/dao/timeefficiency/WorkRecordDao.java +++ b/src/main/java/com/sipai/dao/timeefficiency/WorkRecordDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.timeefficiency; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.timeefficiency.WorkRecord; +import org.springframework.stereotype.Repository; @Repository public class WorkRecordDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/timeefficiency/WorkerPositionDao.java b/src/main/java/com/sipai/dao/timeefficiency/WorkerPositionDao.java index 33fde898..572ad11e 100644 --- a/src/main/java/com/sipai/dao/timeefficiency/WorkerPositionDao.java +++ b/src/main/java/com/sipai/dao/timeefficiency/WorkerPositionDao.java @@ -1,13 +1,8 @@ package com.sipai.dao.timeefficiency; -import java.util.List; - -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; -import com.sipai.entity.timeefficiency.PatrolPlan; import com.sipai.entity.timeefficiency.WorkerPosition; -import com.sipai.entity.work.Group; +import org.springframework.stereotype.Repository; @Repository public class WorkerPositionDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/user/BonusPointDao.java b/src/main/java/com/sipai/dao/user/BonusPointDao.java index a50b8069..35d9fc98 100644 --- a/src/main/java/com/sipai/dao/user/BonusPointDao.java +++ b/src/main/java/com/sipai/dao/user/BonusPointDao.java @@ -1,13 +1,8 @@ package com.sipai.dao.user; -import java.util.List; - -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.user.BonusPoint; -import com.sipai.entity.user.ExtSystem; -import com.sipai.entity.work.Group; +import org.springframework.stereotype.Repository; @Repository public class BonusPointDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/user/BonusPointRecordDao.java b/src/main/java/com/sipai/dao/user/BonusPointRecordDao.java index 12c177e9..b82811b5 100644 --- a/src/main/java/com/sipai/dao/user/BonusPointRecordDao.java +++ b/src/main/java/com/sipai/dao/user/BonusPointRecordDao.java @@ -1,14 +1,8 @@ package com.sipai.dao.user; -import java.util.List; - -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; -import com.sipai.entity.user.BonusPoint; import com.sipai.entity.user.BonusPointRecord; -import com.sipai.entity.user.ExtSystem; -import com.sipai.entity.work.Group; +import org.springframework.stereotype.Repository; @Repository public class BonusPointRecordDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/user/CompanyDao.java b/src/main/java/com/sipai/dao/user/CompanyDao.java index 76f61396..fa205e7a 100644 --- a/src/main/java/com/sipai/dao/user/CompanyDao.java +++ b/src/main/java/com/sipai/dao/user/CompanyDao.java @@ -1,12 +1,11 @@ package com.sipai.dao.user; -import java.util.List; - -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.equipment.EquipmentCardTree; import com.sipai.entity.user.Company; +import org.springframework.stereotype.Repository; + +import java.util.List; @Repository public class CompanyDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/user/DeptAreaDao.java b/src/main/java/com/sipai/dao/user/DeptAreaDao.java index 894fd8f0..0d98eff0 100644 --- a/src/main/java/com/sipai/dao/user/DeptAreaDao.java +++ b/src/main/java/com/sipai/dao/user/DeptAreaDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.user; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.user.DeptArea; +import org.springframework.stereotype.Repository; @Repository public class DeptAreaDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/user/DeptDao.java b/src/main/java/com/sipai/dao/user/DeptDao.java index 30dcd52c..031bc151 100644 --- a/src/main/java/com/sipai/dao/user/DeptDao.java +++ b/src/main/java/com/sipai/dao/user/DeptDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.user; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.user.Dept; +import org.springframework.stereotype.Repository; @Repository public class DeptDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/user/DeptProcessDao.java b/src/main/java/com/sipai/dao/user/DeptProcessDao.java index 080b28cc..b28df3a7 100644 --- a/src/main/java/com/sipai/dao/user/DeptProcessDao.java +++ b/src/main/java/com/sipai/dao/user/DeptProcessDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.user; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.user.DeptProcess; +import org.springframework.stereotype.Repository; @Repository public class DeptProcessDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/user/DeptRoleDao.java b/src/main/java/com/sipai/dao/user/DeptRoleDao.java index c11f9e69..6c0c0a1b 100644 --- a/src/main/java/com/sipai/dao/user/DeptRoleDao.java +++ b/src/main/java/com/sipai/dao/user/DeptRoleDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.user; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.user.DeptRole; +import org.springframework.stereotype.Repository; @Repository public class DeptRoleDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/user/ExtSystemDao.java b/src/main/java/com/sipai/dao/user/ExtSystemDao.java index 15bd8191..b0c2f077 100644 --- a/src/main/java/com/sipai/dao/user/ExtSystemDao.java +++ b/src/main/java/com/sipai/dao/user/ExtSystemDao.java @@ -1,12 +1,8 @@ package com.sipai.dao.user; -import java.util.List; - -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.user.ExtSystem; -import com.sipai.entity.work.Group; +import org.springframework.stereotype.Repository; @Repository public class ExtSystemDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/user/JobDao.java b/src/main/java/com/sipai/dao/user/JobDao.java index a5e6f5c2..95848e49 100644 --- a/src/main/java/com/sipai/dao/user/JobDao.java +++ b/src/main/java/com/sipai/dao/user/JobDao.java @@ -1,12 +1,11 @@ package com.sipai.dao.user; -import java.util.List; - +import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.base.Tree; +import com.sipai.entity.user.Job; import org.springframework.stereotype.Repository; -import com.sipai.dao.base.CommDaoImpl; -import com.sipai.entity.user.Job; +import java.util.List; @Repository public class JobDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/user/MenuDao.java b/src/main/java/com/sipai/dao/user/MenuDao.java index 8c0d3fd4..1064ac87 100644 --- a/src/main/java/com/sipai/dao/user/MenuDao.java +++ b/src/main/java/com/sipai/dao/user/MenuDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.user; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.user.Menu; +import org.springframework.stereotype.Repository; @Repository public class MenuDao extends CommDaoImpl

{ diff --git a/src/main/java/com/sipai/dao/user/MobileManagementDao.java b/src/main/java/com/sipai/dao/user/MobileManagementDao.java index a7d9b70e..339f2e7d 100644 --- a/src/main/java/com/sipai/dao/user/MobileManagementDao.java +++ b/src/main/java/com/sipai/dao/user/MobileManagementDao.java @@ -1,12 +1,10 @@ package com.sipai.dao.user; -import java.util.List; - -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.user.MobileManagement; -import com.sipai.entity.user.User; +import org.springframework.stereotype.Repository; + +import java.util.List; @Repository public class MobileManagementDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/user/MobileValidationDao.java b/src/main/java/com/sipai/dao/user/MobileValidationDao.java index 8863cb66..4f7d91ac 100644 --- a/src/main/java/com/sipai/dao/user/MobileValidationDao.java +++ b/src/main/java/com/sipai/dao/user/MobileValidationDao.java @@ -1,12 +1,8 @@ package com.sipai.dao.user; -import java.util.List; - -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.user.MobileValidation; -import com.sipai.entity.user.UserRole; +import org.springframework.stereotype.Repository; @Repository public class MobileValidationDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/user/ProcessSectionDao.java b/src/main/java/com/sipai/dao/user/ProcessSectionDao.java index c9539c96..98585960 100644 --- a/src/main/java/com/sipai/dao/user/ProcessSectionDao.java +++ b/src/main/java/com/sipai/dao/user/ProcessSectionDao.java @@ -1,15 +1,11 @@ package com.sipai.dao.user; -import java.util.List; - -import org.springframework.stereotype.Repository; - -import com.itextpdf.text.pdf.PdfStructTreeController.returnType; import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.equipment.EquipmentCard; -import com.sipai.entity.user.Company; import com.sipai.entity.user.ProcessSection; -import com.sipai.entity.user.Role; +import org.springframework.stereotype.Repository; + +import java.util.List; @Repository public class ProcessSectionDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/user/ProcessSectionScoreDao.java b/src/main/java/com/sipai/dao/user/ProcessSectionScoreDao.java index 827b4ec9..5fa04e38 100644 --- a/src/main/java/com/sipai/dao/user/ProcessSectionScoreDao.java +++ b/src/main/java/com/sipai/dao/user/ProcessSectionScoreDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.user; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.user.ProcessSectionScore; +import org.springframework.stereotype.Repository; @Repository public class ProcessSectionScoreDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/user/ProcessSectionTypeDao.java b/src/main/java/com/sipai/dao/user/ProcessSectionTypeDao.java index b18bb2fb..c1444225 100644 --- a/src/main/java/com/sipai/dao/user/ProcessSectionTypeDao.java +++ b/src/main/java/com/sipai/dao/user/ProcessSectionTypeDao.java @@ -1,14 +1,8 @@ package com.sipai.dao.user; -import java.util.List; - -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; -import com.sipai.entity.user.Company; -import com.sipai.entity.user.ProcessSection; import com.sipai.entity.user.ProcessSectionType; -import com.sipai.entity.user.Role; +import org.springframework.stereotype.Repository; @Repository public class ProcessSectionTypeDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/user/RoleDao.java b/src/main/java/com/sipai/dao/user/RoleDao.java index f8b4d87d..3d31301c 100644 --- a/src/main/java/com/sipai/dao/user/RoleDao.java +++ b/src/main/java/com/sipai/dao/user/RoleDao.java @@ -1,11 +1,10 @@ package com.sipai.dao.user; -import java.util.List; - -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.user.Role; +import org.springframework.stereotype.Repository; + +import java.util.List; @Repository public class RoleDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/user/RoleMenuDao.java b/src/main/java/com/sipai/dao/user/RoleMenuDao.java index a666367e..791acf5d 100644 --- a/src/main/java/com/sipai/dao/user/RoleMenuDao.java +++ b/src/main/java/com/sipai/dao/user/RoleMenuDao.java @@ -1,14 +1,13 @@ package com.sipai.dao.user; +import com.sipai.dao.base.CommDaoImpl; +import com.sipai.entity.user.RoleMenu; +import org.springframework.stereotype.Repository; + import java.util.HashMap; import java.util.List; import java.util.Map; -import org.springframework.stereotype.Repository; - -import com.sipai.dao.base.CommDaoImpl; -import com.sipai.entity.user.RoleMenu; - @Repository public class RoleMenuDao extends CommDaoImpl{ public RoleMenuDao() { diff --git a/src/main/java/com/sipai/dao/user/UnitDao.java b/src/main/java/com/sipai/dao/user/UnitDao.java index e89d8113..bcdbf630 100644 --- a/src/main/java/com/sipai/dao/user/UnitDao.java +++ b/src/main/java/com/sipai/dao/user/UnitDao.java @@ -1,12 +1,10 @@ package com.sipai.dao.user; -import java.util.List; - +import com.sipai.dao.base.CommDaoImpl; +import com.sipai.entity.user.Unit; import org.springframework.stereotype.Repository; -import com.sipai.dao.base.CommDaoImpl; -import com.sipai.entity.maintenance.Maintenance; -import com.sipai.entity.user.Unit; +import java.util.List; @Repository public class UnitDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/user/UserDetailDao.java b/src/main/java/com/sipai/dao/user/UserDetailDao.java index d2e07a2c..e62bbea3 100644 --- a/src/main/java/com/sipai/dao/user/UserDetailDao.java +++ b/src/main/java/com/sipai/dao/user/UserDetailDao.java @@ -1,10 +1,8 @@ package com.sipai.dao.user; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.user.UserDetail; -import com.sipai.entity.user.UserJob; +import org.springframework.stereotype.Repository; @Repository public class UserDetailDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/user/UserJobDao.java b/src/main/java/com/sipai/dao/user/UserJobDao.java index 67a102f2..e135ed08 100644 --- a/src/main/java/com/sipai/dao/user/UserJobDao.java +++ b/src/main/java/com/sipai/dao/user/UserJobDao.java @@ -1,11 +1,10 @@ package com.sipai.dao.user; -import java.util.List; - -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.user.UserJob; +import org.springframework.stereotype.Repository; + +import java.util.List; @Repository public class UserJobDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/user/UserPowerDao.java b/src/main/java/com/sipai/dao/user/UserPowerDao.java index a23a77fd..27af64c5 100644 --- a/src/main/java/com/sipai/dao/user/UserPowerDao.java +++ b/src/main/java/com/sipai/dao/user/UserPowerDao.java @@ -1,11 +1,10 @@ package com.sipai.dao.user; -import java.util.List; - -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.user.UserPower; +import org.springframework.stereotype.Repository; + +import java.util.List; @Repository public class UserPowerDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/user/UserRoleDao.java b/src/main/java/com/sipai/dao/user/UserRoleDao.java index 2f167fef..dc1fbd8b 100644 --- a/src/main/java/com/sipai/dao/user/UserRoleDao.java +++ b/src/main/java/com/sipai/dao/user/UserRoleDao.java @@ -1,11 +1,10 @@ package com.sipai.dao.user; -import java.util.List; - -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.user.UserRole; +import org.springframework.stereotype.Repository; + +import java.util.List; @Repository public class UserRoleDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/user/UserTimeDao.java b/src/main/java/com/sipai/dao/user/UserTimeDao.java index aeca95fc..9edb3b46 100644 --- a/src/main/java/com/sipai/dao/user/UserTimeDao.java +++ b/src/main/java/com/sipai/dao/user/UserTimeDao.java @@ -1,12 +1,10 @@ package com.sipai.dao.user; -import java.util.List; - +import com.sipai.dao.base.CommDaoImpl; +import com.sipai.entity.user.UserTime; import org.springframework.stereotype.Repository; -import com.sipai.dao.base.CommDaoImpl; -import com.sipai.entity.user.User; -import com.sipai.entity.user.UserTime; +import java.util.List; @Repository public class UserTimeDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/valueEngineering/EquipmentDepreciationDao.java b/src/main/java/com/sipai/dao/valueEngineering/EquipmentDepreciationDao.java index da934aad..d3de8d79 100644 --- a/src/main/java/com/sipai/dao/valueEngineering/EquipmentDepreciationDao.java +++ b/src/main/java/com/sipai/dao/valueEngineering/EquipmentDepreciationDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.valueEngineering; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.valueEngineering.EquipmentDepreciation; +import org.springframework.stereotype.Repository; @Repository public class EquipmentDepreciationDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/valueEngineering/EquipmentEvaluateDao.java b/src/main/java/com/sipai/dao/valueEngineering/EquipmentEvaluateDao.java index 6d92877d..b02d9b44 100644 --- a/src/main/java/com/sipai/dao/valueEngineering/EquipmentEvaluateDao.java +++ b/src/main/java/com/sipai/dao/valueEngineering/EquipmentEvaluateDao.java @@ -1,13 +1,8 @@ package com.sipai.dao.valueEngineering; -import java.util.List; - -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.valueEngineering.EquipmentEvaluate; -import com.sipai.entity.valueEngineering.EquipmentModel; -import com.sipai.entity.work.KPIPoint; +import org.springframework.stereotype.Repository; @Repository public class EquipmentEvaluateDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/valueEngineering/EquipmentModelDao.java b/src/main/java/com/sipai/dao/valueEngineering/EquipmentModelDao.java index 93cb1f2a..1694bc9d 100644 --- a/src/main/java/com/sipai/dao/valueEngineering/EquipmentModelDao.java +++ b/src/main/java/com/sipai/dao/valueEngineering/EquipmentModelDao.java @@ -1,12 +1,8 @@ package com.sipai.dao.valueEngineering; -import java.util.List; - -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.valueEngineering.EquipmentModel; -import com.sipai.entity.work.KPIPoint; +import org.springframework.stereotype.Repository; @Repository public class EquipmentModelDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/visit/VisitApplyDao.java b/src/main/java/com/sipai/dao/visit/VisitApplyDao.java index ac112a5d..92d2fc2f 100644 --- a/src/main/java/com/sipai/dao/visit/VisitApplyDao.java +++ b/src/main/java/com/sipai/dao/visit/VisitApplyDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.visit; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.visit.VisitApply; +import org.springframework.stereotype.Repository; @Repository public class VisitApplyDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/visit/VisitPositionDao.java b/src/main/java/com/sipai/dao/visit/VisitPositionDao.java index f983f2df..49d01b37 100644 --- a/src/main/java/com/sipai/dao/visit/VisitPositionDao.java +++ b/src/main/java/com/sipai/dao/visit/VisitPositionDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.visit; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.visit.VisitPosition; +import org.springframework.stereotype.Repository; @Repository public class VisitPositionDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/visit/VisitRegisterDao.java b/src/main/java/com/sipai/dao/visit/VisitRegisterDao.java index 026a056d..cc086bb7 100644 --- a/src/main/java/com/sipai/dao/visit/VisitRegisterDao.java +++ b/src/main/java/com/sipai/dao/visit/VisitRegisterDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.visit; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.visit.VisitRegister; +import org.springframework.stereotype.Repository; @Repository public class VisitRegisterDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/visit/VisitSafetyCommitmentDao.java b/src/main/java/com/sipai/dao/visit/VisitSafetyCommitmentDao.java index 1fb58769..92ef81bf 100644 --- a/src/main/java/com/sipai/dao/visit/VisitSafetyCommitmentDao.java +++ b/src/main/java/com/sipai/dao/visit/VisitSafetyCommitmentDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.visit; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.visit.VisitSafetyCommitment; +import org.springframework.stereotype.Repository; @Repository public class VisitSafetyCommitmentDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/visit/VisitSafetyCommitmentRecordDao.java b/src/main/java/com/sipai/dao/visit/VisitSafetyCommitmentRecordDao.java index 5abe81e8..1d520883 100644 --- a/src/main/java/com/sipai/dao/visit/VisitSafetyCommitmentRecordDao.java +++ b/src/main/java/com/sipai/dao/visit/VisitSafetyCommitmentRecordDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.visit; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.visit.VisitSafetyCommitmentRecord; +import org.springframework.stereotype.Repository; @Repository public class VisitSafetyCommitmentRecordDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/visit/VisitVisitorsDao.java b/src/main/java/com/sipai/dao/visit/VisitVisitorsDao.java index 569d7549..0b881967 100644 --- a/src/main/java/com/sipai/dao/visit/VisitVisitorsDao.java +++ b/src/main/java/com/sipai/dao/visit/VisitVisitorsDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.visit; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.visit.VisitVisitors; +import org.springframework.stereotype.Repository; @Repository public class VisitVisitorsDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/visual/CacheDataDao.java b/src/main/java/com/sipai/dao/visual/CacheDataDao.java index 4271b8e5..12714f39 100644 --- a/src/main/java/com/sipai/dao/visual/CacheDataDao.java +++ b/src/main/java/com/sipai/dao/visual/CacheDataDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.visual; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.visual.CacheData; +import org.springframework.stereotype.Repository; @Repository public class CacheDataDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/visual/DataTypeDao.java b/src/main/java/com/sipai/dao/visual/DataTypeDao.java index 1d0649fe..52f6abaf 100644 --- a/src/main/java/com/sipai/dao/visual/DataTypeDao.java +++ b/src/main/java/com/sipai/dao/visual/DataTypeDao.java @@ -1,10 +1,8 @@ package com.sipai.dao.visual; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.visual.DataType; -import com.sipai.entity.visual.Interaction; +import org.springframework.stereotype.Repository; @Repository public class DataTypeDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/visual/InteractionDao.java b/src/main/java/com/sipai/dao/visual/InteractionDao.java index e26734a7..bdf327f0 100644 --- a/src/main/java/com/sipai/dao/visual/InteractionDao.java +++ b/src/main/java/com/sipai/dao/visual/InteractionDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.visual; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.visual.Interaction; +import org.springframework.stereotype.Repository; @Repository public class InteractionDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/visual/JspConfigureDao.java b/src/main/java/com/sipai/dao/visual/JspConfigureDao.java index b2a35d11..3c2d03a0 100644 --- a/src/main/java/com/sipai/dao/visual/JspConfigureDao.java +++ b/src/main/java/com/sipai/dao/visual/JspConfigureDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.visual; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.visual.JspConfigure; +import org.springframework.stereotype.Repository; @Repository public class JspConfigureDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/visual/JspConfigureDetailDao.java b/src/main/java/com/sipai/dao/visual/JspConfigureDetailDao.java index fc3fdf0c..5f4b614d 100644 --- a/src/main/java/com/sipai/dao/visual/JspConfigureDetailDao.java +++ b/src/main/java/com/sipai/dao/visual/JspConfigureDetailDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.visual; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.visual.JspConfigureDetail; +import org.springframework.stereotype.Repository; @Repository public class JspConfigureDetailDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/visual/JspElementDao.java b/src/main/java/com/sipai/dao/visual/JspElementDao.java index d1cd7d75..7687ccb5 100644 --- a/src/main/java/com/sipai/dao/visual/JspElementDao.java +++ b/src/main/java/com/sipai/dao/visual/JspElementDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.visual; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.visual.JspElement; +import org.springframework.stereotype.Repository; @Repository public class JspElementDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/visual/LayoutDao.java b/src/main/java/com/sipai/dao/visual/LayoutDao.java index f9c19e3b..32039e9e 100644 --- a/src/main/java/com/sipai/dao/visual/LayoutDao.java +++ b/src/main/java/com/sipai/dao/visual/LayoutDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.visual; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.visual.Layout; +import org.springframework.stereotype.Repository; @Repository public class LayoutDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/visual/LayoutDetailDao.java b/src/main/java/com/sipai/dao/visual/LayoutDetailDao.java index 30c7634a..a6b30e51 100644 --- a/src/main/java/com/sipai/dao/visual/LayoutDetailDao.java +++ b/src/main/java/com/sipai/dao/visual/LayoutDetailDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.visual; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.visual.LayoutDetail; +import org.springframework.stereotype.Repository; @Repository public class LayoutDetailDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/visual/PlanDao.java b/src/main/java/com/sipai/dao/visual/PlanDao.java index 8d33ad0f..11832d14 100644 --- a/src/main/java/com/sipai/dao/visual/PlanDao.java +++ b/src/main/java/com/sipai/dao/visual/PlanDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.visual; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.visual.Plan; +import org.springframework.stereotype.Repository; @Repository public class PlanDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/visual/PlanInteractionDao.java b/src/main/java/com/sipai/dao/visual/PlanInteractionDao.java index 1c14c2c1..8006c720 100644 --- a/src/main/java/com/sipai/dao/visual/PlanInteractionDao.java +++ b/src/main/java/com/sipai/dao/visual/PlanInteractionDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.visual; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.visual.PlanInteraction; +import org.springframework.stereotype.Repository; @Repository public class PlanInteractionDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/visual/PlanLayoutDao.java b/src/main/java/com/sipai/dao/visual/PlanLayoutDao.java index 0a82e547..c0865b45 100644 --- a/src/main/java/com/sipai/dao/visual/PlanLayoutDao.java +++ b/src/main/java/com/sipai/dao/visual/PlanLayoutDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.visual; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.visual.PlanLayout; +import org.springframework.stereotype.Repository; @Repository public class PlanLayoutDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/visual/ProcessOperationDao.java b/src/main/java/com/sipai/dao/visual/ProcessOperationDao.java index a0ff7986..1b6f7a60 100644 --- a/src/main/java/com/sipai/dao/visual/ProcessOperationDao.java +++ b/src/main/java/com/sipai/dao/visual/ProcessOperationDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.visual; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.visual.ProcessOperation; +import org.springframework.stereotype.Repository; @Repository public class ProcessOperationDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/visual/VisualCacheConfigDao.java b/src/main/java/com/sipai/dao/visual/VisualCacheConfigDao.java index 0c430375..43ba3d78 100644 --- a/src/main/java/com/sipai/dao/visual/VisualCacheConfigDao.java +++ b/src/main/java/com/sipai/dao/visual/VisualCacheConfigDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.visual; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.visual.VisualCacheConfig; +import org.springframework.stereotype.Repository; @Repository public class VisualCacheConfigDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/visual/VisualJspDao.java b/src/main/java/com/sipai/dao/visual/VisualJspDao.java index 7b17b9aa..9814059d 100644 --- a/src/main/java/com/sipai/dao/visual/VisualJspDao.java +++ b/src/main/java/com/sipai/dao/visual/VisualJspDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.visual; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.visual.VisualJsp; +import org.springframework.stereotype.Repository; @Repository public class VisualJspDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/whp/baseinfo/WhpEquipmentDao.java b/src/main/java/com/sipai/dao/whp/baseinfo/WhpEquipmentDao.java index a3925207..b689dab8 100644 --- a/src/main/java/com/sipai/dao/whp/baseinfo/WhpEquipmentDao.java +++ b/src/main/java/com/sipai/dao/whp/baseinfo/WhpEquipmentDao.java @@ -2,8 +2,8 @@ package com.sipai.dao.whp.baseinfo; import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.enums.EnumJsonObject; -import com.sipai.entity.whp.baseinfo.WhpEquipmentQuery; import com.sipai.entity.whp.baseinfo.WhpEquipment; +import com.sipai.entity.whp.baseinfo.WhpEquipmentQuery; import org.springframework.stereotype.Repository; import java.util.List; diff --git a/src/main/java/com/sipai/dao/whp/baseinfo/WhpSampleCodeDao.java b/src/main/java/com/sipai/dao/whp/baseinfo/WhpSampleCodeDao.java index a265ec46..95b79a01 100644 --- a/src/main/java/com/sipai/dao/whp/baseinfo/WhpSampleCodeDao.java +++ b/src/main/java/com/sipai/dao/whp/baseinfo/WhpSampleCodeDao.java @@ -1,8 +1,8 @@ package com.sipai.dao.whp.baseinfo; import com.sipai.dao.base.CommDaoImpl; -import com.sipai.entity.whp.baseinfo.WhpSampleCodeQuery; import com.sipai.entity.whp.baseinfo.WhpSampleCode; +import com.sipai.entity.whp.baseinfo.WhpSampleCodeQuery; import org.springframework.stereotype.Repository; import java.util.List; diff --git a/src/main/java/com/sipai/dao/whp/baseinfo/WhpSampleTypeDao.java b/src/main/java/com/sipai/dao/whp/baseinfo/WhpSampleTypeDao.java index fd811f1d..5417a59e 100644 --- a/src/main/java/com/sipai/dao/whp/baseinfo/WhpSampleTypeDao.java +++ b/src/main/java/com/sipai/dao/whp/baseinfo/WhpSampleTypeDao.java @@ -2,8 +2,8 @@ package com.sipai.dao.whp.baseinfo; import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.enums.EnumJsonObject; -import com.sipai.entity.whp.baseinfo.WhpSampleTypeQuery; import com.sipai.entity.whp.baseinfo.WhpSampleType; +import com.sipai.entity.whp.baseinfo.WhpSampleTypeQuery; import org.springframework.stereotype.Repository; import java.util.List; diff --git a/src/main/java/com/sipai/dao/whp/baseinfo/WhpTestItemWorkingCurveDao.java b/src/main/java/com/sipai/dao/whp/baseinfo/WhpTestItemWorkingCurveDao.java index 740cacdb..6db30d3f 100644 --- a/src/main/java/com/sipai/dao/whp/baseinfo/WhpTestItemWorkingCurveDao.java +++ b/src/main/java/com/sipai/dao/whp/baseinfo/WhpTestItemWorkingCurveDao.java @@ -1 +1 @@ -package com.sipai.dao.whp.baseinfo; import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.whp.baseinfo.WhpTestItemWorkingCurveQuery; import com.sipai.entity.whp.baseinfo.WhpTestItemWorkingCurve; import org.springframework.stereotype.Repository; import java.util.List; /** * 方法依据Dao * @Author: zxq * @Date: 2023/05/15 */ @Repository public class WhpTestItemWorkingCurveDao extends CommDaoImpl { public WhpTestItemWorkingCurveDao() { super(); this.setMappernamespace("whp.baseinfo.WhpTestItemWorkingCurveMapper"); } public List queryList(WhpTestItemWorkingCurveQuery s) { return getSqlSession().selectList("whp.baseinfo.WhpTestItemWorkingCurveMapper.queryList", s); } } \ No newline at end of file +package com.sipai.dao.whp.baseinfo; import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.whp.baseinfo.WhpTestItemWorkingCurve; import com.sipai.entity.whp.baseinfo.WhpTestItemWorkingCurveQuery; import org.springframework.stereotype.Repository; import java.util.List; /** * 方法依据Dao * @Author: zxq * @Date: 2023/05/15 */ @Repository public class WhpTestItemWorkingCurveDao extends CommDaoImpl { public WhpTestItemWorkingCurveDao() { super(); this.setMappernamespace("whp.baseinfo.WhpTestItemWorkingCurveMapper"); } public List queryList(WhpTestItemWorkingCurveQuery s) { return getSqlSession().selectList("whp.baseinfo.WhpTestItemWorkingCurveMapper.queryList", s); } } \ No newline at end of file diff --git a/src/main/java/com/sipai/dao/whp/baseinfo/WhpTestMethodDao.java b/src/main/java/com/sipai/dao/whp/baseinfo/WhpTestMethodDao.java index 935c0493..1bd603a9 100644 --- a/src/main/java/com/sipai/dao/whp/baseinfo/WhpTestMethodDao.java +++ b/src/main/java/com/sipai/dao/whp/baseinfo/WhpTestMethodDao.java @@ -1 +1 @@ -package com.sipai.dao.whp.baseinfo; import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.enums.EnumJsonObject; import com.sipai.entity.whp.baseinfo.WhpTestItem; import com.sipai.entity.whp.baseinfo.WhpTestMethodQuery; import com.sipai.entity.whp.baseinfo.WhpTestMethod; import org.springframework.stereotype.Repository; import java.util.List; /** * 方法依据Dao * @Author: zxq * @Date: 2023/05/15 */ @Repository public class WhpTestMethodDao extends CommDaoImpl { public WhpTestMethodDao() { super(); this.setMappernamespace("whp.baseinfo.WhpTestMethodMapper"); } public List queryList(WhpTestMethodQuery s) { return getSqlSession().selectList("whp.baseinfo.WhpTestMethodMapper.queryList", s); } public List testMethodDropDownList(WhpTestMethodQuery s) { return getSqlSession().selectList("whp.baseinfo.WhpTestMethodMapper.testMethodDropDownList",s); } } \ No newline at end of file +package com.sipai.dao.whp.baseinfo; import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.enums.EnumJsonObject; import com.sipai.entity.whp.baseinfo.WhpTestMethod; import com.sipai.entity.whp.baseinfo.WhpTestMethodQuery; import org.springframework.stereotype.Repository; import java.util.List; /** * 方法依据Dao * @Author: zxq * @Date: 2023/05/15 */ @Repository public class WhpTestMethodDao extends CommDaoImpl { public WhpTestMethodDao() { super(); this.setMappernamespace("whp.baseinfo.WhpTestMethodMapper"); } public List queryList(WhpTestMethodQuery s) { return getSqlSession().selectList("whp.baseinfo.WhpTestMethodMapper.queryList", s); } public List testMethodDropDownList(WhpTestMethodQuery s) { return getSqlSession().selectList("whp.baseinfo.WhpTestMethodMapper.testMethodDropDownList",s); } } \ No newline at end of file diff --git a/src/main/java/com/sipai/dao/whp/liquidWasteDispose/WhpLiquidWasteDisposeDao.java b/src/main/java/com/sipai/dao/whp/liquidWasteDispose/WhpLiquidWasteDisposeDao.java index 1b0f2304..94ab2e4f 100644 --- a/src/main/java/com/sipai/dao/whp/liquidWasteDispose/WhpLiquidWasteDisposeDao.java +++ b/src/main/java/com/sipai/dao/whp/liquidWasteDispose/WhpLiquidWasteDisposeDao.java @@ -1 +1 @@ -package com.sipai.dao.whp.liquidWasteDispose; import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.whp.liquidWasteDispose.WhpLiquidWasteDisposeQuery; import com.sipai.entity.whp.liquidWasteDispose.WhpLiquidWasteDispose; import org.springframework.stereotype.Repository; import java.util.List; /** * 余样处置方式Dao * @Author: 李晨 * @Date: 2022/12/20 */ @Repository public class WhpLiquidWasteDisposeDao extends CommDaoImpl { public WhpLiquidWasteDisposeDao() { super(); this.setMappernamespace("whp.liquidWasteDispose.WhpLiquidWasteDisposeMapper"); } public List queryList(WhpLiquidWasteDisposeQuery s) { return getSqlSession().selectList("whp.liquidWasteDispose.WhpLiquidWasteDisposeMapper.queryList", s); } public Float getCurrentNumbCount(WhpLiquidWasteDisposeQuery s) { return getSqlSession().selectOne("whp.liquidWasteDispose.WhpLiquidWasteDisposeMapper.getCurrentNumbCount", s); } public Float getNumberCount(WhpLiquidWasteDisposeQuery s) { return getSqlSession().selectOne("whp.liquidWasteDispose.WhpLiquidWasteDisposeMapper.getNumberCount", s); } public List queryListDispose(WhpLiquidWasteDisposeQuery s) { return getSqlSession().selectList("whp.liquidWasteDispose.WhpLiquidWasteDisposeMapper.queryListDispose", s); } } \ No newline at end of file +package com.sipai.dao.whp.liquidWasteDispose; import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.whp.liquidWasteDispose.WhpLiquidWasteDispose; import com.sipai.entity.whp.liquidWasteDispose.WhpLiquidWasteDisposeQuery; import org.springframework.stereotype.Repository; import java.util.List; /** * 余样处置方式Dao * @Author: 李晨 * @Date: 2022/12/20 */ @Repository public class WhpLiquidWasteDisposeDao extends CommDaoImpl { public WhpLiquidWasteDisposeDao() { super(); this.setMappernamespace("whp.liquidWasteDispose.WhpLiquidWasteDisposeMapper"); } public List queryList(WhpLiquidWasteDisposeQuery s) { return getSqlSession().selectList("whp.liquidWasteDispose.WhpLiquidWasteDisposeMapper.queryList", s); } public Float getCurrentNumbCount(WhpLiquidWasteDisposeQuery s) { return getSqlSession().selectOne("whp.liquidWasteDispose.WhpLiquidWasteDisposeMapper.getCurrentNumbCount", s); } public Float getNumberCount(WhpLiquidWasteDisposeQuery s) { return getSqlSession().selectOne("whp.liquidWasteDispose.WhpLiquidWasteDisposeMapper.getNumberCount", s); } public List queryListDispose(WhpLiquidWasteDisposeQuery s) { return getSqlSession().selectList("whp.liquidWasteDispose.WhpLiquidWasteDisposeMapper.queryListDispose", s); } } \ No newline at end of file diff --git a/src/main/java/com/sipai/dao/whp/liquidWasteDispose/WhpLiquidWasteDisposeLogDao.java b/src/main/java/com/sipai/dao/whp/liquidWasteDispose/WhpLiquidWasteDisposeLogDao.java index fe31195a..6bce35f0 100644 --- a/src/main/java/com/sipai/dao/whp/liquidWasteDispose/WhpLiquidWasteDisposeLogDao.java +++ b/src/main/java/com/sipai/dao/whp/liquidWasteDispose/WhpLiquidWasteDisposeLogDao.java @@ -1 +1 @@ -package com.sipai.dao.whp.liquidWasteDispose; import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.whp.liquidWasteDispose.WhpLiquidWasteDisposeLogQuery; import com.sipai.entity.whp.liquidWasteDispose.WhpLiquidWasteDisposeLog; import org.springframework.stereotype.Repository; import java.util.List; /** * 方法依据Dao * @Author: zxq * @Date: 2023/05/15 */ @Repository public class WhpLiquidWasteDisposeLogDao extends CommDaoImpl { public WhpLiquidWasteDisposeLogDao() { super(); this.setMappernamespace("whp.liquidWasteDispose.WhpLiquidWasteDisposeLogMapper"); } public List queryList(WhpLiquidWasteDisposeLogQuery s) { return getSqlSession().selectList("whp.liquidWasteDispose.WhpLiquidWasteDisposeLogMapper.queryList", s); } } \ No newline at end of file +package com.sipai.dao.whp.liquidWasteDispose; import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.whp.liquidWasteDispose.WhpLiquidWasteDisposeLog; import com.sipai.entity.whp.liquidWasteDispose.WhpLiquidWasteDisposeLogQuery; import org.springframework.stereotype.Repository; import java.util.List; /** * 方法依据Dao * @Author: zxq * @Date: 2023/05/15 */ @Repository public class WhpLiquidWasteDisposeLogDao extends CommDaoImpl { public WhpLiquidWasteDisposeLogDao() { super(); this.setMappernamespace("whp.liquidWasteDispose.WhpLiquidWasteDisposeLogMapper"); } public List queryList(WhpLiquidWasteDisposeLogQuery s) { return getSqlSession().selectList("whp.liquidWasteDispose.WhpLiquidWasteDisposeLogMapper.queryList", s); } } \ No newline at end of file diff --git a/src/main/java/com/sipai/dao/whp/plan/WhpSamplingPlanDao.java b/src/main/java/com/sipai/dao/whp/plan/WhpSamplingPlanDao.java index 21daf2cc..ce7ccef0 100644 --- a/src/main/java/com/sipai/dao/whp/plan/WhpSamplingPlanDao.java +++ b/src/main/java/com/sipai/dao/whp/plan/WhpSamplingPlanDao.java @@ -1,7 +1,6 @@ package com.sipai.dao.whp.plan; import com.sipai.dao.base.CommDaoImpl; -import com.sipai.entity.enums.whp.PlanIndexJson; import com.sipai.entity.whp.plan.WhpSamplingPlan; import com.sipai.entity.whp.plan.WhpSamplingPlanQuery; import org.springframework.stereotype.Repository; diff --git a/src/main/java/com/sipai/dao/whp/plan/WhpSamplingPlanTaskDao.java b/src/main/java/com/sipai/dao/whp/plan/WhpSamplingPlanTaskDao.java index 9397444c..952ed898 100644 --- a/src/main/java/com/sipai/dao/whp/plan/WhpSamplingPlanTaskDao.java +++ b/src/main/java/com/sipai/dao/whp/plan/WhpSamplingPlanTaskDao.java @@ -1 +1 @@ -package com.sipai.dao.whp.plan; import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.enums.EnumJsonObject; import com.sipai.entity.enums.whp.PlanIndexJson; import com.sipai.entity.whp.plan.WhpSamplingPlanQuery; import com.sipai.entity.whp.plan.WhpSamplingPlanTaskQuery; import com.sipai.entity.whp.plan.WhpSamplingPlanTask; import org.springframework.stereotype.Repository; import java.util.List; /** * 采样任务Dao * @Author: 李晨 * @Date: 2022/12/30 */ @Repository public class WhpSamplingPlanTaskDao extends CommDaoImpl { public WhpSamplingPlanTaskDao() { super(); this.setMappernamespace("whp.plan.WhpSamplingPlanTaskMapper"); } public List queryList(WhpSamplingPlanTaskQuery s) { return getSqlSession().selectList("whp.plan.WhpSamplingPlanTaskMapper.queryList", s); } public List sampleUserDropDown() { return getSqlSession().selectList("whp.plan.WhpSamplingPlanTaskMapper.sampleUserDropDown"); } public List addressDropDown() { return getSqlSession().selectList("whp.plan.WhpSamplingPlanTaskMapper.addressDropDown"); } public List queryListNoTemplate(WhpSamplingPlanTaskQuery query) { return getSqlSession().selectList("whp.plan.WhpSamplingPlanTaskMapper.queryListNoTemplate", query); } public void updateStatusByPlanId(WhpSamplingPlanTask bean) { getSqlSession().update("whp.plan.WhpSamplingPlanTaskMapper.updateStatusByPlanId", bean); } public List queryListPlanTj(WhpSamplingPlanQuery s){ return getSqlSession().selectList("whp.plan.WhpSamplingPlanTaskMapper.selectPlanCount", s); } public List selectItemCount(WhpSamplingPlanQuery s){ return getSqlSession().selectList("whp.plan.WhpSamplingPlanTaskMapper.selectItemCount", s); } public List selectTypeByDate(WhpSamplingPlanQuery s){ return getSqlSession().selectList("whp.plan.WhpSamplingPlanTaskMapper.selectTypeByDate", s); } public List selectPlanByDate(WhpSamplingPlanQuery s){ return getSqlSession().selectList("whp.plan.WhpSamplingPlanTaskMapper.selectPlanByDate", s); } } \ No newline at end of file +package com.sipai.dao.whp.plan; import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.enums.EnumJsonObject; import com.sipai.entity.enums.whp.PlanIndexJson; import com.sipai.entity.whp.plan.WhpSamplingPlanQuery; import com.sipai.entity.whp.plan.WhpSamplingPlanTask; import com.sipai.entity.whp.plan.WhpSamplingPlanTaskQuery; import org.springframework.stereotype.Repository; import java.util.List; /** * 采样任务Dao * @Author: 李晨 * @Date: 2022/12/30 */ @Repository public class WhpSamplingPlanTaskDao extends CommDaoImpl { public WhpSamplingPlanTaskDao() { super(); this.setMappernamespace("whp.plan.WhpSamplingPlanTaskMapper"); } public List queryList(WhpSamplingPlanTaskQuery s) { return getSqlSession().selectList("whp.plan.WhpSamplingPlanTaskMapper.queryList", s); } public List sampleUserDropDown() { return getSqlSession().selectList("whp.plan.WhpSamplingPlanTaskMapper.sampleUserDropDown"); } public List addressDropDown() { return getSqlSession().selectList("whp.plan.WhpSamplingPlanTaskMapper.addressDropDown"); } public List queryListNoTemplate(WhpSamplingPlanTaskQuery query) { return getSqlSession().selectList("whp.plan.WhpSamplingPlanTaskMapper.queryListNoTemplate", query); } public void updateStatusByPlanId(WhpSamplingPlanTask bean) { getSqlSession().update("whp.plan.WhpSamplingPlanTaskMapper.updateStatusByPlanId", bean); } public List queryListPlanTj(WhpSamplingPlanQuery s){ return getSqlSession().selectList("whp.plan.WhpSamplingPlanTaskMapper.selectPlanCount", s); } public List selectItemCount(WhpSamplingPlanQuery s){ return getSqlSession().selectList("whp.plan.WhpSamplingPlanTaskMapper.selectItemCount", s); } public List selectTypeByDate(WhpSamplingPlanQuery s){ return getSqlSession().selectList("whp.plan.WhpSamplingPlanTaskMapper.selectTypeByDate", s); } public List selectPlanByDate(WhpSamplingPlanQuery s){ return getSqlSession().selectList("whp.plan.WhpSamplingPlanTaskMapper.selectPlanByDate", s); } } \ No newline at end of file diff --git a/src/main/java/com/sipai/dao/whp/test/WhpSamplingPlanTaskTestConfirmDao.java b/src/main/java/com/sipai/dao/whp/test/WhpSamplingPlanTaskTestConfirmDao.java index 112e339b..012a1d28 100644 --- a/src/main/java/com/sipai/dao/whp/test/WhpSamplingPlanTaskTestConfirmDao.java +++ b/src/main/java/com/sipai/dao/whp/test/WhpSamplingPlanTaskTestConfirmDao.java @@ -1 +1 @@ -package com.sipai.dao.whp.test; import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.enums.EnumJsonObject; import com.sipai.entity.whp.test.WhpSamplingPlanTaskTestConfirmQuery; import com.sipai.entity.whp.test.WhpSamplingPlanTaskTestConfirm; import com.sipai.entity.whp.test.WhpSamplingPlanTaskTestConfirmListVo; import org.springframework.stereotype.Repository; import java.util.List; /** * 计划单检测项目分组信息Dao * @Author: 李晨 * @Date: 2023/1/5 */ @Repository public class WhpSamplingPlanTaskTestConfirmDao extends CommDaoImpl { public WhpSamplingPlanTaskTestConfirmDao() { super(); this.setMappernamespace("whp.test.WhpSamplingPlanTaskTestConfirmMapper"); } public List queryList(WhpSamplingPlanTaskTestConfirmQuery s) { return getSqlSession().selectList("whp.test.WhpSamplingPlanTaskTestConfirmMapper.queryList", s); } public List testItemTree(WhpSamplingPlanTaskTestConfirmQuery query) { return getSqlSession().selectList("whp.test.WhpSamplingPlanTaskTestConfirmMapper.testItemTree", query); } public List selectPlanCodeList(WhpSamplingPlanTaskTestConfirm query) { return getSqlSession().selectList("whp.test.WhpSamplingPlanTaskTestConfirmMapper.selectPlanCodeList", query); } } \ No newline at end of file +package com.sipai.dao.whp.test; import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.enums.EnumJsonObject; import com.sipai.entity.whp.test.WhpSamplingPlanTaskTestConfirm; import com.sipai.entity.whp.test.WhpSamplingPlanTaskTestConfirmListVo; import com.sipai.entity.whp.test.WhpSamplingPlanTaskTestConfirmQuery; import org.springframework.stereotype.Repository; import java.util.List; /** * 计划单检测项目分组信息Dao * @Author: 李晨 * @Date: 2023/1/5 */ @Repository public class WhpSamplingPlanTaskTestConfirmDao extends CommDaoImpl { public WhpSamplingPlanTaskTestConfirmDao() { super(); this.setMappernamespace("whp.test.WhpSamplingPlanTaskTestConfirmMapper"); } public List queryList(WhpSamplingPlanTaskTestConfirmQuery s) { return getSqlSession().selectList("whp.test.WhpSamplingPlanTaskTestConfirmMapper.queryList", s); } public List testItemTree(WhpSamplingPlanTaskTestConfirmQuery query) { return getSqlSession().selectList("whp.test.WhpSamplingPlanTaskTestConfirmMapper.testItemTree", query); } public List selectPlanCodeList(WhpSamplingPlanTaskTestConfirm query) { return getSqlSession().selectList("whp.test.WhpSamplingPlanTaskTestConfirmMapper.selectPlanCodeList", query); } } \ No newline at end of file diff --git a/src/main/java/com/sipai/dao/whp/test/WhpSamplingPlanTaskTestItemDao.java b/src/main/java/com/sipai/dao/whp/test/WhpSamplingPlanTaskTestItemDao.java index 715d03c2..0c8c3a10 100644 --- a/src/main/java/com/sipai/dao/whp/test/WhpSamplingPlanTaskTestItemDao.java +++ b/src/main/java/com/sipai/dao/whp/test/WhpSamplingPlanTaskTestItemDao.java @@ -1 +1 @@ -package com.sipai.dao.whp.test; import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.whp.test.WhpSamplingPlanTaskTestConfirm; import com.sipai.entity.whp.test.WhpSamplingPlanTaskTestItemQuery; import com.sipai.entity.whp.test.WhpSamplingPlanTaskTestItem; import org.springframework.stereotype.Repository; import java.util.List; /** * 计划单检测项目记录Dao * @Author: 李晨 * @Date: 2023/1/5 */ @Repository public class WhpSamplingPlanTaskTestItemDao extends CommDaoImpl { public WhpSamplingPlanTaskTestItemDao() { super(); this.setMappernamespace("whp.test.WhpSamplingPlanTaskTestItemMapper"); } public List queryList(WhpSamplingPlanTaskTestItemQuery s) { return getSqlSession().selectList("whp.test.WhpSamplingPlanTaskTestItemMapper.queryList", s); } public int updateConfirmId(WhpSamplingPlanTaskTestConfirm confirm) { return getSqlSession().update("whp.test.WhpSamplingPlanTaskTestItemMapper.updateConfirmId", confirm); } public int updateStatusByConfirmId(WhpSamplingPlanTaskTestItem confirm) { return getSqlSession().update("whp.test.WhpSamplingPlanTaskTestItemMapper.updateStatusByConfirmId", confirm); } } \ No newline at end of file +package com.sipai.dao.whp.test; import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.whp.test.WhpSamplingPlanTaskTestConfirm; import com.sipai.entity.whp.test.WhpSamplingPlanTaskTestItem; import com.sipai.entity.whp.test.WhpSamplingPlanTaskTestItemQuery; import org.springframework.stereotype.Repository; import java.util.List; /** * 计划单检测项目记录Dao * @Author: 李晨 * @Date: 2023/1/5 */ @Repository public class WhpSamplingPlanTaskTestItemDao extends CommDaoImpl { public WhpSamplingPlanTaskTestItemDao() { super(); this.setMappernamespace("whp.test.WhpSamplingPlanTaskTestItemMapper"); } public List queryList(WhpSamplingPlanTaskTestItemQuery s) { return getSqlSession().selectList("whp.test.WhpSamplingPlanTaskTestItemMapper.queryList", s); } public int updateConfirmId(WhpSamplingPlanTaskTestConfirm confirm) { return getSqlSession().update("whp.test.WhpSamplingPlanTaskTestItemMapper.updateConfirmId", confirm); } public int updateStatusByConfirmId(WhpSamplingPlanTaskTestItem confirm) { return getSqlSession().update("whp.test.WhpSamplingPlanTaskTestItemMapper.updateStatusByConfirmId", confirm); } } \ No newline at end of file diff --git a/src/main/java/com/sipai/dao/whp/test/WhpTaskItemCurveDao.java b/src/main/java/com/sipai/dao/whp/test/WhpTaskItemCurveDao.java index a1728585..d43a69a7 100644 --- a/src/main/java/com/sipai/dao/whp/test/WhpTaskItemCurveDao.java +++ b/src/main/java/com/sipai/dao/whp/test/WhpTaskItemCurveDao.java @@ -1 +1 @@ -package com.sipai.dao.whp.test; import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.whp.test.WhpTaskItemCurveQuery; import com.sipai.entity.whp.test.WhpTaskItemCurve; import org.springframework.stereotype.Repository; import java.util.List; /** * 方法依据Dao * @Author: zxq * @Date: 2023/05/15 */ @Repository public class WhpTaskItemCurveDao extends CommDaoImpl { public WhpTaskItemCurveDao() { super(); this.setMappernamespace("whp.test.WhpTaskItemCurveMapper"); } public List queryList(WhpTaskItemCurveQuery s) { return getSqlSession().selectList("whp.test.WhpTaskItemCurveMapper.queryList", s); } } \ No newline at end of file +package com.sipai.dao.whp.test; import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.whp.test.WhpTaskItemCurve; import com.sipai.entity.whp.test.WhpTaskItemCurveQuery; import org.springframework.stereotype.Repository; import java.util.List; /** * 方法依据Dao * @Author: zxq * @Date: 2023/05/15 */ @Repository public class WhpTaskItemCurveDao extends CommDaoImpl { public WhpTaskItemCurveDao() { super(); this.setMappernamespace("whp.test.WhpTaskItemCurveMapper"); } public List queryList(WhpTaskItemCurveQuery s) { return getSqlSession().selectList("whp.test.WhpTaskItemCurveMapper.queryList", s); } } \ No newline at end of file diff --git a/src/main/java/com/sipai/dao/work/AutoAlertDao.java b/src/main/java/com/sipai/dao/work/AutoAlertDao.java index 0f2e44ae..2aa4bcfd 100644 --- a/src/main/java/com/sipai/dao/work/AutoAlertDao.java +++ b/src/main/java/com/sipai/dao/work/AutoAlertDao.java @@ -1,11 +1,8 @@ package com.sipai.dao.work; -import java.util.List; - -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.work.AutoAlert; +import org.springframework.stereotype.Repository; @Repository public class AutoAlertDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/work/CameraDao.java b/src/main/java/com/sipai/dao/work/CameraDao.java index a7eb81e1..871dad05 100644 --- a/src/main/java/com/sipai/dao/work/CameraDao.java +++ b/src/main/java/com/sipai/dao/work/CameraDao.java @@ -1,11 +1,10 @@ package com.sipai.dao.work; -import java.util.List; - -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.work.Camera; +import org.springframework.stereotype.Repository; + +import java.util.List; @Repository public class CameraDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/work/CameraDetailDao.java b/src/main/java/com/sipai/dao/work/CameraDetailDao.java index 958ca2fd..48a8bb67 100644 --- a/src/main/java/com/sipai/dao/work/CameraDetailDao.java +++ b/src/main/java/com/sipai/dao/work/CameraDetailDao.java @@ -1,15 +1,9 @@ package com.sipai.dao.work; import com.sipai.dao.base.CommDaoImpl; -import com.sipai.entity.work.Camera; import com.sipai.entity.work.CameraDetail; -import com.sipai.entity.work.GroupManage; import org.springframework.stereotype.Repository; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - @Repository public class CameraDetailDao extends CommDaoImpl{ public CameraDetailDao() { diff --git a/src/main/java/com/sipai/dao/work/CameraFileDao.java b/src/main/java/com/sipai/dao/work/CameraFileDao.java index 05d2de7a..ffde1bc4 100644 --- a/src/main/java/com/sipai/dao/work/CameraFileDao.java +++ b/src/main/java/com/sipai/dao/work/CameraFileDao.java @@ -1,11 +1,8 @@ package com.sipai.dao.work; -import java.util.List; - -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.work.CameraFile; +import org.springframework.stereotype.Repository; @Repository public class CameraFileDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/work/ChannelPortConfigDao.java b/src/main/java/com/sipai/dao/work/ChannelPortConfigDao.java index b93f1232..ff426454 100644 --- a/src/main/java/com/sipai/dao/work/ChannelPortConfigDao.java +++ b/src/main/java/com/sipai/dao/work/ChannelPortConfigDao.java @@ -4,8 +4,6 @@ import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.work.ChannelPortConfig; import org.springframework.stereotype.Repository; -import java.util.List; - @Repository public class ChannelPortConfigDao extends CommDaoImpl{ public ChannelPortConfigDao(){ diff --git a/src/main/java/com/sipai/dao/work/ElectricityMeterDao.java b/src/main/java/com/sipai/dao/work/ElectricityMeterDao.java index 539e105e..d143881d 100644 --- a/src/main/java/com/sipai/dao/work/ElectricityMeterDao.java +++ b/src/main/java/com/sipai/dao/work/ElectricityMeterDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.work; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.work.ElectricityMeter; +import org.springframework.stereotype.Repository; @Repository public class ElectricityMeterDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/work/GroupContentDao.java b/src/main/java/com/sipai/dao/work/GroupContentDao.java index bae8e9f2..a08aa4eb 100644 --- a/src/main/java/com/sipai/dao/work/GroupContentDao.java +++ b/src/main/java/com/sipai/dao/work/GroupContentDao.java @@ -1,11 +1,8 @@ package com.sipai.dao.work; -import java.util.List; - -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.work.GroupContent; +import org.springframework.stereotype.Repository; @Repository public class GroupContentDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/work/GroupContentFormDao.java b/src/main/java/com/sipai/dao/work/GroupContentFormDao.java index 72d2d5c9..084064de 100644 --- a/src/main/java/com/sipai/dao/work/GroupContentFormDao.java +++ b/src/main/java/com/sipai/dao/work/GroupContentFormDao.java @@ -1,11 +1,8 @@ package com.sipai.dao.work; -import java.util.List; - -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.work.GroupContentForm; +import org.springframework.stereotype.Repository; @Repository public class GroupContentFormDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/work/GroupContentFormDataDao.java b/src/main/java/com/sipai/dao/work/GroupContentFormDataDao.java index 32826aa9..7e99e8ca 100644 --- a/src/main/java/com/sipai/dao/work/GroupContentFormDataDao.java +++ b/src/main/java/com/sipai/dao/work/GroupContentFormDataDao.java @@ -1,11 +1,8 @@ package com.sipai.dao.work; -import java.util.List; - -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.work.GroupContentFormData; +import org.springframework.stereotype.Repository; @Repository public class GroupContentFormDataDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/work/GroupDao.java b/src/main/java/com/sipai/dao/work/GroupDao.java index 374eb628..38f6c475 100644 --- a/src/main/java/com/sipai/dao/work/GroupDao.java +++ b/src/main/java/com/sipai/dao/work/GroupDao.java @@ -1,11 +1,8 @@ package com.sipai.dao.work; -import java.util.List; - -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.work.Group; +import org.springframework.stereotype.Repository; @Repository public class GroupDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/work/GroupDetailDao.java b/src/main/java/com/sipai/dao/work/GroupDetailDao.java index 734a3f0a..2c694f9f 100644 --- a/src/main/java/com/sipai/dao/work/GroupDetailDao.java +++ b/src/main/java/com/sipai/dao/work/GroupDetailDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.work; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.work.GroupDetail; +import org.springframework.stereotype.Repository; @Repository public class GroupDetailDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/work/GroupManageDao.java b/src/main/java/com/sipai/dao/work/GroupManageDao.java index 4d07e821..f972f1fe 100644 --- a/src/main/java/com/sipai/dao/work/GroupManageDao.java +++ b/src/main/java/com/sipai/dao/work/GroupManageDao.java @@ -1,15 +1,13 @@ package com.sipai.dao.work; +import com.sipai.dao.base.CommDaoImpl; +import com.sipai.entity.work.GroupManage; +import org.springframework.stereotype.Repository; + import java.util.HashMap; import java.util.List; import java.util.Map; -import org.springframework.stereotype.Repository; - -import com.sipai.dao.base.CommDaoImpl; -import com.sipai.entity.work.GroupMember; -import com.sipai.entity.work.GroupManage; - @Repository public class GroupManageDao extends CommDaoImpl{ public GroupManageDao() { diff --git a/src/main/java/com/sipai/dao/work/GroupMemberDao.java b/src/main/java/com/sipai/dao/work/GroupMemberDao.java index 700d35f1..639f1cd0 100644 --- a/src/main/java/com/sipai/dao/work/GroupMemberDao.java +++ b/src/main/java/com/sipai/dao/work/GroupMemberDao.java @@ -1,11 +1,10 @@ package com.sipai.dao.work; -import java.util.List; - -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.work.GroupMember; +import org.springframework.stereotype.Repository; + +import java.util.List; @Repository public class GroupMemberDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/work/GroupTimeDao.java b/src/main/java/com/sipai/dao/work/GroupTimeDao.java index d25a913c..b919870c 100644 --- a/src/main/java/com/sipai/dao/work/GroupTimeDao.java +++ b/src/main/java/com/sipai/dao/work/GroupTimeDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.work; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.work.GroupTime; +import org.springframework.stereotype.Repository; import java.util.HashMap; import java.util.List; diff --git a/src/main/java/com/sipai/dao/work/GroupTypeDao.java b/src/main/java/com/sipai/dao/work/GroupTypeDao.java index 15639034..89b27fbc 100644 --- a/src/main/java/com/sipai/dao/work/GroupTypeDao.java +++ b/src/main/java/com/sipai/dao/work/GroupTypeDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.work; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.work.GroupType; +import org.springframework.stereotype.Repository; @Repository public class GroupTypeDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/work/KPIPointDao.java b/src/main/java/com/sipai/dao/work/KPIPointDao.java index ca8df93e..71308b5e 100644 --- a/src/main/java/com/sipai/dao/work/KPIPointDao.java +++ b/src/main/java/com/sipai/dao/work/KPIPointDao.java @@ -1,11 +1,8 @@ package com.sipai.dao.work; -import java.util.List; - -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.work.KPIPoint; +import org.springframework.stereotype.Repository; @Repository public class KPIPointDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/work/KPIPointProfessorDao.java b/src/main/java/com/sipai/dao/work/KPIPointProfessorDao.java index a54f7f5c..efaa3e97 100644 --- a/src/main/java/com/sipai/dao/work/KPIPointProfessorDao.java +++ b/src/main/java/com/sipai/dao/work/KPIPointProfessorDao.java @@ -1,11 +1,8 @@ package com.sipai.dao.work; -import java.util.List; - -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.work.KPIPointProfessor; +import org.springframework.stereotype.Repository; @Repository public class KPIPointProfessorDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/work/KPIPointProfessorParamDao.java b/src/main/java/com/sipai/dao/work/KPIPointProfessorParamDao.java index abac3bd9..9d8a3b79 100644 --- a/src/main/java/com/sipai/dao/work/KPIPointProfessorParamDao.java +++ b/src/main/java/com/sipai/dao/work/KPIPointProfessorParamDao.java @@ -1,11 +1,8 @@ package com.sipai.dao.work; -import java.util.List; - -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.work.KPIPointProfessorParam; +import org.springframework.stereotype.Repository; @Repository public class KPIPointProfessorParamDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/work/LagerScreenConfigureDao.java b/src/main/java/com/sipai/dao/work/LagerScreenConfigureDao.java index 5180397a..b4078da3 100644 --- a/src/main/java/com/sipai/dao/work/LagerScreenConfigureDao.java +++ b/src/main/java/com/sipai/dao/work/LagerScreenConfigureDao.java @@ -1,11 +1,8 @@ package com.sipai.dao.work; -import java.util.List; - -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.work.LagerScreenConfigure; +import org.springframework.stereotype.Repository; @Repository public class LagerScreenConfigureDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/work/LagerScreenConfigureDetailDao.java b/src/main/java/com/sipai/dao/work/LagerScreenConfigureDetailDao.java index ffa21bed..3d602c80 100644 --- a/src/main/java/com/sipai/dao/work/LagerScreenConfigureDetailDao.java +++ b/src/main/java/com/sipai/dao/work/LagerScreenConfigureDetailDao.java @@ -1,11 +1,8 @@ package com.sipai.dao.work; -import java.util.List; - -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.work.LagerScreenConfigureDetail; +import org.springframework.stereotype.Repository; @Repository public class LagerScreenConfigureDetailDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/work/LagerScreenDataDao.java b/src/main/java/com/sipai/dao/work/LagerScreenDataDao.java index c134a1f5..ac5cd8d2 100644 --- a/src/main/java/com/sipai/dao/work/LagerScreenDataDao.java +++ b/src/main/java/com/sipai/dao/work/LagerScreenDataDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.work; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.work.LagerScreenData; +import org.springframework.stereotype.Repository; @Repository public class LagerScreenDataDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/work/MPointHisChangeDataDao.java b/src/main/java/com/sipai/dao/work/MPointHisChangeDataDao.java index df1ae50d..5c72f970 100644 --- a/src/main/java/com/sipai/dao/work/MPointHisChangeDataDao.java +++ b/src/main/java/com/sipai/dao/work/MPointHisChangeDataDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.work; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.work.MPointHisChangeData; +import org.springframework.stereotype.Repository; import java.util.List; diff --git a/src/main/java/com/sipai/dao/work/MeasurePoint_DATADao.java b/src/main/java/com/sipai/dao/work/MeasurePoint_DATADao.java index a576bfec..18c1d678 100644 --- a/src/main/java/com/sipai/dao/work/MeasurePoint_DATADao.java +++ b/src/main/java/com/sipai/dao/work/MeasurePoint_DATADao.java @@ -1,11 +1,8 @@ package com.sipai.dao.work; -import java.util.List; - -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.work.MeasurePoint_DATA; +import org.springframework.stereotype.Repository; @Repository public class MeasurePoint_DATADao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/work/ModbusConfigDao.java b/src/main/java/com/sipai/dao/work/ModbusConfigDao.java index db697470..1eac115a 100644 --- a/src/main/java/com/sipai/dao/work/ModbusConfigDao.java +++ b/src/main/java/com/sipai/dao/work/ModbusConfigDao.java @@ -2,11 +2,8 @@ package com.sipai.dao.work; import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.work.ModbusConfig; -import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; -import java.util.List; - @Repository public class ModbusConfigDao extends CommDaoImpl { diff --git a/src/main/java/com/sipai/dao/work/ModbusFigDao.java b/src/main/java/com/sipai/dao/work/ModbusFigDao.java index 2051a36e..e07c52c5 100644 --- a/src/main/java/com/sipai/dao/work/ModbusFigDao.java +++ b/src/main/java/com/sipai/dao/work/ModbusFigDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.work; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.work.ModbusFig; +import org.springframework.stereotype.Repository; @Repository public class ModbusFigDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/work/ModbusInterfaceDao.java b/src/main/java/com/sipai/dao/work/ModbusInterfaceDao.java index dc0362d0..a7fbd418 100644 --- a/src/main/java/com/sipai/dao/work/ModbusInterfaceDao.java +++ b/src/main/java/com/sipai/dao/work/ModbusInterfaceDao.java @@ -2,11 +2,8 @@ package com.sipai.dao.work; import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.work.ModbusInterface; -import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; -import java.util.List; - @Repository public class ModbusInterfaceDao extends CommDaoImpl { diff --git a/src/main/java/com/sipai/dao/work/ModbusPointDao.java b/src/main/java/com/sipai/dao/work/ModbusPointDao.java index d3bd1e97..b97483d0 100644 --- a/src/main/java/com/sipai/dao/work/ModbusPointDao.java +++ b/src/main/java/com/sipai/dao/work/ModbusPointDao.java @@ -2,11 +2,8 @@ package com.sipai.dao.work; import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.work.ModbusPoint; -import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; -import java.util.List; - @Repository public class ModbusPointDao extends CommDaoImpl { diff --git a/src/main/java/com/sipai/dao/work/ModbusRecordDao.java b/src/main/java/com/sipai/dao/work/ModbusRecordDao.java index 3a2c345e..f8bc9a7d 100644 --- a/src/main/java/com/sipai/dao/work/ModbusRecordDao.java +++ b/src/main/java/com/sipai/dao/work/ModbusRecordDao.java @@ -1,10 +1,8 @@ package com.sipai.dao.work; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; -import com.sipai.entity.work.ModbusFig; import com.sipai.entity.work.ModbusRecord; +import org.springframework.stereotype.Repository; @Repository public class ModbusRecordDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/work/ProductionIndexDataDao.java b/src/main/java/com/sipai/dao/work/ProductionIndexDataDao.java index a8849855..3f25d8a3 100644 --- a/src/main/java/com/sipai/dao/work/ProductionIndexDataDao.java +++ b/src/main/java/com/sipai/dao/work/ProductionIndexDataDao.java @@ -1,12 +1,10 @@ package com.sipai.dao.work; -import java.util.List; - -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.work.ProductionIndexData; -import com.sipai.entity.work.ProductionIndexData; +import org.springframework.stereotype.Repository; + +import java.util.List; @Repository public class ProductionIndexDataDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/work/ProductionIndexPlanNameConfigureDao.java b/src/main/java/com/sipai/dao/work/ProductionIndexPlanNameConfigureDao.java index 2eb36447..2b267e44 100644 --- a/src/main/java/com/sipai/dao/work/ProductionIndexPlanNameConfigureDao.java +++ b/src/main/java/com/sipai/dao/work/ProductionIndexPlanNameConfigureDao.java @@ -1,11 +1,8 @@ package com.sipai.dao.work; -import java.util.List; - -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.work.ProductionIndexPlanNameConfigure; +import org.springframework.stereotype.Repository; @Repository public class ProductionIndexPlanNameConfigureDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/work/ProductionIndexPlanNameDataDao.java b/src/main/java/com/sipai/dao/work/ProductionIndexPlanNameDataDao.java index 8120a98d..3c936a46 100644 --- a/src/main/java/com/sipai/dao/work/ProductionIndexPlanNameDataDao.java +++ b/src/main/java/com/sipai/dao/work/ProductionIndexPlanNameDataDao.java @@ -1,11 +1,10 @@ package com.sipai.dao.work; -import java.util.List; - -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.work.ProductionIndexPlanNameData; +import org.springframework.stereotype.Repository; + +import java.util.List; @Repository public class ProductionIndexPlanNameDataDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/work/ProductionIndexPlanNameDataHisDao.java b/src/main/java/com/sipai/dao/work/ProductionIndexPlanNameDataHisDao.java index 281558b9..6492793f 100644 --- a/src/main/java/com/sipai/dao/work/ProductionIndexPlanNameDataHisDao.java +++ b/src/main/java/com/sipai/dao/work/ProductionIndexPlanNameDataHisDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.work; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.work.ProductionIndexPlanNameDataHis; +import org.springframework.stereotype.Repository; @Repository public class ProductionIndexPlanNameDataHisDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/work/ProductionIndexWorkOrderDao.java b/src/main/java/com/sipai/dao/work/ProductionIndexWorkOrderDao.java index a752166f..8864dbd7 100644 --- a/src/main/java/com/sipai/dao/work/ProductionIndexWorkOrderDao.java +++ b/src/main/java/com/sipai/dao/work/ProductionIndexWorkOrderDao.java @@ -1,11 +1,8 @@ package com.sipai.dao.work; -import java.util.List; - -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.work.ProductionIndexWorkOrder; +import org.springframework.stereotype.Repository; @Repository public class ProductionIndexWorkOrderDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/work/ScadaPicDao.java b/src/main/java/com/sipai/dao/work/ScadaPicDao.java index 3aae267e..d51c3ddf 100644 --- a/src/main/java/com/sipai/dao/work/ScadaPicDao.java +++ b/src/main/java/com/sipai/dao/work/ScadaPicDao.java @@ -1,12 +1,10 @@ package com.sipai.dao.work; -import java.util.List; - -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.work.ScadaPic; -import com.sipai.entity.work.ScadaPic_ProcessSection; +import org.springframework.stereotype.Repository; + +import java.util.List; @Repository public class ScadaPicDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/work/ScadaPic_EMDao.java b/src/main/java/com/sipai/dao/work/ScadaPic_EMDao.java index 7c58a285..dee0afc2 100644 --- a/src/main/java/com/sipai/dao/work/ScadaPic_EMDao.java +++ b/src/main/java/com/sipai/dao/work/ScadaPic_EMDao.java @@ -1,14 +1,8 @@ package com.sipai.dao.work; -import java.util.List; - -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; -import com.sipai.entity.work.Group; import com.sipai.entity.work.ScadaPic_EM; -import com.sipai.entity.work.ScadaPic_MPoint; -import com.sipai.entity.work.ScadaPic_Txt; +import org.springframework.stereotype.Repository; @Repository public class ScadaPic_EMDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/work/ScadaPic_MPointDao.java b/src/main/java/com/sipai/dao/work/ScadaPic_MPointDao.java index c344d402..f3fd5b9a 100644 --- a/src/main/java/com/sipai/dao/work/ScadaPic_MPointDao.java +++ b/src/main/java/com/sipai/dao/work/ScadaPic_MPointDao.java @@ -1,13 +1,8 @@ package com.sipai.dao.work; -import java.util.List; - -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; -import com.sipai.entity.work.Group; import com.sipai.entity.work.ScadaPic_MPoint; -import com.sipai.entity.work.ScadaPic_Txt; +import org.springframework.stereotype.Repository; @Repository public class ScadaPic_MPointDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/work/ScadaPic_MPoint_ExpressionDao.java b/src/main/java/com/sipai/dao/work/ScadaPic_MPoint_ExpressionDao.java index 2c899b89..a068dd87 100644 --- a/src/main/java/com/sipai/dao/work/ScadaPic_MPoint_ExpressionDao.java +++ b/src/main/java/com/sipai/dao/work/ScadaPic_MPoint_ExpressionDao.java @@ -1,14 +1,8 @@ package com.sipai.dao.work; -import java.util.List; - -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; -import com.sipai.entity.work.Group; -import com.sipai.entity.work.ScadaPic_MPoint; import com.sipai.entity.work.ScadaPic_MPoint_Expression; -import com.sipai.entity.work.ScadaPic_Txt; +import org.springframework.stereotype.Repository; @Repository public class ScadaPic_MPoint_ExpressionDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/work/ScadaPic_ProcessSectionDao.java b/src/main/java/com/sipai/dao/work/ScadaPic_ProcessSectionDao.java index 59f6b62d..0e8396e1 100644 --- a/src/main/java/com/sipai/dao/work/ScadaPic_ProcessSectionDao.java +++ b/src/main/java/com/sipai/dao/work/ScadaPic_ProcessSectionDao.java @@ -1,11 +1,10 @@ package com.sipai.dao.work; -import java.util.List; - -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.work.ScadaPic_ProcessSection; +import org.springframework.stereotype.Repository; + +import java.util.List; @Repository diff --git a/src/main/java/com/sipai/dao/work/ScadaPic_TxtDao.java b/src/main/java/com/sipai/dao/work/ScadaPic_TxtDao.java index 787b4b64..129db23d 100644 --- a/src/main/java/com/sipai/dao/work/ScadaPic_TxtDao.java +++ b/src/main/java/com/sipai/dao/work/ScadaPic_TxtDao.java @@ -1,12 +1,8 @@ package com.sipai.dao.work; -import java.util.List; - -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; -import com.sipai.entity.work.Group; import com.sipai.entity.work.ScadaPic_Txt; +import org.springframework.stereotype.Repository; @Repository public class ScadaPic_TxtDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/work/SchedulingDao.java b/src/main/java/com/sipai/dao/work/SchedulingDao.java index 8406d0de..aa2b0402 100644 --- a/src/main/java/com/sipai/dao/work/SchedulingDao.java +++ b/src/main/java/com/sipai/dao/work/SchedulingDao.java @@ -1,14 +1,13 @@ package com.sipai.dao.work; +import com.sipai.dao.base.CommDaoImpl; +import com.sipai.entity.work.Scheduling; +import org.springframework.stereotype.Repository; + import java.util.HashMap; import java.util.List; import java.util.Map; -import org.springframework.stereotype.Repository; - -import com.sipai.dao.base.CommDaoImpl; -import com.sipai.entity.work.Scheduling; - @Repository public class SchedulingDao extends CommDaoImpl{ public SchedulingDao() { diff --git a/src/main/java/com/sipai/dao/work/SchedulingReplaceJobDao.java b/src/main/java/com/sipai/dao/work/SchedulingReplaceJobDao.java index df828c54..65385974 100644 --- a/src/main/java/com/sipai/dao/work/SchedulingReplaceJobDao.java +++ b/src/main/java/com/sipai/dao/work/SchedulingReplaceJobDao.java @@ -1,13 +1,8 @@ package com.sipai.dao.work; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.work.SchedulingReplaceJob; +import org.springframework.stereotype.Repository; @Repository public class SchedulingReplaceJobDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/work/SpeechRecognitionDao.java b/src/main/java/com/sipai/dao/work/SpeechRecognitionDao.java index 8f5e74d3..d795e3aa 100644 --- a/src/main/java/com/sipai/dao/work/SpeechRecognitionDao.java +++ b/src/main/java/com/sipai/dao/work/SpeechRecognitionDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.work; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.work.SpeechRecognition; +import org.springframework.stereotype.Repository; @Repository public class SpeechRecognitionDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/work/SpeechRecognitionMpRespondDao.java b/src/main/java/com/sipai/dao/work/SpeechRecognitionMpRespondDao.java index 1cb14d58..ccba3731 100644 --- a/src/main/java/com/sipai/dao/work/SpeechRecognitionMpRespondDao.java +++ b/src/main/java/com/sipai/dao/work/SpeechRecognitionMpRespondDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.work; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.work.SpeechRecognitionMpRespond; +import org.springframework.stereotype.Repository; @Repository public class SpeechRecognitionMpRespondDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/work/UserWorkStationDao.java b/src/main/java/com/sipai/dao/work/UserWorkStationDao.java index d5c5521f..89b6a11c 100644 --- a/src/main/java/com/sipai/dao/work/UserWorkStationDao.java +++ b/src/main/java/com/sipai/dao/work/UserWorkStationDao.java @@ -1,10 +1,8 @@ package com.sipai.dao.work; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; -import com.sipai.entity.work.Group; import com.sipai.entity.work.UserWorkStation; +import org.springframework.stereotype.Repository; @Repository public class UserWorkStationDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/work/WeatherDao.java b/src/main/java/com/sipai/dao/work/WeatherDao.java index 07485f97..6814264b 100644 --- a/src/main/java/com/sipai/dao/work/WeatherDao.java +++ b/src/main/java/com/sipai/dao/work/WeatherDao.java @@ -1,11 +1,10 @@ package com.sipai.dao.work; -import java.util.List; - -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.work.Weather; +import org.springframework.stereotype.Repository; + +import java.util.List; @Repository public class WeatherDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/work/WeatherNewDao.java b/src/main/java/com/sipai/dao/work/WeatherNewDao.java index 7379413a..2831616a 100644 --- a/src/main/java/com/sipai/dao/work/WeatherNewDao.java +++ b/src/main/java/com/sipai/dao/work/WeatherNewDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.work; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.work.WeatherNew; +import org.springframework.stereotype.Repository; import java.util.List; diff --git a/src/main/java/com/sipai/dao/work/WordAnalysisReportContentCurveAxisDao.java b/src/main/java/com/sipai/dao/work/WordAnalysisReportContentCurveAxisDao.java index 35413740..3a57d861 100644 --- a/src/main/java/com/sipai/dao/work/WordAnalysisReportContentCurveAxisDao.java +++ b/src/main/java/com/sipai/dao/work/WordAnalysisReportContentCurveAxisDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.work; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.work.WordAnalysisReportContentCurveAxis; +import org.springframework.stereotype.Repository; @Repository public class WordAnalysisReportContentCurveAxisDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/work/WordAnalysisReportContentCurveDao.java b/src/main/java/com/sipai/dao/work/WordAnalysisReportContentCurveDao.java index d6b3bfe4..3cee1e7a 100644 --- a/src/main/java/com/sipai/dao/work/WordAnalysisReportContentCurveDao.java +++ b/src/main/java/com/sipai/dao/work/WordAnalysisReportContentCurveDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.work; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.work.WordAnalysisReportContentCurve; +import org.springframework.stereotype.Repository; @Repository public class WordAnalysisReportContentCurveDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/work/WordAnalysisReportContentDao.java b/src/main/java/com/sipai/dao/work/WordAnalysisReportContentDao.java index 68d2315e..9cddb67b 100644 --- a/src/main/java/com/sipai/dao/work/WordAnalysisReportContentDao.java +++ b/src/main/java/com/sipai/dao/work/WordAnalysisReportContentDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.work; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.work.WordAnalysisReportContent; +import org.springframework.stereotype.Repository; @Repository public class WordAnalysisReportContentDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/work/WordAnalysisReportContentFormDao.java b/src/main/java/com/sipai/dao/work/WordAnalysisReportContentFormDao.java index 647a9b14..a155a15b 100644 --- a/src/main/java/com/sipai/dao/work/WordAnalysisReportContentFormDao.java +++ b/src/main/java/com/sipai/dao/work/WordAnalysisReportContentFormDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.work; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.work.WordAnalysisReportContentForm; +import org.springframework.stereotype.Repository; @Repository public class WordAnalysisReportContentFormDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/work/WordAnalysisReportFormDataDao.java b/src/main/java/com/sipai/dao/work/WordAnalysisReportFormDataDao.java index 170e123f..6b277c23 100644 --- a/src/main/java/com/sipai/dao/work/WordAnalysisReportFormDataDao.java +++ b/src/main/java/com/sipai/dao/work/WordAnalysisReportFormDataDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.work; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.work.WordAnalysisReportFormData; +import org.springframework.stereotype.Repository; @Repository public class WordAnalysisReportFormDataDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/work/WordAnalysisReportRecordDao.java b/src/main/java/com/sipai/dao/work/WordAnalysisReportRecordDao.java index 04eb3a5c..52ebf138 100644 --- a/src/main/java/com/sipai/dao/work/WordAnalysisReportRecordDao.java +++ b/src/main/java/com/sipai/dao/work/WordAnalysisReportRecordDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.work; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.work.WordAnalysisReportRecord; +import org.springframework.stereotype.Repository; @Repository public class WordAnalysisReportRecordDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/work/WordAnalysisReportStructureDao.java b/src/main/java/com/sipai/dao/work/WordAnalysisReportStructureDao.java index 8d324815..76b1b5f1 100644 --- a/src/main/java/com/sipai/dao/work/WordAnalysisReportStructureDao.java +++ b/src/main/java/com/sipai/dao/work/WordAnalysisReportStructureDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.work; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.work.WordAnalysisReportStructure; +import org.springframework.stereotype.Repository; @Repository public class WordAnalysisReportStructureDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/work/WordAnalysisReportTextDao.java b/src/main/java/com/sipai/dao/work/WordAnalysisReportTextDao.java index 16dafef1..96b5cd70 100644 --- a/src/main/java/com/sipai/dao/work/WordAnalysisReportTextDao.java +++ b/src/main/java/com/sipai/dao/work/WordAnalysisReportTextDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.work; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.work.WordAnalysisReportText; +import org.springframework.stereotype.Repository; @Repository public class WordAnalysisReportTextDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/workorder/WorkorderAchievementDao.java b/src/main/java/com/sipai/dao/workorder/WorkorderAchievementDao.java index 9b64b699..199e5328 100644 --- a/src/main/java/com/sipai/dao/workorder/WorkorderAchievementDao.java +++ b/src/main/java/com/sipai/dao/workorder/WorkorderAchievementDao.java @@ -1,17 +1,15 @@ package com.sipai.dao.workorder; +import com.sipai.dao.base.CommDaoImpl; +import com.sipai.entity.workorder.WorkTimeRespDto; +import com.sipai.entity.workorder.WorkUserTimeRespDto; +import com.sipai.entity.workorder.WorkorderAchievement; +import org.springframework.stereotype.Repository; + import java.util.HashMap; import java.util.List; import java.util.Map; -import com.sipai.entity.workorder.WorkTimeRespDto; -import com.sipai.entity.workorder.WorkUserTimeRespDto; -import org.springframework.stereotype.Repository; - -import com.sipai.dao.base.CommDaoImpl; -import com.sipai.entity.sparepart.Stock; -import com.sipai.entity.workorder.WorkorderAchievement; - @Repository public class WorkorderAchievementDao extends CommDaoImpl{ public WorkorderAchievementDao() { diff --git a/src/main/java/com/sipai/dao/workorder/WorkorderAchievementOrderDao.java b/src/main/java/com/sipai/dao/workorder/WorkorderAchievementOrderDao.java index f4dcef45..618c47cf 100644 --- a/src/main/java/com/sipai/dao/workorder/WorkorderAchievementOrderDao.java +++ b/src/main/java/com/sipai/dao/workorder/WorkorderAchievementOrderDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.workorder; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.workorder.WorkorderAchievementOrder; +import org.springframework.stereotype.Repository; @Repository public class WorkorderAchievementOrderDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/workorder/WorkorderConsumeDao.java b/src/main/java/com/sipai/dao/workorder/WorkorderConsumeDao.java index 98ea974f..0fb28adc 100644 --- a/src/main/java/com/sipai/dao/workorder/WorkorderConsumeDao.java +++ b/src/main/java/com/sipai/dao/workorder/WorkorderConsumeDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.workorder; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.workorder.WorkorderConsume; +import org.springframework.stereotype.Repository; @Repository public class WorkorderConsumeDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/dao/workorder/WorkorderDetailDao.java b/src/main/java/com/sipai/dao/workorder/WorkorderDetailDao.java index 7ea2ade1..eed27a2e 100644 --- a/src/main/java/com/sipai/dao/workorder/WorkorderDetailDao.java +++ b/src/main/java/com/sipai/dao/workorder/WorkorderDetailDao.java @@ -1,10 +1,8 @@ package com.sipai.dao.workorder; -import com.sipai.entity.timeefficiency.PatrolRecord; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.workorder.WorkorderDetail; +import org.springframework.stereotype.Repository; import java.util.HashMap; import java.util.List; diff --git a/src/main/java/com/sipai/dao/workorder/WorkorderRepairContentDao.java b/src/main/java/com/sipai/dao/workorder/WorkorderRepairContentDao.java index fe2d5e2a..0a4e8c88 100644 --- a/src/main/java/com/sipai/dao/workorder/WorkorderRepairContentDao.java +++ b/src/main/java/com/sipai/dao/workorder/WorkorderRepairContentDao.java @@ -1,9 +1,8 @@ package com.sipai.dao.workorder; -import org.springframework.stereotype.Repository; - import com.sipai.dao.base.CommDaoImpl; import com.sipai.entity.workorder.WorkorderRepairContent; +import org.springframework.stereotype.Repository; @Repository public class WorkorderRepairContentDao extends CommDaoImpl{ diff --git a/src/main/java/com/sipai/entity/achievement/AcceptanceModel.java b/src/main/java/com/sipai/entity/achievement/AcceptanceModel.java index 6c10291a..73765846 100644 --- a/src/main/java/com/sipai/entity/achievement/AcceptanceModel.java +++ b/src/main/java/com/sipai/entity/achievement/AcceptanceModel.java @@ -1,9 +1,9 @@ package com.sipai.entity.achievement; -import java.io.Serializable; - import com.sipai.entity.base.SQLAdapter; +import java.io.Serializable; + public class AcceptanceModel extends SQLAdapter implements Serializable { private static final long serialVersionUID = -7608492419538630987L; diff --git a/src/main/java/com/sipai/entity/activiti/Leave.java b/src/main/java/com/sipai/entity/activiti/Leave.java index 3c065405..8b7ffb90 100644 --- a/src/main/java/com/sipai/entity/activiti/Leave.java +++ b/src/main/java/com/sipai/entity/activiti/Leave.java @@ -1,14 +1,7 @@ package com.sipai.entity.activiti; -import java.math.BigDecimal; -import java.util.List; -import java.util.Map; - - - - - - +import com.sipai.entity.base.SQLAdapter; +import com.sipai.entity.user.User; import org.activiti.engine.history.HistoricProcessInstance; import org.activiti.engine.history.HistoricTaskInstance; import org.activiti.engine.repository.ProcessDefinition; @@ -17,8 +10,9 @@ import org.activiti.engine.task.Comment; import org.activiti.engine.task.Task; import org.springframework.stereotype.Component; -import com.sipai.entity.base.SQLAdapter; -import com.sipai.entity.user.User; +import java.math.BigDecimal; +import java.util.List; +import java.util.Map; @Component public class Leave extends SQLAdapter implements Cloneable{ private BigDecimal id; diff --git a/src/main/java/com/sipai/entity/activiti/ProcessType.java b/src/main/java/com/sipai/entity/activiti/ProcessType.java index 14e302bf..48fb475c 100644 --- a/src/main/java/com/sipai/entity/activiti/ProcessType.java +++ b/src/main/java/com/sipai/entity/activiti/ProcessType.java @@ -1,10 +1,6 @@ package com.sipai.entity.activiti; -import java.util.HashMap; -import java.util.Map; - import com.sipai.entity.timeefficiency.PatrolType; - import net.sf.json.JSONArray; import net.sf.json.JSONObject; diff --git a/src/main/java/com/sipai/entity/activiti/TaskModel.java b/src/main/java/com/sipai/entity/activiti/TaskModel.java index 4b29ee1d..8be01d8f 100644 --- a/src/main/java/com/sipai/entity/activiti/TaskModel.java +++ b/src/main/java/com/sipai/entity/activiti/TaskModel.java @@ -1,19 +1,7 @@ package com.sipai.entity.activiti; -import java.math.BigDecimal; -import java.util.List; -import java.util.Map; - - - -import org.activiti.engine.history.HistoricProcessInstance; -import org.activiti.engine.repository.ProcessDefinition; -import org.activiti.engine.runtime.ProcessInstance; -import org.activiti.engine.task.Comment; -import org.activiti.engine.task.Task; -import org.springframework.stereotype.Component; - import com.sipai.entity.base.SQLAdapter; +import org.springframework.stereotype.Component; @Component public class TaskModel extends SQLAdapter { private String id; diff --git a/src/main/java/com/sipai/entity/activiti/TodoTask.java b/src/main/java/com/sipai/entity/activiti/TodoTask.java index ce44d3c3..7833cbf9 100644 --- a/src/main/java/com/sipai/entity/activiti/TodoTask.java +++ b/src/main/java/com/sipai/entity/activiti/TodoTask.java @@ -1,14 +1,6 @@ package com.sipai.entity.activiti; -import java.util.List; -import java.util.Map; - - - - - - - +import com.sipai.entity.user.User; import org.activiti.engine.history.HistoricProcessInstance; import org.activiti.engine.repository.ProcessDefinition; import org.activiti.engine.runtime.ProcessInstance; @@ -16,7 +8,8 @@ import org.activiti.engine.task.Comment; import org.activiti.engine.task.Task; import org.springframework.stereotype.Component; -import com.sipai.entity.user.User; +import java.util.List; +import java.util.Map; /** * 待办任务bean * */ diff --git a/src/main/java/com/sipai/entity/activiti/WorkTask.java b/src/main/java/com/sipai/entity/activiti/WorkTask.java index 267531d5..23f32fe6 100644 --- a/src/main/java/com/sipai/entity/activiti/WorkTask.java +++ b/src/main/java/com/sipai/entity/activiti/WorkTask.java @@ -1,11 +1,7 @@ package com.sipai.entity.activiti; -import java.util.List; - -import org.springframework.stereotype.Component; - import com.sipai.entity.base.SQLAdapter; -import com.sipai.entity.equipment.EquipmentArrangement; +import org.springframework.stereotype.Component; @Component public class WorkTask extends SQLAdapter { diff --git a/src/main/java/com/sipai/entity/administration/Index.java b/src/main/java/com/sipai/entity/administration/Index.java index 05eeef7a..a9887333 100644 --- a/src/main/java/com/sipai/entity/administration/Index.java +++ b/src/main/java/com/sipai/entity/administration/Index.java @@ -1,12 +1,12 @@ package com.sipai.entity.administration; -import java.math.BigDecimal; -import java.util.List; - import com.sipai.entity.base.SQLAdapter; import com.sipai.entity.user.Company; import com.sipai.entity.user.Dept; +import java.math.BigDecimal; +import java.util.List; + public class Index extends SQLAdapter{ private String dateYear; diff --git a/src/main/java/com/sipai/entity/administration/IndexClass.java b/src/main/java/com/sipai/entity/administration/IndexClass.java index 433536df..0717a551 100644 --- a/src/main/java/com/sipai/entity/administration/IndexClass.java +++ b/src/main/java/com/sipai/entity/administration/IndexClass.java @@ -1,8 +1,9 @@ package com.sipai.entity.administration; -import java.util.List; import com.sipai.entity.base.SQLAdapter; +import java.util.List; + public class IndexClass extends SQLAdapter{ private String id; diff --git a/src/main/java/com/sipai/entity/administration/IndexCycle.java b/src/main/java/com/sipai/entity/administration/IndexCycle.java index d817de07..c2f22e1e 100644 --- a/src/main/java/com/sipai/entity/administration/IndexCycle.java +++ b/src/main/java/com/sipai/entity/administration/IndexCycle.java @@ -1,9 +1,9 @@ package com.sipai.entity.administration; -import java.math.BigDecimal; - import com.sipai.entity.base.SQLAdapter; +import java.math.BigDecimal; + public class IndexCycle extends SQLAdapter{ private String id; diff --git a/src/main/java/com/sipai/entity/administration/IndexWork.java b/src/main/java/com/sipai/entity/administration/IndexWork.java index b7194d53..50a73330 100644 --- a/src/main/java/com/sipai/entity/administration/IndexWork.java +++ b/src/main/java/com/sipai/entity/administration/IndexWork.java @@ -1,10 +1,9 @@ package com.sipai.entity.administration; -import java.math.BigDecimal; - import com.sipai.entity.base.BusinessUnitAdapter; import com.sipai.entity.user.Company; -import java.util.Date; + +import java.math.BigDecimal; public class IndexWork extends BusinessUnitAdapter{ diff --git a/src/main/java/com/sipai/entity/administration/Organization.java b/src/main/java/com/sipai/entity/administration/Organization.java index c12571db..5f745497 100644 --- a/src/main/java/com/sipai/entity/administration/Organization.java +++ b/src/main/java/com/sipai/entity/administration/Organization.java @@ -1,11 +1,9 @@ package com.sipai.entity.administration; -import java.math.BigDecimal; - import com.sipai.entity.base.BusinessUnitAdapter; -import com.sipai.entity.base.SQLAdapter; import com.sipai.entity.user.Company; -import java.util.Date; + +import java.math.BigDecimal; public class Organization extends BusinessUnitAdapter{ diff --git a/src/main/java/com/sipai/entity/administration/OrganizationClass.java b/src/main/java/com/sipai/entity/administration/OrganizationClass.java index 97d39323..36f96e98 100644 --- a/src/main/java/com/sipai/entity/administration/OrganizationClass.java +++ b/src/main/java/com/sipai/entity/administration/OrganizationClass.java @@ -1,9 +1,9 @@ package com.sipai.entity.administration; -import java.util.List; - import com.sipai.entity.base.SQLAdapter; +import java.util.List; + public class OrganizationClass extends SQLAdapter{ public static final String Type_0="0";//岗位类型 public static final String Type_1="1";//工作类型 diff --git a/src/main/java/com/sipai/entity/administration/Temporary.java b/src/main/java/com/sipai/entity/administration/Temporary.java index 512892a0..ed3bb7f1 100644 --- a/src/main/java/com/sipai/entity/administration/Temporary.java +++ b/src/main/java/com/sipai/entity/administration/Temporary.java @@ -1,12 +1,10 @@ package com.sipai.entity.administration; -import java.math.BigDecimal; -import java.util.Date; - import com.sipai.entity.base.BusinessUnitAdapter; -import com.sipai.entity.base.SQLAdapter; import com.sipai.entity.user.Company; +import java.math.BigDecimal; + public class Temporary extends BusinessUnitAdapter{ private String id; diff --git a/src/main/java/com/sipai/entity/alarm/AlarmCondition.java b/src/main/java/com/sipai/entity/alarm/AlarmCondition.java index 387e26f9..2036f031 100644 --- a/src/main/java/com/sipai/entity/alarm/AlarmCondition.java +++ b/src/main/java/com/sipai/entity/alarm/AlarmCondition.java @@ -1,7 +1,5 @@ package com.sipai.entity.alarm; -import java.util.Date; - import com.sipai.entity.base.SQLAdapter; import com.sipai.entity.scada.MPoint; diff --git a/src/main/java/com/sipai/entity/alarm/AlarmInformationAlarmModeEnum.java b/src/main/java/com/sipai/entity/alarm/AlarmInformationAlarmModeEnum.java index 7da83430..8a7fcf11 100644 --- a/src/main/java/com/sipai/entity/alarm/AlarmInformationAlarmModeEnum.java +++ b/src/main/java/com/sipai/entity/alarm/AlarmInformationAlarmModeEnum.java @@ -1,13 +1,12 @@ package com.sipai.entity.alarm; -import java.util.ArrayList; -import java.util.List; - import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; - import net.sf.json.JSONArray; +import java.util.ArrayList; +import java.util.List; + /** * 报警方式 枚举 * diff --git a/src/main/java/com/sipai/entity/alarm/AlarmLevelsCodeEnum.java b/src/main/java/com/sipai/entity/alarm/AlarmLevelsCodeEnum.java index 2e40b768..3792488f 100644 --- a/src/main/java/com/sipai/entity/alarm/AlarmLevelsCodeEnum.java +++ b/src/main/java/com/sipai/entity/alarm/AlarmLevelsCodeEnum.java @@ -1,13 +1,12 @@ package com.sipai.entity.alarm; -import java.util.ArrayList; -import java.util.List; - import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; - import net.sf.json.JSONArray; +import java.util.ArrayList; +import java.util.List; + /** * 报警等级 枚举 * diff --git a/src/main/java/com/sipai/entity/alarm/AlarmMoldCodeEnum.java b/src/main/java/com/sipai/entity/alarm/AlarmMoldCodeEnum.java index a3b42b0d..03edc619 100644 --- a/src/main/java/com/sipai/entity/alarm/AlarmMoldCodeEnum.java +++ b/src/main/java/com/sipai/entity/alarm/AlarmMoldCodeEnum.java @@ -1,13 +1,12 @@ package com.sipai.entity.alarm; -import java.util.ArrayList; -import java.util.List; - import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; - import net.sf.json.JSONArray; +import java.util.ArrayList; +import java.util.List; + /** * 报警类型 枚举 */ diff --git a/src/main/java/com/sipai/entity/alarm/AlarmRecord.java b/src/main/java/com/sipai/entity/alarm/AlarmRecord.java index 14f1aedc..81fed4a6 100644 --- a/src/main/java/com/sipai/entity/alarm/AlarmRecord.java +++ b/src/main/java/com/sipai/entity/alarm/AlarmRecord.java @@ -1,7 +1,5 @@ package com.sipai.entity.alarm; -import java.util.Date; - import com.sipai.entity.base.SQLAdapter; public class AlarmRecord extends SQLAdapter{ diff --git a/src/main/java/com/sipai/entity/alarm/AlarmSolution.java b/src/main/java/com/sipai/entity/alarm/AlarmSolution.java index b8350d80..1e078ac5 100644 --- a/src/main/java/com/sipai/entity/alarm/AlarmSolution.java +++ b/src/main/java/com/sipai/entity/alarm/AlarmSolution.java @@ -1,11 +1,10 @@ package com.sipai.entity.alarm; -import java.util.Date; -import java.util.List; - import com.sipai.entity.base.SQLAdapter; import com.sipai.entity.user.Dept; +import java.util.List; + public class AlarmSolution extends SQLAdapter{ private String id; diff --git a/src/main/java/com/sipai/entity/alarm/AlarmSubscribe.java b/src/main/java/com/sipai/entity/alarm/AlarmSubscribe.java index b70cd237..4c6864de 100644 --- a/src/main/java/com/sipai/entity/alarm/AlarmSubscribe.java +++ b/src/main/java/com/sipai/entity/alarm/AlarmSubscribe.java @@ -1,7 +1,6 @@ package com.sipai.entity.alarm; import com.sipai.entity.base.SQLAdapter; -import com.sipai.entity.scada.MPoint; public class AlarmSubscribe extends SQLAdapter { private String id; diff --git a/src/main/java/com/sipai/entity/alarm/AlarmType.java b/src/main/java/com/sipai/entity/alarm/AlarmType.java index ef6cb2b9..6f3a12ad 100644 --- a/src/main/java/com/sipai/entity/alarm/AlarmType.java +++ b/src/main/java/com/sipai/entity/alarm/AlarmType.java @@ -1,11 +1,10 @@ package com.sipai.entity.alarm; -import java.util.Date; -import java.util.List; - import com.sipai.entity.base.SQLAdapter; import com.sipai.entity.user.User; +import java.util.List; + public class AlarmType extends SQLAdapter{ private String id; diff --git a/src/main/java/com/sipai/entity/base/BaseConfig.java b/src/main/java/com/sipai/entity/base/BaseConfig.java index 1fd180e1..95b49683 100644 --- a/src/main/java/com/sipai/entity/base/BaseConfig.java +++ b/src/main/java/com/sipai/entity/base/BaseConfig.java @@ -1,7 +1,5 @@ package com.sipai.entity.base; -import java.util.List; - public class BaseConfig { private String TargetServer_MiniMes; private String TargetServer_RFID; diff --git a/src/main/java/com/sipai/entity/base/BasicComponents.java b/src/main/java/com/sipai/entity/base/BasicComponents.java index df70c996..cbeb8b7e 100644 --- a/src/main/java/com/sipai/entity/base/BasicComponents.java +++ b/src/main/java/com/sipai/entity/base/BasicComponents.java @@ -1,7 +1,5 @@ package com.sipai.entity.base; -import java.util.Date; - public class BasicComponents extends SQLAdapter{ private String code; diff --git a/src/main/java/com/sipai/entity/base/BasicConfigure.java b/src/main/java/com/sipai/entity/base/BasicConfigure.java index ec0e3a1d..d7ca642b 100644 --- a/src/main/java/com/sipai/entity/base/BasicConfigure.java +++ b/src/main/java/com/sipai/entity/base/BasicConfigure.java @@ -1,7 +1,5 @@ package com.sipai.entity.base; -import java.util.Date; - public class BasicConfigure extends SQLAdapter{ private String id; diff --git a/src/main/java/com/sipai/entity/base/CommonFile.java b/src/main/java/com/sipai/entity/base/CommonFile.java index 5c88298b..688850d9 100644 --- a/src/main/java/com/sipai/entity/base/CommonFile.java +++ b/src/main/java/com/sipai/entity/base/CommonFile.java @@ -1,6 +1,5 @@ package com.sipai.entity.base; -import com.sipai.entity.equipment.EquipmentCard; import com.sipai.entity.user.User; public class CommonFile extends SQLAdapter { diff --git a/src/main/java/com/sipai/entity/base/MainPage.java b/src/main/java/com/sipai/entity/base/MainPage.java index bcf80f99..1252fcf0 100644 --- a/src/main/java/com/sipai/entity/base/MainPage.java +++ b/src/main/java/com/sipai/entity/base/MainPage.java @@ -1,7 +1,5 @@ package com.sipai.entity.base; -import java.util.Date; - import com.sipai.entity.scada.MPoint; import com.sipai.entity.scada.MPoint4APP; diff --git a/src/main/java/com/sipai/entity/base/MainPageType.java b/src/main/java/com/sipai/entity/base/MainPageType.java index 32a284d4..1f32b6e6 100644 --- a/src/main/java/com/sipai/entity/base/MainPageType.java +++ b/src/main/java/com/sipai/entity/base/MainPageType.java @@ -1,7 +1,5 @@ package com.sipai.entity.base; -import java.util.Date; - public class MainPageType extends SQLAdapter{ private String id; diff --git a/src/main/java/com/sipai/entity/base/MainPageTypeUser.java b/src/main/java/com/sipai/entity/base/MainPageTypeUser.java index bb92307b..ab007867 100644 --- a/src/main/java/com/sipai/entity/base/MainPageTypeUser.java +++ b/src/main/java/com/sipai/entity/base/MainPageTypeUser.java @@ -1,7 +1,5 @@ package com.sipai.entity.base; -import java.util.Date; - public class MainPageTypeUser extends SQLAdapter{ private String id; diff --git a/src/main/java/com/sipai/entity/base/MinioConfiguration.java b/src/main/java/com/sipai/entity/base/MinioConfiguration.java index 7a0cabc2..c4bbca5d 100644 --- a/src/main/java/com/sipai/entity/base/MinioConfiguration.java +++ b/src/main/java/com/sipai/entity/base/MinioConfiguration.java @@ -1,16 +1,14 @@ package com.sipai.entity.base; +import com.sipai.tools.MinioProp; import io.minio.MinioClient; import io.minio.errors.InvalidEndpointException; import io.minio.errors.InvalidPortException; - import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; -import com.sipai.tools.MinioProp; - @Configuration @ComponentScan public class MinioConfiguration { diff --git a/src/main/java/com/sipai/entity/base/ServerConfig.java b/src/main/java/com/sipai/entity/base/ServerConfig.java index f52758b6..cb4bead1 100644 --- a/src/main/java/com/sipai/entity/base/ServerConfig.java +++ b/src/main/java/com/sipai/entity/base/ServerConfig.java @@ -1,7 +1,5 @@ package com.sipai.entity.base; -import java.util.List; - public class ServerConfig { private String type; diff --git a/src/main/java/com/sipai/entity/base/Tree.java b/src/main/java/com/sipai/entity/base/Tree.java index 291794af..a05b59b5 100644 --- a/src/main/java/com/sipai/entity/base/Tree.java +++ b/src/main/java/com/sipai/entity/base/Tree.java @@ -1,7 +1,5 @@ package com.sipai.entity.base; -import java.util.List; - /** * BootStrap TreeView模型 * diff --git a/src/main/java/com/sipai/entity/bim/BIMAlarmThreshold.java b/src/main/java/com/sipai/entity/bim/BIMAlarmThreshold.java index 538b5ddf..ad5f1a7b 100644 --- a/src/main/java/com/sipai/entity/bim/BIMAlarmThreshold.java +++ b/src/main/java/com/sipai/entity/bim/BIMAlarmThreshold.java @@ -1,10 +1,9 @@ package com.sipai.entity.bim; -import java.math.BigDecimal; -import java.util.Date; - import com.sipai.entity.base.SQLAdapter; +import java.math.BigDecimal; + /** * BIM返回报警阈值数据 */ diff --git a/src/main/java/com/sipai/entity/bim/BIMCurrency.java b/src/main/java/com/sipai/entity/bim/BIMCurrency.java index 5c498f36..892a2f34 100644 --- a/src/main/java/com/sipai/entity/bim/BIMCurrency.java +++ b/src/main/java/com/sipai/entity/bim/BIMCurrency.java @@ -1,8 +1,8 @@ package com.sipai.entity.bim; -import java.math.BigDecimal; - import com.sipai.entity.base.SQLAdapter; + +import java.math.BigDecimal; import java.util.Date; /** diff --git a/src/main/java/com/sipai/entity/bot/Bot.java b/src/main/java/com/sipai/entity/bot/Bot.java index 0cc4d927..4d4225cf 100644 --- a/src/main/java/com/sipai/entity/bot/Bot.java +++ b/src/main/java/com/sipai/entity/bot/Bot.java @@ -1,9 +1,9 @@ package com.sipai.entity.bot; -import java.math.BigDecimal; - import com.sipai.entity.base.SQLAdapter; +import java.math.BigDecimal; + public class Bot extends SQLAdapter{ private String id; diff --git a/src/main/java/com/sipai/entity/business/BusinessUnitAudit.java b/src/main/java/com/sipai/entity/business/BusinessUnitAudit.java index fb713e26..efa5ed06 100644 --- a/src/main/java/com/sipai/entity/business/BusinessUnitAudit.java +++ b/src/main/java/com/sipai/entity/business/BusinessUnitAudit.java @@ -1,7 +1,5 @@ package com.sipai.entity.business; -import java.util.Date; - import com.sipai.entity.base.SQLAdapter; public class BusinessUnitAudit extends SQLAdapter{ diff --git a/src/main/java/com/sipai/entity/business/BusinessUnitDeptApply.java b/src/main/java/com/sipai/entity/business/BusinessUnitDeptApply.java index 22f2efac..0ae567bc 100644 --- a/src/main/java/com/sipai/entity/business/BusinessUnitDeptApply.java +++ b/src/main/java/com/sipai/entity/business/BusinessUnitDeptApply.java @@ -1,7 +1,5 @@ package com.sipai.entity.business; -import java.util.Date; - import com.sipai.entity.base.SQLAdapter; public class BusinessUnitDeptApply extends SQLAdapter{ diff --git a/src/main/java/com/sipai/entity/business/BusinessUnitHandle.java b/src/main/java/com/sipai/entity/business/BusinessUnitHandle.java index 4c7fe977..c7add7b1 100644 --- a/src/main/java/com/sipai/entity/business/BusinessUnitHandle.java +++ b/src/main/java/com/sipai/entity/business/BusinessUnitHandle.java @@ -1,7 +1,5 @@ package com.sipai.entity.business; -import java.util.Date; - import com.sipai.entity.base.SQLAdapter; public class BusinessUnitHandle extends SQLAdapter{ diff --git a/src/main/java/com/sipai/entity/business/BusinessUnitHandleDetail.java b/src/main/java/com/sipai/entity/business/BusinessUnitHandleDetail.java index bb4cd17e..17aa3417 100644 --- a/src/main/java/com/sipai/entity/business/BusinessUnitHandleDetail.java +++ b/src/main/java/com/sipai/entity/business/BusinessUnitHandleDetail.java @@ -1,7 +1,5 @@ package com.sipai.entity.business; -import java.util.Date; - import com.sipai.entity.base.SQLAdapter; import com.sipai.entity.maintenance.MaintenanceDetail; diff --git a/src/main/java/com/sipai/entity/business/BusinessUnitInquiry.java b/src/main/java/com/sipai/entity/business/BusinessUnitInquiry.java index 36458e36..690cc45e 100644 --- a/src/main/java/com/sipai/entity/business/BusinessUnitInquiry.java +++ b/src/main/java/com/sipai/entity/business/BusinessUnitInquiry.java @@ -1,7 +1,5 @@ package com.sipai.entity.business; -import java.util.Date; - import com.sipai.entity.base.SQLAdapter; public class BusinessUnitInquiry extends SQLAdapter{ diff --git a/src/main/java/com/sipai/entity/business/BusinessUnitIssue.java b/src/main/java/com/sipai/entity/business/BusinessUnitIssue.java index 8db641e3..890c34bc 100644 --- a/src/main/java/com/sipai/entity/business/BusinessUnitIssue.java +++ b/src/main/java/com/sipai/entity/business/BusinessUnitIssue.java @@ -1,7 +1,5 @@ package com.sipai.entity.business; -import java.util.Date; - import com.sipai.entity.base.SQLAdapter; public class BusinessUnitIssue extends SQLAdapter{ diff --git a/src/main/java/com/sipai/entity/business/BusinessUnitRecord.java b/src/main/java/com/sipai/entity/business/BusinessUnitRecord.java index 870c55e8..1390ff10 100644 --- a/src/main/java/com/sipai/entity/business/BusinessUnitRecord.java +++ b/src/main/java/com/sipai/entity/business/BusinessUnitRecord.java @@ -53,7 +53,6 @@ import org.apache.axis.encoding.Base64; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; -import javax.annotation.Resource; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.HashMap; diff --git a/src/main/java/com/sipai/entity/command/EmergencyConfigureDetail.java b/src/main/java/com/sipai/entity/command/EmergencyConfigureDetail.java index f9b6cb34..f7891f3a 100644 --- a/src/main/java/com/sipai/entity/command/EmergencyConfigureDetail.java +++ b/src/main/java/com/sipai/entity/command/EmergencyConfigureDetail.java @@ -1,7 +1,8 @@ package com.sipai.entity.command; + import com.sipai.entity.base.SQLAdapter; + import java.math.BigDecimal; -import java.util.Date; public class EmergencyConfigureDetail extends SQLAdapter { private String id; diff --git a/src/main/java/com/sipai/entity/command/EmergencyConfigureWorkOrder.java b/src/main/java/com/sipai/entity/command/EmergencyConfigureWorkOrder.java index a65782ed..10363606 100644 --- a/src/main/java/com/sipai/entity/command/EmergencyConfigureWorkOrder.java +++ b/src/main/java/com/sipai/entity/command/EmergencyConfigureWorkOrder.java @@ -1,7 +1,5 @@ package com.sipai.entity.command; -import java.util.Date; - import com.sipai.entity.base.SQLAdapter; public class EmergencyConfigureWorkOrder extends SQLAdapter { diff --git a/src/main/java/com/sipai/entity/command/EmergencyConfigurefile.java b/src/main/java/com/sipai/entity/command/EmergencyConfigurefile.java index c83114bc..a090c236 100644 --- a/src/main/java/com/sipai/entity/command/EmergencyConfigurefile.java +++ b/src/main/java/com/sipai/entity/command/EmergencyConfigurefile.java @@ -1,7 +1,5 @@ package com.sipai.entity.command; -import java.util.Date; - import com.sipai.entity.base.SQLAdapter; public class EmergencyConfigurefile extends SQLAdapter{ diff --git a/src/main/java/com/sipai/entity/command/EmergencyRecordsDetail.java b/src/main/java/com/sipai/entity/command/EmergencyRecordsDetail.java index c482e532..bb250b81 100644 --- a/src/main/java/com/sipai/entity/command/EmergencyRecordsDetail.java +++ b/src/main/java/com/sipai/entity/command/EmergencyRecordsDetail.java @@ -1,9 +1,6 @@ package com.sipai.entity.command; -import java.util.Date; - import com.sipai.entity.base.SQLAdapter; -import io.swagger.annotations.ApiModelProperty; public class EmergencyRecordsDetail extends SQLAdapter { diff --git a/src/main/java/com/sipai/entity/command/EmergencyRecordsWorkOrder.java b/src/main/java/com/sipai/entity/command/EmergencyRecordsWorkOrder.java index 9d5ea808..c6cf39d6 100644 --- a/src/main/java/com/sipai/entity/command/EmergencyRecordsWorkOrder.java +++ b/src/main/java/com/sipai/entity/command/EmergencyRecordsWorkOrder.java @@ -1,7 +1,5 @@ package com.sipai.entity.command; -import java.util.Date; - import com.sipai.entity.base.SQLAdapter; import com.sipai.entity.timeefficiency.PatrolRecord; diff --git a/src/main/java/com/sipai/entity/cqbyt/TestReport.java b/src/main/java/com/sipai/entity/cqbyt/TestReport.java index 5df8fa02..376c410a 100644 --- a/src/main/java/com/sipai/entity/cqbyt/TestReport.java +++ b/src/main/java/com/sipai/entity/cqbyt/TestReport.java @@ -1,9 +1,9 @@ package com.sipai.entity.cqbyt; -import java.util.List; - import com.sipai.entity.base.SQLAdapter; +import java.util.List; + public class TestReport extends SQLAdapter { private String id; diff --git a/src/main/java/com/sipai/entity/cqbyt/Ytsj.java b/src/main/java/com/sipai/entity/cqbyt/Ytsj.java index f4721159..5c636590 100644 --- a/src/main/java/com/sipai/entity/cqbyt/Ytsj.java +++ b/src/main/java/com/sipai/entity/cqbyt/Ytsj.java @@ -1,6 +1,7 @@ package com.sipai.entity.cqbyt; import com.sipai.entity.base.SQLAdapter; + import java.math.BigDecimal; public class Ytsj extends SQLAdapter { diff --git a/src/main/java/com/sipai/entity/data/CurveMpoint.java b/src/main/java/com/sipai/entity/data/CurveMpoint.java index 5ae9851b..2537426d 100644 --- a/src/main/java/com/sipai/entity/data/CurveMpoint.java +++ b/src/main/java/com/sipai/entity/data/CurveMpoint.java @@ -1,13 +1,11 @@ package com.sipai.entity.data; -import java.io.Serializable; -import java.util.Date; - import com.sipai.entity.base.SQLAdapter; import com.sipai.entity.scada.MPoint; -import com.sipai.entity.user.Company; import com.sipai.entity.user.Unit; +import java.io.Serializable; + public class CurveMpoint extends SQLAdapter implements Serializable{ /** * diff --git a/src/main/java/com/sipai/entity/data/CurveRemark.java b/src/main/java/com/sipai/entity/data/CurveRemark.java index 5811d5dd..ea6bcd65 100644 --- a/src/main/java/com/sipai/entity/data/CurveRemark.java +++ b/src/main/java/com/sipai/entity/data/CurveRemark.java @@ -1,9 +1,9 @@ package com.sipai.entity.data; -import java.io.Serializable; - import com.sipai.entity.base.SQLAdapter; +import java.io.Serializable; + public class CurveRemark extends SQLAdapter implements Serializable{ /** * diff --git a/src/main/java/com/sipai/entity/data/DataCurve.java b/src/main/java/com/sipai/entity/data/DataCurve.java index 2451b3d6..b50e7671 100644 --- a/src/main/java/com/sipai/entity/data/DataCurve.java +++ b/src/main/java/com/sipai/entity/data/DataCurve.java @@ -1,10 +1,9 @@ package com.sipai.entity.data; -import java.io.Serializable; -import java.util.Date; - import com.sipai.entity.base.SQLAdapter; +import java.io.Serializable; + public class DataCurve extends SQLAdapter implements Serializable{ private static final long serialVersionUID = 1120702528984972427L; diff --git a/src/main/java/com/sipai/entity/data/XServer.java b/src/main/java/com/sipai/entity/data/XServer.java index d1b65aee..0d4373dd 100644 --- a/src/main/java/com/sipai/entity/data/XServer.java +++ b/src/main/java/com/sipai/entity/data/XServer.java @@ -1,7 +1,5 @@ package com.sipai.entity.data; -import java.util.Date; - import com.sipai.entity.base.SQLAdapter; import com.sipai.entity.user.Company; diff --git a/src/main/java/com/sipai/entity/document/Doctype.java b/src/main/java/com/sipai/entity/document/Doctype.java index 7e3e80be..505aacf2 100644 --- a/src/main/java/com/sipai/entity/document/Doctype.java +++ b/src/main/java/com/sipai/entity/document/Doctype.java @@ -1,9 +1,9 @@ package com.sipai.entity.document; -import java.util.Date; - import com.sipai.entity.base.SQLAdapter; +import java.util.Date; + public class Doctype extends SQLAdapter{ private String id; private String name; diff --git a/src/main/java/com/sipai/entity/document/FileIn.java b/src/main/java/com/sipai/entity/document/FileIn.java index b2a1c8d3..1abad630 100644 --- a/src/main/java/com/sipai/entity/document/FileIn.java +++ b/src/main/java/com/sipai/entity/document/FileIn.java @@ -1,8 +1,6 @@ package com.sipai.entity.document; -import com.sipai.entity.base.SQLAdapter; - import java.io.IOException; import java.io.InputStream; diff --git a/src/main/java/com/sipai/entity/efficiency/EfficiencyOverviewConfigure.java b/src/main/java/com/sipai/entity/efficiency/EfficiencyOverviewConfigure.java index 7508256b..68b960f8 100644 --- a/src/main/java/com/sipai/entity/efficiency/EfficiencyOverviewConfigure.java +++ b/src/main/java/com/sipai/entity/efficiency/EfficiencyOverviewConfigure.java @@ -1,7 +1,6 @@ package com.sipai.entity.efficiency; import com.sipai.entity.base.SQLAdapter; -import java.util.Date; public class EfficiencyOverviewConfigure extends SQLAdapter{ private String id; diff --git a/src/main/java/com/sipai/entity/efficiency/EfficiencyStatistics.java b/src/main/java/com/sipai/entity/efficiency/EfficiencyStatistics.java index 9053fe6c..224dcd27 100644 --- a/src/main/java/com/sipai/entity/efficiency/EfficiencyStatistics.java +++ b/src/main/java/com/sipai/entity/efficiency/EfficiencyStatistics.java @@ -1,11 +1,11 @@ package com.sipai.entity.efficiency; -import java.math.BigDecimal; -import java.util.List; - import com.sipai.entity.base.SQLAdapter; import com.sipai.entity.scada.MPoint; +import java.math.BigDecimal; +import java.util.List; + public class EfficiencyStatistics extends SQLAdapter { private String id; diff --git a/src/main/java/com/sipai/entity/enums/EnableTypeEnum.java b/src/main/java/com/sipai/entity/enums/EnableTypeEnum.java index 1ee1b582..c10474fd 100644 --- a/src/main/java/com/sipai/entity/enums/EnableTypeEnum.java +++ b/src/main/java/com/sipai/entity/enums/EnableTypeEnum.java @@ -1,7 +1,5 @@ package com.sipai.entity.enums; -import com.sipai.tools.ValueTypeEnum; - /** * 启用禁用状态： * @author lichen diff --git a/src/main/java/com/sipai/entity/enums/ProcessSectionCodeEnum.java b/src/main/java/com/sipai/entity/enums/ProcessSectionCodeEnum.java index d1f962ee..4d81f352 100644 --- a/src/main/java/com/sipai/entity/enums/ProcessSectionCodeEnum.java +++ b/src/main/java/com/sipai/entity/enums/ProcessSectionCodeEnum.java @@ -1,7 +1,5 @@ package com.sipai.entity.enums; -import com.sipai.tools.ValueTypeEnum; - public enum ProcessSectionCodeEnum { ONE("01", "一级泵房"), TWO("02", "投矾间"), diff --git a/src/main/java/com/sipai/entity/enums/safety/SafetyOutsiderJobStatusEnum.java b/src/main/java/com/sipai/entity/enums/safety/SafetyOutsiderJobStatusEnum.java index cb3a933b..15aadbde 100644 --- a/src/main/java/com/sipai/entity/enums/safety/SafetyOutsiderJobStatusEnum.java +++ b/src/main/java/com/sipai/entity/enums/safety/SafetyOutsiderJobStatusEnum.java @@ -3,7 +3,6 @@ package com.sipai.entity.enums.safety; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.Setter; -import org.springframework.web.bind.annotation.GetMapping; /** * 相关单位作业状态 diff --git a/src/main/java/com/sipai/entity/enums/whp/SampleAppearanceEnum.java b/src/main/java/com/sipai/entity/enums/whp/SampleAppearanceEnum.java index fb5e994a..1286c36f 100644 --- a/src/main/java/com/sipai/entity/enums/whp/SampleAppearanceEnum.java +++ b/src/main/java/com/sipai/entity/enums/whp/SampleAppearanceEnum.java @@ -1,8 +1,6 @@ package com.sipai.entity.enums.whp; import lombok.AllArgsConstructor; -import lombok.Getter; -import lombok.Setter; /** * 样品外观 diff --git a/src/main/java/com/sipai/entity/equipment/AssetClass.java b/src/main/java/com/sipai/entity/equipment/AssetClass.java index bd757967..ff4da685 100644 --- a/src/main/java/com/sipai/entity/equipment/AssetClass.java +++ b/src/main/java/com/sipai/entity/equipment/AssetClass.java @@ -1,7 +1,5 @@ package com.sipai.entity.equipment; -import java.util.Date; - import com.sipai.entity.base.SQLAdapter; //资产类型 public class AssetClass extends SQLAdapter{ diff --git a/src/main/java/com/sipai/entity/equipment/Characteristic.java b/src/main/java/com/sipai/entity/equipment/Characteristic.java index 53d121bf..91de84fb 100644 --- a/src/main/java/com/sipai/entity/equipment/Characteristic.java +++ b/src/main/java/com/sipai/entity/equipment/Characteristic.java @@ -1,9 +1,9 @@ package com.sipai.entity.equipment; -import java.util.Date; - import com.sipai.entity.base.SQLAdapter; +import java.util.Date; + public class Characteristic extends SQLAdapter { private String id; diff --git a/src/main/java/com/sipai/entity/equipment/EquipmentAcceptanceApply.java b/src/main/java/com/sipai/entity/equipment/EquipmentAcceptanceApply.java index 6415fd26..48eeb336 100644 --- a/src/main/java/com/sipai/entity/equipment/EquipmentAcceptanceApply.java +++ b/src/main/java/com/sipai/entity/equipment/EquipmentAcceptanceApply.java @@ -1,9 +1,6 @@ package com.sipai.entity.equipment; -import java.util.Date; - import com.sipai.entity.base.BusinessUnitAdapter; -import com.sipai.entity.base.SQLAdapter; public class EquipmentAcceptanceApply extends BusinessUnitAdapter{ private String id; diff --git a/src/main/java/com/sipai/entity/equipment/EquipmentAcceptanceApplyDetail.java b/src/main/java/com/sipai/entity/equipment/EquipmentAcceptanceApplyDetail.java index 7367c85c..9bb19720 100644 --- a/src/main/java/com/sipai/entity/equipment/EquipmentAcceptanceApplyDetail.java +++ b/src/main/java/com/sipai/entity/equipment/EquipmentAcceptanceApplyDetail.java @@ -1,7 +1,5 @@ package com.sipai.entity.equipment; -import java.util.Date; - import com.sipai.entity.base.SQLAdapter; import com.sipai.entity.sparepart.Goods; import com.sipai.entity.sparepart.PurchaseRecordDetail; diff --git a/src/main/java/com/sipai/entity/equipment/EquipmentAccident.java b/src/main/java/com/sipai/entity/equipment/EquipmentAccident.java index 1fe370df..92514cd2 100644 --- a/src/main/java/com/sipai/entity/equipment/EquipmentAccident.java +++ b/src/main/java/com/sipai/entity/equipment/EquipmentAccident.java @@ -1,8 +1,5 @@ package com.sipai.entity.equipment; -import java.util.Date; -import java.util.List; - import com.sipai.entity.base.SQLAdapter; public class EquipmentAccident extends SQLAdapter{ diff --git a/src/main/java/com/sipai/entity/equipment/EquipmentAccidentDetail.java b/src/main/java/com/sipai/entity/equipment/EquipmentAccidentDetail.java index 994a65ff..633b10a7 100644 --- a/src/main/java/com/sipai/entity/equipment/EquipmentAccidentDetail.java +++ b/src/main/java/com/sipai/entity/equipment/EquipmentAccidentDetail.java @@ -1,7 +1,6 @@ package com.sipai.entity.equipment; import com.sipai.entity.base.SQLAdapter; -import java.util.Date; public class EquipmentAccidentDetail extends SQLAdapter{ private String id; diff --git a/src/main/java/com/sipai/entity/equipment/EquipmentArrangement.java b/src/main/java/com/sipai/entity/equipment/EquipmentArrangement.java index fe54cb27..22e74882 100644 --- a/src/main/java/com/sipai/entity/equipment/EquipmentArrangement.java +++ b/src/main/java/com/sipai/entity/equipment/EquipmentArrangement.java @@ -1,10 +1,7 @@ package com.sipai.entity.equipment; -import java.util.Date; - -import org.springframework.stereotype.Component; - import com.sipai.entity.base.SQLAdapter; +import org.springframework.stereotype.Component; @Component public class EquipmentArrangement extends SQLAdapter{ private String id; diff --git a/src/main/java/com/sipai/entity/equipment/EquipmentBelong.java b/src/main/java/com/sipai/entity/equipment/EquipmentBelong.java index 44ed1de6..09022bca 100644 --- a/src/main/java/com/sipai/entity/equipment/EquipmentBelong.java +++ b/src/main/java/com/sipai/entity/equipment/EquipmentBelong.java @@ -1,7 +1,5 @@ package com.sipai.entity.equipment; -import java.util.Date; - import com.sipai.entity.base.SQLAdapter; public class EquipmentBelong extends SQLAdapter{ diff --git a/src/main/java/com/sipai/entity/equipment/EquipmentCard.java b/src/main/java/com/sipai/entity/equipment/EquipmentCard.java index 16632dcb..6046c937 100644 --- a/src/main/java/com/sipai/entity/equipment/EquipmentCard.java +++ b/src/main/java/com/sipai/entity/equipment/EquipmentCard.java @@ -1,15 +1,14 @@ package com.sipai.entity.equipment; -import java.math.BigDecimal; -import java.util.Date; -import java.util.List; - import com.alibaba.fastjson.JSONArray; import com.sipai.entity.base.SQLAdapter; import com.sipai.entity.scada.MPoint4APP; import com.sipai.entity.user.Company; import com.sipai.entity.user.ProcessSection; +import java.math.BigDecimal; +import java.util.List; + public class EquipmentCard extends SQLAdapter { public static String[] equipmentCardTypeArr = {"生产设备", "特种设备", "仪器仪表", "车辆", "安全工具", "其它"}; diff --git a/src/main/java/com/sipai/entity/equipment/EquipmentCardLinks.java b/src/main/java/com/sipai/entity/equipment/EquipmentCardLinks.java index 51a68212..4c755f1a 100644 --- a/src/main/java/com/sipai/entity/equipment/EquipmentCardLinks.java +++ b/src/main/java/com/sipai/entity/equipment/EquipmentCardLinks.java @@ -1,9 +1,8 @@ package com.sipai.entity.equipment; -import java.util.List; - import com.sipai.entity.base.SQLAdapter; -import java.util.Date; + +import java.util.List; public class EquipmentCardLinks extends SQLAdapter { diff --git a/src/main/java/com/sipai/entity/equipment/EquipmentCardLinksParameter.java b/src/main/java/com/sipai/entity/equipment/EquipmentCardLinksParameter.java index 040bf17e..5063b91f 100644 --- a/src/main/java/com/sipai/entity/equipment/EquipmentCardLinksParameter.java +++ b/src/main/java/com/sipai/entity/equipment/EquipmentCardLinksParameter.java @@ -1,7 +1,6 @@ package com.sipai.entity.equipment; import com.sipai.entity.base.SQLAdapter; -import java.util.Date; public class EquipmentCardLinksParameter extends SQLAdapter { diff --git a/src/main/java/com/sipai/entity/equipment/EquipmentCardProp.java b/src/main/java/com/sipai/entity/equipment/EquipmentCardProp.java index f45b2869..cbff5acc 100644 --- a/src/main/java/com/sipai/entity/equipment/EquipmentCardProp.java +++ b/src/main/java/com/sipai/entity/equipment/EquipmentCardProp.java @@ -1,10 +1,9 @@ package com.sipai.entity.equipment; -import java.math.BigDecimal; -import java.util.Date; - import com.sipai.entity.base.SQLAdapter; +import java.math.BigDecimal; + public class EquipmentCardProp extends SQLAdapter{ private String contractId; diff --git a/src/main/java/com/sipai/entity/equipment/EquipmentCardRemark.java b/src/main/java/com/sipai/entity/equipment/EquipmentCardRemark.java index 55dc333e..584919db 100644 --- a/src/main/java/com/sipai/entity/equipment/EquipmentCardRemark.java +++ b/src/main/java/com/sipai/entity/equipment/EquipmentCardRemark.java @@ -1,7 +1,5 @@ package com.sipai.entity.equipment; -import java.util.Date; - public class EquipmentCardRemark { private String id; diff --git a/src/main/java/com/sipai/entity/equipment/EquipmentClassProp.java b/src/main/java/com/sipai/entity/equipment/EquipmentClassProp.java index 32b3735f..bae66662 100644 --- a/src/main/java/com/sipai/entity/equipment/EquipmentClassProp.java +++ b/src/main/java/com/sipai/entity/equipment/EquipmentClassProp.java @@ -1,7 +1,5 @@ package com.sipai.entity.equipment; -import java.util.Date; - import com.sipai.entity.base.SQLAdapter; public class EquipmentClassProp extends SQLAdapter{ diff --git a/src/main/java/com/sipai/entity/equipment/EquipmentCode.java b/src/main/java/com/sipai/entity/equipment/EquipmentCode.java index 91eff94b..61a7edd2 100644 --- a/src/main/java/com/sipai/entity/equipment/EquipmentCode.java +++ b/src/main/java/com/sipai/entity/equipment/EquipmentCode.java @@ -1,7 +1,5 @@ package com.sipai.entity.equipment; -import java.util.Date; - import com.sipai.entity.base.SQLAdapter; public class EquipmentCode extends SQLAdapter{ diff --git a/src/main/java/com/sipai/entity/equipment/EquipmentCodeLibrary.java b/src/main/java/com/sipai/entity/equipment/EquipmentCodeLibrary.java index 8e9776b9..386eeaef 100644 --- a/src/main/java/com/sipai/entity/equipment/EquipmentCodeLibrary.java +++ b/src/main/java/com/sipai/entity/equipment/EquipmentCodeLibrary.java @@ -1,7 +1,5 @@ package com.sipai.entity.equipment; -import java.util.Date; - import com.sipai.entity.base.SQLAdapter; public class EquipmentCodeLibrary extends SQLAdapter { diff --git a/src/main/java/com/sipai/entity/equipment/EquipmentCodeRule.java b/src/main/java/com/sipai/entity/equipment/EquipmentCodeRule.java index 945924e5..2836fbca 100644 --- a/src/main/java/com/sipai/entity/equipment/EquipmentCodeRule.java +++ b/src/main/java/com/sipai/entity/equipment/EquipmentCodeRule.java @@ -1,7 +1,5 @@ package com.sipai.entity.equipment; -import java.util.Date; - import com.sipai.entity.base.SQLAdapter; public class EquipmentCodeRule extends SQLAdapter{ diff --git a/src/main/java/com/sipai/entity/equipment/EquipmentFile.java b/src/main/java/com/sipai/entity/equipment/EquipmentFile.java index 5bea05de..7a47ee3b 100644 --- a/src/main/java/com/sipai/entity/equipment/EquipmentFile.java +++ b/src/main/java/com/sipai/entity/equipment/EquipmentFile.java @@ -1,7 +1,5 @@ package com.sipai.entity.equipment; -import java.util.Date; - import com.sipai.entity.base.SQLAdapter; public class EquipmentFile extends SQLAdapter{ diff --git a/src/main/java/com/sipai/entity/equipment/EquipmentIncreaseValue.java b/src/main/java/com/sipai/entity/equipment/EquipmentIncreaseValue.java index 9646f6fe..26e32f38 100644 --- a/src/main/java/com/sipai/entity/equipment/EquipmentIncreaseValue.java +++ b/src/main/java/com/sipai/entity/equipment/EquipmentIncreaseValue.java @@ -1,10 +1,9 @@ package com.sipai.entity.equipment; -import java.math.BigDecimal; -import java.util.Date; - import com.sipai.entity.base.SQLAdapter; +import java.math.BigDecimal; + public class EquipmentIncreaseValue extends SQLAdapter{ private String id; diff --git a/src/main/java/com/sipai/entity/equipment/EquipmentLevel.java b/src/main/java/com/sipai/entity/equipment/EquipmentLevel.java index d3f36cf6..5f78b603 100644 --- a/src/main/java/com/sipai/entity/equipment/EquipmentLevel.java +++ b/src/main/java/com/sipai/entity/equipment/EquipmentLevel.java @@ -1,7 +1,5 @@ package com.sipai.entity.equipment; -import java.util.Date; - import com.sipai.entity.base.SQLAdapter; //设备等级 public class EquipmentLevel extends SQLAdapter{ diff --git a/src/main/java/com/sipai/entity/equipment/EquipmentLoseApply.java b/src/main/java/com/sipai/entity/equipment/EquipmentLoseApply.java index b050dd55..7b449941 100644 --- a/src/main/java/com/sipai/entity/equipment/EquipmentLoseApply.java +++ b/src/main/java/com/sipai/entity/equipment/EquipmentLoseApply.java @@ -1,10 +1,8 @@ package com.sipai.entity.equipment; -import java.math.BigDecimal; -import java.util.Date; - import com.sipai.entity.base.BusinessUnitAdapter; -import com.sipai.entity.base.SQLAdapter; + +import java.math.BigDecimal; public class EquipmentLoseApply extends BusinessUnitAdapter { diff --git a/src/main/java/com/sipai/entity/equipment/EquipmentLoseApplyDetail.java b/src/main/java/com/sipai/entity/equipment/EquipmentLoseApplyDetail.java index 704d7ce6..a33cd1cf 100644 --- a/src/main/java/com/sipai/entity/equipment/EquipmentLoseApplyDetail.java +++ b/src/main/java/com/sipai/entity/equipment/EquipmentLoseApplyDetail.java @@ -1,8 +1,5 @@ package com.sipai.entity.equipment; -import java.util.Date; -import java.util.List; - import com.sipai.entity.base.SQLAdapter; public class EquipmentLoseApplyDetail extends SQLAdapter{ diff --git a/src/main/java/com/sipai/entity/equipment/EquipmentMaintain.java b/src/main/java/com/sipai/entity/equipment/EquipmentMaintain.java index 1038156f..33841196 100644 --- a/src/main/java/com/sipai/entity/equipment/EquipmentMaintain.java +++ b/src/main/java/com/sipai/entity/equipment/EquipmentMaintain.java @@ -1,10 +1,7 @@ package com.sipai.entity.equipment; -import java.util.List; - -import org.springframework.stereotype.Component; import com.sipai.entity.base.SQLAdapter; -import com.sipai.entity.user.User; +import org.springframework.stereotype.Component; @Component diff --git a/src/main/java/com/sipai/entity/equipment/EquipmentParamset.java b/src/main/java/com/sipai/entity/equipment/EquipmentParamset.java index c7ef018f..c11604fd 100644 --- a/src/main/java/com/sipai/entity/equipment/EquipmentParamset.java +++ b/src/main/java/com/sipai/entity/equipment/EquipmentParamset.java @@ -1,7 +1,5 @@ package com.sipai.entity.equipment; -import java.util.Date; - import com.sipai.entity.base.SQLAdapter; public class EquipmentParamset extends SQLAdapter{ diff --git a/src/main/java/com/sipai/entity/equipment/EquipmentParamsetValue.java b/src/main/java/com/sipai/entity/equipment/EquipmentParamsetValue.java index 06c254b2..864426db 100644 --- a/src/main/java/com/sipai/entity/equipment/EquipmentParamsetValue.java +++ b/src/main/java/com/sipai/entity/equipment/EquipmentParamsetValue.java @@ -1,7 +1,5 @@ package com.sipai.entity.equipment; -import java.util.Date; - import com.sipai.entity.base.SQLAdapter; public class EquipmentParamsetValue extends SQLAdapter{ diff --git a/src/main/java/com/sipai/entity/equipment/EquipmentRepairPlan.java b/src/main/java/com/sipai/entity/equipment/EquipmentRepairPlan.java index 8f47d0ee..9770d296 100644 --- a/src/main/java/com/sipai/entity/equipment/EquipmentRepairPlan.java +++ b/src/main/java/com/sipai/entity/equipment/EquipmentRepairPlan.java @@ -1,13 +1,11 @@ package com.sipai.entity.equipment; -import java.math.BigDecimal; -import java.util.Date; - import com.sipai.entity.base.BusinessUnitAdapter; -import com.sipai.entity.base.SQLAdapter; import com.sipai.entity.user.Company; import com.sipai.entity.user.ProcessSection; +import java.math.BigDecimal; + public class EquipmentRepairPlan extends BusinessUnitAdapter{ private String id; diff --git a/src/main/java/com/sipai/entity/equipment/EquipmentSaleApply.java b/src/main/java/com/sipai/entity/equipment/EquipmentSaleApply.java index b81bf27e..027dbb30 100644 --- a/src/main/java/com/sipai/entity/equipment/EquipmentSaleApply.java +++ b/src/main/java/com/sipai/entity/equipment/EquipmentSaleApply.java @@ -1,10 +1,8 @@ package com.sipai.entity.equipment; -import java.math.BigDecimal; -import java.util.Date; - import com.sipai.entity.base.BusinessUnitAdapter; -import com.sipai.entity.base.SQLAdapter; + +import java.math.BigDecimal; public class EquipmentSaleApply extends BusinessUnitAdapter{ private String id; diff --git a/src/main/java/com/sipai/entity/equipment/EquipmentSaleApplyDetail.java b/src/main/java/com/sipai/entity/equipment/EquipmentSaleApplyDetail.java index 7510ff47..43ebd6ba 100644 --- a/src/main/java/com/sipai/entity/equipment/EquipmentSaleApplyDetail.java +++ b/src/main/java/com/sipai/entity/equipment/EquipmentSaleApplyDetail.java @@ -1,7 +1,5 @@ package com.sipai.entity.equipment; -import java.util.Date; - import com.sipai.entity.base.SQLAdapter; public class EquipmentSaleApplyDetail extends SQLAdapter{ diff --git a/src/main/java/com/sipai/entity/equipment/EquipmentScrapApply.java b/src/main/java/com/sipai/entity/equipment/EquipmentScrapApply.java index 38859fca..a58575f6 100644 --- a/src/main/java/com/sipai/entity/equipment/EquipmentScrapApply.java +++ b/src/main/java/com/sipai/entity/equipment/EquipmentScrapApply.java @@ -1,10 +1,10 @@ package com.sipai.entity.equipment; +import com.sipai.entity.base.BusinessUnitAdapter; + import java.math.BigDecimal; import java.util.List; -import com.sipai.entity.base.BusinessUnitAdapter; - public class EquipmentScrapApply extends BusinessUnitAdapter{ private String id; diff --git a/src/main/java/com/sipai/entity/equipment/EquipmentScrapApplyDetail.java b/src/main/java/com/sipai/entity/equipment/EquipmentScrapApplyDetail.java index b4c202b9..239c2c30 100644 --- a/src/main/java/com/sipai/entity/equipment/EquipmentScrapApplyDetail.java +++ b/src/main/java/com/sipai/entity/equipment/EquipmentScrapApplyDetail.java @@ -1,7 +1,5 @@ package com.sipai.entity.equipment; -import java.util.Date; - import com.sipai.entity.base.SQLAdapter; public class EquipmentScrapApplyDetail extends SQLAdapter{ diff --git a/src/main/java/com/sipai/entity/equipment/EquipmentSpecification.java b/src/main/java/com/sipai/entity/equipment/EquipmentSpecification.java index 816de1a9..a002db6b 100644 --- a/src/main/java/com/sipai/entity/equipment/EquipmentSpecification.java +++ b/src/main/java/com/sipai/entity/equipment/EquipmentSpecification.java @@ -1,7 +1,5 @@ package com.sipai.entity.equipment; -import java.util.Date; - import com.sipai.entity.base.SQLAdapter; public class EquipmentSpecification extends SQLAdapter{ diff --git a/src/main/java/com/sipai/entity/equipment/EquipmentStopRecordDetail.java b/src/main/java/com/sipai/entity/equipment/EquipmentStopRecordDetail.java index 650ba896..eb139ef2 100644 --- a/src/main/java/com/sipai/entity/equipment/EquipmentStopRecordDetail.java +++ b/src/main/java/com/sipai/entity/equipment/EquipmentStopRecordDetail.java @@ -1,7 +1,5 @@ package com.sipai.entity.equipment; -import java.util.Date; - import com.sipai.entity.base.BusinessUnitAdapter; public class EquipmentStopRecordDetail extends BusinessUnitAdapter{ diff --git a/src/main/java/com/sipai/entity/equipment/EquipmentTransfersApply.java b/src/main/java/com/sipai/entity/equipment/EquipmentTransfersApply.java index 7aad77e7..09166295 100644 --- a/src/main/java/com/sipai/entity/equipment/EquipmentTransfersApply.java +++ b/src/main/java/com/sipai/entity/equipment/EquipmentTransfersApply.java @@ -1,11 +1,8 @@ package com.sipai.entity.equipment; -import java.math.BigDecimal; - import com.sipai.entity.base.BusinessUnitAdapter; -import com.sipai.entity.base.SQLAdapter; -import java.util.Date; +import java.math.BigDecimal; import java.util.List; public class EquipmentTransfersApply extends BusinessUnitAdapter{ diff --git a/src/main/java/com/sipai/entity/equipment/EquipmentTypeNumber.java b/src/main/java/com/sipai/entity/equipment/EquipmentTypeNumber.java index 7d96cc6e..b143110e 100644 --- a/src/main/java/com/sipai/entity/equipment/EquipmentTypeNumber.java +++ b/src/main/java/com/sipai/entity/equipment/EquipmentTypeNumber.java @@ -1,7 +1,5 @@ package com.sipai.entity.equipment; -import java.util.Date; - import com.sipai.entity.base.SQLAdapter; public class EquipmentTypeNumber extends SQLAdapter{ diff --git a/src/main/java/com/sipai/entity/equipment/EquipmentUseAge.java b/src/main/java/com/sipai/entity/equipment/EquipmentUseAge.java index 94fd379b..f1597e1b 100644 --- a/src/main/java/com/sipai/entity/equipment/EquipmentUseAge.java +++ b/src/main/java/com/sipai/entity/equipment/EquipmentUseAge.java @@ -1,7 +1,5 @@ package com.sipai.entity.equipment; -import java.util.Date; - import com.sipai.entity.base.SQLAdapter; public class EquipmentUseAge extends SQLAdapter{ diff --git a/src/main/java/com/sipai/entity/equipment/GeographyArea.java b/src/main/java/com/sipai/entity/equipment/GeographyArea.java index c06b8e76..8a0d740f 100644 --- a/src/main/java/com/sipai/entity/equipment/GeographyArea.java +++ b/src/main/java/com/sipai/entity/equipment/GeographyArea.java @@ -1,7 +1,5 @@ package com.sipai.entity.equipment; -import java.util.Date; - import com.sipai.entity.base.SQLAdapter; public class GeographyArea extends SQLAdapter{ diff --git a/src/main/java/com/sipai/entity/equipment/MaintenancePlan.java b/src/main/java/com/sipai/entity/equipment/MaintenancePlan.java index 65b962ee..5c84b0cd 100644 --- a/src/main/java/com/sipai/entity/equipment/MaintenancePlan.java +++ b/src/main/java/com/sipai/entity/equipment/MaintenancePlan.java @@ -1,13 +1,11 @@ package com.sipai.entity.equipment; -import java.math.BigDecimal; -import java.util.Date; - import com.sipai.entity.base.BusinessUnitAdapter; -import com.sipai.entity.base.SQLAdapter; import com.sipai.entity.user.Company; import com.sipai.entity.user.ProcessSection; +import java.math.BigDecimal; + public class MaintenancePlan extends BusinessUnitAdapter{ private String id; diff --git a/src/main/java/com/sipai/entity/evaluation/EvaluationCriterion.java b/src/main/java/com/sipai/entity/evaluation/EvaluationCriterion.java index 1ff65ed1..09431052 100644 --- a/src/main/java/com/sipai/entity/evaluation/EvaluationCriterion.java +++ b/src/main/java/com/sipai/entity/evaluation/EvaluationCriterion.java @@ -1,7 +1,5 @@ package com.sipai.entity.evaluation; -import java.util.Date; - import com.sipai.entity.base.SQLAdapter; /** * 评价标准 diff --git a/src/main/java/com/sipai/entity/evaluation/EvaluationIndex.java b/src/main/java/com/sipai/entity/evaluation/EvaluationIndex.java index 4b66ee6a..ea261088 100644 --- a/src/main/java/com/sipai/entity/evaluation/EvaluationIndex.java +++ b/src/main/java/com/sipai/entity/evaluation/EvaluationIndex.java @@ -1,10 +1,9 @@ package com.sipai.entity.evaluation; -import java.util.Date; -import java.util.List; - import com.sipai.entity.base.SQLAdapter; +import java.util.List; + /** * 评价指数配置主表 * @author 54588 diff --git a/src/main/java/com/sipai/entity/evaluation/EvaluationIndexDay.java b/src/main/java/com/sipai/entity/evaluation/EvaluationIndexDay.java index e2d07e77..ae4523eb 100644 --- a/src/main/java/com/sipai/entity/evaluation/EvaluationIndexDay.java +++ b/src/main/java/com/sipai/entity/evaluation/EvaluationIndexDay.java @@ -1,7 +1,5 @@ package com.sipai.entity.evaluation; -import java.util.Date; - import com.sipai.entity.base.SQLAdapter; /** * 日评指数 diff --git a/src/main/java/com/sipai/entity/evaluation/EvaluationIndexM.java b/src/main/java/com/sipai/entity/evaluation/EvaluationIndexM.java index ccc4f5b7..278c58e1 100644 --- a/src/main/java/com/sipai/entity/evaluation/EvaluationIndexM.java +++ b/src/main/java/com/sipai/entity/evaluation/EvaluationIndexM.java @@ -1,9 +1,8 @@ package com.sipai.entity.evaluation; -import java.util.Date; -import java.util.List; - import com.sipai.entity.base.SQLAdapter; + +import java.util.List; /** * 月评价指数配置 * @author 54588 diff --git a/src/main/java/com/sipai/entity/evaluation/EvaluationIndexMonth.java b/src/main/java/com/sipai/entity/evaluation/EvaluationIndexMonth.java index 22a2ea60..7265fd6b 100644 --- a/src/main/java/com/sipai/entity/evaluation/EvaluationIndexMonth.java +++ b/src/main/java/com/sipai/entity/evaluation/EvaluationIndexMonth.java @@ -1,7 +1,5 @@ package com.sipai.entity.evaluation; -import java.util.Date; - import com.sipai.entity.base.SQLAdapter; /** diff --git a/src/main/java/com/sipai/entity/evaluation/EvaluationIndexY.java b/src/main/java/com/sipai/entity/evaluation/EvaluationIndexY.java index 2ed7ce4b..b0aa7f82 100644 --- a/src/main/java/com/sipai/entity/evaluation/EvaluationIndexY.java +++ b/src/main/java/com/sipai/entity/evaluation/EvaluationIndexY.java @@ -1,10 +1,9 @@ package com.sipai.entity.evaluation; -import java.util.Date; -import java.util.List; - import com.sipai.entity.base.SQLAdapter; +import java.util.List; + /** * 年评价指标配置 * @author 54588 diff --git a/src/main/java/com/sipai/entity/evaluation/EvaluationIndexYear.java b/src/main/java/com/sipai/entity/evaluation/EvaluationIndexYear.java index ef4b3d20..fee03182 100644 --- a/src/main/java/com/sipai/entity/evaluation/EvaluationIndexYear.java +++ b/src/main/java/com/sipai/entity/evaluation/EvaluationIndexYear.java @@ -1,7 +1,5 @@ package com.sipai.entity.evaluation; -import java.util.Date; - import com.sipai.entity.base.SQLAdapter; /** diff --git a/src/main/java/com/sipai/entity/finance/FinanceEquipmentDeptInfo.java b/src/main/java/com/sipai/entity/finance/FinanceEquipmentDeptInfo.java index 689e9910..06e0796b 100644 --- a/src/main/java/com/sipai/entity/finance/FinanceEquipmentDeptInfo.java +++ b/src/main/java/com/sipai/entity/finance/FinanceEquipmentDeptInfo.java @@ -1,7 +1,5 @@ package com.sipai.entity.finance; -import java.util.Date; - import com.sipai.entity.base.SQLAdapter; public class FinanceEquipmentDeptInfo extends SQLAdapter{ diff --git a/src/main/java/com/sipai/entity/fwk/Menunumber.java b/src/main/java/com/sipai/entity/fwk/Menunumber.java index 0973d2d7..f2bedafb 100644 --- a/src/main/java/com/sipai/entity/fwk/Menunumber.java +++ b/src/main/java/com/sipai/entity/fwk/Menunumber.java @@ -1,7 +1,5 @@ package com.sipai.entity.fwk; -import java.util.Date; - import com.sipai.entity.base.SQLAdapter; public class Menunumber extends SQLAdapter{ diff --git a/src/main/java/com/sipai/entity/fwk/UserToMenu.java b/src/main/java/com/sipai/entity/fwk/UserToMenu.java index c32226e6..89416624 100644 --- a/src/main/java/com/sipai/entity/fwk/UserToMenu.java +++ b/src/main/java/com/sipai/entity/fwk/UserToMenu.java @@ -1,7 +1,5 @@ package com.sipai.entity.fwk; -import java.util.Date; - import com.sipai.entity.base.SQLAdapter; public class UserToMenu extends SQLAdapter{ diff --git a/src/main/java/com/sipai/entity/fwk/WeatherHistory.java b/src/main/java/com/sipai/entity/fwk/WeatherHistory.java index db20bb8b..691f5966 100644 --- a/src/main/java/com/sipai/entity/fwk/WeatherHistory.java +++ b/src/main/java/com/sipai/entity/fwk/WeatherHistory.java @@ -1,7 +1,5 @@ package com.sipai.entity.fwk; -import java.util.Date; - import com.sipai.entity.base.SQLAdapter; public class WeatherHistory extends SQLAdapter{ diff --git a/src/main/java/com/sipai/entity/hqconfig/EnterRecord.java b/src/main/java/com/sipai/entity/hqconfig/EnterRecord.java index f11fedd6..218d709d 100644 --- a/src/main/java/com/sipai/entity/hqconfig/EnterRecord.java +++ b/src/main/java/com/sipai/entity/hqconfig/EnterRecord.java @@ -3,8 +3,6 @@ package com.sipai.entity.hqconfig; import com.sipai.entity.user.User; import com.sipai.entity.work.AreaManage; -import java.util.Date; - public class EnterRecord { private String id; diff --git a/src/main/java/com/sipai/entity/hqconfig/PositionsCasual.java b/src/main/java/com/sipai/entity/hqconfig/PositionsCasual.java index 62a3d99c..59ac207a 100644 --- a/src/main/java/com/sipai/entity/hqconfig/PositionsCasual.java +++ b/src/main/java/com/sipai/entity/hqconfig/PositionsCasual.java @@ -2,8 +2,6 @@ package com.sipai.entity.hqconfig; import com.sipai.entity.base.SQLAdapter; -import java.util.Date; - public class PositionsCasual extends SQLAdapter { private String id; diff --git a/src/main/java/com/sipai/entity/hqconfig/RiskLevel.java b/src/main/java/com/sipai/entity/hqconfig/RiskLevel.java index e7c2b9c9..2c86a903 100644 --- a/src/main/java/com/sipai/entity/hqconfig/RiskLevel.java +++ b/src/main/java/com/sipai/entity/hqconfig/RiskLevel.java @@ -1,7 +1,5 @@ package com.sipai.entity.hqconfig; -import java.util.Date; - import com.sipai.entity.alarm.AlarmLevelsConfig; import com.sipai.entity.base.SQLAdapter; import com.sipai.entity.work.AreaManage; diff --git a/src/main/java/com/sipai/entity/hqconfig/WorkModel.java b/src/main/java/com/sipai/entity/hqconfig/WorkModel.java index 063431fc..04010f62 100644 --- a/src/main/java/com/sipai/entity/hqconfig/WorkModel.java +++ b/src/main/java/com/sipai/entity/hqconfig/WorkModel.java @@ -1,12 +1,10 @@ package com.sipai.entity.hqconfig; -import java.util.Date; -import java.util.List; - import com.sipai.entity.base.SQLAdapter; import com.sipai.entity.work.AreaManage; import com.sipai.entity.work.CameraDetail; -import com.sipai.entity.work.CameraNVR; + +import java.util.List; public class WorkModel extends SQLAdapter{ private String id; diff --git a/src/main/java/com/sipai/entity/info/Info.java b/src/main/java/com/sipai/entity/info/Info.java index acc322e0..c52b1d41 100644 --- a/src/main/java/com/sipai/entity/info/Info.java +++ b/src/main/java/com/sipai/entity/info/Info.java @@ -1,7 +1,5 @@ package com.sipai.entity.info; -import java.util.Date; - import com.sipai.entity.base.SQLAdapter; import com.sipai.entity.user.User; diff --git a/src/main/java/com/sipai/entity/info/LogInfo.java b/src/main/java/com/sipai/entity/info/LogInfo.java index 80b4af5d..9bedbbcf 100644 --- a/src/main/java/com/sipai/entity/info/LogInfo.java +++ b/src/main/java/com/sipai/entity/info/LogInfo.java @@ -4,7 +4,6 @@ import com.sipai.entity.base.SQLAdapter; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; -import java.util.Date; public class LogInfo extends SQLAdapter implements Serializable { private static final long serialVersionUID = 3204169314032723061L; diff --git a/src/main/java/com/sipai/entity/jsyw/JsywPoint.java b/src/main/java/com/sipai/entity/jsyw/JsywPoint.java index 90bbdd94..f9715497 100644 --- a/src/main/java/com/sipai/entity/jsyw/JsywPoint.java +++ b/src/main/java/com/sipai/entity/jsyw/JsywPoint.java @@ -1,10 +1,9 @@ package com.sipai.entity.jsyw; -import java.math.BigDecimal; -import java.util.Date; - import com.sipai.entity.base.SQLAdapter; +import java.math.BigDecimal; + public class JsywPoint extends SQLAdapter { private String id; diff --git a/src/main/java/com/sipai/entity/kpi/KpiApplyBiz.java b/src/main/java/com/sipai/entity/kpi/KpiApplyBiz.java index c093a4f8..cffabe74 100644 --- a/src/main/java/com/sipai/entity/kpi/KpiApplyBiz.java +++ b/src/main/java/com/sipai/entity/kpi/KpiApplyBiz.java @@ -1,7 +1,6 @@ package com.sipai.entity.kpi; import com.sipai.entity.base.SQLAdapter; -import com.sipai.entity.user.User; import lombok.Data; import lombok.EqualsAndHashCode; import org.apache.commons.lang3.StringUtils; diff --git a/src/main/java/com/sipai/entity/kpi/KpiPlanDetail.java b/src/main/java/com/sipai/entity/kpi/KpiPlanDetail.java index 343deaca..920f511f 100644 --- a/src/main/java/com/sipai/entity/kpi/KpiPlanDetail.java +++ b/src/main/java/com/sipai/entity/kpi/KpiPlanDetail.java @@ -3,7 +3,6 @@ package com.sipai.entity.kpi; import com.alibaba.excel.annotation.ExcelIgnore; import com.alibaba.excel.annotation.ExcelProperty; import com.sipai.entity.base.SQLAdapter; -import lombok.Data; import java.math.BigDecimal; diff --git a/src/main/java/com/sipai/entity/maintenance/Abnormity.java b/src/main/java/com/sipai/entity/maintenance/Abnormity.java index 8f675f0f..7f6ec883 100644 --- a/src/main/java/com/sipai/entity/maintenance/Abnormity.java +++ b/src/main/java/com/sipai/entity/maintenance/Abnormity.java @@ -1,7 +1,6 @@ package com.sipai.entity.maintenance; import com.sipai.entity.base.BusinessUnitAdapter; -import com.sipai.entity.base.SQLAdapter; import com.sipai.entity.timeefficiency.PatrolPoint; import com.sipai.entity.timeefficiency.PatrolRecord; import com.sipai.entity.user.Company; diff --git a/src/main/java/com/sipai/entity/maintenance/AnticorrosiveLibrary.java b/src/main/java/com/sipai/entity/maintenance/AnticorrosiveLibrary.java index 6e0508c9..2cc85f8b 100644 --- a/src/main/java/com/sipai/entity/maintenance/AnticorrosiveLibrary.java +++ b/src/main/java/com/sipai/entity/maintenance/AnticorrosiveLibrary.java @@ -1,7 +1,5 @@ package com.sipai.entity.maintenance; -import java.math.BigDecimal; - import com.sipai.entity.base.SQLAdapter; /** * 设备防腐库 diff --git a/src/main/java/com/sipai/entity/maintenance/CompanyMaintenanceResult.java b/src/main/java/com/sipai/entity/maintenance/CompanyMaintenanceResult.java index 550bc243..42e44d24 100644 --- a/src/main/java/com/sipai/entity/maintenance/CompanyMaintenanceResult.java +++ b/src/main/java/com/sipai/entity/maintenance/CompanyMaintenanceResult.java @@ -1,10 +1,7 @@ package com.sipai.entity.maintenance; import com.sipai.entity.user.Company; -import com.sipai.entity.user.Unit; -import com.sipai.entity.user.User; import com.sipai.service.user.UnitService; -import com.sipai.service.user.UserService; import com.sipai.tools.SpringContextUtil; public class CompanyMaintenanceResult { diff --git a/src/main/java/com/sipai/entity/maintenance/EquipmentPlan.java b/src/main/java/com/sipai/entity/maintenance/EquipmentPlan.java index 5a7b844a..8f471e8c 100644 --- a/src/main/java/com/sipai/entity/maintenance/EquipmentPlan.java +++ b/src/main/java/com/sipai/entity/maintenance/EquipmentPlan.java @@ -1,7 +1,6 @@ package com.sipai.entity.maintenance; import com.sipai.entity.base.BusinessUnitAdapter; -import com.sipai.entity.base.SQLAdapter; import com.sipai.entity.user.Company; import java.util.List; diff --git a/src/main/java/com/sipai/entity/maintenance/EquipmentPlanEqu.java b/src/main/java/com/sipai/entity/maintenance/EquipmentPlanEqu.java index 7f8e3a66..f6eeeac2 100644 --- a/src/main/java/com/sipai/entity/maintenance/EquipmentPlanEqu.java +++ b/src/main/java/com/sipai/entity/maintenance/EquipmentPlanEqu.java @@ -4,8 +4,6 @@ import com.sipai.entity.base.SQLAdapter; import com.sipai.entity.equipment.EquipmentCard; import com.sipai.entity.user.User; -import java.util.List; - /** * 维修计划--挂设备 * @author SJ diff --git a/src/main/java/com/sipai/entity/maintenance/EquipmentPlanMainYear.java b/src/main/java/com/sipai/entity/maintenance/EquipmentPlanMainYear.java index 5202c5d0..2a807a0b 100644 --- a/src/main/java/com/sipai/entity/maintenance/EquipmentPlanMainYear.java +++ b/src/main/java/com/sipai/entity/maintenance/EquipmentPlanMainYear.java @@ -1,12 +1,11 @@ package com.sipai.entity.maintenance; -import java.math.BigDecimal; -import java.util.Date; - import com.sipai.entity.base.SQLAdapter; import com.sipai.entity.equipment.EquipmentCard; import com.sipai.entity.user.User; +import java.math.BigDecimal; + public class EquipmentPlanMainYear extends SQLAdapter { private String id; diff --git a/src/main/java/com/sipai/entity/maintenance/FaultLibrary.java b/src/main/java/com/sipai/entity/maintenance/FaultLibrary.java index 61408d14..d9eaf20d 100644 --- a/src/main/java/com/sipai/entity/maintenance/FaultLibrary.java +++ b/src/main/java/com/sipai/entity/maintenance/FaultLibrary.java @@ -1,7 +1,5 @@ package com.sipai.entity.maintenance; -import java.util.Date; - import com.sipai.entity.base.SQLAdapter; public class FaultLibrary extends SQLAdapter{ diff --git a/src/main/java/com/sipai/entity/maintenance/LibraryMaintainCarDetail.java b/src/main/java/com/sipai/entity/maintenance/LibraryMaintainCarDetail.java index 67b54664..5b87e600 100644 --- a/src/main/java/com/sipai/entity/maintenance/LibraryMaintainCarDetail.java +++ b/src/main/java/com/sipai/entity/maintenance/LibraryMaintainCarDetail.java @@ -1,9 +1,9 @@ package com.sipai.entity.maintenance; -import java.math.BigDecimal; - import com.sipai.entity.base.SQLAdapter; +import java.math.BigDecimal; + public class LibraryMaintainCarDetail extends SQLAdapter { public final static Double KM5000=0.5; diff --git a/src/main/java/com/sipai/entity/maintenance/MaintainCar.java b/src/main/java/com/sipai/entity/maintenance/MaintainCar.java index 9410b58f..e6438583 100644 --- a/src/main/java/com/sipai/entity/maintenance/MaintainCar.java +++ b/src/main/java/com/sipai/entity/maintenance/MaintainCar.java @@ -1,9 +1,8 @@ package com.sipai.entity.maintenance; -import java.math.BigDecimal; - import com.sipai.entity.base.BusinessUnitAdapter; -import com.sipai.entity.base.SQLAdapter; + +import java.math.BigDecimal; public class MaintainCar extends BusinessUnitAdapter { private String id; diff --git a/src/main/java/com/sipai/entity/maintenance/MaintainPlan.java b/src/main/java/com/sipai/entity/maintenance/MaintainPlan.java index 608bdf9b..378b0fe8 100644 --- a/src/main/java/com/sipai/entity/maintenance/MaintainPlan.java +++ b/src/main/java/com/sipai/entity/maintenance/MaintainPlan.java @@ -1,9 +1,6 @@ package com.sipai.entity.maintenance; -import java.util.HashMap; -import java.util.Map; - import com.sipai.entity.base.SQLAdapter; import com.sipai.entity.user.Company; diff --git a/src/main/java/com/sipai/entity/maintenance/Maintainer.java b/src/main/java/com/sipai/entity/maintenance/Maintainer.java index 0a640038..0862e77d 100644 --- a/src/main/java/com/sipai/entity/maintenance/Maintainer.java +++ b/src/main/java/com/sipai/entity/maintenance/Maintainer.java @@ -2,7 +2,6 @@ package com.sipai.entity.maintenance; import com.sipai.entity.base.SQLAdapter; -import java.util.Date; import java.util.List; public class Maintainer extends SQLAdapter{ diff --git a/src/main/java/com/sipai/entity/maintenance/MaintainerCompany.java b/src/main/java/com/sipai/entity/maintenance/MaintainerCompany.java index d05fbf41..ded974a4 100644 --- a/src/main/java/com/sipai/entity/maintenance/MaintainerCompany.java +++ b/src/main/java/com/sipai/entity/maintenance/MaintainerCompany.java @@ -1,7 +1,5 @@ package com.sipai.entity.maintenance; -import java.util.Date; - import com.sipai.entity.base.SQLAdapter; public class MaintainerCompany extends SQLAdapter{ diff --git a/src/main/java/com/sipai/entity/maintenance/MaintainerSelectType.java b/src/main/java/com/sipai/entity/maintenance/MaintainerSelectType.java index 469d1a8e..ba1373cf 100644 --- a/src/main/java/com/sipai/entity/maintenance/MaintainerSelectType.java +++ b/src/main/java/com/sipai/entity/maintenance/MaintainerSelectType.java @@ -1,7 +1,5 @@ package com.sipai.entity.maintenance; -import java.util.Date; - import com.sipai.entity.base.SQLAdapter; public class MaintainerSelectType extends SQLAdapter{ diff --git a/src/main/java/com/sipai/entity/maintenance/MaintainerType.java b/src/main/java/com/sipai/entity/maintenance/MaintainerType.java index a3d69fb0..e208018e 100644 --- a/src/main/java/com/sipai/entity/maintenance/MaintainerType.java +++ b/src/main/java/com/sipai/entity/maintenance/MaintainerType.java @@ -1,7 +1,5 @@ package com.sipai.entity.maintenance; -import java.util.Date; - import com.sipai.entity.base.SQLAdapter; public class MaintainerType extends SQLAdapter{ diff --git a/src/main/java/com/sipai/entity/maintenance/Maintenance.java b/src/main/java/com/sipai/entity/maintenance/Maintenance.java index 2eccc500..44c99196 100644 --- a/src/main/java/com/sipai/entity/maintenance/Maintenance.java +++ b/src/main/java/com/sipai/entity/maintenance/Maintenance.java @@ -1,7 +1,5 @@ package com.sipai.entity.maintenance; -import java.util.Date; - import com.sipai.entity.base.SQLAdapter; import com.sipai.entity.user.Company; diff --git a/src/main/java/com/sipai/entity/maintenance/MaintenanceDetail.java b/src/main/java/com/sipai/entity/maintenance/MaintenanceDetail.java index 77db2fcc..fc1323f7 100644 --- a/src/main/java/com/sipai/entity/maintenance/MaintenanceDetail.java +++ b/src/main/java/com/sipai/entity/maintenance/MaintenanceDetail.java @@ -1,18 +1,14 @@ package com.sipai.entity.maintenance; -import java.math.BigDecimal; -import java.util.Date; - -import net.sf.json.JSONArray; - -import com.sipai.entity.activiti.TodoTask; import com.sipai.entity.base.BusinessUnitAdapter; -import com.sipai.entity.base.SQLAdapter; import com.sipai.entity.equipment.EquipmentCard; import com.sipai.entity.equipment.MaintenancePlan; import com.sipai.entity.user.Company; import com.sipai.entity.user.ProcessSection; import com.sipai.entity.user.User; +import net.sf.json.JSONArray; + +import java.math.BigDecimal; public class MaintenanceDetail extends BusinessUnitAdapter{ public final static String Status_Start="0";//开始 diff --git a/src/main/java/com/sipai/entity/maintenance/MaintenanceEquipment.java b/src/main/java/com/sipai/entity/maintenance/MaintenanceEquipment.java index f6d7ddcf..e9fa65db 100644 --- a/src/main/java/com/sipai/entity/maintenance/MaintenanceEquipment.java +++ b/src/main/java/com/sipai/entity/maintenance/MaintenanceEquipment.java @@ -1,7 +1,5 @@ package com.sipai.entity.maintenance; -import java.util.Date; - import com.sipai.entity.base.SQLAdapter; public class MaintenanceEquipment extends SQLAdapter{ diff --git a/src/main/java/com/sipai/entity/maintenance/MaintenanceFile.java b/src/main/java/com/sipai/entity/maintenance/MaintenanceFile.java index 46f94e8c..cd0061bb 100644 --- a/src/main/java/com/sipai/entity/maintenance/MaintenanceFile.java +++ b/src/main/java/com/sipai/entity/maintenance/MaintenanceFile.java @@ -1,7 +1,5 @@ package com.sipai.entity.maintenance; -import java.util.Date; - import com.sipai.entity.base.SQLAdapter; public class MaintenanceFile extends SQLAdapter{ diff --git a/src/main/java/com/sipai/entity/maintenance/MaintenanceRecord.java b/src/main/java/com/sipai/entity/maintenance/MaintenanceRecord.java index ae93e44d..519d238e 100644 --- a/src/main/java/com/sipai/entity/maintenance/MaintenanceRecord.java +++ b/src/main/java/com/sipai/entity/maintenance/MaintenanceRecord.java @@ -1,7 +1,5 @@ package com.sipai.entity.maintenance; -import java.util.Date; - import com.sipai.entity.base.SQLAdapter; import com.sipai.entity.user.Unit; import com.sipai.entity.user.User; diff --git a/src/main/java/com/sipai/entity/maintenance/PlanRecordAbnormity.java b/src/main/java/com/sipai/entity/maintenance/PlanRecordAbnormity.java index b3d95a5c..d9cb7e22 100644 --- a/src/main/java/com/sipai/entity/maintenance/PlanRecordAbnormity.java +++ b/src/main/java/com/sipai/entity/maintenance/PlanRecordAbnormity.java @@ -1,7 +1,5 @@ package com.sipai.entity.maintenance; -import java.util.Date; - import com.sipai.entity.base.SQLAdapter; public class PlanRecordAbnormity extends SQLAdapter{ diff --git a/src/main/java/com/sipai/entity/maintenance/Repair.java b/src/main/java/com/sipai/entity/maintenance/Repair.java index 19317aa0..f89305ec 100644 --- a/src/main/java/com/sipai/entity/maintenance/Repair.java +++ b/src/main/java/com/sipai/entity/maintenance/Repair.java @@ -1,9 +1,7 @@ package com.sipai.entity.maintenance; import com.sipai.entity.base.BusinessUnitAdapter; -import com.sipai.entity.base.SQLAdapter; import com.sipai.entity.equipment.EquipmentCard; -import com.sipai.entity.user.User; public class Repair extends BusinessUnitAdapter{ //计划类型 diff --git a/src/main/java/com/sipai/entity/maintenance/RepairCar.java b/src/main/java/com/sipai/entity/maintenance/RepairCar.java index 4079b018..fa34bfda 100644 --- a/src/main/java/com/sipai/entity/maintenance/RepairCar.java +++ b/src/main/java/com/sipai/entity/maintenance/RepairCar.java @@ -1,9 +1,9 @@ package com.sipai.entity.maintenance; -import java.math.BigDecimal; - import com.sipai.entity.base.BusinessUnitAdapter; +import java.math.BigDecimal; + public class RepairCar extends BusinessUnitAdapter { private String id; diff --git a/src/main/java/com/sipai/entity/msg/EmppAdmin.java b/src/main/java/com/sipai/entity/msg/EmppAdmin.java index 4bceb361..0eb4b105 100644 --- a/src/main/java/com/sipai/entity/msg/EmppAdmin.java +++ b/src/main/java/com/sipai/entity/msg/EmppAdmin.java @@ -1,9 +1,9 @@ package com.sipai.entity.msg; -import java.util.Date; - import com.sipai.entity.base.SQLAdapter; +import java.util.Date; + public class EmppAdmin extends SQLAdapter{ private String id; diff --git a/src/main/java/com/sipai/entity/msg/EmppSend.java b/src/main/java/com/sipai/entity/msg/EmppSend.java index 3e8cf16f..daca4525 100644 --- a/src/main/java/com/sipai/entity/msg/EmppSend.java +++ b/src/main/java/com/sipai/entity/msg/EmppSend.java @@ -1,9 +1,9 @@ package com.sipai.entity.msg; -import java.util.Date; - import com.sipai.entity.base.SQLAdapter; +import java.util.Date; + public class EmppSend extends SQLAdapter{ private String id; diff --git a/src/main/java/com/sipai/entity/msg/EmppSendUser.java b/src/main/java/com/sipai/entity/msg/EmppSendUser.java index b8642b5f..0f4f8767 100644 --- a/src/main/java/com/sipai/entity/msg/EmppSendUser.java +++ b/src/main/java/com/sipai/entity/msg/EmppSendUser.java @@ -1,9 +1,9 @@ package com.sipai.entity.msg; -import java.util.Date; - import com.sipai.entity.base.SQLAdapter; +import java.util.Date; + public class EmppSendUser extends SQLAdapter{ private String id; diff --git a/src/main/java/com/sipai/entity/msg/Msg.java b/src/main/java/com/sipai/entity/msg/Msg.java index b4f2ffa1..afd62556 100644 --- a/src/main/java/com/sipai/entity/msg/Msg.java +++ b/src/main/java/com/sipai/entity/msg/Msg.java @@ -1,11 +1,10 @@ package com.sipai.entity.msg; -import java.util.Date; -import java.util.List; - import com.sipai.entity.base.SQLAdapter; import com.sipai.entity.user.User; +import java.util.List; + public class Msg extends SQLAdapter { public static String ReadFlag = "1"; //已读 diff --git a/src/main/java/com/sipai/entity/msg/MsgAlarmlevel.java b/src/main/java/com/sipai/entity/msg/MsgAlarmlevel.java index ddda6300..7a4426ad 100644 --- a/src/main/java/com/sipai/entity/msg/MsgAlarmlevel.java +++ b/src/main/java/com/sipai/entity/msg/MsgAlarmlevel.java @@ -1,10 +1,9 @@ package com.sipai.entity.msg; -import java.util.Date; -import java.util.List; - import com.sipai.entity.base.SQLAdapter; +import java.util.List; + public class MsgAlarmlevel extends SQLAdapter{ private String id; diff --git a/src/main/java/com/sipai/entity/msg/MsgRecv.java b/src/main/java/com/sipai/entity/msg/MsgRecv.java index f649549b..747b363a 100644 --- a/src/main/java/com/sipai/entity/msg/MsgRecv.java +++ b/src/main/java/com/sipai/entity/msg/MsgRecv.java @@ -1,9 +1,9 @@ package com.sipai.entity.msg; -import java.util.Date; - import com.sipai.entity.base.SQLAdapter; +import java.util.Date; + public class MsgRecv extends SQLAdapter{ private String id; diff --git a/src/main/java/com/sipai/entity/msg/MsgRole.java b/src/main/java/com/sipai/entity/msg/MsgRole.java index 27698a87..bf52d1c8 100644 --- a/src/main/java/com/sipai/entity/msg/MsgRole.java +++ b/src/main/java/com/sipai/entity/msg/MsgRole.java @@ -1,9 +1,9 @@ package com.sipai.entity.msg; -import java.util.Date; - import com.sipai.entity.base.SQLAdapter; +import java.util.Date; + public class MsgRole extends SQLAdapter{ private String id; diff --git a/src/main/java/com/sipai/entity/msg/MsgType.java b/src/main/java/com/sipai/entity/msg/MsgType.java index d3b3462e..10a9c3de 100644 --- a/src/main/java/com/sipai/entity/msg/MsgType.java +++ b/src/main/java/com/sipai/entity/msg/MsgType.java @@ -1,10 +1,10 @@ package com.sipai.entity.msg; +import com.sipai.entity.base.SQLAdapter; + import java.util.Date; import java.util.List; -import com.sipai.entity.base.SQLAdapter; - public class MsgType extends SQLAdapter{ private String id; diff --git a/src/main/java/com/sipai/entity/msg/Msguser.java b/src/main/java/com/sipai/entity/msg/Msguser.java index 19b04a55..57f10d51 100644 --- a/src/main/java/com/sipai/entity/msg/Msguser.java +++ b/src/main/java/com/sipai/entity/msg/Msguser.java @@ -1,10 +1,10 @@ package com.sipai.entity.msg; -import java.util.Date; - import com.sipai.entity.base.SQLAdapter; import com.sipai.entity.user.User; +import java.util.Date; + public class Msguser extends SQLAdapter{ private String id; diff --git a/src/main/java/com/sipai/entity/msg/Smsuser.java b/src/main/java/com/sipai/entity/msg/Smsuser.java index cc44f7b6..07bafad9 100644 --- a/src/main/java/com/sipai/entity/msg/Smsuser.java +++ b/src/main/java/com/sipai/entity/msg/Smsuser.java @@ -1,10 +1,10 @@ package com.sipai.entity.msg; -import java.util.Date; - import com.sipai.entity.base.SQLAdapter; import com.sipai.entity.user.User; +import java.util.Date; + public class Smsuser extends SQLAdapter{ private String id; diff --git a/src/main/java/com/sipai/entity/process/LibraryProcessManageType.java b/src/main/java/com/sipai/entity/process/LibraryProcessManageType.java index 6c890b28..75990d1b 100644 --- a/src/main/java/com/sipai/entity/process/LibraryProcessManageType.java +++ b/src/main/java/com/sipai/entity/process/LibraryProcessManageType.java @@ -1,7 +1,5 @@ package com.sipai.entity.process; -import java.util.Date; - import com.sipai.entity.base.SQLAdapter; /** diff --git a/src/main/java/com/sipai/entity/process/LibraryRoutineWork.java b/src/main/java/com/sipai/entity/process/LibraryRoutineWork.java index cd35f1de..b44bdf03 100644 --- a/src/main/java/com/sipai/entity/process/LibraryRoutineWork.java +++ b/src/main/java/com/sipai/entity/process/LibraryRoutineWork.java @@ -1,7 +1,6 @@ package com.sipai.entity.process; import com.sipai.entity.base.SQLAdapter; -import java.math.BigDecimal; /** * 周期常规工作库 diff --git a/src/main/java/com/sipai/entity/process/ProcessWebsite.java b/src/main/java/com/sipai/entity/process/ProcessWebsite.java index 86b15039..4253a778 100644 --- a/src/main/java/com/sipai/entity/process/ProcessWebsite.java +++ b/src/main/java/com/sipai/entity/process/ProcessWebsite.java @@ -1,7 +1,5 @@ package com.sipai.entity.process; -import java.util.Date; - import com.sipai.entity.base.SQLAdapter; public class ProcessWebsite extends SQLAdapter{ diff --git a/src/main/java/com/sipai/entity/process/TestIndexManage.java b/src/main/java/com/sipai/entity/process/TestIndexManage.java index b08fb63e..3b2cedc3 100644 --- a/src/main/java/com/sipai/entity/process/TestIndexManage.java +++ b/src/main/java/com/sipai/entity/process/TestIndexManage.java @@ -1,9 +1,9 @@ package com.sipai.entity.process; -import java.util.List; - import com.sipai.entity.base.SQLAdapter; +import java.util.List; + public class TestIndexManage extends SQLAdapter{ //启用状态 public final static String Active_true="1";//启用 diff --git a/src/main/java/com/sipai/entity/report/ReportEnergy10KVDay.java b/src/main/java/com/sipai/entity/report/ReportEnergy10KVDay.java index 57fc0836..2812c084 100644 --- a/src/main/java/com/sipai/entity/report/ReportEnergy10KVDay.java +++ b/src/main/java/com/sipai/entity/report/ReportEnergy10KVDay.java @@ -1,7 +1,5 @@ package com.sipai.entity.report; -import java.util.Date; - import com.sipai.entity.base.SQLAdapter; public class ReportEnergy10KVDay extends SQLAdapter{ diff --git a/src/main/java/com/sipai/entity/report/ReportEnergyPump.java b/src/main/java/com/sipai/entity/report/ReportEnergyPump.java index 51235d2e..8aa21cb3 100644 --- a/src/main/java/com/sipai/entity/report/ReportEnergyPump.java +++ b/src/main/java/com/sipai/entity/report/ReportEnergyPump.java @@ -1,7 +1,5 @@ package com.sipai.entity.report; -import java.util.Date; - import com.sipai.entity.base.SQLAdapter; /** * diff --git a/src/main/java/com/sipai/entity/report/ReportEnergyPumpParam.java b/src/main/java/com/sipai/entity/report/ReportEnergyPumpParam.java index 4940a5ae..0184b46f 100644 --- a/src/main/java/com/sipai/entity/report/ReportEnergyPumpParam.java +++ b/src/main/java/com/sipai/entity/report/ReportEnergyPumpParam.java @@ -1,7 +1,5 @@ package com.sipai.entity.report; -import java.util.Date; - import com.sipai.entity.base.SQLAdapter; public class ReportEnergyPumpParam extends SQLAdapter{ diff --git a/src/main/java/com/sipai/entity/report/ReportTemplate.java b/src/main/java/com/sipai/entity/report/ReportTemplate.java index 7a247f35..37eabc60 100644 --- a/src/main/java/com/sipai/entity/report/ReportTemplate.java +++ b/src/main/java/com/sipai/entity/report/ReportTemplate.java @@ -1,7 +1,5 @@ package com.sipai.entity.report; -import java.util.Date; - import com.sipai.entity.base.SQLAdapter; public class ReportTemplate extends SQLAdapter{ diff --git a/src/main/java/com/sipai/entity/report/ReportWaterBackWashEquipment.java b/src/main/java/com/sipai/entity/report/ReportWaterBackWashEquipment.java index 81da7dc2..eaec8f03 100644 --- a/src/main/java/com/sipai/entity/report/ReportWaterBackWashEquipment.java +++ b/src/main/java/com/sipai/entity/report/ReportWaterBackWashEquipment.java @@ -1,10 +1,9 @@ package com.sipai.entity.report; -import java.math.BigDecimal; -import java.util.Date; - import com.sipai.entity.base.SQLAdapter; +import java.math.BigDecimal; + public class ReportWaterBackWashEquipment extends SQLAdapter{ private String time;//时间点 diff --git a/src/main/java/com/sipai/entity/report/ReportWaterInAndOutFlow.java b/src/main/java/com/sipai/entity/report/ReportWaterInAndOutFlow.java index 4cd8f48f..da3a2de6 100644 --- a/src/main/java/com/sipai/entity/report/ReportWaterInAndOutFlow.java +++ b/src/main/java/com/sipai/entity/report/ReportWaterInAndOutFlow.java @@ -1,10 +1,9 @@ package com.sipai.entity.report; -import java.math.BigDecimal; -import java.util.Date; - import com.sipai.entity.base.SQLAdapter; +import java.math.BigDecimal; + public class ReportWaterInAndOutFlow extends SQLAdapter{ private String time;//时间点 diff --git a/src/main/java/com/sipai/entity/report/ReportWaterOutletPump.java b/src/main/java/com/sipai/entity/report/ReportWaterOutletPump.java index 934701c3..6771b5e1 100644 --- a/src/main/java/com/sipai/entity/report/ReportWaterOutletPump.java +++ b/src/main/java/com/sipai/entity/report/ReportWaterOutletPump.java @@ -1,10 +1,9 @@ package com.sipai.entity.report; -import java.math.BigDecimal; -import java.util.Date; - import com.sipai.entity.base.SQLAdapter; +import java.math.BigDecimal; + public class ReportWaterOutletPump extends SQLAdapter{ private String time;//时间点 diff --git a/src/main/java/com/sipai/entity/report/ReportWaterTlc.java b/src/main/java/com/sipai/entity/report/ReportWaterTlc.java index 9284a2a1..f2b731ce 100644 --- a/src/main/java/com/sipai/entity/report/ReportWaterTlc.java +++ b/src/main/java/com/sipai/entity/report/ReportWaterTlc.java @@ -1,9 +1,8 @@ package com.sipai.entity.report; -import java.math.BigDecimal; -import java.util.Date; - import com.sipai.entity.base.SQLAdapter; + +import java.math.BigDecimal; /** * 工艺参数日/月报表 - 炭滤池,17个测量点 * @author 12235 diff --git a/src/main/java/com/sipai/entity/report/RptCollectMode.java b/src/main/java/com/sipai/entity/report/RptCollectMode.java index 881199b5..d6e679c1 100644 --- a/src/main/java/com/sipai/entity/report/RptCollectMode.java +++ b/src/main/java/com/sipai/entity/report/RptCollectMode.java @@ -1,7 +1,5 @@ package com.sipai.entity.report; -import java.util.Date; - import com.sipai.entity.base.SQLAdapter; public class RptCollectMode extends SQLAdapter{ diff --git a/src/main/java/com/sipai/entity/report/RptCreate.java b/src/main/java/com/sipai/entity/report/RptCreate.java index 28bbc0c2..3f9a7beb 100644 --- a/src/main/java/com/sipai/entity/report/RptCreate.java +++ b/src/main/java/com/sipai/entity/report/RptCreate.java @@ -1,8 +1,6 @@ package com.sipai.entity.report; import com.sipai.entity.base.BusinessUnitAdapter; -import com.sipai.entity.base.SQLAdapter; -import com.sipai.entity.user.User; /** * 报表生成记录 diff --git a/src/main/java/com/sipai/entity/report/RptDayLog.java b/src/main/java/com/sipai/entity/report/RptDayLog.java index 65649517..08a48b91 100644 --- a/src/main/java/com/sipai/entity/report/RptDayLog.java +++ b/src/main/java/com/sipai/entity/report/RptDayLog.java @@ -1,13 +1,13 @@ package com.sipai.entity.report; -import java.io.Serializable; -import java.util.ArrayList; - import com.sipai.entity.base.SQLAdapter; import com.sipai.entity.scada.MPoint; import com.sipai.entity.scada.MPointHistory; import com.sipai.entity.user.User; +import java.io.Serializable; +import java.util.ArrayList; + public class RptDayLog extends SQLAdapter implements Serializable { diff --git a/src/main/java/com/sipai/entity/report/RptDeptSet.java b/src/main/java/com/sipai/entity/report/RptDeptSet.java index afa47543..18183a99 100644 --- a/src/main/java/com/sipai/entity/report/RptDeptSet.java +++ b/src/main/java/com/sipai/entity/report/RptDeptSet.java @@ -1,9 +1,9 @@ package com.sipai.entity.report; -import java.io.Serializable; - import com.sipai.entity.base.SQLAdapter; +import java.io.Serializable; + public class RptDeptSet extends SQLAdapter implements Serializable { private Integer morder; diff --git a/src/main/java/com/sipai/entity/report/RptDeptSetUser.java b/src/main/java/com/sipai/entity/report/RptDeptSetUser.java index 0f930be5..bfd90682 100644 --- a/src/main/java/com/sipai/entity/report/RptDeptSetUser.java +++ b/src/main/java/com/sipai/entity/report/RptDeptSetUser.java @@ -1,9 +1,9 @@ package com.sipai.entity.report; -import java.io.Serializable; - import com.sipai.entity.base.SQLAdapter; +import java.io.Serializable; + public class RptDeptSetUser extends SQLAdapter implements Serializable { private static final long serialVersionUID = 3454020177122517211L; diff --git a/src/main/java/com/sipai/entity/report/RptMpSet.java b/src/main/java/com/sipai/entity/report/RptMpSet.java index 2728b5f6..6ecdd35e 100644 --- a/src/main/java/com/sipai/entity/report/RptMpSet.java +++ b/src/main/java/com/sipai/entity/report/RptMpSet.java @@ -1,10 +1,10 @@ package com.sipai.entity.report; -import java.io.Serializable; - import com.sipai.entity.base.SQLAdapter; import com.sipai.entity.scada.MPoint; +import java.io.Serializable; + /** * 报表信息设置--附表--附表 * @author s123 diff --git a/src/main/java/com/sipai/entity/report/RptTypeSet.java b/src/main/java/com/sipai/entity/report/RptTypeSet.java index b5a13df1..407709a4 100644 --- a/src/main/java/com/sipai/entity/report/RptTypeSet.java +++ b/src/main/java/com/sipai/entity/report/RptTypeSet.java @@ -1,10 +1,9 @@ package com.sipai.entity.report; -import java.io.Serializable; -import java.util.Date; - import com.sipai.entity.base.SQLAdapter; +import java.io.Serializable; + /** * 报表信息类型设置表 * @author s123 diff --git a/src/main/java/com/sipai/entity/report/TemplateFile.java b/src/main/java/com/sipai/entity/report/TemplateFile.java index 9e43a818..f358ad2d 100644 --- a/src/main/java/com/sipai/entity/report/TemplateFile.java +++ b/src/main/java/com/sipai/entity/report/TemplateFile.java @@ -1,7 +1,5 @@ package com.sipai.entity.report; -import java.util.Date; - import com.sipai.entity.base.SQLAdapter; public class TemplateFile extends SQLAdapter{ diff --git a/src/main/java/com/sipai/entity/report/TemplateType.java b/src/main/java/com/sipai/entity/report/TemplateType.java index 02c841db..577cc155 100644 --- a/src/main/java/com/sipai/entity/report/TemplateType.java +++ b/src/main/java/com/sipai/entity/report/TemplateType.java @@ -1,10 +1,6 @@ package com.sipai.entity.report; -import java.util.Date; - import com.sipai.entity.base.SQLAdapter; -import com.sipai.service.report.BaseService; -import com.sipai.tools.SpringContextUtil; public class TemplateType extends SQLAdapter { diff --git a/src/main/java/com/sipai/entity/safety/SafetyEducationBuilder.java b/src/main/java/com/sipai/entity/safety/SafetyEducationBuilder.java index 5c2c6f20..ed89b8b7 100644 --- a/src/main/java/com/sipai/entity/safety/SafetyEducationBuilder.java +++ b/src/main/java/com/sipai/entity/safety/SafetyEducationBuilder.java @@ -2,8 +2,6 @@ package com.sipai.entity.safety; import lombok.Data; -import java.util.Date; - @Data public class SafetyEducationBuilder { private String id; diff --git a/src/main/java/com/sipai/entity/safety/SafetyEducationInsider.java b/src/main/java/com/sipai/entity/safety/SafetyEducationInsider.java index 171e5b67..8da6d95d 100644 --- a/src/main/java/com/sipai/entity/safety/SafetyEducationInsider.java +++ b/src/main/java/com/sipai/entity/safety/SafetyEducationInsider.java @@ -3,7 +3,6 @@ package com.sipai.entity.safety; import lombok.Data; import java.math.BigDecimal; -import java.util.Date; @Data public class SafetyEducationInsider { diff --git a/src/main/java/com/sipai/entity/safety/SafetyEducationInsiderVo.java b/src/main/java/com/sipai/entity/safety/SafetyEducationInsiderVo.java index da0dc466..4407db52 100644 --- a/src/main/java/com/sipai/entity/safety/SafetyEducationInsiderVo.java +++ b/src/main/java/com/sipai/entity/safety/SafetyEducationInsiderVo.java @@ -3,8 +3,6 @@ package com.sipai.entity.safety; import lombok.Data; import lombok.EqualsAndHashCode; -import java.math.BigDecimal; - @EqualsAndHashCode(callSuper = true) @Data public class SafetyEducationInsiderVo extends SafetyEducationInsider { diff --git a/src/main/java/com/sipai/entity/safety/SafetyEducationTrainee.java b/src/main/java/com/sipai/entity/safety/SafetyEducationTrainee.java index 66685880..c54fc8a6 100644 --- a/src/main/java/com/sipai/entity/safety/SafetyEducationTrainee.java +++ b/src/main/java/com/sipai/entity/safety/SafetyEducationTrainee.java @@ -2,8 +2,6 @@ package com.sipai.entity.safety; import lombok.Data; -import java.util.Date; - @Data public class SafetyEducationTrainee { private String id; diff --git a/src/main/java/com/sipai/entity/safety/SafetyEducationVisitor.java b/src/main/java/com/sipai/entity/safety/SafetyEducationVisitor.java index 1f800728..aa3d4da9 100644 --- a/src/main/java/com/sipai/entity/safety/SafetyEducationVisitor.java +++ b/src/main/java/com/sipai/entity/safety/SafetyEducationVisitor.java @@ -1,8 +1,6 @@ package com.sipai.entity.safety; import lombok.Data; - -import java.util.Date; @Data public class SafetyEducationVisitor { private String id; diff --git a/src/main/java/com/sipai/entity/safety/SafetyFlowTask.java b/src/main/java/com/sipai/entity/safety/SafetyFlowTask.java index 85b5bdfe..85dc85e6 100644 --- a/src/main/java/com/sipai/entity/safety/SafetyFlowTask.java +++ b/src/main/java/com/sipai/entity/safety/SafetyFlowTask.java @@ -4,8 +4,6 @@ import com.sipai.entity.base.SQLAdapter; import lombok.Data; import lombok.EqualsAndHashCode; -import java.util.Date; - @EqualsAndHashCode(callSuper = true) @Data public class SafetyFlowTask extends SQLAdapter { diff --git a/src/main/java/com/sipai/entity/safety/SafetyFlowTaskDetail.java b/src/main/java/com/sipai/entity/safety/SafetyFlowTaskDetail.java index 69324a8c..b84adff1 100644 --- a/src/main/java/com/sipai/entity/safety/SafetyFlowTaskDetail.java +++ b/src/main/java/com/sipai/entity/safety/SafetyFlowTaskDetail.java @@ -4,8 +4,6 @@ import com.sipai.entity.base.SQLAdapter; import lombok.Data; import lombok.EqualsAndHashCode; -import java.util.Date; - @EqualsAndHashCode(callSuper = true) @Data public class SafetyFlowTaskDetail extends SQLAdapter { diff --git a/src/main/java/com/sipai/entity/safety/SafetyFlowTaskVo.java b/src/main/java/com/sipai/entity/safety/SafetyFlowTaskVo.java index 59a43419..3eaf4523 100644 --- a/src/main/java/com/sipai/entity/safety/SafetyFlowTaskVo.java +++ b/src/main/java/com/sipai/entity/safety/SafetyFlowTaskVo.java @@ -4,7 +4,6 @@ import lombok.Data; import lombok.EqualsAndHashCode; import java.util.ArrayList; -import java.util.Date; import java.util.List; @EqualsAndHashCode(callSuper = true) diff --git a/src/main/java/com/sipai/entity/safety/SafetyJobInside.java b/src/main/java/com/sipai/entity/safety/SafetyJobInside.java index f19d4a0c..2addc9c7 100644 --- a/src/main/java/com/sipai/entity/safety/SafetyJobInside.java +++ b/src/main/java/com/sipai/entity/safety/SafetyJobInside.java @@ -4,8 +4,6 @@ import com.sipai.entity.base.SQLAdapter; import lombok.Data; import lombok.EqualsAndHashCode; -import java.util.Date; - @EqualsAndHashCode(callSuper = true) @Data public class SafetyJobInside extends SQLAdapter { diff --git a/src/main/java/com/sipai/entity/scada/MPoint.java b/src/main/java/com/sipai/entity/scada/MPoint.java index 07b14709..60386c8b 100644 --- a/src/main/java/com/sipai/entity/scada/MPoint.java +++ b/src/main/java/com/sipai/entity/scada/MPoint.java @@ -6,9 +6,7 @@ import com.sipai.entity.base.SQLAdapter; import com.sipai.entity.equipment.EquipmentCard; import com.sipai.entity.user.Company; import com.sipai.entity.user.ProcessSection; - import net.sf.json.JSONArray; -import org.springframework.data.annotation.Id; import org.springframework.data.elasticsearch.annotations.*; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/sipai/entity/scada/MPoint4APP.java b/src/main/java/com/sipai/entity/scada/MPoint4APP.java index ac57910a..8746b989 100644 --- a/src/main/java/com/sipai/entity/scada/MPoint4APP.java +++ b/src/main/java/com/sipai/entity/scada/MPoint4APP.java @@ -1,12 +1,11 @@ package com.sipai.entity.scada; +import com.sipai.entity.base.SQLAdapter; +import org.springframework.stereotype.Component; + import java.io.Serializable; import java.math.BigDecimal; -import org.springframework.stereotype.Component; - -import com.sipai.entity.base.SQLAdapter; - @Component public class MPoint4APP extends SQLAdapter implements Serializable{ diff --git a/src/main/java/com/sipai/entity/scada/MPointHistory.java b/src/main/java/com/sipai/entity/scada/MPointHistory.java index ebe361cc..9cd33788 100644 --- a/src/main/java/com/sipai/entity/scada/MPointHistory.java +++ b/src/main/java/com/sipai/entity/scada/MPointHistory.java @@ -1,12 +1,11 @@ package com.sipai.entity.scada; -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.Date; - import com.sipai.entity.base.SQLAdapter; import com.sipai.entity.user.User; +import java.io.Serializable; +import java.math.BigDecimal; + public class MPointHistory extends SQLAdapter implements Serializable { diff --git a/src/main/java/com/sipai/entity/scada/MPointProgramme.java b/src/main/java/com/sipai/entity/scada/MPointProgramme.java index 2636aa70..e0b4eb28 100644 --- a/src/main/java/com/sipai/entity/scada/MPointProgramme.java +++ b/src/main/java/com/sipai/entity/scada/MPointProgramme.java @@ -1,9 +1,9 @@ package com.sipai.entity.scada; -import java.io.Serializable; - import com.sipai.entity.base.SQLAdapter; +import java.io.Serializable; + public class MPointProgramme extends SQLAdapter implements Serializable{ /** * diff --git a/src/main/java/com/sipai/entity/scada/MPointProgrammeDetail.java b/src/main/java/com/sipai/entity/scada/MPointProgrammeDetail.java index 08a2ef60..591034bb 100644 --- a/src/main/java/com/sipai/entity/scada/MPointProgrammeDetail.java +++ b/src/main/java/com/sipai/entity/scada/MPointProgrammeDetail.java @@ -1,10 +1,10 @@ package com.sipai.entity.scada; +import com.sipai.entity.base.SQLAdapter; + import java.io.Serializable; import java.math.BigDecimal; -import com.sipai.entity.base.SQLAdapter; - public class MPointProgrammeDetail extends SQLAdapter implements Serializable{ /** * diff --git a/src/main/java/com/sipai/entity/scada/MPointProp.java b/src/main/java/com/sipai/entity/scada/MPointProp.java index 52c208b2..1a8915ea 100644 --- a/src/main/java/com/sipai/entity/scada/MPointProp.java +++ b/src/main/java/com/sipai/entity/scada/MPointProp.java @@ -1,9 +1,5 @@ package com.sipai.entity.scada; -import java.util.Date; - -import javax.management.loading.PrivateClassLoader; - import com.sipai.entity.base.SQLAdapter; import com.sipai.entity.user.Company; diff --git a/src/main/java/com/sipai/entity/scada/MPointPropSource.java b/src/main/java/com/sipai/entity/scada/MPointPropSource.java index b90ef802..30e6c440 100644 --- a/src/main/java/com/sipai/entity/scada/MPointPropSource.java +++ b/src/main/java/com/sipai/entity/scada/MPointPropSource.java @@ -1,15 +1,13 @@ package com.sipai.entity.scada; -import java.io.Serializable; -import java.util.Date; - -import org.springframework.data.elasticsearch.annotations.Document; - import com.fasterxml.jackson.annotation.JsonProperty; import com.sipai.entity.base.SQLAdapter; +import org.springframework.data.elasticsearch.annotations.Document; import org.springframework.data.elasticsearch.annotations.Field; import org.springframework.data.elasticsearch.annotations.FieldType; +import java.io.Serializable; + @Document(indexName = "es_mpointpropsource", type = "esmpointpropsource") public class MPointPropSource extends SQLAdapter implements Serializable{ /** diff --git a/src/main/java/com/sipai/entity/scada/MPointPropTarget.java b/src/main/java/com/sipai/entity/scada/MPointPropTarget.java index 47338d17..69117a32 100644 --- a/src/main/java/com/sipai/entity/scada/MPointPropTarget.java +++ b/src/main/java/com/sipai/entity/scada/MPointPropTarget.java @@ -1,7 +1,5 @@ package com.sipai.entity.scada; -import java.util.Date; - import com.sipai.entity.base.SQLAdapter; public class MPointPropTarget extends SQLAdapter{ diff --git a/src/main/java/com/sipai/entity/scada/ScadaAlarm.java b/src/main/java/com/sipai/entity/scada/ScadaAlarm.java index ff276fe5..8aeed7a5 100644 --- a/src/main/java/com/sipai/entity/scada/ScadaAlarm.java +++ b/src/main/java/com/sipai/entity/scada/ScadaAlarm.java @@ -1,6 +1,7 @@ package com.sipai.entity.scada; import com.sipai.entity.base.SQLAdapter; + import java.math.BigDecimal; public class ScadaAlarm extends SQLAdapter{ diff --git a/src/main/java/com/sipai/entity/scada/TempReport.java b/src/main/java/com/sipai/entity/scada/TempReport.java index 6000b888..bbab576a 100644 --- a/src/main/java/com/sipai/entity/scada/TempReport.java +++ b/src/main/java/com/sipai/entity/scada/TempReport.java @@ -1,9 +1,9 @@ package com.sipai.entity.scada; -import java.io.Serializable; - import com.sipai.entity.base.SQLAdapter; +import java.io.Serializable; + public class TempReport extends SQLAdapter implements Serializable{ /** * diff --git a/src/main/java/com/sipai/entity/schedule/ScheduleJob.java b/src/main/java/com/sipai/entity/schedule/ScheduleJob.java index 674bc717..047fa30b 100644 --- a/src/main/java/com/sipai/entity/schedule/ScheduleJob.java +++ b/src/main/java/com/sipai/entity/schedule/ScheduleJob.java @@ -1,7 +1,5 @@ package com.sipai.entity.schedule; -import java.util.Date; - import com.sipai.entity.base.SQLAdapter; public class ScheduleJob extends SQLAdapter{ diff --git a/src/main/java/com/sipai/entity/schedule/ScheduleJobDetail.java b/src/main/java/com/sipai/entity/schedule/ScheduleJobDetail.java index 322473b7..5bfdee03 100644 --- a/src/main/java/com/sipai/entity/schedule/ScheduleJobDetail.java +++ b/src/main/java/com/sipai/entity/schedule/ScheduleJobDetail.java @@ -1,7 +1,5 @@ package com.sipai.entity.schedule; -import java.util.Date; - import com.sipai.entity.base.SQLAdapter; public class ScheduleJobDetail extends SQLAdapter{ diff --git a/src/main/java/com/sipai/entity/schedule/ScheduleJobType.java b/src/main/java/com/sipai/entity/schedule/ScheduleJobType.java index b8860ac1..0a151acd 100644 --- a/src/main/java/com/sipai/entity/schedule/ScheduleJobType.java +++ b/src/main/java/com/sipai/entity/schedule/ScheduleJobType.java @@ -1,7 +1,5 @@ package com.sipai.entity.schedule; -import java.util.Date; - import com.sipai.entity.base.SQLAdapter; public class ScheduleJobType extends SQLAdapter{ diff --git a/src/main/java/com/sipai/entity/sparepart/ApplyPurchasePlan.java b/src/main/java/com/sipai/entity/sparepart/ApplyPurchasePlan.java index e83e348f..6251d7fc 100644 --- a/src/main/java/com/sipai/entity/sparepart/ApplyPurchasePlan.java +++ b/src/main/java/com/sipai/entity/sparepart/ApplyPurchasePlan.java @@ -1,7 +1,5 @@ package com.sipai.entity.sparepart; -import java.util.Date; - import com.sipai.entity.base.SQLAdapter; import com.sipai.entity.user.Unit; diff --git a/src/main/java/com/sipai/entity/sparepart/Channels.java b/src/main/java/com/sipai/entity/sparepart/Channels.java index 5ee4600f..717de21b 100644 --- a/src/main/java/com/sipai/entity/sparepart/Channels.java +++ b/src/main/java/com/sipai/entity/sparepart/Channels.java @@ -1,10 +1,9 @@ package com.sipai.entity.sparepart; -import java.util.Date; -import java.util.List; - import com.sipai.entity.base.SQLAdapter; +import java.util.List; + public class Channels extends SQLAdapter{ private Integer source; diff --git a/src/main/java/com/sipai/entity/sparepart/ConsumeDetail.java b/src/main/java/com/sipai/entity/sparepart/ConsumeDetail.java index c54f0edc..a4819a78 100644 --- a/src/main/java/com/sipai/entity/sparepart/ConsumeDetail.java +++ b/src/main/java/com/sipai/entity/sparepart/ConsumeDetail.java @@ -1,10 +1,9 @@ package com.sipai.entity.sparepart; -import java.math.BigDecimal; -import java.util.Date; - import com.sipai.entity.base.SQLAdapter; +import java.math.BigDecimal; + public class ConsumeDetail extends SQLAdapter{ private String id; diff --git a/src/main/java/com/sipai/entity/sparepart/Contract.java b/src/main/java/com/sipai/entity/sparepart/Contract.java index ad59f2dd..d68ac430 100644 --- a/src/main/java/com/sipai/entity/sparepart/Contract.java +++ b/src/main/java/com/sipai/entity/sparepart/Contract.java @@ -1,14 +1,13 @@ package com.sipai.entity.sparepart; -import java.math.BigDecimal; -import java.util.List; - import com.sipai.entity.base.BusinessUnitAdapter; import com.sipai.entity.user.Company; import com.sipai.entity.user.Dept; import com.sipai.entity.user.User; import com.sipai.entity.work.AutoAlert; -import java.util.Date; + +import java.math.BigDecimal; +import java.util.List; public class Contract extends BusinessUnitAdapter{ diff --git a/src/main/java/com/sipai/entity/sparepart/ContractChangeFile.java b/src/main/java/com/sipai/entity/sparepart/ContractChangeFile.java index df832783..f7190d40 100644 --- a/src/main/java/com/sipai/entity/sparepart/ContractChangeFile.java +++ b/src/main/java/com/sipai/entity/sparepart/ContractChangeFile.java @@ -1,7 +1,5 @@ package com.sipai.entity.sparepart; -import java.util.Date; - import com.sipai.entity.base.SQLAdapter; public class ContractChangeFile extends SQLAdapter{ diff --git a/src/main/java/com/sipai/entity/sparepart/ContractClass.java b/src/main/java/com/sipai/entity/sparepart/ContractClass.java index e7acdd05..b8964e9f 100644 --- a/src/main/java/com/sipai/entity/sparepart/ContractClass.java +++ b/src/main/java/com/sipai/entity/sparepart/ContractClass.java @@ -1,9 +1,9 @@ package com.sipai.entity.sparepart; -import java.util.List; - import com.sipai.entity.base.SQLAdapter; +import java.util.List; + public class ContractClass extends SQLAdapter{ private String id; diff --git a/src/main/java/com/sipai/entity/sparepart/ContractDetail.java b/src/main/java/com/sipai/entity/sparepart/ContractDetail.java index dbad9f1f..8e11cafb 100644 --- a/src/main/java/com/sipai/entity/sparepart/ContractDetail.java +++ b/src/main/java/com/sipai/entity/sparepart/ContractDetail.java @@ -1,10 +1,9 @@ package com.sipai.entity.sparepart; -import java.math.BigDecimal; -import java.util.Date; - import com.sipai.entity.base.SQLAdapter; +import java.math.BigDecimal; + public class ContractDetail extends SQLAdapter{ private String id; diff --git a/src/main/java/com/sipai/entity/sparepart/ContractDetailInvoice.java b/src/main/java/com/sipai/entity/sparepart/ContractDetailInvoice.java index efa0cb26..17af1918 100644 --- a/src/main/java/com/sipai/entity/sparepart/ContractDetailInvoice.java +++ b/src/main/java/com/sipai/entity/sparepart/ContractDetailInvoice.java @@ -1,9 +1,9 @@ package com.sipai.entity.sparepart; -import java.math.BigDecimal; - import com.sipai.entity.base.SQLAdapter; +import java.math.BigDecimal; + public class ContractDetailInvoice extends SQLAdapter{ private String id; diff --git a/src/main/java/com/sipai/entity/sparepart/ContractDetailInvoiceFile.java b/src/main/java/com/sipai/entity/sparepart/ContractDetailInvoiceFile.java index eec243ee..4814c319 100644 --- a/src/main/java/com/sipai/entity/sparepart/ContractDetailInvoiceFile.java +++ b/src/main/java/com/sipai/entity/sparepart/ContractDetailInvoiceFile.java @@ -1,7 +1,5 @@ package com.sipai.entity.sparepart; -import java.util.Date; - import com.sipai.entity.base.SQLAdapter; public class ContractDetailInvoiceFile extends SQLAdapter { diff --git a/src/main/java/com/sipai/entity/sparepart/ContractDetailPayment.java b/src/main/java/com/sipai/entity/sparepart/ContractDetailPayment.java index 8a60b044..aeccb345 100644 --- a/src/main/java/com/sipai/entity/sparepart/ContractDetailPayment.java +++ b/src/main/java/com/sipai/entity/sparepart/ContractDetailPayment.java @@ -1,9 +1,9 @@ package com.sipai.entity.sparepart; -import java.math.BigDecimal; - import com.sipai.entity.base.SQLAdapter; +import java.math.BigDecimal; + public class ContractDetailPayment extends SQLAdapter { private String id; diff --git a/src/main/java/com/sipai/entity/sparepart/ContractFile.java b/src/main/java/com/sipai/entity/sparepart/ContractFile.java index 2b3e6dcc..5f4d1236 100644 --- a/src/main/java/com/sipai/entity/sparepart/ContractFile.java +++ b/src/main/java/com/sipai/entity/sparepart/ContractFile.java @@ -1,7 +1,5 @@ package com.sipai.entity.sparepart; -import java.util.Date; - import com.sipai.entity.base.SQLAdapter; public class ContractFile extends SQLAdapter { diff --git a/src/main/java/com/sipai/entity/sparepart/ContractTaxRate.java b/src/main/java/com/sipai/entity/sparepart/ContractTaxRate.java index 0ac727f4..da3f9d28 100644 --- a/src/main/java/com/sipai/entity/sparepart/ContractTaxRate.java +++ b/src/main/java/com/sipai/entity/sparepart/ContractTaxRate.java @@ -1,7 +1,5 @@ package com.sipai.entity.sparepart; -import java.util.Date; - import com.sipai.entity.base.SQLAdapter; public class ContractTaxRate extends SQLAdapter { diff --git a/src/main/java/com/sipai/entity/sparepart/Goods.java b/src/main/java/com/sipai/entity/sparepart/Goods.java index 705f81f0..7fd7547e 100644 --- a/src/main/java/com/sipai/entity/sparepart/Goods.java +++ b/src/main/java/com/sipai/entity/sparepart/Goods.java @@ -1,7 +1,5 @@ package com.sipai.entity.sparepart; -import java.util.Date; - import com.sipai.entity.base.SQLAdapter; public class Goods extends SQLAdapter{ diff --git a/src/main/java/com/sipai/entity/sparepart/GoodsAcceptanceApplyDetail.java b/src/main/java/com/sipai/entity/sparepart/GoodsAcceptanceApplyDetail.java index ce7fc16c..1a61f257 100644 --- a/src/main/java/com/sipai/entity/sparepart/GoodsAcceptanceApplyDetail.java +++ b/src/main/java/com/sipai/entity/sparepart/GoodsAcceptanceApplyDetail.java @@ -1,8 +1,5 @@ package com.sipai.entity.sparepart; -import java.util.Date; -import java.util.List; - import com.sipai.entity.base.SQLAdapter; public class GoodsAcceptanceApplyDetail extends SQLAdapter{ diff --git a/src/main/java/com/sipai/entity/sparepart/GoodsApply.java b/src/main/java/com/sipai/entity/sparepart/GoodsApply.java index 033d2435..ad35fede 100644 --- a/src/main/java/com/sipai/entity/sparepart/GoodsApply.java +++ b/src/main/java/com/sipai/entity/sparepart/GoodsApply.java @@ -1,9 +1,9 @@ package com.sipai.entity.sparepart; -import java.util.Date; - import com.sipai.entity.base.SQLAdapter; +import java.util.Date; + public class GoodsApply extends SQLAdapter { private String id; diff --git a/src/main/java/com/sipai/entity/sparepart/GoodsClass.java b/src/main/java/com/sipai/entity/sparepart/GoodsClass.java index d1f52399..47f55de3 100644 --- a/src/main/java/com/sipai/entity/sparepart/GoodsClass.java +++ b/src/main/java/com/sipai/entity/sparepart/GoodsClass.java @@ -1,7 +1,5 @@ package com.sipai.entity.sparepart; -import java.util.Date; - import com.sipai.entity.base.SQLAdapter; public class GoodsClass extends SQLAdapter{ diff --git a/src/main/java/com/sipai/entity/sparepart/InStockRecord.java b/src/main/java/com/sipai/entity/sparepart/InStockRecord.java index ecbcdf00..734ee7d7 100644 --- a/src/main/java/com/sipai/entity/sparepart/InStockRecord.java +++ b/src/main/java/com/sipai/entity/sparepart/InStockRecord.java @@ -1,12 +1,10 @@ package com.sipai.entity.sparepart; -import java.math.BigDecimal; -import java.util.Date; - import com.sipai.entity.base.BusinessUnitAdapter; -import com.sipai.entity.base.SQLAdapter; import com.sipai.entity.user.Company; +import java.math.BigDecimal; + public class InStockRecord extends BusinessUnitAdapter{ private String billNumber; diff --git a/src/main/java/com/sipai/entity/sparepart/InStockRecordDetail.java b/src/main/java/com/sipai/entity/sparepart/InStockRecordDetail.java index b2704880..ce0ed44b 100644 --- a/src/main/java/com/sipai/entity/sparepart/InStockRecordDetail.java +++ b/src/main/java/com/sipai/entity/sparepart/InStockRecordDetail.java @@ -1,11 +1,10 @@ package com.sipai.entity.sparepart; -import java.math.BigDecimal; -import java.util.Date; - import com.sipai.entity.base.SQLAdapter; import com.sipai.entity.user.Dept; +import java.math.BigDecimal; + public class InStockRecordDetail extends SQLAdapter{ private String id; diff --git a/src/main/java/com/sipai/entity/sparepart/OutStockRecord.java b/src/main/java/com/sipai/entity/sparepart/OutStockRecord.java index 0db3d213..cd9b5602 100644 --- a/src/main/java/com/sipai/entity/sparepart/OutStockRecord.java +++ b/src/main/java/com/sipai/entity/sparepart/OutStockRecord.java @@ -1,13 +1,11 @@ package com.sipai.entity.sparepart; -import java.math.BigDecimal; -import java.util.Date; - import com.sipai.entity.base.BusinessUnitAdapter; -import com.sipai.entity.base.SQLAdapter; import com.sipai.entity.user.Company; import com.sipai.entity.user.Dept; +import java.math.BigDecimal; + public class OutStockRecord extends BusinessUnitAdapter{ private String billNumber; diff --git a/src/main/java/com/sipai/entity/sparepart/OutStockRecordDetail.java b/src/main/java/com/sipai/entity/sparepart/OutStockRecordDetail.java index c86f61df..a31786ef 100644 --- a/src/main/java/com/sipai/entity/sparepart/OutStockRecordDetail.java +++ b/src/main/java/com/sipai/entity/sparepart/OutStockRecordDetail.java @@ -1,11 +1,10 @@ package com.sipai.entity.sparepart; -import java.math.BigDecimal; -import java.util.Date; - import com.sipai.entity.base.SQLAdapter; import com.sipai.entity.user.Dept; +import java.math.BigDecimal; + public class OutStockRecordDetail extends SQLAdapter{ private String id; diff --git a/src/main/java/com/sipai/entity/sparepart/Performance.java b/src/main/java/com/sipai/entity/sparepart/Performance.java index 814abc0d..b581aafe 100644 --- a/src/main/java/com/sipai/entity/sparepart/Performance.java +++ b/src/main/java/com/sipai/entity/sparepart/Performance.java @@ -1,7 +1,5 @@ package com.sipai.entity.sparepart; -import java.util.Date; - import com.sipai.entity.base.SQLAdapter; public class Performance extends SQLAdapter { diff --git a/src/main/java/com/sipai/entity/sparepart/PurchaseDetail.java b/src/main/java/com/sipai/entity/sparepart/PurchaseDetail.java index 6a1cf761..df07cca8 100644 --- a/src/main/java/com/sipai/entity/sparepart/PurchaseDetail.java +++ b/src/main/java/com/sipai/entity/sparepart/PurchaseDetail.java @@ -1,10 +1,9 @@ package com.sipai.entity.sparepart; -import java.math.BigDecimal; -import java.util.Date; - import com.sipai.entity.base.SQLAdapter; +import java.math.BigDecimal; + public class PurchaseDetail extends SQLAdapter{ private String id; diff --git a/src/main/java/com/sipai/entity/sparepart/PurchaseMethods.java b/src/main/java/com/sipai/entity/sparepart/PurchaseMethods.java index 17db533a..6475ebed 100644 --- a/src/main/java/com/sipai/entity/sparepart/PurchaseMethods.java +++ b/src/main/java/com/sipai/entity/sparepart/PurchaseMethods.java @@ -1,7 +1,5 @@ package com.sipai.entity.sparepart; -import java.util.Date; - import com.sipai.entity.base.SQLAdapter; public class PurchaseMethods extends SQLAdapter { diff --git a/src/main/java/com/sipai/entity/sparepart/PurchasePlan.java b/src/main/java/com/sipai/entity/sparepart/PurchasePlan.java index 6822cc10..3f53c744 100644 --- a/src/main/java/com/sipai/entity/sparepart/PurchasePlan.java +++ b/src/main/java/com/sipai/entity/sparepart/PurchasePlan.java @@ -1,11 +1,9 @@ package com.sipai.entity.sparepart; -import java.math.BigDecimal; -import java.util.Date; - import com.sipai.entity.base.SQLAdapter; import com.sipai.entity.user.Dept; -import com.sipai.entity.user.User; + +import java.math.BigDecimal; public class PurchasePlan extends SQLAdapter{ private String id; diff --git a/src/main/java/com/sipai/entity/sparepart/PurchaseRecord.java b/src/main/java/com/sipai/entity/sparepart/PurchaseRecord.java index 826d3a1f..2c60062c 100644 --- a/src/main/java/com/sipai/entity/sparepart/PurchaseRecord.java +++ b/src/main/java/com/sipai/entity/sparepart/PurchaseRecord.java @@ -1,11 +1,10 @@ package com.sipai.entity.sparepart; -import java.math.BigDecimal; -import java.util.Date; - import com.sipai.entity.base.SQLAdapter; import com.sipai.entity.user.Company; +import java.math.BigDecimal; + public class PurchaseRecord extends SQLAdapter{ private String id; diff --git a/src/main/java/com/sipai/entity/sparepart/PurchaseRecordDetail.java b/src/main/java/com/sipai/entity/sparepart/PurchaseRecordDetail.java index 556d127b..db2f1cc8 100644 --- a/src/main/java/com/sipai/entity/sparepart/PurchaseRecordDetail.java +++ b/src/main/java/com/sipai/entity/sparepart/PurchaseRecordDetail.java @@ -1,11 +1,10 @@ package com.sipai.entity.sparepart; -import java.math.BigDecimal; -import java.util.Date; - import com.sipai.entity.base.SQLAdapter; import com.sipai.entity.user.Dept; +import java.math.BigDecimal; + public class PurchaseRecordDetail extends SQLAdapter{ private String id; diff --git a/src/main/java/com/sipai/entity/sparepart/Purpose.java b/src/main/java/com/sipai/entity/sparepart/Purpose.java index 388b848d..f0a22cb8 100644 --- a/src/main/java/com/sipai/entity/sparepart/Purpose.java +++ b/src/main/java/com/sipai/entity/sparepart/Purpose.java @@ -1,7 +1,5 @@ package com.sipai.entity.sparepart; -import java.util.Date; - import com.sipai.entity.base.SQLAdapter; public class Purpose extends SQLAdapter { diff --git a/src/main/java/com/sipai/entity/sparepart/QualificationType_copy.java b/src/main/java/com/sipai/entity/sparepart/QualificationType_copy.java index 2fd2a943..0c4786f0 100644 --- a/src/main/java/com/sipai/entity/sparepart/QualificationType_copy.java +++ b/src/main/java/com/sipai/entity/sparepart/QualificationType_copy.java @@ -1,7 +1,5 @@ package com.sipai.entity.sparepart; -import java.util.Date; - import com.sipai.entity.base.SQLAdapter; public class QualificationType_copy extends SQLAdapter{ diff --git a/src/main/java/com/sipai/entity/sparepart/RawMaterialDetail.java b/src/main/java/com/sipai/entity/sparepart/RawMaterialDetail.java index b74cbb02..d724ce1b 100644 --- a/src/main/java/com/sipai/entity/sparepart/RawMaterialDetail.java +++ b/src/main/java/com/sipai/entity/sparepart/RawMaterialDetail.java @@ -1,11 +1,10 @@ package com.sipai.entity.sparepart; -import java.math.BigDecimal; -import java.util.Date; - import com.sipai.entity.base.SQLAdapter; import com.sipai.entity.user.Dept; +import java.math.BigDecimal; + public class RawMaterialDetail extends SQLAdapter { private String id; diff --git a/src/main/java/com/sipai/entity/sparepart/ReturnStockRecord.java b/src/main/java/com/sipai/entity/sparepart/ReturnStockRecord.java index 04b1dfc0..d428f715 100644 --- a/src/main/java/com/sipai/entity/sparepart/ReturnStockRecord.java +++ b/src/main/java/com/sipai/entity/sparepart/ReturnStockRecord.java @@ -1,12 +1,10 @@ package com.sipai.entity.sparepart; -import java.math.BigDecimal; -import java.util.Date; - -import com.sipai.entity.base.BusinessUnitAdapter; import com.sipai.entity.base.SQLAdapter; import com.sipai.entity.user.Company; +import java.math.BigDecimal; + public class ReturnStockRecord extends SQLAdapter{ private String id; diff --git a/src/main/java/com/sipai/entity/sparepart/ReturnStockRecordDetail.java b/src/main/java/com/sipai/entity/sparepart/ReturnStockRecordDetail.java index 0f2b1a34..2f43fc95 100644 --- a/src/main/java/com/sipai/entity/sparepart/ReturnStockRecordDetail.java +++ b/src/main/java/com/sipai/entity/sparepart/ReturnStockRecordDetail.java @@ -1,11 +1,10 @@ package com.sipai.entity.sparepart; -import java.math.BigDecimal; -import java.util.Date; - import com.sipai.entity.base.SQLAdapter; import com.sipai.entity.user.Dept; +import java.math.BigDecimal; + public class ReturnStockRecordDetail extends SQLAdapter{ private String id; diff --git a/src/main/java/com/sipai/entity/sparepart/Score_copy.java b/src/main/java/com/sipai/entity/sparepart/Score_copy.java index e9036f2a..29471bb2 100644 --- a/src/main/java/com/sipai/entity/sparepart/Score_copy.java +++ b/src/main/java/com/sipai/entity/sparepart/Score_copy.java @@ -1,7 +1,5 @@ package com.sipai.entity.sparepart; -import java.util.Date; - import com.sipai.entity.base.SQLAdapter; public class Score_copy extends SQLAdapter{ diff --git a/src/main/java/com/sipai/entity/sparepart/SewageInput.java b/src/main/java/com/sipai/entity/sparepart/SewageInput.java index 7bf2cd62..19df5044 100644 --- a/src/main/java/com/sipai/entity/sparepart/SewageInput.java +++ b/src/main/java/com/sipai/entity/sparepart/SewageInput.java @@ -1,7 +1,5 @@ package com.sipai.entity.sparepart; -import java.util.Date; - import com.sipai.entity.base.SQLAdapter; import com.sipai.entity.user.User; diff --git a/src/main/java/com/sipai/entity/sparepart/SparePartCommString.java b/src/main/java/com/sipai/entity/sparepart/SparePartCommString.java index ea2dcdaf..e3b80ae4 100644 --- a/src/main/java/com/sipai/entity/sparepart/SparePartCommString.java +++ b/src/main/java/com/sipai/entity/sparepart/SparePartCommString.java @@ -1,9 +1,5 @@ package com.sipai.entity.sparepart; -import java.util.List; -import java.util.Map; -import java.util.concurrent.LinkedBlockingQueue; - public class SparePartCommString { //仓库状态 diff --git a/src/main/java/com/sipai/entity/sparepart/Stock.java b/src/main/java/com/sipai/entity/sparepart/Stock.java index 74e9b6d8..fdbc1ea8 100644 --- a/src/main/java/com/sipai/entity/sparepart/Stock.java +++ b/src/main/java/com/sipai/entity/sparepart/Stock.java @@ -1,11 +1,10 @@ package com.sipai.entity.sparepart; -import java.math.BigDecimal; -import java.util.Date; - import com.sipai.entity.base.SQLAdapter; import com.sipai.entity.user.Company; +import java.math.BigDecimal; + public class Stock extends SQLAdapter{ private String id; diff --git a/src/main/java/com/sipai/entity/sparepart/StockCheck.java b/src/main/java/com/sipai/entity/sparepart/StockCheck.java index 116708a6..ef2a553e 100644 --- a/src/main/java/com/sipai/entity/sparepart/StockCheck.java +++ b/src/main/java/com/sipai/entity/sparepart/StockCheck.java @@ -1,9 +1,6 @@ package com.sipai.entity.sparepart; -import java.util.Date; - import com.sipai.entity.base.BusinessUnitAdapter; -import com.sipai.entity.base.SQLAdapter; import com.sipai.entity.user.Company; public class StockCheck extends BusinessUnitAdapter{ diff --git a/src/main/java/com/sipai/entity/sparepart/StockCheckDetail.java b/src/main/java/com/sipai/entity/sparepart/StockCheckDetail.java index 23b6ac1f..1ecf6a5e 100644 --- a/src/main/java/com/sipai/entity/sparepart/StockCheckDetail.java +++ b/src/main/java/com/sipai/entity/sparepart/StockCheckDetail.java @@ -1,10 +1,9 @@ package com.sipai.entity.sparepart; -import java.math.BigDecimal; -import java.util.Date; - import com.sipai.entity.base.SQLAdapter; +import java.math.BigDecimal; + public class StockCheckDetail extends SQLAdapter{ private String id; diff --git a/src/main/java/com/sipai/entity/sparepart/StockTransfersApplyDetail.java b/src/main/java/com/sipai/entity/sparepart/StockTransfersApplyDetail.java index 3d3fa390..bde5ac20 100644 --- a/src/main/java/com/sipai/entity/sparepart/StockTransfersApplyDetail.java +++ b/src/main/java/com/sipai/entity/sparepart/StockTransfersApplyDetail.java @@ -1,10 +1,9 @@ package com.sipai.entity.sparepart; -import java.math.BigDecimal; -import java.util.Date; - import com.sipai.entity.base.SQLAdapter; +import java.math.BigDecimal; + public class StockTransfersApplyDetail extends SQLAdapter{ private String id; diff --git a/src/main/java/com/sipai/entity/sparepart/Subscribe.java b/src/main/java/com/sipai/entity/sparepart/Subscribe.java index ed7bb357..b62d9ea5 100644 --- a/src/main/java/com/sipai/entity/sparepart/Subscribe.java +++ b/src/main/java/com/sipai/entity/sparepart/Subscribe.java @@ -1,13 +1,11 @@ package com.sipai.entity.sparepart; -import java.math.BigDecimal; -import java.util.Date; - import com.sipai.entity.base.BusinessUnitAdapter; -import com.sipai.entity.base.SQLAdapter; import com.sipai.entity.user.Company; import com.sipai.entity.user.Dept; +import java.math.BigDecimal; + public class Subscribe extends BusinessUnitAdapter{ private String id; diff --git a/src/main/java/com/sipai/entity/sparepart/SubscribeDetail.java b/src/main/java/com/sipai/entity/sparepart/SubscribeDetail.java index bc20f5dd..7ca6cdfc 100644 --- a/src/main/java/com/sipai/entity/sparepart/SubscribeDetail.java +++ b/src/main/java/com/sipai/entity/sparepart/SubscribeDetail.java @@ -1,9 +1,8 @@ package com.sipai.entity.sparepart; -import java.math.BigDecimal; - import com.sipai.entity.base.SQLAdapter; -import java.util.Date; + +import java.math.BigDecimal; public class SubscribeDetail extends SQLAdapter{ private String planArrivalTime; diff --git a/src/main/java/com/sipai/entity/sparepart/Supplier.java b/src/main/java/com/sipai/entity/sparepart/Supplier.java index e0ba5d3f..b9ef8ebe 100644 --- a/src/main/java/com/sipai/entity/sparepart/Supplier.java +++ b/src/main/java/com/sipai/entity/sparepart/Supplier.java @@ -1,7 +1,5 @@ package com.sipai.entity.sparepart; -import java.util.Date; - import com.sipai.entity.base.SQLAdapter; public class Supplier extends SQLAdapter{ diff --git a/src/main/java/com/sipai/entity/sparepart/SupplierClass.java b/src/main/java/com/sipai/entity/sparepart/SupplierClass.java index 99767955..21c9b39a 100644 --- a/src/main/java/com/sipai/entity/sparepart/SupplierClass.java +++ b/src/main/java/com/sipai/entity/sparepart/SupplierClass.java @@ -1,7 +1,5 @@ package com.sipai.entity.sparepart; -import java.util.Date; - import com.sipai.entity.base.SQLAdapter; public class SupplierClass extends SQLAdapter{ diff --git a/src/main/java/com/sipai/entity/sparepart/SupplierClass_copy.java b/src/main/java/com/sipai/entity/sparepart/SupplierClass_copy.java index 90a70e87..be4a27c0 100644 --- a/src/main/java/com/sipai/entity/sparepart/SupplierClass_copy.java +++ b/src/main/java/com/sipai/entity/sparepart/SupplierClass_copy.java @@ -1,7 +1,5 @@ package com.sipai.entity.sparepart; -import java.util.Date; - import com.sipai.entity.base.SQLAdapter; public class SupplierClass_copy extends SQLAdapter{ diff --git a/src/main/java/com/sipai/entity/sparepart/SupplierQualification_copy.java b/src/main/java/com/sipai/entity/sparepart/SupplierQualification_copy.java index ec2b955a..57d93c17 100644 --- a/src/main/java/com/sipai/entity/sparepart/SupplierQualification_copy.java +++ b/src/main/java/com/sipai/entity/sparepart/SupplierQualification_copy.java @@ -1,7 +1,5 @@ package com.sipai.entity.sparepart; -import java.util.Date; - import com.sipai.entity.base.SQLAdapter; public class SupplierQualification_copy extends SQLAdapter{ diff --git a/src/main/java/com/sipai/entity/sparepart/Supplier_copy.java b/src/main/java/com/sipai/entity/sparepart/Supplier_copy.java index 050e3190..785d7157 100644 --- a/src/main/java/com/sipai/entity/sparepart/Supplier_copy.java +++ b/src/main/java/com/sipai/entity/sparepart/Supplier_copy.java @@ -1,7 +1,5 @@ package com.sipai.entity.sparepart; -import java.util.Date; - import com.sipai.entity.base.SQLAdapter; public class Supplier_copy extends SQLAdapter{ diff --git a/src/main/java/com/sipai/entity/sparepart/Warehouse.java b/src/main/java/com/sipai/entity/sparepart/Warehouse.java index e9d644cc..f93689a0 100644 --- a/src/main/java/com/sipai/entity/sparepart/Warehouse.java +++ b/src/main/java/com/sipai/entity/sparepart/Warehouse.java @@ -1,7 +1,5 @@ package com.sipai.entity.sparepart; -import java.util.Date; - import com.sipai.entity.base.SQLAdapter; import com.sipai.entity.user.Company; diff --git a/src/main/java/com/sipai/entity/sparepart/WarrantyPeriod.java b/src/main/java/com/sipai/entity/sparepart/WarrantyPeriod.java index a34e1722..3ed0cfa3 100644 --- a/src/main/java/com/sipai/entity/sparepart/WarrantyPeriod.java +++ b/src/main/java/com/sipai/entity/sparepart/WarrantyPeriod.java @@ -1,7 +1,5 @@ package com.sipai.entity.sparepart; -import java.util.Date; - import com.sipai.entity.base.SQLAdapter; public class WarrantyPeriod extends SQLAdapter { diff --git a/src/main/java/com/sipai/entity/structure/Structure.java b/src/main/java/com/sipai/entity/structure/Structure.java index 007ce421..e309a5bb 100644 --- a/src/main/java/com/sipai/entity/structure/Structure.java +++ b/src/main/java/com/sipai/entity/structure/Structure.java @@ -1,10 +1,6 @@ package com.sipai.entity.structure; -import java.math.BigDecimal; -import java.util.List; - import com.sipai.entity.base.SQLAdapter; -import com.sipai.entity.equipment.EquipmentCard; public class Structure extends SQLAdapter{ diff --git a/src/main/java/com/sipai/entity/structure/StructureCard.java b/src/main/java/com/sipai/entity/structure/StructureCard.java index 8b704d10..f54cea17 100644 --- a/src/main/java/com/sipai/entity/structure/StructureCard.java +++ b/src/main/java/com/sipai/entity/structure/StructureCard.java @@ -1,11 +1,11 @@ package com.sipai.entity.structure; -import java.math.BigDecimal; -import java.util.List; - import com.sipai.entity.base.SQLAdapter; import com.sipai.entity.equipment.EquipmentCard; +import java.math.BigDecimal; +import java.util.List; + public class StructureCard extends SQLAdapter{ public static String design="'最大设计能力";//'最大设计能力 public static String adjustable="可调能力";//可调能力 diff --git a/src/main/java/com/sipai/entity/structure/StructureCardPicture.java b/src/main/java/com/sipai/entity/structure/StructureCardPicture.java index e2b430dc..e7f22e20 100644 --- a/src/main/java/com/sipai/entity/structure/StructureCardPicture.java +++ b/src/main/java/com/sipai/entity/structure/StructureCardPicture.java @@ -1,7 +1,5 @@ package com.sipai.entity.structure; -import java.util.Date; - import com.sipai.entity.base.SQLAdapter; import com.sipai.entity.user.Company; diff --git a/src/main/java/com/sipai/entity/structure/StructureCardPictureRoute.java b/src/main/java/com/sipai/entity/structure/StructureCardPictureRoute.java index 474ff616..2074ae72 100644 --- a/src/main/java/com/sipai/entity/structure/StructureCardPictureRoute.java +++ b/src/main/java/com/sipai/entity/structure/StructureCardPictureRoute.java @@ -1,11 +1,10 @@ package com.sipai.entity.structure; -import java.math.BigDecimal; -import java.util.Date; - import com.sipai.entity.base.SQLAdapter; import com.sipai.entity.timeefficiency.PatrolPoint; +import java.math.BigDecimal; + public class StructureCardPictureRoute extends SQLAdapter{ private String id; diff --git a/src/main/java/com/sipai/entity/structure/StructureCardPictureRoutePointdetail.java b/src/main/java/com/sipai/entity/structure/StructureCardPictureRoutePointdetail.java index 9bb4a961..ef954039 100644 --- a/src/main/java/com/sipai/entity/structure/StructureCardPictureRoutePointdetail.java +++ b/src/main/java/com/sipai/entity/structure/StructureCardPictureRoutePointdetail.java @@ -1,7 +1,5 @@ package com.sipai.entity.structure; -import java.util.Date; - import com.sipai.entity.base.SQLAdapter; public class StructureCardPictureRoutePointdetail extends SQLAdapter{ diff --git a/src/main/java/com/sipai/entity/structure/StructureClass.java b/src/main/java/com/sipai/entity/structure/StructureClass.java index 380d6316..37c4233a 100644 --- a/src/main/java/com/sipai/entity/structure/StructureClass.java +++ b/src/main/java/com/sipai/entity/structure/StructureClass.java @@ -1,7 +1,5 @@ package com.sipai.entity.structure; -import java.util.Date; - import com.sipai.entity.base.SQLAdapter; //设备类型 public class StructureClass extends SQLAdapter { diff --git a/src/main/java/com/sipai/entity/structure/StructureCommStr.java b/src/main/java/com/sipai/entity/structure/StructureCommStr.java index ff18b00f..255540b7 100644 --- a/src/main/java/com/sipai/entity/structure/StructureCommStr.java +++ b/src/main/java/com/sipai/entity/structure/StructureCommStr.java @@ -1,11 +1,5 @@ package com.sipai.entity.structure; -import java.math.BigDecimal; -import java.util.List; - -import com.sipai.entity.base.SQLAdapter; -import com.sipai.entity.equipment.EquipmentCard; - public class StructureCommStr { public static final String iconLevel0 = "fa fa-industry";//构筑物 public static final String iconLevel1 = "fa fa-cogs";//工艺单体 diff --git a/src/main/java/com/sipai/entity/teacher/TeacherFile.java b/src/main/java/com/sipai/entity/teacher/TeacherFile.java index 97ad3c97..a1f006a3 100644 --- a/src/main/java/com/sipai/entity/teacher/TeacherFile.java +++ b/src/main/java/com/sipai/entity/teacher/TeacherFile.java @@ -1,7 +1,5 @@ package com.sipai.entity.teacher; -import java.util.Date; - import com.sipai.entity.base.SQLAdapter; public class TeacherFile extends SQLAdapter { diff --git a/src/main/java/com/sipai/entity/teacher/Teachertype.java b/src/main/java/com/sipai/entity/teacher/Teachertype.java index d61c87e7..268d34ba 100644 --- a/src/main/java/com/sipai/entity/teacher/Teachertype.java +++ b/src/main/java/com/sipai/entity/teacher/Teachertype.java @@ -1,7 +1,5 @@ package com.sipai.entity.teacher; -import java.util.Date; - import com.sipai.entity.base.SQLAdapter; public class Teachertype extends SQLAdapter { diff --git a/src/main/java/com/sipai/entity/third/Common.java b/src/main/java/com/sipai/entity/third/Common.java index 93741db2..1c83231f 100644 --- a/src/main/java/com/sipai/entity/third/Common.java +++ b/src/main/java/com/sipai/entity/third/Common.java @@ -1,8 +1,6 @@ package com.sipai.entity.third; -import lombok.AllArgsConstructor; import lombok.Data; -import lombok.NoArgsConstructor; @Data public class Common { diff --git a/src/main/java/com/sipai/entity/timeefficiency/EfficiencyProcess.java b/src/main/java/com/sipai/entity/timeefficiency/EfficiencyProcess.java index 0cbb382c..9ff2ab53 100644 --- a/src/main/java/com/sipai/entity/timeefficiency/EfficiencyProcess.java +++ b/src/main/java/com/sipai/entity/timeefficiency/EfficiencyProcess.java @@ -1,9 +1,9 @@ package com.sipai.entity.timeefficiency; -import java.util.Date; - import com.sipai.entity.base.SQLAdapter; +import java.util.Date; + public class EfficiencyProcess extends SQLAdapter{ private String id; diff --git a/src/main/java/com/sipai/entity/timeefficiency/ElectricityPrice.java b/src/main/java/com/sipai/entity/timeefficiency/ElectricityPrice.java index e8dc745f..edc14d60 100644 --- a/src/main/java/com/sipai/entity/timeefficiency/ElectricityPrice.java +++ b/src/main/java/com/sipai/entity/timeefficiency/ElectricityPrice.java @@ -1,7 +1,5 @@ package com.sipai.entity.timeefficiency; -import java.util.Date; - import com.sipai.entity.base.SQLAdapter; import com.sipai.entity.user.Company; diff --git a/src/main/java/com/sipai/entity/timeefficiency/ElectricityPriceDetail.java b/src/main/java/com/sipai/entity/timeefficiency/ElectricityPriceDetail.java index eecf268c..dc7950e3 100644 --- a/src/main/java/com/sipai/entity/timeefficiency/ElectricityPriceDetail.java +++ b/src/main/java/com/sipai/entity/timeefficiency/ElectricityPriceDetail.java @@ -1,9 +1,9 @@ package com.sipai.entity.timeefficiency; -import java.util.Date; - import com.sipai.entity.base.SQLAdapter; +import java.util.Date; + public class ElectricityPriceDetail extends SQLAdapter{ private String id; diff --git a/src/main/java/com/sipai/entity/timeefficiency/PatrolArea.java b/src/main/java/com/sipai/entity/timeefficiency/PatrolArea.java index 8fd8d2dd..1e35a57a 100644 --- a/src/main/java/com/sipai/entity/timeefficiency/PatrolArea.java +++ b/src/main/java/com/sipai/entity/timeefficiency/PatrolArea.java @@ -1,13 +1,13 @@ package com.sipai.entity.timeefficiency; -import java.io.Serializable; -import java.util.List; - import com.sipai.entity.base.SQLAdapter; import com.sipai.entity.user.Company; import com.sipai.entity.user.ProcessSection; import com.sipai.entity.user.Unit; +import java.io.Serializable; +import java.util.List; + public class PatrolArea extends SQLAdapter implements Serializable{ /** * diff --git a/src/main/java/com/sipai/entity/timeefficiency/PatrolAreaFloor.java b/src/main/java/com/sipai/entity/timeefficiency/PatrolAreaFloor.java index 01b0d0ef..4cada3e5 100644 --- a/src/main/java/com/sipai/entity/timeefficiency/PatrolAreaFloor.java +++ b/src/main/java/com/sipai/entity/timeefficiency/PatrolAreaFloor.java @@ -1,12 +1,10 @@ package com.sipai.entity.timeefficiency; -import java.io.Serializable; -import java.util.Date; - import com.sipai.entity.base.SQLAdapter; -import com.sipai.entity.user.Company; import com.sipai.entity.user.Unit; +import java.io.Serializable; + public class PatrolAreaFloor extends SQLAdapter implements Serializable{ /** * diff --git a/src/main/java/com/sipai/entity/timeefficiency/PatrolAreaProcessSection.java b/src/main/java/com/sipai/entity/timeefficiency/PatrolAreaProcessSection.java index e5521280..fdac71d9 100644 --- a/src/main/java/com/sipai/entity/timeefficiency/PatrolAreaProcessSection.java +++ b/src/main/java/com/sipai/entity/timeefficiency/PatrolAreaProcessSection.java @@ -1,9 +1,9 @@ package com.sipai.entity.timeefficiency; -import java.io.Serializable; - import com.sipai.entity.base.SQLAdapter; +import java.io.Serializable; + public class PatrolAreaProcessSection extends SQLAdapter implements Serializable{ /** * diff --git a/src/main/java/com/sipai/entity/timeefficiency/PatrolContents.java b/src/main/java/com/sipai/entity/timeefficiency/PatrolContents.java index 79a55750..0cdf4aba 100644 --- a/src/main/java/com/sipai/entity/timeefficiency/PatrolContents.java +++ b/src/main/java/com/sipai/entity/timeefficiency/PatrolContents.java @@ -1,7 +1,8 @@ package com.sipai.entity.timeefficiency; -import java.io.Serializable; import com.sipai.entity.base.SQLAdapter; + +import java.io.Serializable; /** * 巡检内容--配置 * @author SJ diff --git a/src/main/java/com/sipai/entity/timeefficiency/PatrolContentsPlan.java b/src/main/java/com/sipai/entity/timeefficiency/PatrolContentsPlan.java index 7bce5f8e..e461f529 100644 --- a/src/main/java/com/sipai/entity/timeefficiency/PatrolContentsPlan.java +++ b/src/main/java/com/sipai/entity/timeefficiency/PatrolContentsPlan.java @@ -1,8 +1,8 @@ package com.sipai.entity.timeefficiency; -import java.io.Serializable; - import com.sipai.entity.base.SQLAdapter; + +import java.io.Serializable; /** * 巡检内容--计划 2020-05-22 * @author SJ diff --git a/src/main/java/com/sipai/entity/timeefficiency/PatrolContentsRecord.java b/src/main/java/com/sipai/entity/timeefficiency/PatrolContentsRecord.java index 0437b4fe..f1ed16b0 100644 --- a/src/main/java/com/sipai/entity/timeefficiency/PatrolContentsRecord.java +++ b/src/main/java/com/sipai/entity/timeefficiency/PatrolContentsRecord.java @@ -1,9 +1,9 @@ package com.sipai.entity.timeefficiency; -import java.io.Serializable; - import com.sipai.entity.base.SQLAdapter; import com.sipai.entity.user.User; + +import java.io.Serializable; /** * 巡检内容--记录 2020-05-22 * @author SJ diff --git a/src/main/java/com/sipai/entity/timeefficiency/PatrolContentsStandard.java b/src/main/java/com/sipai/entity/timeefficiency/PatrolContentsStandard.java index 50b62915..bbb2920c 100644 --- a/src/main/java/com/sipai/entity/timeefficiency/PatrolContentsStandard.java +++ b/src/main/java/com/sipai/entity/timeefficiency/PatrolContentsStandard.java @@ -1,9 +1,9 @@ package com.sipai.entity.timeefficiency; -import java.io.Serializable; - import com.sipai.entity.base.SQLAdapter; +import java.io.Serializable; + /** * 巡检内容标准库--目前只用于设备 * （定义一套库的标准，如集团层可以定义一类设备的巡检内容，厂内可同步内容） diff --git a/src/main/java/com/sipai/entity/timeefficiency/PatrolMeasurePointPlan.java b/src/main/java/com/sipai/entity/timeefficiency/PatrolMeasurePointPlan.java index 56036cf8..38248f1e 100644 --- a/src/main/java/com/sipai/entity/timeefficiency/PatrolMeasurePointPlan.java +++ b/src/main/java/com/sipai/entity/timeefficiency/PatrolMeasurePointPlan.java @@ -1,10 +1,10 @@ package com.sipai.entity.timeefficiency; -import java.io.Serializable; - import com.sipai.entity.base.SQLAdapter; import com.sipai.entity.scada.MPoint; +import java.io.Serializable; + public class PatrolMeasurePointPlan extends SQLAdapter implements Serializable{ /** * diff --git a/src/main/java/com/sipai/entity/timeefficiency/PatrolMeasurePointRecord.java b/src/main/java/com/sipai/entity/timeefficiency/PatrolMeasurePointRecord.java index f8893622..9664dbe0 100644 --- a/src/main/java/com/sipai/entity/timeefficiency/PatrolMeasurePointRecord.java +++ b/src/main/java/com/sipai/entity/timeefficiency/PatrolMeasurePointRecord.java @@ -1,12 +1,10 @@ package com.sipai.entity.timeefficiency; -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.Date; - import com.sipai.entity.base.SQLAdapter; import com.sipai.entity.scada.MPoint; +import java.io.Serializable; + /** * 巡检记录下每个巡检点内的填报记录 * @author SJ diff --git a/src/main/java/com/sipai/entity/timeefficiency/PatrolModel.java b/src/main/java/com/sipai/entity/timeefficiency/PatrolModel.java index ea33440d..fd95361e 100644 --- a/src/main/java/com/sipai/entity/timeefficiency/PatrolModel.java +++ b/src/main/java/com/sipai/entity/timeefficiency/PatrolModel.java @@ -1,11 +1,10 @@ package com.sipai.entity.timeefficiency; -import java.io.Serializable; -import java.util.Date; - import com.sipai.entity.base.SQLAdapter; import com.sipai.entity.user.Unit; +import java.io.Serializable; + public class PatrolModel extends SQLAdapter implements Serializable{ private static final long serialVersionUID = 8192722452777264874L; private String id; diff --git a/src/main/java/com/sipai/entity/timeefficiency/PatrolPlan.java b/src/main/java/com/sipai/entity/timeefficiency/PatrolPlan.java index 4fa3668a..ba3ed2ee 100644 --- a/src/main/java/com/sipai/entity/timeefficiency/PatrolPlan.java +++ b/src/main/java/com/sipai/entity/timeefficiency/PatrolPlan.java @@ -1,12 +1,12 @@ package com.sipai.entity.timeefficiency; -import java.io.Serializable; -import java.util.List; - import com.sipai.entity.base.SQLAdapter; import com.sipai.entity.user.Dept; import com.sipai.entity.user.ProcessSection; +import java.io.Serializable; +import java.util.List; + public class PatrolPlan extends SQLAdapter implements Serializable { /** * diff --git a/src/main/java/com/sipai/entity/timeefficiency/PatrolPlanDept.java b/src/main/java/com/sipai/entity/timeefficiency/PatrolPlanDept.java index 74bec202..24387e34 100644 --- a/src/main/java/com/sipai/entity/timeefficiency/PatrolPlanDept.java +++ b/src/main/java/com/sipai/entity/timeefficiency/PatrolPlanDept.java @@ -1,9 +1,10 @@ package com.sipai.entity.timeefficiency; -import java.io.Serializable; import com.sipai.entity.base.SQLAdapter; +import java.io.Serializable; + /** * 巡检计划关联任务班组 */ diff --git a/src/main/java/com/sipai/entity/timeefficiency/PatrolPlanPatrolCamera.java b/src/main/java/com/sipai/entity/timeefficiency/PatrolPlanPatrolCamera.java index 6cc46c6b..00a77370 100644 --- a/src/main/java/com/sipai/entity/timeefficiency/PatrolPlanPatrolCamera.java +++ b/src/main/java/com/sipai/entity/timeefficiency/PatrolPlanPatrolCamera.java @@ -1,7 +1,5 @@ package com.sipai.entity.timeefficiency; -import java.util.Date; - import com.sipai.entity.base.SQLAdapter; import com.sipai.entity.work.Camera; diff --git a/src/main/java/com/sipai/entity/timeefficiency/PatrolPlanPatrolEquipment.java b/src/main/java/com/sipai/entity/timeefficiency/PatrolPlanPatrolEquipment.java index a4873753..dcba57dc 100644 --- a/src/main/java/com/sipai/entity/timeefficiency/PatrolPlanPatrolEquipment.java +++ b/src/main/java/com/sipai/entity/timeefficiency/PatrolPlanPatrolEquipment.java @@ -1,10 +1,10 @@ package com.sipai.entity.timeefficiency; -import java.io.Serializable; - import com.sipai.entity.base.SQLAdapter; import com.sipai.entity.equipment.EquipmentCard; +import java.io.Serializable; + /** * 巡检设备--计划 * diff --git a/src/main/java/com/sipai/entity/timeefficiency/PatrolPlanPatrolPoint.java b/src/main/java/com/sipai/entity/timeefficiency/PatrolPlanPatrolPoint.java index 46551358..bea0b800 100644 --- a/src/main/java/com/sipai/entity/timeefficiency/PatrolPlanPatrolPoint.java +++ b/src/main/java/com/sipai/entity/timeefficiency/PatrolPlanPatrolPoint.java @@ -1,10 +1,9 @@ package com.sipai.entity.timeefficiency; -import java.io.Serializable; -import java.util.Date; - import com.sipai.entity.base.SQLAdapter; +import java.io.Serializable; + public class PatrolPlanPatrolPoint extends SQLAdapter implements Serializable{ /** * diff --git a/src/main/java/com/sipai/entity/timeefficiency/PatrolPoint.java b/src/main/java/com/sipai/entity/timeefficiency/PatrolPoint.java index 3e28e7ab..50e7d1cc 100644 --- a/src/main/java/com/sipai/entity/timeefficiency/PatrolPoint.java +++ b/src/main/java/com/sipai/entity/timeefficiency/PatrolPoint.java @@ -1,9 +1,5 @@ package com.sipai.entity.timeefficiency; -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.List; - import com.sipai.entity.base.CommonFile; import com.sipai.entity.base.SQLAdapter; import com.sipai.entity.user.ProcessSection; @@ -11,6 +7,10 @@ import com.sipai.entity.user.Unit; import com.sipai.entity.work.AreaManage; import com.sipai.entity.work.ModbusFig; +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.List; + public class PatrolPoint extends SQLAdapter implements Serializable { /** * diff --git a/src/main/java/com/sipai/entity/timeefficiency/PatrolPointCamera.java b/src/main/java/com/sipai/entity/timeefficiency/PatrolPointCamera.java index 01f896c2..6cbb0918 100644 --- a/src/main/java/com/sipai/entity/timeefficiency/PatrolPointCamera.java +++ b/src/main/java/com/sipai/entity/timeefficiency/PatrolPointCamera.java @@ -1,11 +1,11 @@ package com.sipai.entity.timeefficiency; -import java.io.Serializable; -import java.util.Date; - import com.sipai.entity.base.SQLAdapter; import com.sipai.entity.work.Camera; +import java.io.Serializable; +import java.util.Date; + public class PatrolPointCamera extends SQLAdapter implements Serializable{ /** diff --git a/src/main/java/com/sipai/entity/timeefficiency/PatrolPointEquipmentCard.java b/src/main/java/com/sipai/entity/timeefficiency/PatrolPointEquipmentCard.java index 076ed70a..9365ea82 100644 --- a/src/main/java/com/sipai/entity/timeefficiency/PatrolPointEquipmentCard.java +++ b/src/main/java/com/sipai/entity/timeefficiency/PatrolPointEquipmentCard.java @@ -1,10 +1,10 @@ package com.sipai.entity.timeefficiency; -import java.io.Serializable; - import com.sipai.entity.base.SQLAdapter; import com.sipai.entity.equipment.EquipmentCard; +import java.io.Serializable; + public class PatrolPointEquipmentCard extends SQLAdapter implements Serializable{ /** * diff --git a/src/main/java/com/sipai/entity/timeefficiency/PatrolPointFile.java b/src/main/java/com/sipai/entity/timeefficiency/PatrolPointFile.java index 7eb3abad..30898a60 100644 --- a/src/main/java/com/sipai/entity/timeefficiency/PatrolPointFile.java +++ b/src/main/java/com/sipai/entity/timeefficiency/PatrolPointFile.java @@ -1,12 +1,9 @@ package com.sipai.entity.timeefficiency; -import java.io.Serializable; -import java.util.Date; -import java.util.List; - -import com.sipai.entity.base.CommonFile; import com.sipai.entity.base.SQLAdapter; +import java.io.Serializable; + public class PatrolPointFile extends SQLAdapter implements Serializable{ /** * diff --git a/src/main/java/com/sipai/entity/timeefficiency/PatrolPointMeasurePoint.java b/src/main/java/com/sipai/entity/timeefficiency/PatrolPointMeasurePoint.java index b4c9ec34..8780f076 100644 --- a/src/main/java/com/sipai/entity/timeefficiency/PatrolPointMeasurePoint.java +++ b/src/main/java/com/sipai/entity/timeefficiency/PatrolPointMeasurePoint.java @@ -1,10 +1,10 @@ package com.sipai.entity.timeefficiency; -import java.io.Serializable; - import com.sipai.entity.base.SQLAdapter; import com.sipai.entity.scada.MPoint; +import java.io.Serializable; + public class PatrolPointMeasurePoint extends SQLAdapter implements Serializable{ /** * diff --git a/src/main/java/com/sipai/entity/timeefficiency/PatrolRecord.java b/src/main/java/com/sipai/entity/timeefficiency/PatrolRecord.java index 39f7e5c9..d24bdea7 100644 --- a/src/main/java/com/sipai/entity/timeefficiency/PatrolRecord.java +++ b/src/main/java/com/sipai/entity/timeefficiency/PatrolRecord.java @@ -1,16 +1,13 @@ package com.sipai.entity.timeefficiency; -import java.io.Serializable; -import java.util.Date; -import java.util.List; - import com.sipai.entity.base.BusinessUnitAdapter; -import com.sipai.entity.base.SQLAdapter; import com.sipai.entity.equipment.EquipmentCard; -import com.sipai.entity.user.Company; import com.sipai.entity.user.Unit; import com.sipai.entity.user.User; +import java.io.Serializable; +import java.util.List; + public class PatrolRecord extends BusinessUnitAdapter implements Serializable { /** * diff --git a/src/main/java/com/sipai/entity/timeefficiency/PatrolRecordCollection.java b/src/main/java/com/sipai/entity/timeefficiency/PatrolRecordCollection.java index 45c5363f..94622a47 100644 --- a/src/main/java/com/sipai/entity/timeefficiency/PatrolRecordCollection.java +++ b/src/main/java/com/sipai/entity/timeefficiency/PatrolRecordCollection.java @@ -1,7 +1,5 @@ package com.sipai.entity.timeefficiency; -import java.util.Date; - import com.sipai.entity.base.SQLAdapter; public class PatrolRecordCollection extends SQLAdapter{ diff --git a/src/main/java/com/sipai/entity/timeefficiency/PatrolRecordPatrolCamera.java b/src/main/java/com/sipai/entity/timeefficiency/PatrolRecordPatrolCamera.java index dd99fc44..ac758556 100644 --- a/src/main/java/com/sipai/entity/timeefficiency/PatrolRecordPatrolCamera.java +++ b/src/main/java/com/sipai/entity/timeefficiency/PatrolRecordPatrolCamera.java @@ -1,7 +1,5 @@ package com.sipai.entity.timeefficiency; -import java.util.Date; - import com.sipai.entity.base.SQLAdapter; import com.sipai.entity.user.User; import com.sipai.entity.work.Camera; diff --git a/src/main/java/com/sipai/entity/timeefficiency/PatrolRecordPatrolEquipment.java b/src/main/java/com/sipai/entity/timeefficiency/PatrolRecordPatrolEquipment.java index f620e18f..45eebf1e 100644 --- a/src/main/java/com/sipai/entity/timeefficiency/PatrolRecordPatrolEquipment.java +++ b/src/main/java/com/sipai/entity/timeefficiency/PatrolRecordPatrolEquipment.java @@ -1,14 +1,13 @@ package com.sipai.entity.timeefficiency; -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.Date; -import java.util.List; - import com.sipai.entity.base.SQLAdapter; import com.sipai.entity.equipment.EquipmentCard; import com.sipai.entity.user.User; +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.List; + public class PatrolRecordPatrolEquipment extends SQLAdapter implements Serializable{ /** * diff --git a/src/main/java/com/sipai/entity/timeefficiency/PatrolRecordPatrolPoint.java b/src/main/java/com/sipai/entity/timeefficiency/PatrolRecordPatrolPoint.java index bb27e953..e716a3f0 100644 --- a/src/main/java/com/sipai/entity/timeefficiency/PatrolRecordPatrolPoint.java +++ b/src/main/java/com/sipai/entity/timeefficiency/PatrolRecordPatrolPoint.java @@ -1,10 +1,9 @@ package com.sipai.entity.timeefficiency; +import com.sipai.entity.base.SQLAdapter; + import java.io.Serializable; import java.math.BigDecimal; -import java.util.Date; - -import com.sipai.entity.base.SQLAdapter; public class PatrolRecordPatrolPoint extends SQLAdapter implements Serializable{ /** diff --git a/src/main/java/com/sipai/entity/timeefficiency/PatrolRecordPatrolRoute.java b/src/main/java/com/sipai/entity/timeefficiency/PatrolRecordPatrolRoute.java index 53bbf4cd..721de668 100644 --- a/src/main/java/com/sipai/entity/timeefficiency/PatrolRecordPatrolRoute.java +++ b/src/main/java/com/sipai/entity/timeefficiency/PatrolRecordPatrolRoute.java @@ -1,13 +1,12 @@ package com.sipai.entity.timeefficiency; -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.Date; -import java.util.List; - import com.sipai.entity.base.SQLAdapter; import com.sipai.entity.user.User; +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.List; + public class PatrolRecordPatrolRoute extends SQLAdapter implements Serializable{ /** * diff --git a/src/main/java/com/sipai/entity/timeefficiency/PatrolRecordViolationRecord.java b/src/main/java/com/sipai/entity/timeefficiency/PatrolRecordViolationRecord.java index 6ab7d03a..18253f45 100644 --- a/src/main/java/com/sipai/entity/timeefficiency/PatrolRecordViolationRecord.java +++ b/src/main/java/com/sipai/entity/timeefficiency/PatrolRecordViolationRecord.java @@ -1,12 +1,12 @@ package com.sipai.entity.timeefficiency; -import java.util.List; - import com.sipai.entity.base.SQLAdapter; import com.sipai.entity.user.Company; import com.sipai.entity.user.Dept; import com.sipai.entity.user.User; +import java.util.List; + public class PatrolRecordViolationRecord extends SQLAdapter{ private String id; diff --git a/src/main/java/com/sipai/entity/timeefficiency/PatrolRoute.java b/src/main/java/com/sipai/entity/timeefficiency/PatrolRoute.java index 7efcd6dc..48addea9 100644 --- a/src/main/java/com/sipai/entity/timeefficiency/PatrolRoute.java +++ b/src/main/java/com/sipai/entity/timeefficiency/PatrolRoute.java @@ -1,10 +1,9 @@ package com.sipai.entity.timeefficiency; +import com.sipai.entity.base.SQLAdapter; + import java.io.Serializable; import java.math.BigDecimal; -import java.util.Date; - -import com.sipai.entity.base.SQLAdapter; public class PatrolRoute extends SQLAdapter implements Serializable{ /** diff --git a/src/main/java/com/sipai/entity/timeefficiency/WorkRecord.java b/src/main/java/com/sipai/entity/timeefficiency/WorkRecord.java index 4ac140ff..a3c56055 100644 --- a/src/main/java/com/sipai/entity/timeefficiency/WorkRecord.java +++ b/src/main/java/com/sipai/entity/timeefficiency/WorkRecord.java @@ -1,10 +1,10 @@ package com.sipai.entity.timeefficiency; -import java.io.Serializable; - import com.sipai.entity.base.SQLAdapter; import com.sipai.entity.user.User; +import java.io.Serializable; + /** * 工作记录 2020-03-13 * @author SJ diff --git a/src/main/java/com/sipai/entity/timeefficiency/WorkerPosition.java b/src/main/java/com/sipai/entity/timeefficiency/WorkerPosition.java index acd1452f..6d1a10b4 100644 --- a/src/main/java/com/sipai/entity/timeefficiency/WorkerPosition.java +++ b/src/main/java/com/sipai/entity/timeefficiency/WorkerPosition.java @@ -1,9 +1,8 @@ package com.sipai.entity.timeefficiency; -import java.io.Serializable; -import java.util.Date; - import com.sipai.entity.base.SQLAdapter; + +import java.io.Serializable; /** * 巡检轨迹 * diff --git a/src/main/java/com/sipai/entity/user/BonusPoint.java b/src/main/java/com/sipai/entity/user/BonusPoint.java index 60e202ac..bc3045e8 100644 --- a/src/main/java/com/sipai/entity/user/BonusPoint.java +++ b/src/main/java/com/sipai/entity/user/BonusPoint.java @@ -1,7 +1,5 @@ package com.sipai.entity.user; -import java.util.Date; - import com.sipai.entity.base.SQLAdapter; public class BonusPoint extends SQLAdapter{ diff --git a/src/main/java/com/sipai/entity/user/BonusPointRecord.java b/src/main/java/com/sipai/entity/user/BonusPointRecord.java index b4011e42..52147b93 100644 --- a/src/main/java/com/sipai/entity/user/BonusPointRecord.java +++ b/src/main/java/com/sipai/entity/user/BonusPointRecord.java @@ -1,7 +1,5 @@ package com.sipai.entity.user; -import java.util.Date; - import com.sipai.entity.base.SQLAdapter; public class BonusPointRecord extends SQLAdapter{ diff --git a/src/main/java/com/sipai/entity/user/Company.java b/src/main/java/com/sipai/entity/user/Company.java index 5f95417d..75e9a347 100644 --- a/src/main/java/com/sipai/entity/user/Company.java +++ b/src/main/java/com/sipai/entity/user/Company.java @@ -1,14 +1,12 @@ package com.sipai.entity.user; -import java.util.List; - import com.sipai.entity.base.SQLAdapter; import com.sipai.entity.maintenance.MaintainerCompany; import com.sipai.entity.timeefficiency.ClockinCollection; import com.sipai.entity.timeefficiency.PatrolPlanCollection; import java.math.BigDecimal; -import java.util.Date; +import java.util.List; public class Company extends SQLAdapter{ diff --git a/src/main/java/com/sipai/entity/user/Dept.java b/src/main/java/com/sipai/entity/user/Dept.java index d2740242..30fc3d45 100644 --- a/src/main/java/com/sipai/entity/user/Dept.java +++ b/src/main/java/com/sipai/entity/user/Dept.java @@ -1,11 +1,11 @@ package com.sipai.entity.user; -import java.util.Date; -import java.util.List; - import com.sipai.entity.base.SQLAdapter; import com.sipai.entity.timeefficiency.PatrolArea; +import java.util.Date; +import java.util.List; + public class Dept extends SQLAdapter{ private String code; diff --git a/src/main/java/com/sipai/entity/user/ExtSystem.java b/src/main/java/com/sipai/entity/user/ExtSystem.java index a11b2c25..217aab22 100644 --- a/src/main/java/com/sipai/entity/user/ExtSystem.java +++ b/src/main/java/com/sipai/entity/user/ExtSystem.java @@ -1,7 +1,5 @@ package com.sipai.entity.user; -import java.util.Date; - import com.sipai.entity.base.SQLAdapter; public class ExtSystem extends SQLAdapter{ diff --git a/src/main/java/com/sipai/entity/user/Job.java b/src/main/java/com/sipai/entity/user/Job.java index b5890240..747e4cf4 100644 --- a/src/main/java/com/sipai/entity/user/Job.java +++ b/src/main/java/com/sipai/entity/user/Job.java @@ -1,9 +1,9 @@ package com.sipai.entity.user; -import java.util.List; - import com.sipai.entity.base.SQLAdapter; +import java.util.List; + public class Job extends SQLAdapter { private String id; diff --git a/src/main/java/com/sipai/entity/user/MobileValidation.java b/src/main/java/com/sipai/entity/user/MobileValidation.java index 4e5eaaf7..54ac348d 100644 --- a/src/main/java/com/sipai/entity/user/MobileValidation.java +++ b/src/main/java/com/sipai/entity/user/MobileValidation.java @@ -1,7 +1,5 @@ package com.sipai.entity.user; -import java.util.Date; - import com.sipai.entity.base.SQLAdapter; public class MobileValidation extends SQLAdapter{ diff --git a/src/main/java/com/sipai/entity/user/ProcessSection.java b/src/main/java/com/sipai/entity/user/ProcessSection.java index 0119d27d..0d97856f 100644 --- a/src/main/java/com/sipai/entity/user/ProcessSection.java +++ b/src/main/java/com/sipai/entity/user/ProcessSection.java @@ -3,7 +3,6 @@ package com.sipai.entity.user; import com.sipai.entity.base.SQLAdapter; import com.sipai.entity.process.ProcessSectionInformation; -import java.util.Date; import java.util.List; import java.util.Map; diff --git a/src/main/java/com/sipai/entity/user/ProcessSectionScore.java b/src/main/java/com/sipai/entity/user/ProcessSectionScore.java index 0245b051..8200ad4a 100644 --- a/src/main/java/com/sipai/entity/user/ProcessSectionScore.java +++ b/src/main/java/com/sipai/entity/user/ProcessSectionScore.java @@ -1,7 +1,5 @@ package com.sipai.entity.user; -import java.util.Date; - import com.sipai.entity.base.SQLAdapter; public class ProcessSectionScore extends SQLAdapter{ diff --git a/src/main/java/com/sipai/entity/user/ProcessSectionType.java b/src/main/java/com/sipai/entity/user/ProcessSectionType.java index 78b62717..e23138fb 100644 --- a/src/main/java/com/sipai/entity/user/ProcessSectionType.java +++ b/src/main/java/com/sipai/entity/user/ProcessSectionType.java @@ -1,7 +1,5 @@ package com.sipai.entity.user; -import java.util.Date; - import com.sipai.entity.base.SQLAdapter; public class ProcessSectionType extends SQLAdapter{ diff --git a/src/main/java/com/sipai/entity/user/UserDetail.java b/src/main/java/com/sipai/entity/user/UserDetail.java index 3d4898d4..1faae4e8 100644 --- a/src/main/java/com/sipai/entity/user/UserDetail.java +++ b/src/main/java/com/sipai/entity/user/UserDetail.java @@ -1,7 +1,5 @@ package com.sipai.entity.user; -import java.util.Date; - import com.sipai.entity.base.SQLAdapter; public class UserDetail extends SQLAdapter{ diff --git a/src/main/java/com/sipai/entity/user/UserJob.java b/src/main/java/com/sipai/entity/user/UserJob.java index 5053bf56..726a2d69 100644 --- a/src/main/java/com/sipai/entity/user/UserJob.java +++ b/src/main/java/com/sipai/entity/user/UserJob.java @@ -1,9 +1,7 @@ package com.sipai.entity.user; -import org.springframework.stereotype.Component; - import com.sipai.entity.base.SQLAdapter; -import java.util.Date; +import org.springframework.stereotype.Component; @Component public class UserJob extends SQLAdapter{ diff --git a/src/main/java/com/sipai/entity/valueEngineering/EquipmentDepreciation.java b/src/main/java/com/sipai/entity/valueEngineering/EquipmentDepreciation.java index 81eda4f8..f7257c9d 100644 --- a/src/main/java/com/sipai/entity/valueEngineering/EquipmentDepreciation.java +++ b/src/main/java/com/sipai/entity/valueEngineering/EquipmentDepreciation.java @@ -1,13 +1,12 @@ package com.sipai.entity.valueEngineering; -import java.math.BigDecimal; -import java.util.Date; - import com.sipai.entity.base.SQLAdapter; import com.sipai.entity.equipment.EquipmentCard; import com.sipai.entity.user.Company; import com.sipai.entity.user.ProcessSection; +import java.math.BigDecimal; + public class EquipmentDepreciation extends SQLAdapter{ private String id; diff --git a/src/main/java/com/sipai/entity/valueEngineering/EquipmentEvaluate.java b/src/main/java/com/sipai/entity/valueEngineering/EquipmentEvaluate.java index a80e7510..187c124a 100644 --- a/src/main/java/com/sipai/entity/valueEngineering/EquipmentEvaluate.java +++ b/src/main/java/com/sipai/entity/valueEngineering/EquipmentEvaluate.java @@ -1,7 +1,5 @@ package com.sipai.entity.valueEngineering; -import java.util.Date; - import com.sipai.entity.base.SQLAdapter; import com.sipai.entity.equipment.EquipmentSpecification; import com.sipai.entity.equipment.EquipmentTypeNumber; diff --git a/src/main/java/com/sipai/entity/visit/VisitApply.java b/src/main/java/com/sipai/entity/visit/VisitApply.java index d85c3acd..cdc17074 100644 --- a/src/main/java/com/sipai/entity/visit/VisitApply.java +++ b/src/main/java/com/sipai/entity/visit/VisitApply.java @@ -1,7 +1,6 @@ package com.sipai.entity.visit; import com.sipai.entity.base.BusinessUnitAdapter; - import io.swagger.annotations.ApiModel; @ApiModel("参观申请表") diff --git a/src/main/java/com/sipai/entity/visit/VisitPosition.java b/src/main/java/com/sipai/entity/visit/VisitPosition.java index 95e76f06..72e6e993 100644 --- a/src/main/java/com/sipai/entity/visit/VisitPosition.java +++ b/src/main/java/com/sipai/entity/visit/VisitPosition.java @@ -1,8 +1,9 @@ package com.sipai.entity.visit; -import java.math.BigDecimal; import com.sipai.entity.base.SQLAdapter; +import java.math.BigDecimal; + public class VisitPosition extends SQLAdapter { private String id; diff --git a/src/main/java/com/sipai/entity/visit/VisitRegister.java b/src/main/java/com/sipai/entity/visit/VisitRegister.java index e8eb7947..4e3fdded 100644 --- a/src/main/java/com/sipai/entity/visit/VisitRegister.java +++ b/src/main/java/com/sipai/entity/visit/VisitRegister.java @@ -1,9 +1,7 @@ package com.sipai.entity.visit; import com.sipai.entity.base.BusinessUnitAdapter; - import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; @ApiModel("参观登记表") public class VisitRegister extends BusinessUnitAdapter { diff --git a/src/main/java/com/sipai/entity/visual/DataType.java b/src/main/java/com/sipai/entity/visual/DataType.java index ac405797..582cf7e9 100644 --- a/src/main/java/com/sipai/entity/visual/DataType.java +++ b/src/main/java/com/sipai/entity/visual/DataType.java @@ -1,7 +1,5 @@ package com.sipai.entity.visual; -import java.util.Date; - import com.sipai.entity.base.SQLAdapter; public class DataType extends SQLAdapter{ diff --git a/src/main/java/com/sipai/entity/visual/Plan.java b/src/main/java/com/sipai/entity/visual/Plan.java index 22736e81..40e6af7e 100644 --- a/src/main/java/com/sipai/entity/visual/Plan.java +++ b/src/main/java/com/sipai/entity/visual/Plan.java @@ -1,9 +1,9 @@ package com.sipai.entity.visual; -import java.util.List; - import com.sipai.entity.base.SQLAdapter; +import java.util.List; + public class Plan extends SQLAdapter{ private String id; diff --git a/src/main/java/com/sipai/entity/visual/PlanInteraction.java b/src/main/java/com/sipai/entity/visual/PlanInteraction.java index d7014eec..47aefe5a 100644 --- a/src/main/java/com/sipai/entity/visual/PlanInteraction.java +++ b/src/main/java/com/sipai/entity/visual/PlanInteraction.java @@ -1,11 +1,11 @@ package com.sipai.entity.visual; -import java.util.List; - import com.sipai.entity.base.SQLAdapter; import com.sipai.entity.scada.MPoint; import com.sipai.entity.work.Camera; +import java.util.List; + public class PlanInteraction extends SQLAdapter{ private String id; diff --git a/src/main/java/com/sipai/entity/visual/PlanLayout.java b/src/main/java/com/sipai/entity/visual/PlanLayout.java index a321fb4b..8e9593c5 100644 --- a/src/main/java/com/sipai/entity/visual/PlanLayout.java +++ b/src/main/java/com/sipai/entity/visual/PlanLayout.java @@ -1,10 +1,10 @@ package com.sipai.entity.visual; -import java.util.List; - import com.sipai.entity.base.SQLAdapter; import com.sipai.entity.work.Camera; +import java.util.List; + public class PlanLayout extends SQLAdapter{ private String id; diff --git a/src/main/java/com/sipai/entity/visual/ProcessOperation.java b/src/main/java/com/sipai/entity/visual/ProcessOperation.java index 6fc751fa..c957d524 100644 --- a/src/main/java/com/sipai/entity/visual/ProcessOperation.java +++ b/src/main/java/com/sipai/entity/visual/ProcessOperation.java @@ -1,7 +1,5 @@ package com.sipai.entity.visual; -import java.util.Date; - import com.sipai.entity.base.SQLAdapter; public class ProcessOperation extends SQLAdapter { diff --git a/src/main/java/com/sipai/entity/visual/VisualCacheData.java b/src/main/java/com/sipai/entity/visual/VisualCacheData.java index ca6ba9d3..c887c2cc 100644 --- a/src/main/java/com/sipai/entity/visual/VisualCacheData.java +++ b/src/main/java/com/sipai/entity/visual/VisualCacheData.java @@ -1,7 +1,6 @@ package com.sipai.entity.visual; import com.sipai.entity.base.SQLAdapter; -import java.util.Date; public class VisualCacheData extends SQLAdapter{ diff --git a/src/main/java/com/sipai/entity/whp/baseinfo/WhpSampleType.java b/src/main/java/com/sipai/entity/whp/baseinfo/WhpSampleType.java index b9b9512f..e9a716fe 100644 --- a/src/main/java/com/sipai/entity/whp/baseinfo/WhpSampleType.java +++ b/src/main/java/com/sipai/entity/whp/baseinfo/WhpSampleType.java @@ -3,7 +3,6 @@ package com.sipai.entity.whp.baseinfo; import com.sipai.entity.base.SQLAdapter; import lombok.Data; -import javax.validation.constraints.NotNull; import java.io.Serializable; /** diff --git a/src/main/java/com/sipai/entity/whp/baseinfo/WhpTestItemWorkingCurve.java b/src/main/java/com/sipai/entity/whp/baseinfo/WhpTestItemWorkingCurve.java index 42c4da7e..60783079 100644 --- a/src/main/java/com/sipai/entity/whp/baseinfo/WhpTestItemWorkingCurve.java +++ b/src/main/java/com/sipai/entity/whp/baseinfo/WhpTestItemWorkingCurve.java @@ -1 +1 @@ -package com.sipai.entity.whp.baseinfo; import com.fasterxml.jackson.annotation.JsonFormat; import com.sipai.entity.base.SQLAdapter; import lombok.Data; import org.codehaus.jackson.map.annotate.JsonSerialize; import org.codehaus.jackson.map.ser.std.ToStringSerializer; import java.io.Serializable; import java.math.BigDecimal; /** * 方法依据 * * @Author: zxq * @Date: 2023/05/15 **/ @Data public class WhpTestItemWorkingCurve extends SQLAdapter implements Serializable { /** * 主键 */ private String id; /** * 检测项目id */ private String test_item_id; /** * 监测点id */ private String kpi_id; /** * 公式类型 0 基础描述 1 常量 2 过程公式 3 结果公式 */ private String formulatype; /** * 计算顺序 */ private String sort; /** * 默认值 */ // @JsonFormat(shape = JsonFormat.Shape.STRING) private String default_value; /** * 名称（基础描述） */ private String name; /** * 单位（基础描述 选填） */ private String unit; private String bizId; } \ No newline at end of file +package com.sipai.entity.whp.baseinfo; import com.sipai.entity.base.SQLAdapter; import lombok.Data; import java.io.Serializable; /** * 方法依据 * * @Author: zxq * @Date: 2023/05/15 **/ @Data public class WhpTestItemWorkingCurve extends SQLAdapter implements Serializable { /** * 主键 */ private String id; /** * 检测项目id */ private String test_item_id; /** * 监测点id */ private String kpi_id; /** * 公式类型 0 基础描述 1 常量 2 过程公式 3 结果公式 */ private String formulatype; /** * 计算顺序 */ private String sort; /** * 默认值 */ // @JsonFormat(shape = JsonFormat.Shape.STRING) private String default_value; /** * 名称（基础描述） */ private String name; /** * 单位（基础描述 选填） */ private String unit; private String bizId; } \ No newline at end of file diff --git a/src/main/java/com/sipai/entity/whp/baseinfo/WhpTestMethod.java b/src/main/java/com/sipai/entity/whp/baseinfo/WhpTestMethod.java index f3dfb3b3..3fb2cb38 100644 --- a/src/main/java/com/sipai/entity/whp/baseinfo/WhpTestMethod.java +++ b/src/main/java/com/sipai/entity/whp/baseinfo/WhpTestMethod.java @@ -1 +1 @@ -package com.sipai.entity.whp.baseinfo; import com.sipai.entity.base.SQLAdapter; import com.sipai.entity.user.Company; import lombok.Data; import java.io.Serializable; import java.math.BigDecimal; /** * 方法依据 * * @Author: zxq * @Date: 2023/05/15 **/ @Data public class WhpTestMethod extends SQLAdapter implements Serializable { /** * 主键 */ private String id; /** * 检测项目id */ private String testItem_id; /** * 方法依据 */ private String methodBasis; /** * 启用时间 */ private String startDate; /** * 状态 */ private Integer status; /** * 顺序 */ private Integer sortNum; /** * 工厂id */ private String bizId; private Company company; } \ No newline at end of file +package com.sipai.entity.whp.baseinfo; import com.sipai.entity.base.SQLAdapter; import com.sipai.entity.user.Company; import lombok.Data; import java.io.Serializable; /** * 方法依据 * * @Author: zxq * @Date: 2023/05/15 **/ @Data public class WhpTestMethod extends SQLAdapter implements Serializable { /** * 主键 */ private String id; /** * 检测项目id */ private String testItem_id; /** * 方法依据 */ private String methodBasis; /** * 启用时间 */ private String startDate; /** * 状态 */ private Integer status; /** * 顺序 */ private Integer sortNum; /** * 工厂id */ private String bizId; private Company company; } \ No newline at end of file diff --git a/src/main/java/com/sipai/entity/whp/baseinfo/WhpTestMethodQuery.java b/src/main/java/com/sipai/entity/whp/baseinfo/WhpTestMethodQuery.java index 9bb047ad..e46a2191 100644 --- a/src/main/java/com/sipai/entity/whp/baseinfo/WhpTestMethodQuery.java +++ b/src/main/java/com/sipai/entity/whp/baseinfo/WhpTestMethodQuery.java @@ -1 +1 @@ -package com.sipai.entity.whp.baseinfo; import lombok.Data; import org.apache.commons.lang3.StringUtils; /** * 方法依据查询条件 * * @Author: zxq * @Date: 2023/05/15 **/ @Data public class WhpTestMethodQuery { /** * 主键 */ private String id; /** * 检测项目id */ private String testItem_id; /** * 方法依据 */ private String methodBasis; /** * 启用时间 */ private String startDate; /** * 状态 */ private Integer status; /** * 顺序 */ private Integer sortNum; /** * 模糊查询 */ private String likeString; /** * 厂 id */ private String bizId; // public void setTestItem_id(String testItem_id) { // if (testItem_id == null || testItem_id.length() == 0) { // this.testItem_id = StringUtils.EMPTY; // } else { // String condition = StringUtils.EMPTY; // for (String deptId : testItem_id.split(",")) { // condition += " test_Item_id like '%" + deptId + "%' or"; // } // condition = condition.substring(0, condition.length() - 2); // condition = " (" + condition + ")"; // this.testItem_id = condition; // } // } } \ No newline at end of file +package com.sipai.entity.whp.baseinfo; import lombok.Data; /** * 方法依据查询条件 * * @Author: zxq * @Date: 2023/05/15 **/ @Data public class WhpTestMethodQuery { /** * 主键 */ private String id; /** * 检测项目id */ private String testItem_id; /** * 方法依据 */ private String methodBasis; /** * 启用时间 */ private String startDate; /** * 状态 */ private Integer status; /** * 顺序 */ private Integer sortNum; /** * 模糊查询 */ private String likeString; /** * 厂 id */ private String bizId; // public void setTestItem_id(String testItem_id) { // if (testItem_id == null || testItem_id.length() == 0) { // this.testItem_id = StringUtils.EMPTY; // } else { // String condition = StringUtils.EMPTY; // for (String deptId : testItem_id.split(",")) { // condition += " test_Item_id like '%" + deptId + "%' or"; // } // condition = condition.substring(0, condition.length() - 2); // condition = " (" + condition + ")"; // this.testItem_id = condition; // } // } } \ No newline at end of file diff --git a/src/main/java/com/sipai/entity/whp/liquidWasteDispose/WhpLiquidWasteDispose.java b/src/main/java/com/sipai/entity/whp/liquidWasteDispose/WhpLiquidWasteDispose.java index a33c3fa8..5c64bc20 100644 --- a/src/main/java/com/sipai/entity/whp/liquidWasteDispose/WhpLiquidWasteDispose.java +++ b/src/main/java/com/sipai/entity/whp/liquidWasteDispose/WhpLiquidWasteDispose.java @@ -1 +1 @@ -package com.sipai.entity.whp.liquidWasteDispose; import com.sipai.entity.base.SQLAdapter; import lombok.Data; import org.apache.axis2.databinding.types.soapencoding.Decimal; import java.io.Serializable; import java.math.BigDecimal; /** * 余样处置方式 * * @Author: 李晨 * @Date: 2022/12/20 **/ @Data public class WhpLiquidWasteDispose extends SQLAdapter implements Serializable { /** * 主键 */ private String id; /** * 废液代码及名称 */ private Integer liquidWasteType; /** * 入库日期 */ private String inputTime; /** * 废物来源 */ private String source; /** * 数量 */ private BigDecimal number; /** * 容器材质 */ private String containerType; /** * 容量 */ private String capacity; /** * 废物存放位置 */ private String location; /** * 废物运送经办人id */ private String transportUserId; /** * 登记人id */ private String createUserId; /** * 登记人姓名 */ private String createUserName; /** * 废物运送经办人名称 */ private String transportUserName; /** * 废物贮存经办人id */ private String repositionUserId; /** * 废物贮存经办人名称 */ private String repositionUserName; /** * 状态 */ private Integer status; /** * 转移日期 */ private String ouputDate; /** * 废物转移经办人id */ private String outputUserId; /** * 废物转移经办人名称 */ private String outputUserName; /** * 登记时间 */ private String createTime; /** * 废物贮存经办人id */ private String outputRepositionUserId; /** * 废物贮存经办人名称 */ private String outputRepositionUserName; /** * 废物去向 */ private String outputLocation; /** * 目前登记容量 */ private BigDecimal currentNumber; /** * 上次 登记容量 */ private BigDecimal lastNumber; } \ No newline at end of file +package com.sipai.entity.whp.liquidWasteDispose; import com.sipai.entity.base.SQLAdapter; import lombok.Data; import java.io.Serializable; import java.math.BigDecimal; /** * 余样处置方式 * * @Author: 李晨 * @Date: 2022/12/20 **/ @Data public class WhpLiquidWasteDispose extends SQLAdapter implements Serializable { /** * 主键 */ private String id; /** * 废液代码及名称 */ private Integer liquidWasteType; /** * 入库日期 */ private String inputTime; /** * 废物来源 */ private String source; /** * 数量 */ private BigDecimal number; /** * 容器材质 */ private String containerType; /** * 容量 */ private String capacity; /** * 废物存放位置 */ private String location; /** * 废物运送经办人id */ private String transportUserId; /** * 登记人id */ private String createUserId; /** * 登记人姓名 */ private String createUserName; /** * 废物运送经办人名称 */ private String transportUserName; /** * 废物贮存经办人id */ private String repositionUserId; /** * 废物贮存经办人名称 */ private String repositionUserName; /** * 状态 */ private Integer status; /** * 转移日期 */ private String ouputDate; /** * 废物转移经办人id */ private String outputUserId; /** * 废物转移经办人名称 */ private String outputUserName; /** * 登记时间 */ private String createTime; /** * 废物贮存经办人id */ private String outputRepositionUserId; /** * 废物贮存经办人名称 */ private String outputRepositionUserName; /** * 废物去向 */ private String outputLocation; /** * 目前登记容量 */ private BigDecimal currentNumber; /** * 上次 登记容量 */ private BigDecimal lastNumber; } \ No newline at end of file diff --git a/src/main/java/com/sipai/entity/whp/liquidWasteDispose/WhpLiquidWasteDisposeExportDetail.java b/src/main/java/com/sipai/entity/whp/liquidWasteDispose/WhpLiquidWasteDisposeExportDetail.java index 993bb93c..d6eeac21 100644 --- a/src/main/java/com/sipai/entity/whp/liquidWasteDispose/WhpLiquidWasteDisposeExportDetail.java +++ b/src/main/java/com/sipai/entity/whp/liquidWasteDispose/WhpLiquidWasteDisposeExportDetail.java @@ -1 +1 @@ -package com.sipai.entity.whp.liquidWasteDispose; import com.sipai.entity.base.SQLAdapter; import lombok.Data; import java.io.Serializable; /** * 余样处置方式 * * @Author: 李晨 * @Date: 2022/12/20 **/ @Data public class WhpLiquidWasteDisposeExportDetail { /** * 废液代码及名称 */ private String liquidWasteTypeName; } \ No newline at end of file +package com.sipai.entity.whp.liquidWasteDispose; import lombok.Data; /** * 余样处置方式 * * @Author: 李晨 * @Date: 2022/12/20 **/ @Data public class WhpLiquidWasteDisposeExportDetail { /** * 废液代码及名称 */ private String liquidWasteTypeName; } \ No newline at end of file diff --git a/src/main/java/com/sipai/entity/whp/liquidWasteDispose/WhpLiquidWasteDisposeQuery.java b/src/main/java/com/sipai/entity/whp/liquidWasteDispose/WhpLiquidWasteDisposeQuery.java index f6e731e3..a579c7d3 100644 --- a/src/main/java/com/sipai/entity/whp/liquidWasteDispose/WhpLiquidWasteDisposeQuery.java +++ b/src/main/java/com/sipai/entity/whp/liquidWasteDispose/WhpLiquidWasteDisposeQuery.java @@ -1 +1 @@ -package com.sipai.entity.whp.liquidWasteDispose; import lombok.Data; import lombok.Getter; import lombok.Setter; /** * 余样处置方式查询条件 * * @Author: 李晨 * @Date: 2022/12/20 **/ @Data public class WhpLiquidWasteDisposeQuery { private String timeRangeBegin; private String timeRangeEnd; @Getter private String timeRange; public void setTimeRange(String timeRange) { this.timeRange = timeRange; this.timeRangeBegin = this.timeRange.split(" ~ ")[0]; this.timeRangeEnd = this.timeRange.split(" ~ ")[1]; } /** * 废液代码及名称 */ private Integer liquidWasteType; /** * 状态 */ private Integer status; /** * 模糊查询 */ private String likeString; private String ids; } \ No newline at end of file +package com.sipai.entity.whp.liquidWasteDispose; import lombok.Data; import lombok.Getter; /** * 余样处置方式查询条件 * * @Author: 李晨 * @Date: 2022/12/20 **/ @Data public class WhpLiquidWasteDisposeQuery { private String timeRangeBegin; private String timeRangeEnd; @Getter private String timeRange; public void setTimeRange(String timeRange) { this.timeRange = timeRange; this.timeRangeBegin = this.timeRange.split(" ~ ")[0]; this.timeRangeEnd = this.timeRange.split(" ~ ")[1]; } /** * 废液代码及名称 */ private Integer liquidWasteType; /** * 状态 */ private Integer status; /** * 模糊查询 */ private String likeString; private String ids; } \ No newline at end of file diff --git a/src/main/java/com/sipai/entity/whp/plan/WhpSamplingPlan.java b/src/main/java/com/sipai/entity/whp/plan/WhpSamplingPlan.java index 0c0242b6..1ae96aee 100644 --- a/src/main/java/com/sipai/entity/whp/plan/WhpSamplingPlan.java +++ b/src/main/java/com/sipai/entity/whp/plan/WhpSamplingPlan.java @@ -3,7 +3,6 @@ package com.sipai.entity.whp.plan; import com.sipai.entity.base.SQLAdapter; import lombok.Data; import lombok.EqualsAndHashCode; -import org.activiti.engine.impl.event.logger.DatabaseEventFlusher; import java.io.Serializable; import java.util.List; diff --git a/src/main/java/com/sipai/entity/whp/test/WhpTaskItemCurve.java b/src/main/java/com/sipai/entity/whp/test/WhpTaskItemCurve.java index bbef7132..9dd50ac1 100644 --- a/src/main/java/com/sipai/entity/whp/test/WhpTaskItemCurve.java +++ b/src/main/java/com/sipai/entity/whp/test/WhpTaskItemCurve.java @@ -1 +1 @@ -package com.sipai.entity.whp.test; import com.sipai.entity.base.SQLAdapter; import lombok.Data; import javax.persistence.Table; import java.io.Serializable; import java.math.BigDecimal; /** * 方法依据 * * @Author: zxq * @Date: 2023/05/15 **/ @Data @Table(name="TH_WHP_TASK_ITEM_CURVE") public class WhpTaskItemCurve extends SQLAdapter implements Serializable { /** * 主键id */ private String id; /** * 我的任务 检测表id */ private String task_test_item_id; /** * 基础描述名称 */ private String name; /** * 基础描述单位 */ private String unit; /** * 项目曲线 基础描述表id */ private String working_curve_id; /** * 值 */ private String calculated_value; /** * 样品编号 */ private String sample_code; /** * 采样点编号 */ private String plan_code; } \ No newline at end of file +package com.sipai.entity.whp.test; import com.sipai.entity.base.SQLAdapter; import lombok.Data; import javax.persistence.Table; import java.io.Serializable; /** * 方法依据 * * @Author: zxq * @Date: 2023/05/15 **/ @Data @Table(name="TH_WHP_TASK_ITEM_CURVE") public class WhpTaskItemCurve extends SQLAdapter implements Serializable { /** * 主键id */ private String id; /** * 我的任务 检测表id */ private String task_test_item_id; /** * 基础描述名称 */ private String name; /** * 基础描述单位 */ private String unit; /** * 项目曲线 基础描述表id */ private String working_curve_id; /** * 值 */ private String calculated_value; /** * 样品编号 */ private String sample_code; /** * 采样点编号 */ private String plan_code; } \ No newline at end of file diff --git a/src/main/java/com/sipai/entity/whp/test/WhpTaskItemCurveVo.java b/src/main/java/com/sipai/entity/whp/test/WhpTaskItemCurveVo.java index 120fe021..553951d0 100644 --- a/src/main/java/com/sipai/entity/whp/test/WhpTaskItemCurveVo.java +++ b/src/main/java/com/sipai/entity/whp/test/WhpTaskItemCurveVo.java @@ -1 +1 @@ -package com.sipai.entity.whp.test; import com.sipai.entity.scada.MPoint; import com.sipai.entity.whp.baseinfo.WhpTestItemWorkingCurve; import com.sipai.entity.whp.baseinfo.WhpTestItemWorkingCurveVo; import lombok.Data; /** * 页面展示 * @Author: zxq * @Date: 2023/05/15 **/ @Data public class WhpTaskItemCurveVo extends WhpTaskItemCurve { private WhpTestItemWorkingCurveVo whpTestItemWorkingCurveVo; private MPoint mPoint; } \ No newline at end of file +package com.sipai.entity.whp.test; import com.sipai.entity.scada.MPoint; import com.sipai.entity.whp.baseinfo.WhpTestItemWorkingCurveVo; import lombok.Data; /** * 页面展示 * @Author: zxq * @Date: 2023/05/15 **/ @Data public class WhpTaskItemCurveVo extends WhpTaskItemCurve { private WhpTestItemWorkingCurveVo whpTestItemWorkingCurveVo; private MPoint mPoint; } \ No newline at end of file diff --git a/src/main/java/com/sipai/entity/work/AutoAlert.java b/src/main/java/com/sipai/entity/work/AutoAlert.java index c3ac13ff..5e69ed4b 100644 --- a/src/main/java/com/sipai/entity/work/AutoAlert.java +++ b/src/main/java/com/sipai/entity/work/AutoAlert.java @@ -2,7 +2,6 @@ package com.sipai.entity.work; import com.sipai.entity.base.SQLAdapter; -import java.util.Date; public class AutoAlert extends SQLAdapter{ private String id; diff --git a/src/main/java/com/sipai/entity/work/CameraDetail.java b/src/main/java/com/sipai/entity/work/CameraDetail.java index 2ad3df6a..d5f30d7b 100644 --- a/src/main/java/com/sipai/entity/work/CameraDetail.java +++ b/src/main/java/com/sipai/entity/work/CameraDetail.java @@ -1,6 +1,5 @@ package com.sipai.entity.work; -import com.sipai.entity.achievement.AcceptanceModelMPoint; import com.sipai.entity.hqconfig.WorkModel; import com.sipai.entity.scada.MPoint; diff --git a/src/main/java/com/sipai/entity/work/ChannelPortConfig.java b/src/main/java/com/sipai/entity/work/ChannelPortConfig.java index 823fa362..a8482cd1 100644 --- a/src/main/java/com/sipai/entity/work/ChannelPortConfig.java +++ b/src/main/java/com/sipai/entity/work/ChannelPortConfig.java @@ -1,7 +1,5 @@ package com.sipai.entity.work; -import java.util.Date; - public class ChannelPortConfig { private String id; diff --git a/src/main/java/com/sipai/entity/work/ElectricityMeter.java b/src/main/java/com/sipai/entity/work/ElectricityMeter.java index 1f47569b..d44f935c 100644 --- a/src/main/java/com/sipai/entity/work/ElectricityMeter.java +++ b/src/main/java/com/sipai/entity/work/ElectricityMeter.java @@ -1,7 +1,5 @@ package com.sipai.entity.work; -import java.util.Date; - import com.sipai.entity.base.SQLAdapter; public class ElectricityMeter extends SQLAdapter { diff --git a/src/main/java/com/sipai/entity/work/Group.java b/src/main/java/com/sipai/entity/work/Group.java index cb5901ff..c7882705 100644 --- a/src/main/java/com/sipai/entity/work/Group.java +++ b/src/main/java/com/sipai/entity/work/Group.java @@ -1,9 +1,9 @@ package com.sipai.entity.work; -import java.util.List; - import com.sipai.entity.base.SQLAdapter; +import java.util.List; + public class Group extends SQLAdapter{ private String id; diff --git a/src/main/java/com/sipai/entity/work/GroupManage.java b/src/main/java/com/sipai/entity/work/GroupManage.java index 8230749a..bad04dc4 100644 --- a/src/main/java/com/sipai/entity/work/GroupManage.java +++ b/src/main/java/com/sipai/entity/work/GroupManage.java @@ -1,8 +1,7 @@ package com.sipai.entity.work; -import org.springframework.stereotype.Component; - import com.sipai.entity.base.SQLAdapter; +import org.springframework.stereotype.Component; /** diff --git a/src/main/java/com/sipai/entity/work/GroupMember.java b/src/main/java/com/sipai/entity/work/GroupMember.java index 352c0e78..d8ba6674 100644 --- a/src/main/java/com/sipai/entity/work/GroupMember.java +++ b/src/main/java/com/sipai/entity/work/GroupMember.java @@ -1,8 +1,7 @@ package com.sipai.entity.work; -import org.springframework.stereotype.Component; - import com.sipai.entity.base.SQLAdapter; +import org.springframework.stereotype.Component; @Component public class GroupMember extends SQLAdapter{ private String id; diff --git a/src/main/java/com/sipai/entity/work/KPIPoint.java b/src/main/java/com/sipai/entity/work/KPIPoint.java index 522d0da7..b3da1b3a 100644 --- a/src/main/java/com/sipai/entity/work/KPIPoint.java +++ b/src/main/java/com/sipai/entity/work/KPIPoint.java @@ -1,11 +1,8 @@ package com.sipai.entity.work; -import java.util.Date; - import com.sipai.entity.base.SQLAdapter; import com.sipai.entity.scada.MPoint; import com.sipai.entity.scada.MPoint4APP; -import com.sipai.entity.user.ProcessSection; public class KPIPoint extends SQLAdapter{ private String id; diff --git a/src/main/java/com/sipai/entity/work/KPIPointProfessor.java b/src/main/java/com/sipai/entity/work/KPIPointProfessor.java index 69c2ca76..d8f53242 100644 --- a/src/main/java/com/sipai/entity/work/KPIPointProfessor.java +++ b/src/main/java/com/sipai/entity/work/KPIPointProfessor.java @@ -1,7 +1,5 @@ package com.sipai.entity.work; -import java.util.Date; - import com.sipai.entity.base.SQLAdapter; public class KPIPointProfessor extends SQLAdapter{ diff --git a/src/main/java/com/sipai/entity/work/KPIPointProfessorParam.java b/src/main/java/com/sipai/entity/work/KPIPointProfessorParam.java index 7f8fd2f8..0ff76597 100644 --- a/src/main/java/com/sipai/entity/work/KPIPointProfessorParam.java +++ b/src/main/java/com/sipai/entity/work/KPIPointProfessorParam.java @@ -1,7 +1,5 @@ package com.sipai.entity.work; -import java.util.Date; - import com.sipai.entity.base.SQLAdapter; import com.sipai.entity.scada.MPoint; diff --git a/src/main/java/com/sipai/entity/work/MeasurePoint_DATA.java b/src/main/java/com/sipai/entity/work/MeasurePoint_DATA.java index 564caecc..110866df 100644 --- a/src/main/java/com/sipai/entity/work/MeasurePoint_DATA.java +++ b/src/main/java/com/sipai/entity/work/MeasurePoint_DATA.java @@ -1,10 +1,10 @@ package com.sipai.entity.work; -import java.util.List; - import com.sipai.entity.base.SQLAdapter; import com.sipai.entity.scada.MPointHistory; +import java.util.List; + public class MeasurePoint_DATA extends SQLAdapter{ private String id; diff --git a/src/main/java/com/sipai/entity/work/ModbusFig.java b/src/main/java/com/sipai/entity/work/ModbusFig.java index 23088de9..79d0dc81 100644 --- a/src/main/java/com/sipai/entity/work/ModbusFig.java +++ b/src/main/java/com/sipai/entity/work/ModbusFig.java @@ -1,8 +1,7 @@ package com.sipai.entity.work; -import org.springframework.stereotype.Component; - import com.sipai.entity.base.SQLAdapter; +import org.springframework.stereotype.Component; @Component public class ModbusFig extends SQLAdapter{ private String id; diff --git a/src/main/java/com/sipai/entity/work/ModbusInterface.java b/src/main/java/com/sipai/entity/work/ModbusInterface.java index d4a9652a..f2afbf75 100644 --- a/src/main/java/com/sipai/entity/work/ModbusInterface.java +++ b/src/main/java/com/sipai/entity/work/ModbusInterface.java @@ -1,7 +1,6 @@ package com.sipai.entity.work; import com.serotonin.modbus4j.ModbusMaster; -import com.serotonin.modbus4j.ip.tcp.TcpMaster; import java.util.HashMap; diff --git a/src/main/java/com/sipai/entity/work/ModbusRecord.java b/src/main/java/com/sipai/entity/work/ModbusRecord.java index d8f75115..f3d45005 100644 --- a/src/main/java/com/sipai/entity/work/ModbusRecord.java +++ b/src/main/java/com/sipai/entity/work/ModbusRecord.java @@ -1,8 +1,7 @@ package com.sipai.entity.work; -import org.springframework.stereotype.Component; - import com.sipai.entity.base.SQLAdapter; +import org.springframework.stereotype.Component; @Component public class ModbusRecord extends SQLAdapter{ private String id; diff --git a/src/main/java/com/sipai/entity/work/OverviewProduce.java b/src/main/java/com/sipai/entity/work/OverviewProduce.java index 94011013..f7f31767 100644 --- a/src/main/java/com/sipai/entity/work/OverviewProduce.java +++ b/src/main/java/com/sipai/entity/work/OverviewProduce.java @@ -1,10 +1,6 @@ package com.sipai.entity.work; import java.util.List; -import java.util.Map; - -import com.sipai.entity.base.SQLAdapter; -import com.sipai.entity.scada.MPointHistory; //主页数据类 diff --git a/src/main/java/com/sipai/entity/work/OverviewProduceBlot.java b/src/main/java/com/sipai/entity/work/OverviewProduceBlot.java index 26bba924..a3f159da 100644 --- a/src/main/java/com/sipai/entity/work/OverviewProduceBlot.java +++ b/src/main/java/com/sipai/entity/work/OverviewProduceBlot.java @@ -1,10 +1,6 @@ package com.sipai.entity.work; import java.util.List; -import java.util.Map; - -import com.sipai.entity.base.SQLAdapter; -import com.sipai.entity.scada.MPointHistory; //主页数据类 diff --git a/src/main/java/com/sipai/entity/work/ScadaPic.java b/src/main/java/com/sipai/entity/work/ScadaPic.java index 38a91a17..5f74802b 100644 --- a/src/main/java/com/sipai/entity/work/ScadaPic.java +++ b/src/main/java/com/sipai/entity/work/ScadaPic.java @@ -1,7 +1,5 @@ package com.sipai.entity.work; -import java.util.Date; - import com.sipai.entity.base.SQLAdapter; public class ScadaPic extends SQLAdapter{ diff --git a/src/main/java/com/sipai/entity/work/ScadaPic_EM.java b/src/main/java/com/sipai/entity/work/ScadaPic_EM.java index 75d96a9a..f507085d 100644 --- a/src/main/java/com/sipai/entity/work/ScadaPic_EM.java +++ b/src/main/java/com/sipai/entity/work/ScadaPic_EM.java @@ -1,7 +1,5 @@ package com.sipai.entity.work; -import java.util.Date; - import com.sipai.entity.base.SQLAdapter; import com.sipai.entity.equipment.EquipmentCard; diff --git a/src/main/java/com/sipai/entity/work/ScadaPic_MPoint.java b/src/main/java/com/sipai/entity/work/ScadaPic_MPoint.java index e3f0299b..aae8a157 100644 --- a/src/main/java/com/sipai/entity/work/ScadaPic_MPoint.java +++ b/src/main/java/com/sipai/entity/work/ScadaPic_MPoint.java @@ -1,7 +1,5 @@ package com.sipai.entity.work; -import java.util.Date; - import com.sipai.entity.base.SQLAdapter; import com.sipai.entity.scada.MPoint; diff --git a/src/main/java/com/sipai/entity/work/ScadaPic_MPoint_Expression.java b/src/main/java/com/sipai/entity/work/ScadaPic_MPoint_Expression.java index 010f301e..6cdc216a 100644 --- a/src/main/java/com/sipai/entity/work/ScadaPic_MPoint_Expression.java +++ b/src/main/java/com/sipai/entity/work/ScadaPic_MPoint_Expression.java @@ -1,7 +1,5 @@ package com.sipai.entity.work; -import java.util.Date; - import com.sipai.entity.base.SQLAdapter; public class ScadaPic_MPoint_Expression extends SQLAdapter{ diff --git a/src/main/java/com/sipai/entity/work/ScadaPic_ProcessSection.java b/src/main/java/com/sipai/entity/work/ScadaPic_ProcessSection.java index afe8d6e2..7c43b394 100644 --- a/src/main/java/com/sipai/entity/work/ScadaPic_ProcessSection.java +++ b/src/main/java/com/sipai/entity/work/ScadaPic_ProcessSection.java @@ -1,7 +1,5 @@ package com.sipai.entity.work; -import java.util.Date; - import com.sipai.entity.base.SQLAdapter; import com.sipai.entity.user.ProcessSection; diff --git a/src/main/java/com/sipai/entity/work/ScadaPic_Txt.java b/src/main/java/com/sipai/entity/work/ScadaPic_Txt.java index d75d1327..3775c449 100644 --- a/src/main/java/com/sipai/entity/work/ScadaPic_Txt.java +++ b/src/main/java/com/sipai/entity/work/ScadaPic_Txt.java @@ -1,7 +1,5 @@ package com.sipai.entity.work; -import java.util.Date; - import com.sipai.entity.base.SQLAdapter; public class ScadaPic_Txt extends SQLAdapter{ diff --git a/src/main/java/com/sipai/entity/work/ShiftRecord.java b/src/main/java/com/sipai/entity/work/ShiftRecord.java index bba5ee96..9a9f4eba 100644 --- a/src/main/java/com/sipai/entity/work/ShiftRecord.java +++ b/src/main/java/com/sipai/entity/work/ShiftRecord.java @@ -1,7 +1,5 @@ package com.sipai.entity.work; -import java.util.Date; - import com.sipai.entity.base.SQLAdapter; public class ShiftRecord extends SQLAdapter{ diff --git a/src/main/java/com/sipai/entity/workorder/OverhaulItemEquipment.java b/src/main/java/com/sipai/entity/workorder/OverhaulItemEquipment.java index ad018640..dc00533e 100644 --- a/src/main/java/com/sipai/entity/workorder/OverhaulItemEquipment.java +++ b/src/main/java/com/sipai/entity/workorder/OverhaulItemEquipment.java @@ -1,10 +1,6 @@ package com.sipai.entity.workorder; import com.sipai.entity.base.SQLAdapter; -import lombok.Data; - -import java.math.BigDecimal; -import java.util.Date; public class OverhaulItemEquipment extends SQLAdapter { private String id; diff --git a/src/main/java/com/sipai/entity/workorder/OverhaulItemProject.java b/src/main/java/com/sipai/entity/workorder/OverhaulItemProject.java index 854468b2..2f324d8c 100644 --- a/src/main/java/com/sipai/entity/workorder/OverhaulItemProject.java +++ b/src/main/java/com/sipai/entity/workorder/OverhaulItemProject.java @@ -1,7 +1,6 @@ package com.sipai.entity.workorder; import com.sipai.entity.base.BusinessUnitAdapter; -import com.sipai.entity.base.SQLAdapter; /** * 设备大修分项项目 sj 2020-11-17 diff --git a/src/main/java/com/sipai/entity/workorder/OverhaulStatistics.java b/src/main/java/com/sipai/entity/workorder/OverhaulStatistics.java index c9c3be2d..56e3ac82 100644 --- a/src/main/java/com/sipai/entity/workorder/OverhaulStatistics.java +++ b/src/main/java/com/sipai/entity/workorder/OverhaulStatistics.java @@ -1,7 +1,6 @@ package com.sipai.entity.workorder; import java.math.BigDecimal; -import java.util.Date; public class OverhaulStatistics { diff --git a/src/main/java/com/sipai/entity/workorder/WorkUserTimeRespDto.java b/src/main/java/com/sipai/entity/workorder/WorkUserTimeRespDto.java index 031b1527..32de45c3 100644 --- a/src/main/java/com/sipai/entity/workorder/WorkUserTimeRespDto.java +++ b/src/main/java/com/sipai/entity/workorder/WorkUserTimeRespDto.java @@ -1,9 +1,5 @@ package com.sipai.entity.workorder; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - import java.math.BigDecimal; public class WorkUserTimeRespDto { diff --git a/src/main/java/com/sipai/entity/workorder/WorkorderConsume.java b/src/main/java/com/sipai/entity/workorder/WorkorderConsume.java index 6472d47d..cd092b35 100644 --- a/src/main/java/com/sipai/entity/workorder/WorkorderConsume.java +++ b/src/main/java/com/sipai/entity/workorder/WorkorderConsume.java @@ -1,10 +1,10 @@ package com.sipai.entity.workorder; -import java.math.BigDecimal; - import com.sipai.entity.base.SQLAdapter; import com.sipai.entity.sparepart.Goods; +import java.math.BigDecimal; + public class WorkorderConsume extends SQLAdapter { private String id; diff --git a/src/main/java/com/sipai/entity/workorder/WorkorderDetail.java b/src/main/java/com/sipai/entity/workorder/WorkorderDetail.java index 77103875..4bc29726 100644 --- a/src/main/java/com/sipai/entity/workorder/WorkorderDetail.java +++ b/src/main/java/com/sipai/entity/workorder/WorkorderDetail.java @@ -1,13 +1,13 @@ package com.sipai.entity.workorder; -import java.math.BigDecimal; - import com.sipai.entity.base.BusinessUnitAdapter; import com.sipai.entity.equipment.EquipmentCard; import com.sipai.entity.maintenance.Abnormity; import com.sipai.entity.user.Company; import com.sipai.entity.user.User; +import java.math.BigDecimal; + /** * 工单管理-主表（新） 维修保养共用 * 2021-07-01 diff --git a/src/main/java/com/sipai/netty/NettyClientHandler.java b/src/main/java/com/sipai/netty/NettyClientHandler.java index f71afbcf..5a211e17 100644 --- a/src/main/java/com/sipai/netty/NettyClientHandler.java +++ b/src/main/java/com/sipai/netty/NettyClientHandler.java @@ -1,13 +1,13 @@ package com.sipai.netty; -import java.nio.charset.Charset; -import java.util.Date; - import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelInboundHandlerAdapter; +import java.nio.charset.Charset; +import java.util.Date; + public class NettyClientHandler extends ChannelInboundHandlerAdapter { /** * 通道信息读取处理 diff --git a/src/main/java/com/sipai/netty/NettyClientLoader.java b/src/main/java/com/sipai/netty/NettyClientLoader.java index 47680fde..45148685 100644 --- a/src/main/java/com/sipai/netty/NettyClientLoader.java +++ b/src/main/java/com/sipai/netty/NettyClientLoader.java @@ -1,15 +1,13 @@ package com.sipai.netty; -import java.util.Scanner; - -import javax.servlet.ServletContextEvent; -import javax.servlet.ServletContextListener; - -import org.springframework.web.context.ContextLoader; - import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import io.netty.channel.Channel; +import org.springframework.web.context.ContextLoader; + +import javax.servlet.ServletContextEvent; +import javax.servlet.ServletContextListener; +import java.util.Scanner; /** * 将socket service随tomcat启动 diff --git a/src/main/java/com/sipai/netty/NettyServerHandler.java b/src/main/java/com/sipai/netty/NettyServerHandler.java index 7c342cc4..b745e0e8 100644 --- a/src/main/java/com/sipai/netty/NettyServerHandler.java +++ b/src/main/java/com/sipai/netty/NettyServerHandler.java @@ -1,29 +1,23 @@ package com.sipai.netty; -import java.math.BigDecimal; -import java.util.List; -import java.util.Map.Entry; - -import javax.annotation.Resource; - import com.alibaba.fastjson.JSONObject; import com.sipai.entity.scada.MPoint; import com.sipai.entity.scada.MPointHistory; -import com.sipai.entity.user.Company; import com.sipai.entity.work.ElectricityMeter; import com.sipai.service.scada.MPointHistoryService; import com.sipai.service.scada.MPointService; -import com.sipai.service.user.UnitService; import com.sipai.service.work.ElectricityMeterService; import com.sipai.tools.CommUtil; import com.sipai.tools.SpringContextUtil; - import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelInboundHandlerAdapter; import io.netty.util.CharsetUtil; +import java.math.BigDecimal; +import java.util.Map.Entry; + public class NettyServerHandler extends ChannelInboundHandlerAdapter { @Override diff --git a/src/main/java/com/sipai/netty/NettyServerLoader.java b/src/main/java/com/sipai/netty/NettyServerLoader.java index 66a6b8bf..e0a6ee50 100644 --- a/src/main/java/com/sipai/netty/NettyServerLoader.java +++ b/src/main/java/com/sipai/netty/NettyServerLoader.java @@ -1,10 +1,10 @@ package com.sipai.netty; +import org.springframework.web.context.ContextLoader; + import javax.servlet.ServletContextEvent; import javax.servlet.ServletContextListener; -import org.springframework.web.context.ContextLoader; - /** * 将socket service随tomcat启动 * diff --git a/src/main/java/com/sipai/quartz/job/AlarmJob.java b/src/main/java/com/sipai/quartz/job/AlarmJob.java index d70b86e6..7610fdb1 100644 --- a/src/main/java/com/sipai/quartz/job/AlarmJob.java +++ b/src/main/java/com/sipai/quartz/job/AlarmJob.java @@ -1,10 +1,5 @@ package com.sipai.quartz.job; -import java.math.BigDecimal; -import java.util.List; - -import javax.annotation.Resource; - import com.sipai.entity.alarm.AlarmCondition; import com.sipai.entity.alarm.AlarmRecord; import com.sipai.entity.alarm.AlarmType; @@ -16,6 +11,10 @@ import com.sipai.service.alarm.AlarmTypeService; import com.sipai.service.scada.MPointService; import com.sipai.tools.CommUtil; +import javax.annotation.Resource; +import java.math.BigDecimal; +import java.util.List; + public class AlarmJob { @Resource private AlarmTypeService alarmTypeService; diff --git a/src/main/java/com/sipai/quartz/job/BIMDataJob.java b/src/main/java/com/sipai/quartz/job/BIMDataJob.java index 82e9df88..b95d3bb7 100644 --- a/src/main/java/com/sipai/quartz/job/BIMDataJob.java +++ b/src/main/java/com/sipai/quartz/job/BIMDataJob.java @@ -16,7 +16,6 @@ import com.sipai.tools.SpringContextUtil; import com.sipai.websocket.MsgWebSocket2; import org.redisson.api.RMap; import org.redisson.api.RedissonClient; -import org.springframework.beans.factory.annotation.Autowired; import java.io.IOException; import java.util.Iterator; diff --git a/src/main/java/com/sipai/quartz/job/BIMDataJob_NS.java b/src/main/java/com/sipai/quartz/job/BIMDataJob_NS.java index 8fc70ff0..5e886fcc 100644 --- a/src/main/java/com/sipai/quartz/job/BIMDataJob_NS.java +++ b/src/main/java/com/sipai/quartz/job/BIMDataJob_NS.java @@ -4,14 +4,12 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.sipai.entity.process.DataPatrol; import com.sipai.entity.scada.MPoint; -import com.sipai.entity.schedule.ScheduleJob; import com.sipai.entity.user.Company; import com.sipai.service.company.CompanyService; import com.sipai.service.process.DataPatrolService; import com.sipai.service.scada.MPointService; import com.sipai.tools.CommString; import com.sipai.tools.CommUtil; -import com.sipai.tools.SpringContextUtil; import com.sipai.websocket.MsgWebSocket2; import org.redisson.api.RMap; import org.redisson.api.RedissonClient; diff --git a/src/main/java/com/sipai/quartz/job/BIMJob.java b/src/main/java/com/sipai/quartz/job/BIMJob.java index 6a622075..e822d5fd 100644 --- a/src/main/java/com/sipai/quartz/job/BIMJob.java +++ b/src/main/java/com/sipai/quartz/job/BIMJob.java @@ -9,13 +9,13 @@ import com.sipai.entity.scada.MPoint; import com.sipai.entity.scada.MPointHistory; import com.sipai.entity.user.Company; import com.sipai.service.bim.BIMAlarmThresholdService; +import com.sipai.service.bim.BIMCameraService; import com.sipai.service.bim.BIMCurrencyService; import com.sipai.service.company.CompanyService; import com.sipai.service.scada.MPointHistoryService; import com.sipai.service.scada.MPointService; import com.sipai.tools.CommString; import com.sipai.tools.CommUtil; -import com.sipai.service.bim.BIMCameraService; import org.apache.http.Consts; import org.apache.http.HttpEntity; import org.apache.http.HttpResponse; diff --git a/src/main/java/com/sipai/quartz/job/BIMNSBotJob.java b/src/main/java/com/sipai/quartz/job/BIMNSBotJob.java index eef76294..fe4c850f 100644 --- a/src/main/java/com/sipai/quartz/job/BIMNSBotJob.java +++ b/src/main/java/com/sipai/quartz/job/BIMNSBotJob.java @@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject; import com.sipai.entity.schedule.ScheduleJob; import com.sipai.tools.*; import com.sipai.websocket.MsgWebSocket2; + import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/com/sipai/quartz/job/BLGSyncDataJob.java b/src/main/java/com/sipai/quartz/job/BLGSyncDataJob.java index de69496d..96f99d41 100644 --- a/src/main/java/com/sipai/quartz/job/BLGSyncDataJob.java +++ b/src/main/java/com/sipai/quartz/job/BLGSyncDataJob.java @@ -1,10 +1,7 @@ package com.sipai.quartz.job; -import com.sipai.entity.enums.whp.SamplingPlanStatusEnum; -import com.sipai.entity.enums.whp.SamplingPlanSyncEnum; import com.sipai.entity.schedule.ScheduleJob; import com.sipai.service.whp.plan.WhpSamplingPlanService; -import com.sipai.service.whp.plan.WhpSamplingPlanTaskService; import com.sipai.service.whp.test.WhpSamplingPlanTaskTestConfirmService; import com.sipai.tools.SpringContextUtil; diff --git a/src/main/java/com/sipai/quartz/job/CQBYTJob.java b/src/main/java/com/sipai/quartz/job/CQBYTJob.java index 19767d55..2a11d723 100644 --- a/src/main/java/com/sipai/quartz/job/CQBYTJob.java +++ b/src/main/java/com/sipai/quartz/job/CQBYTJob.java @@ -12,31 +12,20 @@ import com.sipai.entity.cqbyt.TestReportDetails; import com.sipai.service.cqbyt.TestReportDetailsService; import com.sipai.service.cqbyt.TestReportService; import com.sipai.tools.CommUtil; -import com.sipai.tools.HttpUtil; - -import java.io.IOException; -import java.math.BigDecimal; -import java.text.DateFormat; -import java.text.SimpleDateFormat; -import java.util.Calendar; -import java.util.Date; -import java.util.Iterator; -import javax.annotation.Resource; - import org.apache.http.HttpEntity; -import org.apache.http.HttpResponse; import org.apache.http.ParseException; -import org.apache.http.client.HttpClient; import org.apache.http.client.methods.CloseableHttpResponse; import org.apache.http.client.methods.HttpGet; import org.apache.http.client.methods.HttpPost; import org.apache.http.entity.StringEntity; import org.apache.http.impl.client.CloseableHttpClient; import org.apache.http.impl.client.HttpClients; -import org.apache.http.message.BasicHeader; -import org.apache.http.protocol.HTTP; import org.apache.http.util.EntityUtils; +import javax.annotation.Resource; +import java.io.IOException; +import java.text.SimpleDateFormat; + public class CQBYTJob { @Resource private TestReportDetailsService testReportDetailsService; diff --git a/src/main/java/com/sipai/quartz/job/CQBYT_KPI_Job.java b/src/main/java/com/sipai/quartz/job/CQBYT_KPI_Job.java index ea9044da..f7c9ca53 100644 --- a/src/main/java/com/sipai/quartz/job/CQBYT_KPI_Job.java +++ b/src/main/java/com/sipai/quartz/job/CQBYT_KPI_Job.java @@ -1,43 +1,7 @@ package com.sipai.quartz.job; -import java.io.IOException; -import java.math.BigDecimal; -import java.security.InvalidKeyException; -import java.security.NoSuchAlgorithmException; -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.List; -import java.util.Locale; - -import javax.annotation.Resource; - -import org.apache.http.HttpEntity; -import org.apache.http.ParseException; -import org.apache.http.client.methods.CloseableHttpResponse; -import org.apache.http.client.methods.HttpGet; -import org.apache.http.client.methods.HttpPost; -import org.apache.http.entity.StringEntity; -import org.apache.http.impl.client.CloseableHttpClient; -import org.apache.http.impl.client.HttpClients; -import org.apache.http.message.BasicHeader; -import org.apache.http.protocol.HTTP; -import org.apache.http.util.EntityUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.xmlpull.v1.XmlPullParserException; - -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; -import com.sipai.entity.cqbyt.KpiAnalysis; -import com.sipai.entity.scada.MPoint; -import com.sipai.entity.scada.MPointHistory; import com.sipai.entity.schedule.ScheduleJob; import com.sipai.service.cqbyt.KpiAnalysisService; -import com.sipai.service.scada.MPointHistoryService; -import com.sipai.service.scada.MPointService; -import com.sipai.tools.CommUtil; import com.sipai.tools.SpringContextUtil; public class CQBYT_KPI_Job { diff --git a/src/main/java/com/sipai/quartz/job/CQBYT_KPI_Job_test.java b/src/main/java/com/sipai/quartz/job/CQBYT_KPI_Job_test.java index e6c7def1..c6892790 100644 --- a/src/main/java/com/sipai/quartz/job/CQBYT_KPI_Job_test.java +++ b/src/main/java/com/sipai/quartz/job/CQBYT_KPI_Job_test.java @@ -1,36 +1,5 @@ package com.sipai.quartz.job; -import java.io.File; -import java.io.IOException; -import java.math.BigDecimal; -import java.nio.file.Files; -import java.nio.file.Paths; -import java.security.InvalidKeyException; -import java.security.NoSuchAlgorithmException; -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.List; -import java.util.Locale; - -import javax.annotation.Resource; - -import org.apache.http.HttpEntity; -import org.apache.http.ParseException; -import org.apache.http.client.methods.CloseableHttpResponse; -import org.apache.http.client.methods.HttpGet; -import org.apache.http.client.methods.HttpPost; -import org.apache.http.entity.StringEntity; -import org.apache.http.impl.client.CloseableHttpClient; -import org.apache.http.impl.client.HttpClients; -import org.apache.http.message.BasicHeader; -import org.apache.http.protocol.HTTP; -import org.apache.http.util.EntityUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; -import org.xmlpull.v1.XmlPullParserException; - import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; @@ -39,11 +8,31 @@ import com.sipai.entity.scada.MPoint; import com.sipai.entity.scada.MPointHistory; import com.sipai.entity.schedule.ScheduleJob; import com.sipai.service.cqbyt.KpiAnalysisService; -import com.sipai.service.report.RptCreateService; import com.sipai.service.scada.MPointHistoryService; import com.sipai.service.scada.MPointService; import com.sipai.tools.CommUtil; import com.sipai.tools.SpringContextUtil; +import org.apache.http.HttpEntity; +import org.apache.http.ParseException; +import org.apache.http.client.methods.CloseableHttpResponse; +import org.apache.http.client.methods.HttpGet; +import org.apache.http.client.methods.HttpPost; +import org.apache.http.entity.StringEntity; +import org.apache.http.impl.client.CloseableHttpClient; +import org.apache.http.impl.client.HttpClients; +import org.apache.http.util.EntityUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.io.File; +import java.io.IOException; +import java.math.BigDecimal; +import java.nio.file.Files; +import java.nio.file.Paths; +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.List; +import java.util.Locale; //@Component public class CQBYT_KPI_Job_test { KpiAnalysisService kpiAnalysisService = (KpiAnalysisService) SpringContextUtil.getBean("kpiAnalysisService"); diff --git a/src/main/java/com/sipai/quartz/job/CameraPicJob.java b/src/main/java/com/sipai/quartz/job/CameraPicJob.java index 99289bf4..e9e53b66 100644 --- a/src/main/java/com/sipai/quartz/job/CameraPicJob.java +++ b/src/main/java/com/sipai/quartz/job/CameraPicJob.java @@ -1,17 +1,14 @@ package com.sipai.quartz.job; -import java.io.*; -import java.net.HttpURLConnection; -import java.net.URL; -import java.text.ParseException; -import java.util.List; -import java.util.Properties; - import com.sipai.entity.work.Camera; import com.sipai.service.work.CameraService; import com.sipai.tools.CommUtil; import org.springframework.beans.factory.annotation.Autowired; +import java.io.IOException; +import java.text.ParseException; +import java.util.List; + public class CameraPicJob { @Autowired private CameraService cameraService; diff --git a/src/main/java/com/sipai/quartz/job/DataCleaningJob.java b/src/main/java/com/sipai/quartz/job/DataCleaningJob.java index dc00fdff..99bf03a3 100644 --- a/src/main/java/com/sipai/quartz/job/DataCleaningJob.java +++ b/src/main/java/com/sipai/quartz/job/DataCleaningJob.java @@ -11,15 +11,11 @@ import com.sipai.service.data.DataCleaningConfigureService; import com.sipai.service.data.DataCleaningHistoryService; import com.sipai.service.data.DataCleaningPointService; import com.sipai.service.scada.MPointHistoryService; -import com.sipai.service.scada.MPointService; import com.sipai.tools.CommUtil; import com.sipai.tools.SpringContextUtil; import java.math.BigDecimal; -import java.sql.SQLOutput; -import java.text.ParseException; import java.util.List; -import javax.annotation.Resource; /** * 数据清洗 diff --git a/src/main/java/com/sipai/quartz/job/DataVisualJob.java b/src/main/java/com/sipai/quartz/job/DataVisualJob.java index efcd3987..4392c7d5 100644 --- a/src/main/java/com/sipai/quartz/job/DataVisualJob.java +++ b/src/main/java/com/sipai/quartz/job/DataVisualJob.java @@ -1,15 +1,5 @@ package com.sipai.quartz.job; -import java.io.BufferedReader; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.math.BigDecimal; -import java.net.HttpURLConnection; -import java.net.URL; -import java.text.ParseException; -import java.util.List; - import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.sipai.entity.process.*; @@ -17,18 +7,21 @@ import com.sipai.entity.scada.MPoint; import com.sipai.service.process.*; import com.sipai.service.scada.MPointService; import com.sipai.tools.CommUtil; -import com.sipai.tools.Mqtt; import com.sipai.tools.MqttUtil; import org.apache.commons.codec.binary.Base64; -import org.eclipse.paho.client.mqttv3.IMqttClient; -import org.eclipse.paho.client.mqttv3.MqttClient; -import org.eclipse.paho.client.mqttv3.MqttConnectOptions; -import org.eclipse.paho.client.mqttv3.MqttException; import org.springframework.beans.factory.annotation.Autowired; import javax.script.ScriptEngine; import javax.script.ScriptEngineManager; import javax.script.ScriptException; +import java.io.BufferedReader; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.math.BigDecimal; +import java.net.HttpURLConnection; +import java.net.URL; +import java.text.ParseException; +import java.util.List; public class DataVisualJob { diff --git a/src/main/java/com/sipai/quartz/job/DataVisualTopic_Job.java b/src/main/java/com/sipai/quartz/job/DataVisualTopic_Job.java index c954dd5d..3ecca8e2 100644 --- a/src/main/java/com/sipai/quartz/job/DataVisualTopic_Job.java +++ b/src/main/java/com/sipai/quartz/job/DataVisualTopic_Job.java @@ -10,14 +10,12 @@ import com.sipai.tools.CommString; import com.sipai.tools.CommUtil; import com.sipai.tools.MqttUtil; import com.sipai.tools.SpringContextUtil; -import org.apache.batik.svggen.font.table.GsubTable; import org.redisson.api.RBatch; import org.redisson.api.RMapCache; import org.redisson.api.RedissonClient; import java.math.BigDecimal; import java.util.List; -import java.util.Map; import java.util.concurrent.TimeUnit; /** diff --git a/src/main/java/com/sipai/quartz/job/HQAQAlarmJob.java b/src/main/java/com/sipai/quartz/job/HQAQAlarmJob.java index 9ed0a134..52c1aad6 100644 --- a/src/main/java/com/sipai/quartz/job/HQAQAlarmJob.java +++ b/src/main/java/com/sipai/quartz/job/HQAQAlarmJob.java @@ -1,13 +1,10 @@ package com.sipai.quartz.job; -import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import com.sipai.entity.enums.PatrolType; import com.sipai.entity.equipment.EquipmentCard; import com.sipai.entity.hqconfig.EnterRecord; import com.sipai.entity.hqconfig.HQAlarmRecord; -import com.sipai.entity.scada.MPointHistory; import com.sipai.entity.schedule.ScheduleJob; import com.sipai.entity.timeefficiency.*; import com.sipai.entity.work.AlarmTypes; @@ -17,14 +14,15 @@ import com.sipai.service.equipment.EquipmentCardService; import com.sipai.service.hqconfig.EnterRecordService; import com.sipai.service.hqconfig.HQAlarmRecordService; import com.sipai.service.timeefficiency.*; -import com.sipai.service.work.*; -import com.sipai.tools.CommUtil; +import com.sipai.service.work.AlarmTypesService; +import com.sipai.service.work.AreaManageService; +import com.sipai.service.work.CameraDetailService; +import com.sipai.service.work.CameraService; import com.sipai.tools.MqttUtil; import com.sipai.tools.SpringContextUtil; import java.math.BigDecimal; import java.math.RoundingMode; -import java.text.DecimalFormat; import java.util.*; import java.util.stream.Collectors; diff --git a/src/main/java/com/sipai/quartz/job/HQAQModelAlarmJob.java b/src/main/java/com/sipai/quartz/job/HQAQModelAlarmJob.java index a426e5ac..02e15800 100644 --- a/src/main/java/com/sipai/quartz/job/HQAQModelAlarmJob.java +++ b/src/main/java/com/sipai/quartz/job/HQAQModelAlarmJob.java @@ -7,11 +7,13 @@ import com.sipai.entity.work.CameraDetail; import com.sipai.service.hqconfig.HQAlarmRecordService; import com.sipai.service.hqconfig.WorkModelService; import com.sipai.service.scada.MPointService; -import com.sipai.tools.*; +import com.sipai.tools.CommString; +import com.sipai.tools.PythonReceiveData; +import com.sipai.tools.SpringContextUtil; import org.apache.commons.lang3.StringUtils; import java.math.BigDecimal; -import java.util.*; +import java.util.List; /** * 虹桥行车模型报警 diff --git a/src/main/java/com/sipai/quartz/job/JSYWJob.java b/src/main/java/com/sipai/quartz/job/JSYWJob.java index 7640ecb0..d400ab6b 100644 --- a/src/main/java/com/sipai/quartz/job/JSYWJob.java +++ b/src/main/java/com/sipai/quartz/job/JSYWJob.java @@ -7,6 +7,14 @@ import com.sipai.entity.jsyw.JsywPoint; import com.sipai.service.jsyw.JsywCompanyService; import com.sipai.service.jsyw.JsywPointService; import com.sipai.tools.CommUtil; +import org.apache.http.client.methods.CloseableHttpResponse; +import org.apache.http.client.methods.HttpGet; +import org.apache.http.client.utils.URIBuilder; +import org.apache.http.impl.client.CloseableHttpClient; +import org.apache.http.impl.client.HttpClients; +import org.apache.http.util.EntityUtils; + +import javax.annotation.Resource; import java.math.BigDecimal; import java.net.URISyntaxException; import java.text.DateFormat; @@ -14,13 +22,6 @@ import java.text.SimpleDateFormat; import java.util.Calendar; import java.util.Date; import java.util.Iterator; -import javax.annotation.Resource; -import org.apache.http.client.methods.CloseableHttpResponse; -import org.apache.http.client.methods.HttpGet; -import org.apache.http.client.utils.URIBuilder; -import org.apache.http.impl.client.CloseableHttpClient; -import org.apache.http.impl.client.HttpClients; -import org.apache.http.util.EntityUtils; public class JSYWJob { @Resource diff --git a/src/main/java/com/sipai/quartz/job/LibraryRoutineWorkJob.java b/src/main/java/com/sipai/quartz/job/LibraryRoutineWorkJob.java index 0400323e..d57dd429 100644 --- a/src/main/java/com/sipai/quartz/job/LibraryRoutineWorkJob.java +++ b/src/main/java/com/sipai/quartz/job/LibraryRoutineWorkJob.java @@ -1,15 +1,8 @@ package com.sipai.quartz.job; -import java.text.ParseException; -import java.util.Calendar; -import java.util.List; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; - import com.sipai.entity.process.LibraryRoutineWork; import com.sipai.entity.process.RoutineWork; import com.sipai.entity.user.Company; -import com.sipai.entity.user.User; import com.sipai.entity.work.Scheduling; import com.sipai.service.process.LibraryRoutineWorkService; import com.sipai.service.process.RoutineWorkService; @@ -17,7 +10,11 @@ import com.sipai.service.user.UnitService; import com.sipai.service.work.SchedulingService; import com.sipai.tools.CommString; import com.sipai.tools.CommUtil; -import org.springframework.ui.Model; + +import javax.annotation.Resource; +import java.text.ParseException; +import java.util.Calendar; +import java.util.List; public class LibraryRoutineWorkJob { @Resource diff --git a/src/main/java/com/sipai/quartz/job/MPointMorderJob.java b/src/main/java/com/sipai/quartz/job/MPointMorderJob.java index b9bac5f1..a4b70afa 100644 --- a/src/main/java/com/sipai/quartz/job/MPointMorderJob.java +++ b/src/main/java/com/sipai/quartz/job/MPointMorderJob.java @@ -7,7 +7,6 @@ import com.sipai.service.company.CompanyService; import com.sipai.service.scada.MPointService; import com.sipai.tools.SpringContextUtil; -import javax.annotation.Resource; import java.util.List; /** diff --git a/src/main/java/com/sipai/quartz/job/MPointPropCalcJob_Day.java b/src/main/java/com/sipai/quartz/job/MPointPropCalcJob_Day.java index ce80d82b..28f2b06e 100644 --- a/src/main/java/com/sipai/quartz/job/MPointPropCalcJob_Day.java +++ b/src/main/java/com/sipai/quartz/job/MPointPropCalcJob_Day.java @@ -5,7 +5,6 @@ import com.sipai.entity.enums.TimeUnitEnum; import com.sipai.entity.scada.MPoint; import com.sipai.service.scada.MPointPropService; import com.sipai.service.scada.MPointService; -import com.sipai.tools.CommString; import com.sipai.tools.CommUtil; import org.apache.log4j.Logger; import org.elasticsearch.index.query.BoolQueryBuilder; @@ -19,7 +18,6 @@ import java.util.Calendar; import java.util.Date; import java.util.Iterator; import java.util.List; -import java.util.concurrent.TimeUnit; public class MPointPropCalcJob_Day { private static final Logger logger = Logger.getLogger(MPointPropCalcJob_Day.class); diff --git a/src/main/java/com/sipai/quartz/job/MPointPropCalcJob_Hour.java b/src/main/java/com/sipai/quartz/job/MPointPropCalcJob_Hour.java index b59808c1..d017ee0f 100644 --- a/src/main/java/com/sipai/quartz/job/MPointPropCalcJob_Hour.java +++ b/src/main/java/com/sipai/quartz/job/MPointPropCalcJob_Hour.java @@ -6,7 +6,6 @@ import com.sipai.entity.scada.MPoint; import com.sipai.service.scada.MPointPropService; import com.sipai.service.scada.MPointPropSourceService; import com.sipai.service.scada.MPointService; -import com.sipai.tools.CommString; import com.sipai.tools.CommUtil; import org.apache.log4j.Logger; import org.elasticsearch.index.query.BoolQueryBuilder; @@ -20,7 +19,6 @@ import java.util.Calendar; import java.util.Date; import java.util.Iterator; import java.util.List; -import java.util.concurrent.TimeUnit; public class MPointPropCalcJob_Hour { private static final Logger logger = Logger.getLogger(MPointPropCalcJob_Hour.class); diff --git a/src/main/java/com/sipai/quartz/job/MPointPropCalcJob_Minute.java b/src/main/java/com/sipai/quartz/job/MPointPropCalcJob_Minute.java index 68aa8216..21a8dd82 100644 --- a/src/main/java/com/sipai/quartz/job/MPointPropCalcJob_Minute.java +++ b/src/main/java/com/sipai/quartz/job/MPointPropCalcJob_Minute.java @@ -7,7 +7,6 @@ import com.sipai.entity.scada.MPoint; import com.sipai.service.scada.MPointPropService; import com.sipai.service.scada.MPointPropSourceService; import com.sipai.service.scada.MPointService; -import com.sipai.tools.CommString; import com.sipai.tools.CommUtil; import org.apache.log4j.Logger; import org.elasticsearch.index.query.BoolQueryBuilder; diff --git a/src/main/java/com/sipai/quartz/job/MaintenancePlanJob.java b/src/main/java/com/sipai/quartz/job/MaintenancePlanJob.java index 33e284cc..6ab16a89 100644 --- a/src/main/java/com/sipai/quartz/job/MaintenancePlanJob.java +++ b/src/main/java/com/sipai/quartz/job/MaintenancePlanJob.java @@ -1,29 +1,20 @@ package com.sipai.quartz.job; -import java.math.BigDecimal; +import com.sipai.dao.maintenance.MaintenanceDetailDao; +import com.sipai.entity.equipment.MaintenancePlan; +import com.sipai.entity.maintenance.MaintenanceCommString; +import com.sipai.entity.sparepart.Stock; +import com.sipai.service.equipment.MaintenancePlanService; +import com.sipai.service.maintenance.MaintenanceDetailService; +import com.sipai.service.sparepart.StockService; + +import javax.annotation.Resource; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.Calendar; import java.util.Date; import java.util.List; -import javax.annotation.Resource; - -import com.sipai.dao.maintenance.MaintenanceDetailDao; -import com.sipai.entity.equipment.MaintenancePlan; -import com.sipai.entity.maintenance.MaintenanceCommString; -import com.sipai.entity.maintenance.MaintenanceDetail; -import com.sipai.entity.sparepart.SparePartCommString; -import com.sipai.entity.sparepart.Stock; -import com.sipai.entity.user.User; -import com.sipai.service.equipment.MaintenancePlanService; -import com.sipai.service.maintenance.MaintenanceDetailService; -import com.sipai.service.msg.MsgServiceImpl; -import com.sipai.service.sparepart.StockService; -import com.sipai.tools.CommString; -import com.sipai.tools.CommUtil; -import com.sipai.tools.SpringContextUtil; - public class MaintenancePlanJob { @Resource private MaintenancePlanService maintenancePlanService; diff --git a/src/main/java/com/sipai/quartz/job/ModbusListenerJob.java b/src/main/java/com/sipai/quartz/job/ModbusListenerJob.java index f83c77b0..f81fb689 100644 --- a/src/main/java/com/sipai/quartz/job/ModbusListenerJob.java +++ b/src/main/java/com/sipai/quartz/job/ModbusListenerJob.java @@ -1,41 +1,34 @@ package com.sipai.quartz.job; import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; import com.sipai.entity.Listener.ListenerHis; -import com.sipai.entity.Listener.ListenerInterface; import com.sipai.entity.Listener.ListenerMessage; import com.sipai.entity.Listener.ListenerPoint; import com.sipai.entity.alarm.*; import com.sipai.entity.equipment.EquipmentCard; import com.sipai.entity.equipment.EquipmentCardCamera; -import com.sipai.entity.process.DecisionExpertBase; import com.sipai.entity.scada.MPoint; import com.sipai.entity.schedule.ScheduleJob; import com.sipai.entity.user.ProcessSection; import com.sipai.entity.work.Camera; import com.sipai.service.Listener.ListenerHisService; -import com.sipai.service.Listener.ListenerInterfaceService; import com.sipai.service.Listener.ListenerMessageService; import com.sipai.service.Listener.ListenerPointService; import com.sipai.service.alarm.AlarmInformationService; import com.sipai.service.alarm.AlarmPointService; import com.sipai.service.alarm.AlarmSubscribeService; 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.process.DecisionExpertBaseService; import com.sipai.service.scada.MPointService; import com.sipai.service.scada.ProAlarmService; import com.sipai.service.user.ProcessSectionService; import com.sipai.service.work.CameraService; import com.sipai.tools.*; -import com.alibaba.fastjson.JSONObject; import com.sipai.websocket.MsgWebSocket2; import org.apache.commons.lang3.StringUtils; - -import javax.annotation.Resource; import java.math.BigDecimal; import java.text.DecimalFormat; import java.util.List; diff --git a/src/main/java/com/sipai/quartz/job/ModelJob.java b/src/main/java/com/sipai/quartz/job/ModelJob.java index 2f12e4b5..3ae7671a 100644 --- a/src/main/java/com/sipai/quartz/job/ModelJob.java +++ b/src/main/java/com/sipai/quartz/job/ModelJob.java @@ -11,7 +11,9 @@ import org.apache.commons.httpclient.methods.PostMethod; import javax.annotation.Resource; import java.math.BigDecimal; import java.text.SimpleDateFormat; -import java.util.*; +import java.util.Calendar; +import java.util.Date; +import java.util.List; /** * （泵组模型） diff --git a/src/main/java/com/sipai/quartz/job/ModelJob_BYT_BZNH.java b/src/main/java/com/sipai/quartz/job/ModelJob_BYT_BZNH.java index 061c5d35..0a9df06e 100644 --- a/src/main/java/com/sipai/quartz/job/ModelJob_BYT_BZNH.java +++ b/src/main/java/com/sipai/quartz/job/ModelJob_BYT_BZNH.java @@ -2,11 +2,9 @@ package com.sipai.quartz.job; import com.sipai.entity.scada.MPoint; import com.sipai.entity.scada.MPointHistory; -import com.sipai.entity.schedule.ScheduleJob; import com.sipai.service.scada.MPointHistoryService; import com.sipai.service.scada.MPointService; import com.sipai.tools.CommUtil; -import com.sipai.tools.SpringContextUtil; import org.apache.commons.httpclient.NameValuePair; import org.apache.commons.httpclient.methods.PostMethod; diff --git a/src/main/java/com/sipai/quartz/job/ModelJob_FSSK_BZNH_1.java b/src/main/java/com/sipai/quartz/job/ModelJob_FSSK_BZNH_1.java index 76c1ee39..ccfa5173 100644 --- a/src/main/java/com/sipai/quartz/job/ModelJob_FSSK_BZNH_1.java +++ b/src/main/java/com/sipai/quartz/job/ModelJob_FSSK_BZNH_1.java @@ -11,7 +11,6 @@ import org.apache.commons.httpclient.NameValuePair; import org.apache.commons.httpclient.methods.PostMethod; import java.math.BigDecimal; -import java.math.RoundingMode; import java.text.SimpleDateFormat; import java.util.Calendar; import java.util.Date; diff --git a/src/main/java/com/sipai/quartz/job/ModelJob_FSSK_BZNH_2.java b/src/main/java/com/sipai/quartz/job/ModelJob_FSSK_BZNH_2.java index 9348950c..03b67fe9 100644 --- a/src/main/java/com/sipai/quartz/job/ModelJob_FSSK_BZNH_2.java +++ b/src/main/java/com/sipai/quartz/job/ModelJob_FSSK_BZNH_2.java @@ -3,8 +3,6 @@ package com.sipai.quartz.job; import com.sipai.entity.scada.MPoint; import com.sipai.entity.scada.MPointHistory; import com.sipai.entity.schedule.ScheduleJob; -import com.sipai.service.company.CompanyService; -import com.sipai.service.equipment.EquipmentCardService; import com.sipai.service.scada.MPointHistoryService; import com.sipai.service.scada.MPointService; import com.sipai.tools.CommUtil; @@ -12,7 +10,6 @@ import com.sipai.tools.SpringContextUtil; import org.apache.commons.httpclient.NameValuePair; import org.apache.commons.httpclient.methods.PostMethod; -import javax.annotation.Resource; import java.math.BigDecimal; import java.math.RoundingMode; import java.text.SimpleDateFormat; diff --git a/src/main/java/com/sipai/quartz/job/ModelJob_JY.java b/src/main/java/com/sipai/quartz/job/ModelJob_JY.java index ebe4640c..cdc9aa50 100644 --- a/src/main/java/com/sipai/quartz/job/ModelJob_JY.java +++ b/src/main/java/com/sipai/quartz/job/ModelJob_JY.java @@ -11,7 +11,8 @@ import org.apache.commons.httpclient.methods.PostMethod; import javax.annotation.Resource; import java.math.BigDecimal; import java.text.SimpleDateFormat; -import java.util.*; +import java.util.Calendar; +import java.util.Date; /** * （加药模型） --- 重庆 diff --git a/src/main/java/com/sipai/quartz/job/ModelJob_JY_20221107.java b/src/main/java/com/sipai/quartz/job/ModelJob_JY_20221107.java index d2538f75..00876039 100644 --- a/src/main/java/com/sipai/quartz/job/ModelJob_JY_20221107.java +++ b/src/main/java/com/sipai/quartz/job/ModelJob_JY_20221107.java @@ -11,7 +11,8 @@ import org.apache.commons.httpclient.methods.PostMethod; import javax.annotation.Resource; import java.math.BigDecimal; import java.text.SimpleDateFormat; -import java.util.*; +import java.util.Calendar; +import java.util.Date; /** * （加药模型） --- 重庆 diff --git a/src/main/java/com/sipai/quartz/job/MpDataStopJob.java b/src/main/java/com/sipai/quartz/job/MpDataStopJob.java index e329704b..816b693f 100644 --- a/src/main/java/com/sipai/quartz/job/MpDataStopJob.java +++ b/src/main/java/com/sipai/quartz/job/MpDataStopJob.java @@ -1,7 +1,5 @@ package com.sipai.quartz.job; -import java.text.ParseException; - import com.sipai.entity.data.XServer; import com.sipai.entity.scada.MPoint; import com.sipai.entity.scada.MPointHistory; @@ -12,6 +10,7 @@ import com.sipai.tools.CommUtil; import javax.annotation.Resource; import java.math.BigDecimal; +import java.text.ParseException; import java.util.List; public class MpDataStopJob { diff --git a/src/main/java/com/sipai/quartz/job/NewFormulaExec_Day.java b/src/main/java/com/sipai/quartz/job/NewFormulaExec_Day.java index d539b7cd..4d5a7ad3 100644 --- a/src/main/java/com/sipai/quartz/job/NewFormulaExec_Day.java +++ b/src/main/java/com/sipai/quartz/job/NewFormulaExec_Day.java @@ -1,9 +1,5 @@ package com.sipai.quartz.job; -import java.text.ParseException; -import java.util.HashMap; -import java.util.List; - import com.sipai.entity.data.XServer; import com.sipai.service.data.XServerService; import com.sipai.service.scada.MPointFormulaService; @@ -12,6 +8,8 @@ import com.sipai.service.scada.MPointService; import com.sipai.tools.CommUtil; import javax.annotation.Resource; +import java.text.ParseException; +import java.util.List; public class NewFormulaExec_Day { @Resource diff --git a/src/main/java/com/sipai/quartz/job/NewFormulaExec_Hour.java b/src/main/java/com/sipai/quartz/job/NewFormulaExec_Hour.java index 9f5cc447..73195c52 100644 --- a/src/main/java/com/sipai/quartz/job/NewFormulaExec_Hour.java +++ b/src/main/java/com/sipai/quartz/job/NewFormulaExec_Hour.java @@ -1,9 +1,5 @@ package com.sipai.quartz.job; -import java.text.ParseException; -import java.util.HashMap; -import java.util.List; - import com.sipai.entity.data.XServer; import com.sipai.service.data.XServerService; import com.sipai.service.scada.MPointFormulaService; @@ -12,6 +8,8 @@ import com.sipai.service.scada.MPointService; import com.sipai.tools.CommUtil; import javax.annotation.Resource; +import java.text.ParseException; +import java.util.List; public class NewFormulaExec_Hour { @Resource diff --git a/src/main/java/com/sipai/quartz/job/NewFormulaExec_Month.java b/src/main/java/com/sipai/quartz/job/NewFormulaExec_Month.java index c7d3a9a4..9fdd549f 100644 --- a/src/main/java/com/sipai/quartz/job/NewFormulaExec_Month.java +++ b/src/main/java/com/sipai/quartz/job/NewFormulaExec_Month.java @@ -1,9 +1,5 @@ package com.sipai.quartz.job; -import java.text.ParseException; -import java.util.HashMap; -import java.util.List; - import com.sipai.entity.data.XServer; import com.sipai.service.data.XServerService; import com.sipai.service.scada.MPointFormulaService; @@ -12,6 +8,8 @@ import com.sipai.service.scada.MPointService; import com.sipai.tools.CommUtil; import javax.annotation.Resource; +import java.text.ParseException; +import java.util.List; public class NewFormulaExec_Month { @Resource diff --git a/src/main/java/com/sipai/quartz/job/NewFormulaExec_NowTime.java b/src/main/java/com/sipai/quartz/job/NewFormulaExec_NowTime.java index 1158a3bc..97978b75 100644 --- a/src/main/java/com/sipai/quartz/job/NewFormulaExec_NowTime.java +++ b/src/main/java/com/sipai/quartz/job/NewFormulaExec_NowTime.java @@ -1,9 +1,5 @@ package com.sipai.quartz.job; -import java.text.ParseException; -import java.util.HashMap; -import java.util.List; - import com.sipai.entity.data.XServer; import com.sipai.service.data.XServerService; import com.sipai.service.scada.MPointFormulaService; @@ -12,6 +8,9 @@ import com.sipai.service.scada.MPointService; import com.sipai.tools.CommUtil; import javax.annotation.Resource; +import java.text.ParseException; +import java.util.HashMap; +import java.util.List; public class NewFormulaExec_NowTime { @Resource diff --git a/src/main/java/com/sipai/quartz/job/OEProcessJob.java b/src/main/java/com/sipai/quartz/job/OEProcessJob.java index 6b34dcd1..3bf014de 100644 --- a/src/main/java/com/sipai/quartz/job/OEProcessJob.java +++ b/src/main/java/com/sipai/quartz/job/OEProcessJob.java @@ -1,18 +1,5 @@ package com.sipai.quartz.job; -import java.io.BufferedInputStream; -import java.io.File; -import java.io.FileInputStream; -import java.io.IOException; -import java.io.InputStream; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Properties; - -import javax.annotation.Resource; - import com.sipai.entity.activiti.OEProcess; import com.sipai.entity.activiti.TodoTask; import com.sipai.entity.user.User; @@ -21,6 +8,11 @@ import com.sipai.service.scada.OEProcessService; import com.sipai.service.user.UserService; import com.sipai.tools.CommUtil; +import javax.annotation.Resource; +import java.io.BufferedInputStream; +import java.io.InputStream; +import java.util.*; + public class OEProcessJob { @Resource diff --git a/src/main/java/com/sipai/quartz/job/OnLineDataSaveJob.java b/src/main/java/com/sipai/quartz/job/OnLineDataSaveJob.java index 9825bd6c..5aaadfdb 100644 --- a/src/main/java/com/sipai/quartz/job/OnLineDataSaveJob.java +++ b/src/main/java/com/sipai/quartz/job/OnLineDataSaveJob.java @@ -2,30 +2,20 @@ package com.sipai.quartz.job; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import com.sipai.dao.repository.MPointRepo; import com.sipai.entity.scada.MPoint; import com.sipai.entity.scada.MPointFormula; import com.sipai.entity.schedule.ScheduleJob; -import com.sipai.entity.work.MPointES; import com.sipai.service.scada.MPointFormulaService; import com.sipai.service.scada.MPointService; import com.sipai.tools.CommString; import com.sipai.tools.CommUtil; import com.sipai.tools.SpringContextUtil; -import com.sipai.websocket.MsgWebSocket2; import org.apache.commons.httpclient.Cookie; import org.apache.commons.httpclient.HttpClient; import org.apache.commons.httpclient.NameValuePair; import org.apache.commons.httpclient.methods.PostMethod; -import org.apache.http.HttpResponse; -import org.apache.http.client.methods.HttpPost; -import org.apache.http.entity.StringEntity; -import org.apache.http.impl.client.DefaultHttpClient; -import org.apache.http.util.EntityUtils; import org.redisson.api.RMap; -import org.redisson.api.RMapCache; import org.redisson.api.RedissonClient; -import org.springframework.beans.factory.BeanIsNotAFactoryException; import java.io.IOException; import java.math.BigDecimal; diff --git a/src/main/java/com/sipai/quartz/job/PatrolPlanJob.java b/src/main/java/com/sipai/quartz/job/PatrolPlanJob.java index 22260943..c3a26037 100644 --- a/src/main/java/com/sipai/quartz/job/PatrolPlanJob.java +++ b/src/main/java/com/sipai/quartz/job/PatrolPlanJob.java @@ -1,13 +1,5 @@ package com.sipai.quartz.job; -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.Arrays; -import java.util.Calendar; -import java.util.Date; -import java.util.List; -import javax.annotation.Resource; - import com.sipai.entity.enums.PatrolType; import com.sipai.entity.timeefficiency.PatrolModel; import com.sipai.entity.timeefficiency.PatrolPlan; @@ -25,6 +17,14 @@ import com.sipai.service.work.GroupTypeService; import com.sipai.service.work.SchedulingService; import com.sipai.tools.CommUtil; +import javax.annotation.Resource; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.Arrays; +import java.util.Calendar; +import java.util.Date; +import java.util.List; + /** * 巡检自动下发 */ diff --git a/src/main/java/com/sipai/quartz/job/PatrolPlanSafeJob.java b/src/main/java/com/sipai/quartz/job/PatrolPlanSafeJob.java index 3d3ad92a..39528b38 100644 --- a/src/main/java/com/sipai/quartz/job/PatrolPlanSafeJob.java +++ b/src/main/java/com/sipai/quartz/job/PatrolPlanSafeJob.java @@ -1,33 +1,23 @@ package com.sipai.quartz.job; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; import com.sipai.entity.enums.PatrolType; -import com.sipai.entity.process.DataPatrol; -import com.sipai.entity.scada.MPoint; import com.sipai.entity.schedule.ScheduleJob; import com.sipai.entity.timeefficiency.PatrolModel; import com.sipai.entity.timeefficiency.PatrolPlan; import com.sipai.entity.timeefficiency.TimeEfficiencyCommStr; import com.sipai.entity.user.Company; import com.sipai.service.company.CompanyService; -import com.sipai.service.process.DataPatrolService; -import com.sipai.service.scada.MPointService; import com.sipai.service.timeefficiency.PatrolModelService; import com.sipai.service.timeefficiency.PatrolPlanService; import com.sipai.service.timeefficiency.PatrolRecordService; -import com.sipai.tools.CommString; import com.sipai.tools.CommUtil; import com.sipai.tools.SpringContextUtil; -import com.sipai.websocket.MsgWebSocket2; -import org.redisson.api.RMap; -import org.redisson.api.RedissonClient; -import org.springframework.beans.factory.annotation.Autowired; import java.text.ParseException; import java.text.SimpleDateFormat; -import java.util.*; +import java.util.Calendar; +import java.util.Date; +import java.util.List; /** * 安全任务自动下发定时器 diff --git a/src/main/java/com/sipai/quartz/job/PatrolRecordAutoCheck.java b/src/main/java/com/sipai/quartz/job/PatrolRecordAutoCheck.java index db08b7ee..9c256597 100644 --- a/src/main/java/com/sipai/quartz/job/PatrolRecordAutoCheck.java +++ b/src/main/java/com/sipai/quartz/job/PatrolRecordAutoCheck.java @@ -1,19 +1,16 @@ package com.sipai.quartz.job; -import com.sipai.entity.base.Result; import com.sipai.entity.schedule.ScheduleJob; import com.sipai.entity.timeefficiency.PatrolRecord; import com.sipai.entity.timeefficiency.PatrolRecordPatrolRoute; import com.sipai.entity.work.GroupDetail; import com.sipai.entity.work.Scheduling; -import com.sipai.service.report.RptCreateService; import com.sipai.service.timeefficiency.PatrolRecordPatrolRouteService; import com.sipai.service.timeefficiency.PatrolRecordService; import com.sipai.service.work.GroupDetailService; import com.sipai.service.work.SchedulingService; import com.sipai.tools.CommUtil; import com.sipai.tools.SpringContextUtil; -import org.springframework.web.servlet.ModelAndView; import java.util.List; diff --git a/src/main/java/com/sipai/quartz/job/ProductionIndexPlanJob.java b/src/main/java/com/sipai/quartz/job/ProductionIndexPlanJob.java index f64f5ae9..69a3f244 100644 --- a/src/main/java/com/sipai/quartz/job/ProductionIndexPlanJob.java +++ b/src/main/java/com/sipai/quartz/job/ProductionIndexPlanJob.java @@ -1,47 +1,26 @@ package com.sipai.quartz.job; -import java.math.BigDecimal; -import java.text.DateFormat; -import java.text.DecimalFormat; -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.*; - -import javax.annotation.Resource; - import com.sipai.entity.enums.DayValueEnum; -import com.sipai.entity.work.ProductionIndexData; -import com.sipai.service.work.ProductionIndexDataService; -import org.apache.commons.lang3.StringUtils; -import org.apache.http.client.methods.CloseableHttpResponse; -import org.apache.http.client.methods.HttpGet; -import org.apache.http.impl.client.CloseableHttpClient; -import org.apache.http.impl.client.HttpClients; -import org.apache.http.util.EntityUtils; -import org.springframework.stereotype.Component; - -import com.alibaba.fastjson.JSONObject; -import com.sipai.entity.enums.DateType; -import com.sipai.entity.jsyw.JsywCompany; -import com.sipai.entity.jsyw.JsywPoint; -import com.sipai.entity.report.RptDeptSet; import com.sipai.entity.scada.MPoint; import com.sipai.entity.scada.MPointHistory; -import com.sipai.entity.schedule.ScheduleJob; +import com.sipai.entity.work.ProductionIndexData; import com.sipai.entity.work.ProductionIndexPlanNameConfigure; import com.sipai.entity.work.ProductionIndexPlanNameData; -import com.sipai.service.jsyw.JsywCompanyService; -import com.sipai.service.jsyw.JsywPointService; -import com.sipai.service.msg.MsgService; -import com.sipai.service.report.RptDeptSetService; -import com.sipai.service.report.RptDeptSetUserService; import com.sipai.service.scada.MPointHistoryService; import com.sipai.service.scada.MPointService; -import com.sipai.service.user.UserJobService; +import com.sipai.service.work.ProductionIndexDataService; import com.sipai.service.work.ProductionIndexPlanNameConfigureService; import com.sipai.service.work.ProductionIndexPlanNameDataService; import com.sipai.tools.CommUtil; -import com.sipai.tools.SpringContextUtil; +import org.apache.commons.lang3.StringUtils; + +import javax.annotation.Resource; +import java.math.BigDecimal; +import java.text.DecimalFormat; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; +import java.util.List; public class ProductionIndexPlanJob { diff --git a/src/main/java/com/sipai/quartz/job/QWeatherJob.java b/src/main/java/com/sipai/quartz/job/QWeatherJob.java index f11513a3..fc7e1f6e 100644 --- a/src/main/java/com/sipai/quartz/job/QWeatherJob.java +++ b/src/main/java/com/sipai/quartz/job/QWeatherJob.java @@ -1,6 +1,5 @@ package com.sipai.quartz.job; -import com.google.gson.JsonObject; import com.sipai.entity.enums.WeatherTypeEnum; import com.sipai.entity.user.Company; import com.sipai.entity.work.WeatherNew; @@ -11,11 +10,9 @@ import net.sf.json.JSONArray; import net.sf.json.JSONObject; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Repository; import javax.annotation.Resource; import java.io.IOException; -import java.text.SimpleDateFormat; import java.util.List; /** diff --git a/src/main/java/com/sipai/quartz/job/QuartzJobFactory.java b/src/main/java/com/sipai/quartz/job/QuartzJobFactory.java index 00a5b16f..62af42ea 100644 --- a/src/main/java/com/sipai/quartz/job/QuartzJobFactory.java +++ b/src/main/java/com/sipai/quartz/job/QuartzJobFactory.java @@ -1,14 +1,13 @@ package com.sipai.quartz.job; +import com.sipai.entity.schedule.ScheduleJob; +import com.sipai.tools.TaskUtils; import org.quartz.Job; import org.quartz.JobExecutionContext; import org.quartz.JobExecutionException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.sipai.entity.schedule.ScheduleJob; -import com.sipai.tools.TaskUtils; - public class QuartzJobFactory implements Job{ public Logger log = LoggerFactory.getLogger(this.getClass()); diff --git a/src/main/java/com/sipai/quartz/job/ReportJob.java b/src/main/java/com/sipai/quartz/job/ReportJob.java index 95b26af9..3b48d5e0 100644 --- a/src/main/java/com/sipai/quartz/job/ReportJob.java +++ b/src/main/java/com/sipai/quartz/job/ReportJob.java @@ -1,7 +1,5 @@ package com.sipai.quartz.job; -import com.sipai.controller.report.RptCreateController; -import com.sipai.entity.report.RptCreate; import com.sipai.entity.schedule.ScheduleJob; import com.sipai.entity.schedule.ScheduleJobDetail; import com.sipai.service.report.RptCreateService; @@ -10,9 +8,6 @@ import com.sipai.tools.CommUtil; import com.sipai.tools.SpringContextUtil; import org.xmlpull.v1.XmlPullParserException; -import javax.annotation.Resource; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; import java.io.IOException; import java.security.InvalidKeyException; import java.security.NoSuchAlgorithmException; diff --git a/src/main/java/com/sipai/quartz/job/ReportMessageJob.java b/src/main/java/com/sipai/quartz/job/ReportMessageJob.java index f3aeb366..fad7d03d 100644 --- a/src/main/java/com/sipai/quartz/job/ReportMessageJob.java +++ b/src/main/java/com/sipai/quartz/job/ReportMessageJob.java @@ -8,16 +8,9 @@ import com.sipai.entity.user.UserJob; import com.sipai.service.msg.MsgService; import com.sipai.service.report.RptDeptSetService; import com.sipai.service.report.RptDeptSetUserService; -import com.sipai.service.schedule.ScheduleJobDetailService; import com.sipai.service.user.UserJobService; -import com.sipai.tools.CommString; -import com.sipai.tools.CommUtil; import com.sipai.tools.SpringContextUtil; -import javax.annotation.Resource; - -import org.springframework.stereotype.Component; - import java.text.DateFormat; import java.text.ParseException; import java.text.SimpleDateFormat; diff --git a/src/main/java/com/sipai/quartz/job/ScadaAlarmJob.java b/src/main/java/com/sipai/quartz/job/ScadaAlarmJob.java index 2c60c2b9..801225d1 100644 --- a/src/main/java/com/sipai/quartz/job/ScadaAlarmJob.java +++ b/src/main/java/com/sipai/quartz/job/ScadaAlarmJob.java @@ -1,30 +1,21 @@ package com.sipai.quartz.job; -import static org.hamcrest.CoreMatchers.nullValue; - -import java.math.BigDecimal; -import java.text.ParseException; -import java.util.List; -import javax.annotation.Resource; - -import org.apache.poi.hssf.record.chart.BeginRecord; - -import com.alibaba.druid.sql.ast.statement.SQLIfStatement.Else; -import com.itextpdf.text.pdf.PdfStructTreeController.returnType; -import com.sipai.dao.scada.ScadaAlarmDao; import com.sipai.entity.data.XServer; import com.sipai.entity.scada.MPoint; import com.sipai.entity.scada.ScadaAlarm; -import com.sipai.entity.user.Company; import com.sipai.entity.user.ProcessSection; import com.sipai.service.data.XServerService; import com.sipai.service.scada.MPointService; import com.sipai.service.scada.ScadaAlarmService; import com.sipai.service.user.ProcessSectionService; import com.sipai.service.user.UnitService; -import com.sipai.tools.CommString; import com.sipai.tools.CommUtil; +import javax.annotation.Resource; +import java.math.BigDecimal; +import java.text.ParseException; +import java.util.List; + public class ScadaAlarmJob { @Resource private UnitService unitService; diff --git a/src/main/java/com/sipai/quartz/job/ScadaModbusJob.java b/src/main/java/com/sipai/quartz/job/ScadaModbusJob.java index b9756413..2bca48a3 100644 --- a/src/main/java/com/sipai/quartz/job/ScadaModbusJob.java +++ b/src/main/java/com/sipai/quartz/job/ScadaModbusJob.java @@ -1,7 +1,5 @@ package com.sipai.quartz.job; -import java.util.Date; - public class ScadaModbusJob { public void execute(){ diff --git a/src/main/java/com/sipai/quartz/job/SpecialEquipmentJob.java b/src/main/java/com/sipai/quartz/job/SpecialEquipmentJob.java index de5c7aaf..7d0908b6 100644 --- a/src/main/java/com/sipai/quartz/job/SpecialEquipmentJob.java +++ b/src/main/java/com/sipai/quartz/job/SpecialEquipmentJob.java @@ -1,30 +1,16 @@ package com.sipai.quartz.job; +import com.sipai.entity.equipment.SpecialEquipment; +import com.sipai.service.equipment.EquipmentCardService; +import com.sipai.service.equipment.SpecialEquipmentService; + +import javax.annotation.Resource; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.Calendar; import java.util.Date; import java.util.List; -import javax.annotation.Resource; - - - - - - - - - - -import org.springframework.util.xml.SimpleSaxErrorHandler; - -import com.sipai.entity.equipment.EquipmentCard; -import com.sipai.entity.equipment.SpecialEquipment; -import com.sipai.service.equipment.EquipmentCardService; -import com.sipai.service.equipment.SpecialEquipmentService; -import com.sipai.tools.CommUtil; - public class SpecialEquipmentJob { @Resource diff --git a/src/main/java/com/sipai/quartz/job/TaskHandler.java b/src/main/java/com/sipai/quartz/job/TaskHandler.java index 6e095f87..0c987013 100644 --- a/src/main/java/com/sipai/quartz/job/TaskHandler.java +++ b/src/main/java/com/sipai/quartz/job/TaskHandler.java @@ -3,11 +3,8 @@ package com.sipai.quartz.job; import com.xxl.job.core.biz.model.ReturnT; import com.xxl.job.core.handler.annotation.XxlJob; -import com.xxl.job.core.log.XxlJobLogger; import org.springframework.stereotype.Component; -import static com.xxl.job.core.biz.model.ReturnT.SUCCESS; - @Component public class TaskHandler { diff --git a/src/main/java/com/sipai/quartz/job/TaskTest1.java b/src/main/java/com/sipai/quartz/job/TaskTest1.java index fca654a0..d42c1215 100644 --- a/src/main/java/com/sipai/quartz/job/TaskTest1.java +++ b/src/main/java/com/sipai/quartz/job/TaskTest1.java @@ -1,22 +1,12 @@ package com.sipai.quartz.job; -import java.util.List; - -import javax.annotation.Resource; - import com.sipai.tools.CommUtil; import com.xxl.job.core.biz.model.ReturnT; import com.xxl.job.core.handler.annotation.XxlJob; -import org.quartz.JobExecutionContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; -import com.sipai.entity.schedule.ScheduleJob; -import com.sipai.entity.schedule.ScheduleJobDetail; -import com.sipai.service.schedule.ScheduleJobDetailService; -import com.sipai.tools.SpringContextUtil; - @Component public class TaskTest1 { diff --git a/src/main/java/com/sipai/quartz/job/TopAlarmNumJob.java b/src/main/java/com/sipai/quartz/job/TopAlarmNumJob.java index 3eb18153..9f88b02f 100644 --- a/src/main/java/com/sipai/quartz/job/TopAlarmNumJob.java +++ b/src/main/java/com/sipai/quartz/job/TopAlarmNumJob.java @@ -1,9 +1,5 @@ package com.sipai.quartz.job; -import java.text.ParseException; -import java.util.List; -import javax.annotation.Resource; - import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.sipai.entity.data.XServer; @@ -13,6 +9,10 @@ import com.sipai.service.scada.ProAlarmService; import com.sipai.tools.CommUtil; import com.sipai.tools.MqttUtil; +import javax.annotation.Resource; +import java.text.ParseException; +import java.util.List; + public class TopAlarmNumJob { @Resource private XServerService xServerService; diff --git a/src/main/java/com/sipai/quartz/job/UserCardJob.java b/src/main/java/com/sipai/quartz/job/UserCardJob.java index d255373c..eb4dcc06 100644 --- a/src/main/java/com/sipai/quartz/job/UserCardJob.java +++ b/src/main/java/com/sipai/quartz/job/UserCardJob.java @@ -1,25 +1,11 @@ package com.sipai.quartz.job; -import com.sipai.entity.scada.MPoint; -import com.sipai.entity.scada.MPointHistory; -import com.sipai.entity.schedule.ScheduleJob; import com.sipai.entity.user.User; -import com.sipai.service.scada.MPointHistoryService; -import com.sipai.service.scada.MPointService; import com.sipai.service.user.UserService; -import com.sipai.tools.CommString; -import com.sipai.tools.CommUtil; -import com.sipai.tools.SpringContextUtil; -import org.apache.commons.httpclient.NameValuePair; -import org.apache.commons.httpclient.methods.PostMethod; import org.redisson.api.RMap; import org.redisson.api.RedissonClient; import javax.annotation.Resource; -import java.math.BigDecimal; -import java.text.SimpleDateFormat; -import java.util.Calendar; -import java.util.Date; import java.util.List; /** diff --git a/src/main/java/com/sipai/quartz/job/WeatherJob.java b/src/main/java/com/sipai/quartz/job/WeatherJob.java index ab655bcb..34925c2b 100644 --- a/src/main/java/com/sipai/quartz/job/WeatherJob.java +++ b/src/main/java/com/sipai/quartz/job/WeatherJob.java @@ -1,25 +1,16 @@ package com.sipai.quartz.job; -import java.io.IOException; -import java.util.List; - -import javax.annotation.Resource; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; - -import com.sipai.entity.schedule.ScheduleJob; import com.sipai.entity.user.Company; import com.sipai.entity.work.WeatherNew; import com.sipai.service.company.CompanyService; -import com.sipai.service.schedule.ScheduleJobDetailService; import com.sipai.service.work.WeatherNewService; import com.sipai.tools.CommUtil; -import com.sipai.tools.SpringContextUtil; - import net.sf.json.JSONObject; +import org.springframework.beans.factory.annotation.Autowired; + +import javax.annotation.Resource; +import java.io.IOException; +import java.util.List; public class WeatherJob { @Autowired diff --git a/src/main/java/com/sipai/quartz/job/WeatherNewJob.java b/src/main/java/com/sipai/quartz/job/WeatherNewJob.java index d6c62892..43d97357 100644 --- a/src/main/java/com/sipai/quartz/job/WeatherNewJob.java +++ b/src/main/java/com/sipai/quartz/job/WeatherNewJob.java @@ -1,17 +1,15 @@ package com.sipai.quartz.job; -import java.util.List; - -import javax.annotation.Resource; - -import net.sf.json.JSONObject; - import com.sipai.entity.user.Company; import com.sipai.entity.work.WeatherNew; import com.sipai.service.company.CompanyService; import com.sipai.service.work.WeatherNewService; import com.sipai.tools.CommUtil; import com.sipai.tools.WeatherTest; +import net.sf.json.JSONObject; + +import javax.annotation.Resource; +import java.util.List; /** * 天气网址异常，停用 diff --git a/src/main/java/com/sipai/quartz/job/ZY1C_Job.java b/src/main/java/com/sipai/quartz/job/ZY1C_Job.java index c37d482f..435f01c8 100644 --- a/src/main/java/com/sipai/quartz/job/ZY1C_Job.java +++ b/src/main/java/com/sipai/quartz/job/ZY1C_Job.java @@ -1,36 +1,18 @@ package com.sipai.quartz.job; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; import com.serotonin.modbus4j.code.DataType; -import com.serotonin.modbus4j.exception.ErrorResponseException; -import com.serotonin.modbus4j.exception.ModbusInitException; -import com.serotonin.modbus4j.exception.ModbusTransportException; import com.sipai.entity.data.DataTransConfig; -import com.sipai.entity.process.DataPatrol; -import com.sipai.entity.scada.MPoint; import com.sipai.entity.scada.MPointHistory; import com.sipai.entity.schedule.ScheduleJob; -import com.sipai.entity.user.Company; -import com.sipai.service.company.CompanyService; import com.sipai.service.data.DataTransConfigService; -import com.sipai.service.process.DataPatrolService; import com.sipai.service.scada.MPointHistoryService; import com.sipai.service.scada.MPointService; -import com.sipai.tools.CommString; import com.sipai.tools.CommUtil; import com.sipai.tools.ModbusUtils; import com.sipai.tools.SpringContextUtil; -import com.sipai.websocket.MsgWebSocket2; -import org.redisson.api.RMap; -import org.redisson.api.RedissonClient; -import java.io.IOException; import java.math.BigDecimal; -import java.util.Iterator; import java.util.List; -import java.util.Map; /** * websocket推送数据给三维（通用接口） diff --git a/src/main/java/com/sipai/quartz/job/whp/AutoSamplePlanJob.java b/src/main/java/com/sipai/quartz/job/whp/AutoSamplePlanJob.java index e6b53147..970353ed 100644 --- a/src/main/java/com/sipai/quartz/job/whp/AutoSamplePlanJob.java +++ b/src/main/java/com/sipai/quartz/job/whp/AutoSamplePlanJob.java @@ -5,14 +5,12 @@ import com.sipai.entity.enums.whp.AmplingPeriodEnum; import com.sipai.entity.enums.whp.SamplingPlanStatusEnum; import com.sipai.entity.whp.baseinfo.WhpSampleType; import com.sipai.entity.whp.plan.WhpSamplingPlan; -import com.sipai.entity.whp.plan.WhpSamplingPlanTask; import com.sipai.service.whp.baseinfo.WhpSampleTypeService; import com.sipai.service.whp.plan.WhpSamplingPlanService; import com.sipai.service.whp.plan.WhpSamplingPlanTaskService; import com.sipai.tools.DateUtil; import javax.annotation.Resource; - import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.Date; diff --git a/src/main/java/com/sipai/redis/MethodCacheInterceptor.java b/src/main/java/com/sipai/redis/MethodCacheInterceptor.java index 6eb53230..e4b42e12 100644 --- a/src/main/java/com/sipai/redis/MethodCacheInterceptor.java +++ b/src/main/java/com/sipai/redis/MethodCacheInterceptor.java @@ -1,16 +1,14 @@ package com.sipai.redis; -import java.io.File; -import java.io.FileInputStream; +import org.aopalliance.intercept.MethodInterceptor; +import org.aopalliance.intercept.MethodInvocation; +import org.apache.log4j.Logger; + import java.io.InputStream; import java.util.ArrayList; import java.util.List; import java.util.Properties; -import org.aopalliance.intercept.MethodInterceptor; -import org.aopalliance.intercept.MethodInvocation; -import org.apache.log4j.Logger; - public class MethodCacheInterceptor implements MethodInterceptor { private Logger logger = Logger.getLogger(MethodCacheInterceptor.class); diff --git a/src/main/java/com/sipai/redis/RedisUtil.java b/src/main/java/com/sipai/redis/RedisUtil.java index 025ba43c..5306e6a7 100644 --- a/src/main/java/com/sipai/redis/RedisUtil.java +++ b/src/main/java/com/sipai/redis/RedisUtil.java @@ -1,19 +1,12 @@ package com.sipai.redis; -import java.io.IOException; -import java.io.InputStream; -import java.io.Serializable; -import java.util.Properties; -import java.util.Set; -import java.util.concurrent.TimeUnit; - - - - import org.apache.log4j.Logger; -import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.data.redis.core.ValueOperations; + +import java.io.Serializable; +import java.util.Set; +import java.util.concurrent.TimeUnit; /** * redis cache 工具类 diff --git a/src/main/java/com/sipai/security/LoginFailureHandler.java b/src/main/java/com/sipai/security/LoginFailureHandler.java index 65b1dc25..44b1b950 100644 --- a/src/main/java/com/sipai/security/LoginFailureHandler.java +++ b/src/main/java/com/sipai/security/LoginFailureHandler.java @@ -1,13 +1,12 @@ package com.sipai.security; -import java.io.IOException; +import org.springframework.security.core.AuthenticationException; +import org.springframework.security.web.authentication.AuthenticationFailureHandler; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; - -import org.springframework.security.core.AuthenticationException; -import org.springframework.security.web.authentication.AuthenticationFailureHandler; +import java.io.IOException; public class LoginFailureHandler implements AuthenticationFailureHandler{ diff --git a/src/main/java/com/sipai/security/MyAccessDecisionManager.java b/src/main/java/com/sipai/security/MyAccessDecisionManager.java index 28fdf080..4f4e1373 100644 --- a/src/main/java/com/sipai/security/MyAccessDecisionManager.java +++ b/src/main/java/com/sipai/security/MyAccessDecisionManager.java @@ -1,14 +1,13 @@ package com.sipai.security; -import java.util.Collection; -import java.util.Iterator; import org.springframework.security.access.AccessDecisionManager; import org.springframework.security.access.AccessDeniedException; import org.springframework.security.access.ConfigAttribute; import org.springframework.security.authentication.InsufficientAuthenticationException; import org.springframework.security.core.Authentication; -import org.springframework.security.core.GrantedAuthority; import org.springframework.stereotype.Component; + +import java.util.Collection; /** * * diff --git a/src/main/java/com/sipai/security/MySecurityMetadataSource.java b/src/main/java/com/sipai/security/MySecurityMetadataSource.java index ace571ba..5b85ae90 100644 --- a/src/main/java/com/sipai/security/MySecurityMetadataSource.java +++ b/src/main/java/com/sipai/security/MySecurityMetadataSource.java @@ -1,22 +1,16 @@ package com.sipai.security; -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import javax.annotation.PostConstruct; -import javax.annotation.Resource; - +import com.sipai.entity.user.Menu; +import com.sipai.service.user.MenuService; import org.springframework.security.access.ConfigAttribute; import org.springframework.security.access.SecurityConfig; import org.springframework.security.web.FilterInvocation; import org.springframework.security.web.access.intercept.FilterInvocationSecurityMetadataSource; import org.springframework.stereotype.Component; -import com.sipai.entity.user.Menu; -import com.sipai.service.user.MenuService; +import javax.annotation.PostConstruct; +import javax.annotation.Resource; +import java.util.*; /** * 加载资源与权限的对应关系 diff --git a/src/main/java/com/sipai/security/MyUserDetailServiceImpl.java b/src/main/java/com/sipai/security/MyUserDetailServiceImpl.java index 96d72366..daf1cad7 100644 --- a/src/main/java/com/sipai/security/MyUserDetailServiceImpl.java +++ b/src/main/java/com/sipai/security/MyUserDetailServiceImpl.java @@ -1,11 +1,9 @@ package com.sipai.security; -import java.util.HashSet; -import java.util.List; -import java.util.Set; - -import javax.annotation.Resource; - +import com.sipai.entity.user.User; +import com.sipai.entity.user.UserPower; +import com.sipai.service.user.MenuService; +import com.sipai.service.user.UserService; import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.authority.SimpleGrantedAuthority; import org.springframework.security.core.userdetails.UserDetails; @@ -13,11 +11,10 @@ import org.springframework.security.core.userdetails.UserDetailsService; import org.springframework.security.core.userdetails.UsernameNotFoundException; import org.springframework.stereotype.Component; -import com.sipai.entity.user.Menu; -import com.sipai.entity.user.User; -import com.sipai.entity.user.UserPower; -import com.sipai.service.user.MenuService; -import com.sipai.service.user.UserService; +import javax.annotation.Resource; +import java.util.HashSet; +import java.util.List; +import java.util.Set; @Component("myUserDetailService") diff --git a/src/main/java/com/sipai/security/tag/AuthorizeTag.java b/src/main/java/com/sipai/security/tag/AuthorizeTag.java index cd750e30..8e0d7e30 100644 --- a/src/main/java/com/sipai/security/tag/AuthorizeTag.java +++ b/src/main/java/com/sipai/security/tag/AuthorizeTag.java @@ -1,20 +1,16 @@ package com.sipai.security.tag; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.jsp.tagext.BodyTagSupport; - - +import com.sipai.entity.user.Menu; +import com.sipai.entity.user.UserPower; +import com.sipai.service.user.MenuService; +import com.sipai.tools.SpringContextUtil; import org.springframework.security.core.context.SecurityContextImpl; import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; -import com.sipai.entity.user.Menu; -import com.sipai.entity.user.User; -import com.sipai.entity.user.UserPower; -import com.sipai.service.user.MenuService; -import com.sipai.tools.SpringContextUtil; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.jsp.tagext.BodyTagSupport; +import java.util.List; /** * 自定义标签 用于前台判断按钮权限 * @author A diff --git a/src/main/java/com/sipai/service/Listener/impl/ListenerMessageServiceImpl.java b/src/main/java/com/sipai/service/Listener/impl/ListenerMessageServiceImpl.java index a62e2bdb..9f7751fc 100644 --- a/src/main/java/com/sipai/service/Listener/impl/ListenerMessageServiceImpl.java +++ b/src/main/java/com/sipai/service/Listener/impl/ListenerMessageServiceImpl.java @@ -1,12 +1,9 @@ package com.sipai.service.Listener.impl; import com.sipai.dao.Listener.ListenerMessageDao; -import com.sipai.dao.user.CompanyDao; import com.sipai.entity.Listener.ListenerMessage; import com.sipai.entity.scada.MPoint; import com.sipai.entity.user.Company; -import com.sipai.entity.user.ProcessSection; -import com.sipai.entity.user.ProcessSectionScore; import com.sipai.service.Listener.ListenerMessageService; import com.sipai.service.company.CompanyService; import com.sipai.service.scada.MPointService; @@ -15,7 +12,6 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.ArrayList; -import java.util.Iterator; import java.util.List; @Service("listenerMessageService") diff --git a/src/main/java/com/sipai/service/accident/AccidentService.java b/src/main/java/com/sipai/service/accident/AccidentService.java index 23c5e7ba..16a5062f 100644 --- a/src/main/java/com/sipai/service/accident/AccidentService.java +++ b/src/main/java/com/sipai/service/accident/AccidentService.java @@ -1,9 +1,9 @@ package com.sipai.service.accident; -import java.util.List; - import com.sipai.entity.accident.Accident; +import java.util.List; + public interface AccidentService { public abstract Accident selectById(String id); diff --git a/src/main/java/com/sipai/service/accident/AccidentTypeService.java b/src/main/java/com/sipai/service/accident/AccidentTypeService.java index ce5a2d3e..a6469984 100644 --- a/src/main/java/com/sipai/service/accident/AccidentTypeService.java +++ b/src/main/java/com/sipai/service/accident/AccidentTypeService.java @@ -1,10 +1,10 @@ package com.sipai.service.accident; +import com.sipai.entity.accident.AccidentType; + import java.util.List; import java.util.Map; -import com.sipai.entity.accident.AccidentType; - public interface AccidentTypeService { public abstract AccidentType selectById(String id); diff --git a/src/main/java/com/sipai/service/accident/ReasonableAdviceService.java b/src/main/java/com/sipai/service/accident/ReasonableAdviceService.java index fec4d05b..3a6882b9 100644 --- a/src/main/java/com/sipai/service/accident/ReasonableAdviceService.java +++ b/src/main/java/com/sipai/service/accident/ReasonableAdviceService.java @@ -22,7 +22,6 @@ import org.activiti.engine.repository.ProcessDefinition; import org.activiti.engine.runtime.ProcessInstance; import org.activiti.engine.task.Task; import org.apache.poi.hssf.usermodel.*; -import org.apache.poi.hssf.util.HSSFColor; import org.apache.poi.ss.usermodel.*; import org.apache.poi.ss.util.CellRangeAddress; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/sipai/service/accident/RoastService.java b/src/main/java/com/sipai/service/accident/RoastService.java index b9f57817..8f5f85d8 100644 --- a/src/main/java/com/sipai/service/accident/RoastService.java +++ b/src/main/java/com/sipai/service/accident/RoastService.java @@ -24,7 +24,6 @@ import org.activiti.engine.repository.ProcessDefinition; import org.activiti.engine.runtime.ProcessInstance; import org.activiti.engine.task.Task; import org.apache.poi.hssf.usermodel.*; -import org.apache.poi.hssf.util.HSSFColor; import org.apache.poi.ss.usermodel.*; import org.apache.poi.ss.util.CellRangeAddress; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/sipai/service/accident/impl/AccidentServiceImpl.java b/src/main/java/com/sipai/service/accident/impl/AccidentServiceImpl.java index 29fceb94..c9437484 100644 --- a/src/main/java/com/sipai/service/accident/impl/AccidentServiceImpl.java +++ b/src/main/java/com/sipai/service/accident/impl/AccidentServiceImpl.java @@ -1,16 +1,14 @@ package com.sipai.service.accident.impl; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.sipai.dao.accident.AccidentDao; import com.sipai.entity.accident.Accident; import com.sipai.service.accident.AccidentService; import com.sipai.service.accident.AccidentTypeService; import com.sipai.service.user.UserService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class AccidentServiceImpl implements AccidentService { diff --git a/src/main/java/com/sipai/service/accident/impl/AccidentTypeServiceImpl.java b/src/main/java/com/sipai/service/accident/impl/AccidentTypeServiceImpl.java index 34e12de9..50bf8b75 100644 --- a/src/main/java/com/sipai/service/accident/impl/AccidentTypeServiceImpl.java +++ b/src/main/java/com/sipai/service/accident/impl/AccidentTypeServiceImpl.java @@ -1,19 +1,16 @@ package com.sipai.service.accident.impl; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import javax.annotation.Resource; - -import net.sf.json.JSONArray; - -import org.springframework.stereotype.Service; - import com.sipai.dao.accident.AccidentTypeDao; import com.sipai.entity.accident.AccidentType; import com.sipai.service.accident.AccidentTypeService; +import net.sf.json.JSONArray; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; @Service public class AccidentTypeServiceImpl implements AccidentTypeService { diff --git a/src/main/java/com/sipai/service/achievement/AcceptanceModelDataService.java b/src/main/java/com/sipai/service/achievement/AcceptanceModelDataService.java index 40e95a8c..866b3416 100644 --- a/src/main/java/com/sipai/service/achievement/AcceptanceModelDataService.java +++ b/src/main/java/com/sipai/service/achievement/AcceptanceModelDataService.java @@ -1,14 +1,9 @@ package com.sipai.service.achievement; -import java.util.List; -import java.util.Map; - -import javax.servlet.http.HttpServletResponse; - -import net.sf.json.JSONArray; - import com.sipai.entity.achievement.AcceptanceModelData; +import java.util.List; + public interface AcceptanceModelDataService { public abstract AcceptanceModelData selectById(String id); diff --git a/src/main/java/com/sipai/service/achievement/AcceptanceModelMPointService.java b/src/main/java/com/sipai/service/achievement/AcceptanceModelMPointService.java index 1bb35aa5..6e4ee720 100644 --- a/src/main/java/com/sipai/service/achievement/AcceptanceModelMPointService.java +++ b/src/main/java/com/sipai/service/achievement/AcceptanceModelMPointService.java @@ -1,9 +1,9 @@ package com.sipai.service.achievement; -import java.util.List; - import com.sipai.entity.achievement.AcceptanceModelMPoint; +import java.util.List; + public interface AcceptanceModelMPointService { public abstract AcceptanceModelMPoint selectById(String unitId, String id); diff --git a/src/main/java/com/sipai/service/achievement/AcceptanceModelOutputDataService.java b/src/main/java/com/sipai/service/achievement/AcceptanceModelOutputDataService.java index ff865475..727bf4d4 100644 --- a/src/main/java/com/sipai/service/achievement/AcceptanceModelOutputDataService.java +++ b/src/main/java/com/sipai/service/achievement/AcceptanceModelOutputDataService.java @@ -1,9 +1,9 @@ package com.sipai.service.achievement; -import java.util.List; - import com.sipai.entity.achievement.AcceptanceModelOutputData; +import java.util.List; + public interface AcceptanceModelOutputDataService { public abstract AcceptanceModelOutputData selectById(String id); diff --git a/src/main/java/com/sipai/service/achievement/AcceptanceModelOutputService.java b/src/main/java/com/sipai/service/achievement/AcceptanceModelOutputService.java index f0841624..3c86281c 100644 --- a/src/main/java/com/sipai/service/achievement/AcceptanceModelOutputService.java +++ b/src/main/java/com/sipai/service/achievement/AcceptanceModelOutputService.java @@ -1,9 +1,9 @@ package com.sipai.service.achievement; -import java.util.List; - import com.sipai.entity.achievement.AcceptanceModelOutput; +import java.util.List; + public interface AcceptanceModelOutputService { public abstract AcceptanceModelOutput selectById(String unitId, String id); diff --git a/src/main/java/com/sipai/service/achievement/AcceptanceModelRecordService.java b/src/main/java/com/sipai/service/achievement/AcceptanceModelRecordService.java index d93f68cc..631c715d 100644 --- a/src/main/java/com/sipai/service/achievement/AcceptanceModelRecordService.java +++ b/src/main/java/com/sipai/service/achievement/AcceptanceModelRecordService.java @@ -1,14 +1,9 @@ package com.sipai.service.achievement; -import java.util.List; -import java.util.Map; - -import javax.servlet.http.HttpServletResponse; - -import net.sf.json.JSONArray; - import com.sipai.entity.achievement.AcceptanceModelRecord; +import java.util.List; + public interface AcceptanceModelRecordService { public abstract AcceptanceModelRecord selectById(String id); diff --git a/src/main/java/com/sipai/service/achievement/AcceptanceModelService.java b/src/main/java/com/sipai/service/achievement/AcceptanceModelService.java index 46f4da0f..0ecbd3d1 100644 --- a/src/main/java/com/sipai/service/achievement/AcceptanceModelService.java +++ b/src/main/java/com/sipai/service/achievement/AcceptanceModelService.java @@ -1,14 +1,10 @@ package com.sipai.service.achievement; +import com.sipai.entity.achievement.AcceptanceModel; + import java.util.List; import java.util.Map; -import javax.servlet.http.HttpServletResponse; - -import net.sf.json.JSONArray; - -import com.sipai.entity.achievement.AcceptanceModel; - public interface AcceptanceModelService { public abstract AcceptanceModel selectById(String id); diff --git a/src/main/java/com/sipai/service/achievement/AcceptanceModelTextDataService.java b/src/main/java/com/sipai/service/achievement/AcceptanceModelTextDataService.java index e9e2e067..599819c4 100644 --- a/src/main/java/com/sipai/service/achievement/AcceptanceModelTextDataService.java +++ b/src/main/java/com/sipai/service/achievement/AcceptanceModelTextDataService.java @@ -1,9 +1,9 @@ package com.sipai.service.achievement; -import java.util.List; - import com.sipai.entity.achievement.AcceptanceModelTextData; +import java.util.List; + public interface AcceptanceModelTextDataService { public abstract AcceptanceModelTextData selectById(String id); diff --git a/src/main/java/com/sipai/service/achievement/AcceptanceModelTextService.java b/src/main/java/com/sipai/service/achievement/AcceptanceModelTextService.java index c6ef3f89..11d1c2f2 100644 --- a/src/main/java/com/sipai/service/achievement/AcceptanceModelTextService.java +++ b/src/main/java/com/sipai/service/achievement/AcceptanceModelTextService.java @@ -1,9 +1,9 @@ package com.sipai.service.achievement; -import java.util.List; - import com.sipai.entity.achievement.AcceptanceModelText; +import java.util.List; + public interface AcceptanceModelTextService { public abstract AcceptanceModelText selectById(String id); diff --git a/src/main/java/com/sipai/service/achievement/impl/AcceptanceModelDataServiceImpl.java b/src/main/java/com/sipai/service/achievement/impl/AcceptanceModelDataServiceImpl.java index 54ce7971..ec9c2914 100644 --- a/src/main/java/com/sipai/service/achievement/impl/AcceptanceModelDataServiceImpl.java +++ b/src/main/java/com/sipai/service/achievement/impl/AcceptanceModelDataServiceImpl.java @@ -1,30 +1,20 @@ package com.sipai.service.achievement.impl; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletResponse; - -import net.sf.json.JSONArray; - -import org.springframework.stereotype.Service; - import com.sipai.dao.achievement.AcceptanceModelDataDao; import com.sipai.entity.achievement.AcceptanceModel; import com.sipai.entity.achievement.AcceptanceModelData; import com.sipai.entity.achievement.AcceptanceModelMPoint; import com.sipai.entity.achievement.AcceptanceModelRecord; -import com.sipai.entity.data.CurveMpoint; -import com.sipai.entity.data.DataCurve; import com.sipai.entity.scada.MPoint; import com.sipai.service.achievement.AcceptanceModelDataService; import com.sipai.service.achievement.AcceptanceModelMPointService; import com.sipai.service.achievement.AcceptanceModelRecordService; import com.sipai.service.achievement.AcceptanceModelService; import com.sipai.service.scada.MPointService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class AcceptanceModelDataServiceImpl implements AcceptanceModelDataService { diff --git a/src/main/java/com/sipai/service/achievement/impl/AcceptanceModelMPointServiceImpl.java b/src/main/java/com/sipai/service/achievement/impl/AcceptanceModelMPointServiceImpl.java index 4d337105..415fd33e 100644 --- a/src/main/java/com/sipai/service/achievement/impl/AcceptanceModelMPointServiceImpl.java +++ b/src/main/java/com/sipai/service/achievement/impl/AcceptanceModelMPointServiceImpl.java @@ -1,15 +1,13 @@ package com.sipai.service.achievement.impl; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.sipai.dao.achievement.AcceptanceModelMPointDao; import com.sipai.entity.achievement.AcceptanceModelMPoint; import com.sipai.service.achievement.AcceptanceModelMPointService; import com.sipai.service.scada.MPointService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class AcceptanceModelMPointServiceImpl implements AcceptanceModelMPointService { diff --git a/src/main/java/com/sipai/service/achievement/impl/AcceptanceModelOutputDataServiceImpl.java b/src/main/java/com/sipai/service/achievement/impl/AcceptanceModelOutputDataServiceImpl.java index 46633041..a34ed696 100644 --- a/src/main/java/com/sipai/service/achievement/impl/AcceptanceModelOutputDataServiceImpl.java +++ b/src/main/java/com/sipai/service/achievement/impl/AcceptanceModelOutputDataServiceImpl.java @@ -1,14 +1,12 @@ package com.sipai.service.achievement.impl; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.sipai.dao.achievement.AcceptanceModelOutputDataDao; import com.sipai.entity.achievement.AcceptanceModelOutputData; import com.sipai.service.achievement.AcceptanceModelOutputDataService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class AcceptanceModelOutputDataServiceImpl implements AcceptanceModelOutputDataService { diff --git a/src/main/java/com/sipai/service/achievement/impl/AcceptanceModelOutputServiceImpl.java b/src/main/java/com/sipai/service/achievement/impl/AcceptanceModelOutputServiceImpl.java index 67f0508f..1de8c00f 100644 --- a/src/main/java/com/sipai/service/achievement/impl/AcceptanceModelOutputServiceImpl.java +++ b/src/main/java/com/sipai/service/achievement/impl/AcceptanceModelOutputServiceImpl.java @@ -1,16 +1,14 @@ package com.sipai.service.achievement.impl; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.sipai.dao.achievement.AcceptanceModelOutputDao; import com.sipai.entity.achievement.AcceptanceModelOutput; import com.sipai.service.achievement.AcceptanceModelOutputService; import com.sipai.service.scada.MPointService; import com.sipai.service.user.UserService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class AcceptanceModelOutputServiceImpl implements AcceptanceModelOutputService { diff --git a/src/main/java/com/sipai/service/achievement/impl/AcceptanceModelRecordServiceImpl.java b/src/main/java/com/sipai/service/achievement/impl/AcceptanceModelRecordServiceImpl.java index 9abe6054..f76b82b4 100644 --- a/src/main/java/com/sipai/service/achievement/impl/AcceptanceModelRecordServiceImpl.java +++ b/src/main/java/com/sipai/service/achievement/impl/AcceptanceModelRecordServiceImpl.java @@ -1,21 +1,12 @@ package com.sipai.service.achievement.impl; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletResponse; - -import net.sf.json.JSONArray; - -import org.springframework.stereotype.Service; - import com.sipai.dao.achievement.AcceptanceModelRecordDao; import com.sipai.entity.achievement.AcceptanceModelRecord; -import com.sipai.entity.data.DataCurve; import com.sipai.service.achievement.AcceptanceModelRecordService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class AcceptanceModelRecordServiceImpl implements AcceptanceModelRecordService { diff --git a/src/main/java/com/sipai/service/achievement/impl/AcceptanceModelServiceImpl.java b/src/main/java/com/sipai/service/achievement/impl/AcceptanceModelServiceImpl.java index 386fae75..1da46dac 100644 --- a/src/main/java/com/sipai/service/achievement/impl/AcceptanceModelServiceImpl.java +++ b/src/main/java/com/sipai/service/achievement/impl/AcceptanceModelServiceImpl.java @@ -1,22 +1,17 @@ package com.sipai.service.achievement.impl; +import com.sipai.dao.achievement.AcceptanceModelDao; +import com.sipai.entity.achievement.AcceptanceModel; +import com.sipai.service.achievement.AcceptanceModelService; +import net.sf.json.JSONArray; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletResponse; - -import net.sf.json.JSONArray; - -import org.springframework.stereotype.Service; - -import com.sipai.dao.achievement.AcceptanceModelDao; -import com.sipai.entity.achievement.AcceptanceModel; -import com.sipai.entity.data.DataCurve; -import com.sipai.service.achievement.AcceptanceModelService; - @Service public class AcceptanceModelServiceImpl implements AcceptanceModelService { @Resource diff --git a/src/main/java/com/sipai/service/achievement/impl/AcceptanceModelTextDataServiceImpl.java b/src/main/java/com/sipai/service/achievement/impl/AcceptanceModelTextDataServiceImpl.java index 49637ae1..d4cb4c2d 100644 --- a/src/main/java/com/sipai/service/achievement/impl/AcceptanceModelTextDataServiceImpl.java +++ b/src/main/java/com/sipai/service/achievement/impl/AcceptanceModelTextDataServiceImpl.java @@ -1,16 +1,13 @@ package com.sipai.service.achievement.impl; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.sipai.dao.achievement.AcceptanceModelTextDataDao; -import com.sipai.entity.achievement.AcceptanceModelText; import com.sipai.entity.achievement.AcceptanceModelTextData; import com.sipai.service.achievement.AcceptanceModelTextDataService; import com.sipai.service.scada.MPointService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class AcceptanceModelTextDataServiceImpl implements AcceptanceModelTextDataService { diff --git a/src/main/java/com/sipai/service/achievement/impl/AcceptanceModelTextServiceImpl.java b/src/main/java/com/sipai/service/achievement/impl/AcceptanceModelTextServiceImpl.java index 6513d1ed..cde1d640 100644 --- a/src/main/java/com/sipai/service/achievement/impl/AcceptanceModelTextServiceImpl.java +++ b/src/main/java/com/sipai/service/achievement/impl/AcceptanceModelTextServiceImpl.java @@ -1,15 +1,13 @@ package com.sipai.service.achievement.impl; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.sipai.dao.achievement.AcceptanceModelTextDao; import com.sipai.entity.achievement.AcceptanceModelText; import com.sipai.service.achievement.AcceptanceModelTextService; import com.sipai.service.scada.MPointService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class AcceptanceModelTextServiceImpl implements AcceptanceModelTextService { diff --git a/src/main/java/com/sipai/service/activiti/AfterModifyApplyContentProcessor.java b/src/main/java/com/sipai/service/activiti/AfterModifyApplyContentProcessor.java index 89e4c25b..108f168b 100644 --- a/src/main/java/com/sipai/service/activiti/AfterModifyApplyContentProcessor.java +++ b/src/main/java/com/sipai/service/activiti/AfterModifyApplyContentProcessor.java @@ -1,5 +1,6 @@ package com.sipai.service.activiti; +import com.sipai.entity.activiti.Leave; import org.activiti.engine.RuntimeService; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; @@ -8,10 +9,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; -import com.sipai.entity.activiti.Leave; - -import java.util.Date; - /** * 调整请假内容处理器 * diff --git a/src/main/java/com/sipai/service/activiti/KpiWorkflowService.java b/src/main/java/com/sipai/service/activiti/KpiWorkflowService.java index 38dba8e2..2f2c39f3 100644 --- a/src/main/java/com/sipai/service/activiti/KpiWorkflowService.java +++ b/src/main/java/com/sipai/service/activiti/KpiWorkflowService.java @@ -1,6 +1,5 @@ package com.sipai.service.activiti; -import com.sipai.entity.kpi.KpiPlanStaff; import com.sipai.entity.kpi.KpiTaskListVO; import com.sipai.entity.user.User; import com.sipai.service.kpi.KpiPlanStaffService; @@ -19,7 +18,6 @@ import org.activiti.engine.impl.pvm.PvmActivity; import org.activiti.engine.impl.pvm.PvmTransition; import org.activiti.engine.impl.pvm.process.ActivityImpl; import org.activiti.engine.impl.task.TaskDefinition; -import org.activiti.engine.runtime.ProcessInstance; import org.activiti.engine.task.Task; import org.activiti.engine.task.TaskQuery; import org.apache.commons.lang3.StringUtils; @@ -27,7 +25,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import javax.annotation.Resource; -import java.util.ArrayList; import java.util.Collection; import java.util.List; import java.util.Map; diff --git a/src/main/java/com/sipai/service/activiti/LeaveManager.java b/src/main/java/com/sipai/service/activiti/LeaveManager.java index dd88db6f..7daf31b8 100644 --- a/src/main/java/com/sipai/service/activiti/LeaveManager.java +++ b/src/main/java/com/sipai/service/activiti/LeaveManager.java @@ -1,18 +1,16 @@ package com.sipai.service.activiti; +import com.sipai.dao.activiti.LeaveDao; +import com.sipai.entity.activiti.Leave; +import com.sipai.tools.CommUtil; import org.activiti.engine.TaskService; import org.activiti.engine.task.Task; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; -import com.sipai.dao.activiti.LeaveDao; -import com.sipai.entity.activiti.Leave; -import com.sipai.tools.CommUtil; - import java.math.BigDecimal; -import java.util.Date; import java.util.Map; /** diff --git a/src/main/java/com/sipai/service/activiti/LeaveWorkflowService.java b/src/main/java/com/sipai/service/activiti/LeaveWorkflowService.java index 800b635d..5c354a19 100644 --- a/src/main/java/com/sipai/service/activiti/LeaveWorkflowService.java +++ b/src/main/java/com/sipai/service/activiti/LeaveWorkflowService.java @@ -1,23 +1,7 @@ package com.sipai.service.activiti; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - - - - - - - - - - - - - -import javax.annotation.Resource; - +import com.sipai.activiti.util.Page; +import com.sipai.entity.activiti.Leave; import org.activiti.engine.*; import org.activiti.engine.history.HistoricProcessInstance; import org.activiti.engine.history.HistoricProcessInstanceQuery; @@ -30,16 +14,14 @@ import org.activiti.engine.task.Task; import org.activiti.engine.task.TaskQuery; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -/*import org.slf4j.Logger; -import org.slf4j.LoggerFactory;*/ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import com.google.gson.Gson; -import com.sipai.activiti.util.Page; -import com.sipai.entity.activiti.Leave; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; @Service @Component public class LeaveWorkflowService { diff --git a/src/main/java/com/sipai/service/activiti/ProcessModelService.java b/src/main/java/com/sipai/service/activiti/ProcessModelService.java index 0c0a2284..c3082bea 100644 --- a/src/main/java/com/sipai/service/activiti/ProcessModelService.java +++ b/src/main/java/com/sipai/service/activiti/ProcessModelService.java @@ -1,73 +1,28 @@ package com.sipai.service.activiti; -import net.sf.json.JSONArray; -import net.sf.json.JSONObject; - +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.node.ObjectNode; +import com.sipai.entity.activiti.TaskModel; +import com.sipai.tools.CommString; 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.HistoryService; import org.activiti.engine.RepositoryService; import org.activiti.engine.RuntimeService; -import org.activiti.engine.history.HistoricProcessInstance; -import org.activiti.engine.impl.RepositoryServiceImpl; -import org.activiti.engine.impl.persistence.entity.ProcessDefinitionEntity; -import org.activiti.engine.impl.pvm.PvmActivity; -import org.activiti.engine.impl.pvm.PvmTransition; -import org.activiti.engine.impl.pvm.process.ActivityImpl; import org.activiti.engine.repository.Deployment; -import org.activiti.engine.repository.ProcessDefinition; -import org.activiti.engine.repository.ProcessDefinitionQuery; -import org.apache.commons.io.IOUtils; -import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.StringUtils; -import org.codehaus.jackson.JsonNode; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.core.io.DefaultResourceLoader; -import org.springframework.core.io.ResourceLoader; import org.springframework.stereotype.Service; -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.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.node.ObjectNode; -import com.sipai.activiti.util.WorkflowUtils; -import com.sipai.entity.activiti.TaskModel; -import com.sipai.entity.activiti.WorkTask; -import com.sipai.entity.user.User; -import com.sipai.tools.CommString; -import com.sipai.tools.CommUtil; -import com.sipai.tools.SpringContextUtil; - -import java.io.ByteArrayInputStream; -import java.io.IOException; -import java.io.InputStream; -import java.text.SimpleDateFormat; import java.util.ArrayList; -import java.util.Collections; -import java.util.Comparator; -import java.util.Date; import java.util.List; -import java.util.Locale; -import java.util.zip.ZipInputStream; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; /** diff --git a/src/main/java/com/sipai/service/activiti/WorkflowProcessDefinitionService.java b/src/main/java/com/sipai/service/activiti/WorkflowProcessDefinitionService.java index feeb3404..e85f5651 100644 --- a/src/main/java/com/sipai/service/activiti/WorkflowProcessDefinitionService.java +++ b/src/main/java/com/sipai/service/activiti/WorkflowProcessDefinitionService.java @@ -1,6 +1,11 @@ package com.sipai.service.activiti; +import com.sipai.activiti.util.WorkflowUtils; +import com.sipai.entity.activiti.WorkTask; +import com.sipai.tools.ActivitiUtil; +import com.sipai.tools.CommString; +import jodd.util.StringUtil; import org.activiti.engine.HistoryService; import org.activiti.engine.RepositoryService; import org.activiti.engine.RuntimeService; @@ -22,26 +27,15 @@ import org.springframework.core.io.Resource; import org.springframework.core.io.ResourceLoader; import org.springframework.stereotype.Service; -import com.sipai.activiti.util.WorkflowUtils; -import com.sipai.entity.activiti.WorkTask; -import com.sipai.tools.ActivitiUtil; -import com.sipai.tools.CommString; -import com.sipai.tools.CommUtil; -import com.sipai.tools.SpringContextUtil; - import java.io.IOException; import java.io.InputStream; -import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Collections; -import java.util.Comparator; import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; import java.util.zip.ZipInputStream; -import jodd.util.StringUtil; - /** * 工作流中流程以及流程实例相关Service * diff --git a/src/main/java/com/sipai/service/activiti/WorkflowTraceService.java b/src/main/java/com/sipai/service/activiti/WorkflowTraceService.java index 191a3fb7..dcdf58a9 100644 --- a/src/main/java/com/sipai/service/activiti/WorkflowTraceService.java +++ b/src/main/java/com/sipai/service/activiti/WorkflowTraceService.java @@ -1,6 +1,7 @@ package com.sipai.service.activiti; +import com.sipai.activiti.util.WorkflowUtils; import org.activiti.engine.IdentityService; import org.activiti.engine.RepositoryService; import org.activiti.engine.RuntimeService; @@ -25,8 +26,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import org.springframework.stereotype.Service; -import com.sipai.activiti.util.WorkflowUtils; - import java.util.*; /** diff --git a/src/main/java/com/sipai/service/administration/IndexClassService.java b/src/main/java/com/sipai/service/administration/IndexClassService.java index 91e90fda..dbbd7f0a 100644 --- a/src/main/java/com/sipai/service/administration/IndexClassService.java +++ b/src/main/java/com/sipai/service/administration/IndexClassService.java @@ -1,20 +1,17 @@ package com.sipai.service.administration; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.sipai.dao.administration.IndexClassDao; import com.sipai.entity.administration.Index; import com.sipai.entity.administration.IndexClass; import com.sipai.tools.CommService; - import net.sf.json.JSONArray; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; @Service public class IndexClassService implements CommService{ diff --git a/src/main/java/com/sipai/service/administration/IndexCycleService.java b/src/main/java/com/sipai/service/administration/IndexCycleService.java index ca9f7962..2a75a1aa 100644 --- a/src/main/java/com/sipai/service/administration/IndexCycleService.java +++ b/src/main/java/com/sipai/service/administration/IndexCycleService.java @@ -1,22 +1,17 @@ package com.sipai.service.administration; +import com.sipai.dao.administration.IndexCycleDao; +import com.sipai.entity.administration.IndexCycle; +import com.sipai.tools.CommService; +import net.sf.json.JSONArray; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - -import com.sipai.dao.administration.IndexCycleDao; -import com.sipai.entity.administration.Index; -import com.sipai.entity.administration.IndexCycle; -import com.sipai.entity.app.AppProductMonitor; -import com.sipai.tools.CommService; - -import net.sf.json.JSONArray; - @Service public class IndexCycleService implements CommService{ diff --git a/src/main/java/com/sipai/service/administration/IndexService.java b/src/main/java/com/sipai/service/administration/IndexService.java index 3d9d9188..2b209414 100644 --- a/src/main/java/com/sipai/service/administration/IndexService.java +++ b/src/main/java/com/sipai/service/administration/IndexService.java @@ -1,25 +1,21 @@ package com.sipai.service.administration; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.sipai.dao.administration.IndexDao; import com.sipai.entity.administration.Index; import com.sipai.entity.administration.IndexClass; import com.sipai.entity.administration.IndexCycle; -import com.sipai.entity.administration.Organization; import com.sipai.entity.user.Dept; import com.sipai.service.user.UnitService; import com.sipai.service.user.UserService; import com.sipai.tools.CommService; - import net.sf.json.JSONArray; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; @Service public class IndexService implements CommService{ diff --git a/src/main/java/com/sipai/service/administration/IndexWorkService.java b/src/main/java/com/sipai/service/administration/IndexWorkService.java index c1a14579..953ea988 100644 --- a/src/main/java/com/sipai/service/administration/IndexWorkService.java +++ b/src/main/java/com/sipai/service/administration/IndexWorkService.java @@ -1,25 +1,11 @@ package com.sipai.service.administration; -import java.math.BigDecimal; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import javax.annotation.Resource; - -import org.activiti.engine.TaskService; -import org.activiti.engine.repository.ProcessDefinition; -import org.activiti.engine.runtime.ProcessInstance; -import org.activiti.engine.task.Task; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - import com.sipai.dao.administration.IndexWorkDao; import com.sipai.entity.activiti.ActivitiCommStr; import com.sipai.entity.activiti.ProcessType; -import com.sipai.entity.administration.IndexWork; import com.sipai.entity.administration.Index; import com.sipai.entity.administration.IndexCycle; +import com.sipai.entity.administration.IndexWork; import com.sipai.entity.base.BusinessUnitAdapter; import com.sipai.entity.business.BusinessUnitAudit; import com.sipai.entity.business.BusinessUnitRecord; @@ -31,7 +17,17 @@ import com.sipai.service.business.BusinessUnitAuditService; import com.sipai.service.user.UnitService; import com.sipai.service.user.UserService; import com.sipai.tools.CommService; -import com.sipai.tools.CommUtil; +import org.activiti.engine.TaskService; +import org.activiti.engine.repository.ProcessDefinition; +import org.activiti.engine.runtime.ProcessInstance; +import org.activiti.engine.task.Task; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; +import java.util.HashMap; +import java.util.List; +import java.util.Map; @Service public class IndexWorkService implements CommService{ diff --git a/src/main/java/com/sipai/service/administration/OrganizationClassService.java b/src/main/java/com/sipai/service/administration/OrganizationClassService.java index 0094f7d2..fea22a18 100644 --- a/src/main/java/com/sipai/service/administration/OrganizationClassService.java +++ b/src/main/java/com/sipai/service/administration/OrganizationClassService.java @@ -1,22 +1,17 @@ package com.sipai.service.administration; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.sipai.dao.administration.OrganizationClassDao; import com.sipai.entity.administration.Organization; import com.sipai.entity.administration.OrganizationClass; -import com.sipai.entity.app.AppProductMonitor; -import com.sipai.entity.data.DataCurve; import com.sipai.tools.CommService; - import net.sf.json.JSONArray; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; @Service public class OrganizationClassService implements CommService{ diff --git a/src/main/java/com/sipai/service/administration/OrganizationService.java b/src/main/java/com/sipai/service/administration/OrganizationService.java index 35e098eb..3fff5cdf 100644 --- a/src/main/java/com/sipai/service/administration/OrganizationService.java +++ b/src/main/java/com/sipai/service/administration/OrganizationService.java @@ -1,19 +1,5 @@ package com.sipai.service.administration; -import java.math.BigDecimal; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import javax.annotation.Resource; - -import org.activiti.engine.TaskService; -import org.activiti.engine.repository.ProcessDefinition; -import org.activiti.engine.runtime.ProcessInstance; -import org.activiti.engine.task.Task; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - import com.sipai.dao.administration.OrganizationDao; import com.sipai.entity.activiti.ActivitiCommStr; import com.sipai.entity.activiti.ProcessType; @@ -22,24 +8,25 @@ import com.sipai.entity.administration.OrganizationClass; import com.sipai.entity.base.BusinessUnitAdapter; import com.sipai.entity.business.BusinessUnitAudit; import com.sipai.entity.business.BusinessUnitRecord; -import com.sipai.entity.maintenance.MaintenanceCommString; -import com.sipai.entity.sparepart.GoodsClass; -import com.sipai.entity.sparepart.SparePartCommString; -import com.sipai.entity.sparepart.Stock; -import com.sipai.entity.sparepart.Warehouse; import com.sipai.entity.user.Company; import com.sipai.entity.user.User; import com.sipai.service.activiti.WorkflowProcessDefinitionService; import com.sipai.service.activiti.WorkflowService; import com.sipai.service.business.BusinessUnitAuditService; -import com.sipai.service.sparepart.GoodsClassService; -import com.sipai.service.sparepart.StockService; -import com.sipai.service.sparepart.SubscribeService; -import com.sipai.service.sparepart.WarehouseService; import com.sipai.service.user.UnitService; import com.sipai.service.user.UserService; import com.sipai.tools.CommService; -import com.sipai.tools.CommUtil; +import org.activiti.engine.TaskService; +import org.activiti.engine.repository.ProcessDefinition; +import org.activiti.engine.runtime.ProcessInstance; +import org.activiti.engine.task.Task; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; +import java.util.HashMap; +import java.util.List; +import java.util.Map; @Service public class OrganizationService implements CommService{ diff --git a/src/main/java/com/sipai/service/administration/TemporaryService.java b/src/main/java/com/sipai/service/administration/TemporaryService.java index c7a68f57..b505314c 100644 --- a/src/main/java/com/sipai/service/administration/TemporaryService.java +++ b/src/main/java/com/sipai/service/administration/TemporaryService.java @@ -1,19 +1,5 @@ package com.sipai.service.administration; -import java.math.BigDecimal; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import javax.annotation.Resource; - -import org.activiti.engine.TaskService; -import org.activiti.engine.repository.ProcessDefinition; -import org.activiti.engine.runtime.ProcessInstance; -import org.activiti.engine.task.Task; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - import com.sipai.dao.administration.TemporaryDao; import com.sipai.entity.activiti.ActivitiCommStr; import com.sipai.entity.activiti.ProcessType; @@ -21,24 +7,25 @@ import com.sipai.entity.administration.Temporary; import com.sipai.entity.base.BusinessUnitAdapter; import com.sipai.entity.business.BusinessUnitAudit; import com.sipai.entity.business.BusinessUnitRecord; -import com.sipai.entity.maintenance.MaintenanceCommString; -import com.sipai.entity.sparepart.GoodsClass; -import com.sipai.entity.sparepart.SparePartCommString; -import com.sipai.entity.sparepart.Stock; -import com.sipai.entity.sparepart.Warehouse; import com.sipai.entity.user.Company; import com.sipai.entity.user.User; import com.sipai.service.activiti.WorkflowProcessDefinitionService; import com.sipai.service.activiti.WorkflowService; import com.sipai.service.business.BusinessUnitAuditService; -import com.sipai.service.sparepart.GoodsClassService; -import com.sipai.service.sparepart.StockService; -import com.sipai.service.sparepart.SubscribeService; -import com.sipai.service.sparepart.WarehouseService; import com.sipai.service.user.UnitService; import com.sipai.service.user.UserService; import com.sipai.tools.CommService; -import com.sipai.tools.CommUtil; +import org.activiti.engine.TaskService; +import org.activiti.engine.repository.ProcessDefinition; +import org.activiti.engine.runtime.ProcessInstance; +import org.activiti.engine.task.Task; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; +import java.util.HashMap; +import java.util.List; +import java.util.Map; @Service public class TemporaryService implements CommService{ diff --git a/src/main/java/com/sipai/service/alarm/AlarmConditionService.java b/src/main/java/com/sipai/service/alarm/AlarmConditionService.java index 0c02b667..9821e6d6 100644 --- a/src/main/java/com/sipai/service/alarm/AlarmConditionService.java +++ b/src/main/java/com/sipai/service/alarm/AlarmConditionService.java @@ -1,16 +1,14 @@ package com.sipai.service.alarm; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.sipai.dao.alarm.AlarmConditionDao; import com.sipai.entity.alarm.AlarmCondition; import com.sipai.entity.scada.MPoint; import com.sipai.service.scada.MPointService; import com.sipai.tools.CommService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class AlarmConditionService implements CommService{ @Resource diff --git a/src/main/java/com/sipai/service/alarm/AlarmInformationService.java b/src/main/java/com/sipai/service/alarm/AlarmInformationService.java index fe2b6363..126dd6f4 100644 --- a/src/main/java/com/sipai/service/alarm/AlarmInformationService.java +++ b/src/main/java/com/sipai/service/alarm/AlarmInformationService.java @@ -1,9 +1,8 @@ package com.sipai.service.alarm; -import java.util.List; - import com.sipai.entity.alarm.AlarmInformation; -import com.sipai.entity.alarm.AlarmLevels; + +import java.util.List; public interface AlarmInformationService { diff --git a/src/main/java/com/sipai/service/alarm/AlarmLevelsService.java b/src/main/java/com/sipai/service/alarm/AlarmLevelsService.java index 91447167..c8f5164d 100644 --- a/src/main/java/com/sipai/service/alarm/AlarmLevelsService.java +++ b/src/main/java/com/sipai/service/alarm/AlarmLevelsService.java @@ -1,9 +1,9 @@ package com.sipai.service.alarm; -import java.util.List; - import com.sipai.entity.alarm.AlarmLevels; +import java.util.List; + public interface AlarmLevelsService { public abstract AlarmLevels selectById(String id); diff --git a/src/main/java/com/sipai/service/alarm/AlarmLevesConfigService.java b/src/main/java/com/sipai/service/alarm/AlarmLevesConfigService.java index d3dfa294..bf685387 100644 --- a/src/main/java/com/sipai/service/alarm/AlarmLevesConfigService.java +++ b/src/main/java/com/sipai/service/alarm/AlarmLevesConfigService.java @@ -1,7 +1,6 @@ package com.sipai.service.alarm; import com.sipai.dao.alarm.AlarmLevelsConfigDao; -import com.sipai.dao.hqconfig.RiskLevelDao; import com.sipai.entity.alarm.AlarmLevelsConfig; import com.sipai.tools.CommService; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/sipai/service/alarm/AlarmMoldService.java b/src/main/java/com/sipai/service/alarm/AlarmMoldService.java index 3d014b85..a69a8102 100644 --- a/src/main/java/com/sipai/service/alarm/AlarmMoldService.java +++ b/src/main/java/com/sipai/service/alarm/AlarmMoldService.java @@ -1,9 +1,9 @@ package com.sipai.service.alarm; -import java.util.List; - import com.sipai.entity.alarm.AlarmMold; +import java.util.List; + public interface AlarmMoldService { public abstract AlarmMold selectById(String id); diff --git a/src/main/java/com/sipai/service/alarm/AlarmPointRiskLevelService.java b/src/main/java/com/sipai/service/alarm/AlarmPointRiskLevelService.java index 457d36cc..c0842e8a 100644 --- a/src/main/java/com/sipai/service/alarm/AlarmPointRiskLevelService.java +++ b/src/main/java/com/sipai/service/alarm/AlarmPointRiskLevelService.java @@ -1,9 +1,8 @@ package com.sipai.service.alarm; -import java.util.List; - import com.sipai.entity.alarm.AlarmPointRiskLevel; -import com.sipai.entity.alarm.AlarmLevels; + +import java.util.List; public interface AlarmPointRiskLevelService { diff --git a/src/main/java/com/sipai/service/alarm/AlarmPointService.java b/src/main/java/com/sipai/service/alarm/AlarmPointService.java index 2f4c4a81..69976d51 100644 --- a/src/main/java/com/sipai/service/alarm/AlarmPointService.java +++ b/src/main/java/com/sipai/service/alarm/AlarmPointService.java @@ -1,10 +1,9 @@ package com.sipai.service.alarm; -import java.util.List; - import com.sipai.entity.alarm.AlarmPoint; import javax.servlet.http.HttpServletRequest; +import java.util.List; public interface AlarmPointService { diff --git a/src/main/java/com/sipai/service/alarm/AlarmRecordService.java b/src/main/java/com/sipai/service/alarm/AlarmRecordService.java index 3e78f3f7..148aad33 100644 --- a/src/main/java/com/sipai/service/alarm/AlarmRecordService.java +++ b/src/main/java/com/sipai/service/alarm/AlarmRecordService.java @@ -1,15 +1,13 @@ package com.sipai.service.alarm; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.sipai.dao.alarm.AlarmRecordDao; import com.sipai.entity.alarm.AlarmRecord; import com.sipai.entity.alarm.AlarmType; import com.sipai.tools.CommService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class AlarmRecordService implements CommService{ @Resource diff --git a/src/main/java/com/sipai/service/alarm/AlarmSolutionService.java b/src/main/java/com/sipai/service/alarm/AlarmSolutionService.java index 5569de32..f288883c 100644 --- a/src/main/java/com/sipai/service/alarm/AlarmSolutionService.java +++ b/src/main/java/com/sipai/service/alarm/AlarmSolutionService.java @@ -1,18 +1,16 @@ package com.sipai.service.alarm; -import java.util.ArrayList; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.sipai.dao.alarm.AlarmSolutionDao; import com.sipai.entity.alarm.AlarmSolution; import com.sipai.entity.alarm.OrderType; import com.sipai.entity.user.Dept; import com.sipai.service.user.UnitService; import com.sipai.tools.CommService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; @Service public class AlarmSolutionService implements CommService{ @Resource diff --git a/src/main/java/com/sipai/service/alarm/AlarmSubscribeService.java b/src/main/java/com/sipai/service/alarm/AlarmSubscribeService.java index 00586d36..ca21200e 100644 --- a/src/main/java/com/sipai/service/alarm/AlarmSubscribeService.java +++ b/src/main/java/com/sipai/service/alarm/AlarmSubscribeService.java @@ -1,9 +1,9 @@ package com.sipai.service.alarm; -import java.util.List; - import com.sipai.entity.alarm.AlarmSubscribe; +import java.util.List; + public interface AlarmSubscribeService { public abstract AlarmSubscribe selectById(String id); diff --git a/src/main/java/com/sipai/service/alarm/AlarmTypeService.java b/src/main/java/com/sipai/service/alarm/AlarmTypeService.java index 80b8abd8..3ca29fcf 100644 --- a/src/main/java/com/sipai/service/alarm/AlarmTypeService.java +++ b/src/main/java/com/sipai/service/alarm/AlarmTypeService.java @@ -1,22 +1,18 @@ package com.sipai.service.alarm; +import com.sipai.dao.alarm.AlarmTypeDao; +import com.sipai.entity.alarm.AlarmType; +import com.sipai.entity.user.User; +import com.sipai.service.user.UserService; +import com.sipai.tools.CommService; +import net.sf.json.JSONArray; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; - -import javax.annotation.Resource; - -import net.sf.json.JSONArray; - -import org.springframework.stereotype.Service; - -import com.sipai.dao.alarm.AlarmTypeDao; -import com.sipai.entity.alarm.AlarmType; -import com.sipai.entity.user.Menu; -import com.sipai.entity.user.User; -import com.sipai.service.user.UserService; -import com.sipai.tools.CommService; @Service public class AlarmTypeService implements CommService{ @Resource diff --git a/src/main/java/com/sipai/service/alarm/impl/AlarmInformationServiceImpl.java b/src/main/java/com/sipai/service/alarm/impl/AlarmInformationServiceImpl.java index 76fa67e7..6e39d61e 100644 --- a/src/main/java/com/sipai/service/alarm/impl/AlarmInformationServiceImpl.java +++ b/src/main/java/com/sipai/service/alarm/impl/AlarmInformationServiceImpl.java @@ -1,16 +1,15 @@ package com.sipai.service.alarm.impl; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; import com.sipai.dao.alarm.AlarmInformationDao; import com.sipai.entity.alarm.AlarmInformation; import com.sipai.entity.alarm.AlarmInformationAlarmModeEnum; import com.sipai.service.alarm.AlarmInformationService; import com.sipai.service.user.UserService; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; +import java.util.List; @Service("alarmInformationService") public class AlarmInformationServiceImpl implements AlarmInformationService { diff --git a/src/main/java/com/sipai/service/alarm/impl/AlarmLevelsServiceImpl.java b/src/main/java/com/sipai/service/alarm/impl/AlarmLevelsServiceImpl.java index c25bd2ef..7ced2fe4 100644 --- a/src/main/java/com/sipai/service/alarm/impl/AlarmLevelsServiceImpl.java +++ b/src/main/java/com/sipai/service/alarm/impl/AlarmLevelsServiceImpl.java @@ -1,14 +1,13 @@ package com.sipai.service.alarm.impl; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; import com.sipai.dao.alarm.AlarmLevelsDao; import com.sipai.entity.alarm.AlarmLevels; import com.sipai.service.alarm.AlarmLevelsService; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; +import java.util.List; @Service public class AlarmLevelsServiceImpl implements AlarmLevelsService { diff --git a/src/main/java/com/sipai/service/alarm/impl/AlarmMoldServiceImpl.java b/src/main/java/com/sipai/service/alarm/impl/AlarmMoldServiceImpl.java index 269472e3..10694f80 100644 --- a/src/main/java/com/sipai/service/alarm/impl/AlarmMoldServiceImpl.java +++ b/src/main/java/com/sipai/service/alarm/impl/AlarmMoldServiceImpl.java @@ -1,14 +1,13 @@ package com.sipai.service.alarm.impl; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; import com.sipai.dao.alarm.AlarmMoldDao; import com.sipai.entity.alarm.AlarmMold; import com.sipai.service.alarm.AlarmMoldService; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; +import java.util.List; @Service public class AlarmMoldServiceImpl implements AlarmMoldService { diff --git a/src/main/java/com/sipai/service/alarm/impl/AlarmPointRiskLevelServiceImpl.java b/src/main/java/com/sipai/service/alarm/impl/AlarmPointRiskLevelServiceImpl.java index 1353fc54..f82f5a0a 100644 --- a/src/main/java/com/sipai/service/alarm/impl/AlarmPointRiskLevelServiceImpl.java +++ b/src/main/java/com/sipai/service/alarm/impl/AlarmPointRiskLevelServiceImpl.java @@ -1,19 +1,17 @@ package com.sipai.service.alarm.impl; -import java.util.List; - -import javax.annotation.Resource; - +import com.sipai.dao.alarm.AlarmPointRiskLevelDao; +import com.sipai.entity.alarm.AlarmPointRiskLevel; import com.sipai.entity.work.AreaManage; +import com.sipai.service.alarm.AlarmPointRiskLevelService; import com.sipai.service.hqconfig.RiskLevelService; import com.sipai.service.work.AreaManageService; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import com.sipai.dao.alarm.AlarmPointRiskLevelDao; -import com.sipai.entity.alarm.AlarmPointRiskLevel; -import com.sipai.service.alarm.AlarmPointRiskLevelService; +import javax.annotation.Resource; +import java.util.List; @Service public class AlarmPointRiskLevelServiceImpl implements AlarmPointRiskLevelService { diff --git a/src/main/java/com/sipai/service/alarm/impl/AlarmPointServiceImpl.java b/src/main/java/com/sipai/service/alarm/impl/AlarmPointServiceImpl.java index 28bd0786..2302fbb4 100644 --- a/src/main/java/com/sipai/service/alarm/impl/AlarmPointServiceImpl.java +++ b/src/main/java/com/sipai/service/alarm/impl/AlarmPointServiceImpl.java @@ -1,28 +1,24 @@ package com.sipai.service.alarm.impl; -import java.math.BigDecimal; -import java.util.List; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; - +import com.sipai.dao.alarm.AlarmPointDao; +import com.sipai.entity.alarm.AlarmInformation; import com.sipai.entity.alarm.AlarmMoldCodeEnum; +import com.sipai.entity.alarm.AlarmPoint; import com.sipai.entity.base.Result; +import com.sipai.entity.scada.MPoint; import com.sipai.entity.scada.ProAlarm; -import com.sipai.entity.user.ProcessSection; +import com.sipai.service.alarm.AlarmInformationService; +import com.sipai.service.alarm.AlarmPointService; +import com.sipai.service.scada.MPointService; import com.sipai.service.scada.ProAlarmService; -import com.sipai.service.user.ProcessSectionService; import com.sipai.tools.CommUtil; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import com.sipai.dao.alarm.AlarmPointDao; -import com.sipai.entity.alarm.AlarmInformation; -import com.sipai.entity.alarm.AlarmPoint; -import com.sipai.entity.scada.MPoint; -import com.sipai.service.alarm.AlarmInformationService; -import com.sipai.service.alarm.AlarmPointService; -import com.sipai.service.scada.MPointService; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import java.math.BigDecimal; +import java.util.List; @Service("alarmPointService") public class AlarmPointServiceImpl implements AlarmPointService { diff --git a/src/main/java/com/sipai/service/alarm/impl/AlarmSubscribeServiceImpl.java b/src/main/java/com/sipai/service/alarm/impl/AlarmSubscribeServiceImpl.java index 308a2d46..385592d4 100644 --- a/src/main/java/com/sipai/service/alarm/impl/AlarmSubscribeServiceImpl.java +++ b/src/main/java/com/sipai/service/alarm/impl/AlarmSubscribeServiceImpl.java @@ -1,17 +1,16 @@ package com.sipai.service.alarm.impl; -import java.util.List; - -import javax.annotation.Resource; +import com.sipai.dao.alarm.AlarmSubscribeDao; import com.sipai.entity.alarm.AlarmPoint; +import com.sipai.entity.alarm.AlarmSubscribe; import com.sipai.entity.scada.MPoint; +import com.sipai.service.alarm.AlarmSubscribeService; import com.sipai.service.scada.MPointService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import com.sipai.dao.alarm.AlarmSubscribeDao; -import com.sipai.entity.alarm.AlarmSubscribe; -import com.sipai.service.alarm.AlarmSubscribeService; +import javax.annotation.Resource; +import java.util.List; @Service("alarmSubscribeService") public class AlarmSubscribeServiceImpl implements AlarmSubscribeService { diff --git a/src/main/java/com/sipai/service/app/AppDataConfigureService.java b/src/main/java/com/sipai/service/app/AppDataConfigureService.java index e9233727..cc97349b 100644 --- a/src/main/java/com/sipai/service/app/AppDataConfigureService.java +++ b/src/main/java/com/sipai/service/app/AppDataConfigureService.java @@ -1,9 +1,9 @@ package com.sipai.service.app; -import java.util.List; - import com.sipai.entity.app.AppDataConfigure; +import java.util.List; + public interface AppDataConfigureService { public abstract AppDataConfigure selectById(String id); diff --git a/src/main/java/com/sipai/service/app/AppHomePageDataService.java b/src/main/java/com/sipai/service/app/AppHomePageDataService.java index 9a3ff348..ee42e77e 100644 --- a/src/main/java/com/sipai/service/app/AppHomePageDataService.java +++ b/src/main/java/com/sipai/service/app/AppHomePageDataService.java @@ -1,9 +1,9 @@ package com.sipai.service.app; -import java.util.List; - import com.sipai.entity.app.AppHomePageData; +import java.util.List; + public interface AppHomePageDataService { public abstract AppHomePageData selectById(String id); diff --git a/src/main/java/com/sipai/service/app/AppMenuitemService.java b/src/main/java/com/sipai/service/app/AppMenuitemService.java index de9c2969..b28618b0 100644 --- a/src/main/java/com/sipai/service/app/AppMenuitemService.java +++ b/src/main/java/com/sipai/service/app/AppMenuitemService.java @@ -1,10 +1,10 @@ package com.sipai.service.app; +import com.sipai.entity.app.AppMenuitem; + import java.util.List; import java.util.Map; -import com.sipai.entity.app.AppMenuitem; - public interface AppMenuitemService { public abstract AppMenuitem selectById(String id); diff --git a/src/main/java/com/sipai/service/app/AppProductMonitorMpService.java b/src/main/java/com/sipai/service/app/AppProductMonitorMpService.java index 0090b7ec..ffb67361 100644 --- a/src/main/java/com/sipai/service/app/AppProductMonitorMpService.java +++ b/src/main/java/com/sipai/service/app/AppProductMonitorMpService.java @@ -1,9 +1,9 @@ package com.sipai.service.app; -import java.util.List; - import com.sipai.entity.app.AppProductMonitorMp; +import java.util.List; + public interface AppProductMonitorMpService { public abstract AppProductMonitorMp selectById(String id); diff --git a/src/main/java/com/sipai/service/app/AppProductMonitorService.java b/src/main/java/com/sipai/service/app/AppProductMonitorService.java index 2caabfd8..d340ec46 100644 --- a/src/main/java/com/sipai/service/app/AppProductMonitorService.java +++ b/src/main/java/com/sipai/service/app/AppProductMonitorService.java @@ -1,9 +1,9 @@ package com.sipai.service.app; -import java.util.List; - import com.sipai.entity.app.AppProductMonitor; +import java.util.List; + public interface AppProductMonitorService { public abstract AppProductMonitor selectById(String id); diff --git a/src/main/java/com/sipai/service/app/AppRoleMenuService.java b/src/main/java/com/sipai/service/app/AppRoleMenuService.java index 1e8013a3..cc0bbf38 100644 --- a/src/main/java/com/sipai/service/app/AppRoleMenuService.java +++ b/src/main/java/com/sipai/service/app/AppRoleMenuService.java @@ -1,10 +1,9 @@ package com.sipai.service.app; -import java.util.List; -import java.util.Map; - import com.sipai.entity.app.AppRoleMenu; +import java.util.List; + public interface AppRoleMenuService { public abstract AppRoleMenu selectById(String id); diff --git a/src/main/java/com/sipai/service/app/impl/AppDataConfigureServiceImpl.java b/src/main/java/com/sipai/service/app/impl/AppDataConfigureServiceImpl.java index 15a2b4be..ca304828 100644 --- a/src/main/java/com/sipai/service/app/impl/AppDataConfigureServiceImpl.java +++ b/src/main/java/com/sipai/service/app/impl/AppDataConfigureServiceImpl.java @@ -1,14 +1,13 @@ package com.sipai.service.app.impl; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; import com.sipai.dao.app.AppDataConfigureDao; import com.sipai.entity.app.AppDataConfigure; import com.sipai.service.app.AppDataConfigureService; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; +import java.util.List; @Service public class AppDataConfigureServiceImpl implements AppDataConfigureService { diff --git a/src/main/java/com/sipai/service/app/impl/AppHomePageDataServiceImpl.java b/src/main/java/com/sipai/service/app/impl/AppHomePageDataServiceImpl.java index a908cd30..60f95407 100644 --- a/src/main/java/com/sipai/service/app/impl/AppHomePageDataServiceImpl.java +++ b/src/main/java/com/sipai/service/app/impl/AppHomePageDataServiceImpl.java @@ -1,14 +1,13 @@ package com.sipai.service.app.impl; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; import com.sipai.dao.app.AppHomePageDataDao; import com.sipai.entity.app.AppHomePageData; import com.sipai.service.app.AppHomePageDataService; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; +import java.util.List; @Service public class AppHomePageDataServiceImpl implements AppHomePageDataService { diff --git a/src/main/java/com/sipai/service/app/impl/AppMenuitemServiceImpl.java b/src/main/java/com/sipai/service/app/impl/AppMenuitemServiceImpl.java index 47c3efb8..a258d977 100644 --- a/src/main/java/com/sipai/service/app/impl/AppMenuitemServiceImpl.java +++ b/src/main/java/com/sipai/service/app/impl/AppMenuitemServiceImpl.java @@ -1,18 +1,17 @@ package com.sipai.service.app.impl; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import javax.annotation.Resource; - -import net.sf.json.JSONArray; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; import com.sipai.dao.app.AppMenuitemDao; import com.sipai.entity.app.AppMenuitem; import com.sipai.service.app.AppMenuitemService; +import net.sf.json.JSONArray; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; @Service public class AppMenuitemServiceImpl implements AppMenuitemService { diff --git a/src/main/java/com/sipai/service/app/impl/AppProductMonitorMpServiceImpl.java b/src/main/java/com/sipai/service/app/impl/AppProductMonitorMpServiceImpl.java index 87efe5da..76ce299a 100644 --- a/src/main/java/com/sipai/service/app/impl/AppProductMonitorMpServiceImpl.java +++ b/src/main/java/com/sipai/service/app/impl/AppProductMonitorMpServiceImpl.java @@ -1,17 +1,14 @@ package com.sipai.service.app.impl; -import java.util.List; - -import javax.annotation.Resource; - -import com.sipai.entity.scada.MPoint; -import org.springframework.stereotype.Service; - import com.sipai.dao.app.AppProductMonitorMpDao; import com.sipai.entity.app.AppProductMonitorMp; -import com.sipai.entity.report.RptDayValSet; +import com.sipai.entity.scada.MPoint; import com.sipai.service.app.AppProductMonitorMpService; import com.sipai.service.scada.MPointService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class AppProductMonitorMpServiceImpl implements AppProductMonitorMpService { diff --git a/src/main/java/com/sipai/service/app/impl/AppProductMonitorServiceImpl.java b/src/main/java/com/sipai/service/app/impl/AppProductMonitorServiceImpl.java index eacae78e..cd04e1df 100644 --- a/src/main/java/com/sipai/service/app/impl/AppProductMonitorServiceImpl.java +++ b/src/main/java/com/sipai/service/app/impl/AppProductMonitorServiceImpl.java @@ -1,13 +1,12 @@ package com.sipai.service.app.impl; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; import com.sipai.dao.app.AppProductMonitorDao; import com.sipai.entity.app.AppProductMonitor; import com.sipai.service.app.AppProductMonitorService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class AppProductMonitorServiceImpl implements AppProductMonitorService { diff --git a/src/main/java/com/sipai/service/app/impl/AppRoleMenuServiceImpl.java b/src/main/java/com/sipai/service/app/impl/AppRoleMenuServiceImpl.java index 4f040fcd..e654503d 100644 --- a/src/main/java/com/sipai/service/app/impl/AppRoleMenuServiceImpl.java +++ b/src/main/java/com/sipai/service/app/impl/AppRoleMenuServiceImpl.java @@ -1,18 +1,14 @@ package com.sipai.service.app.impl; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import javax.annotation.Resource; - -import net.sf.json.JSONArray; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; import com.sipai.dao.app.AppRoleMenuDao; import com.sipai.entity.app.AppRoleMenu; import com.sipai.service.app.AppRoleMenuService; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; @Service public class AppRoleMenuServiceImpl implements AppRoleMenuService { diff --git a/src/main/java/com/sipai/service/base/BasicHomePageService.java b/src/main/java/com/sipai/service/base/BasicHomePageService.java index 0bf36d08..85973f39 100644 --- a/src/main/java/com/sipai/service/base/BasicHomePageService.java +++ b/src/main/java/com/sipai/service/base/BasicHomePageService.java @@ -1,22 +1,19 @@ package com.sipai.service.base; +import com.alibaba.fastjson.JSON; +import com.sipai.dao.base.BasicHomePageDao; +import com.sipai.entity.base.BasicHomePage; +import com.sipai.entity.user.Unit; +import com.sipai.service.user.UserService; +import com.sipai.tools.CommService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.annotation.Resource; - -import com.alibaba.fastjson.JSON; -import com.sipai.entity.user.Company; -import com.sipai.entity.user.Unit; -import com.sipai.service.user.UserService; -import org.springframework.stereotype.Service; - -import com.sipai.dao.base.BasicHomePageDao; -import com.sipai.entity.base.BasicHomePage; -import com.sipai.tools.CommService; - @Service public class BasicHomePageService implements CommService { @Resource diff --git a/src/main/java/com/sipai/service/base/CommonFileService.java b/src/main/java/com/sipai/service/base/CommonFileService.java index 84be5000..9ce30577 100644 --- a/src/main/java/com/sipai/service/base/CommonFileService.java +++ b/src/main/java/com/sipai/service/base/CommonFileService.java @@ -1,14 +1,13 @@ package com.sipai.service.base; +import com.sipai.entity.base.CommonFile; +import com.sipai.entity.document.FileIn; +import com.sipai.entity.user.User; +import org.springframework.web.multipart.MultipartFile; + import java.io.IOException; import java.util.List; -import com.sipai.entity.document.FileIn; -import org.springframework.web.multipart.MultipartFile; - -import com.sipai.entity.base.CommonFile; -import com.sipai.entity.user.User; - public interface CommonFileService { public CommonFile selectById(String id, String mappernamespace); diff --git a/src/main/java/com/sipai/service/base/LoginServiceImpl.java b/src/main/java/com/sipai/service/base/LoginServiceImpl.java index 77669766..ddc15428 100644 --- a/src/main/java/com/sipai/service/base/LoginServiceImpl.java +++ b/src/main/java/com/sipai/service/base/LoginServiceImpl.java @@ -1,13 +1,12 @@ package com.sipai.service.base; -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - import com.sipai.dao.user.UserDao; import com.sipai.entity.user.User; import com.sipai.tools.CommUtil; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; @Service diff --git a/src/main/java/com/sipai/service/base/MainPageService.java b/src/main/java/com/sipai/service/base/MainPageService.java index abe37bef..23fbac1a 100644 --- a/src/main/java/com/sipai/service/base/MainPageService.java +++ b/src/main/java/com/sipai/service/base/MainPageService.java @@ -1,10 +1,4 @@ package com.sipai.service.base; -import java.util.ArrayList; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; import com.sipai.dao.base.MainPageDao; import com.sipai.entity.base.MainPage; @@ -13,6 +7,11 @@ import com.sipai.entity.scada.MPoint; import com.sipai.entity.scada.MPoint4APP; import com.sipai.service.scada.MPointService; import com.sipai.tools.CommService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; @Service public class MainPageService implements CommService{ diff --git a/src/main/java/com/sipai/service/base/MainPageTypeService.java b/src/main/java/com/sipai/service/base/MainPageTypeService.java index b4e21680..6eb1b187 100644 --- a/src/main/java/com/sipai/service/base/MainPageTypeService.java +++ b/src/main/java/com/sipai/service/base/MainPageTypeService.java @@ -1,13 +1,12 @@ package com.sipai.service.base; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; import com.sipai.dao.base.MainPageTypeDao; import com.sipai.entity.base.MainPageType; import com.sipai.tools.CommService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class MainPageTypeService implements CommService{ diff --git a/src/main/java/com/sipai/service/bim/BIMAlarmThresholdService.java b/src/main/java/com/sipai/service/bim/BIMAlarmThresholdService.java index 3b66d971..161f360b 100644 --- a/src/main/java/com/sipai/service/bim/BIMAlarmThresholdService.java +++ b/src/main/java/com/sipai/service/bim/BIMAlarmThresholdService.java @@ -1,6 +1,7 @@ package com.sipai.service.bim; import com.sipai.entity.bim.BIMAlarmThreshold; + import java.util.List; public interface BIMAlarmThresholdService { diff --git a/src/main/java/com/sipai/service/bim/BIMCDHomePageTreeService.java b/src/main/java/com/sipai/service/bim/BIMCDHomePageTreeService.java index eb810448..37337a3e 100644 --- a/src/main/java/com/sipai/service/bim/BIMCDHomePageTreeService.java +++ b/src/main/java/com/sipai/service/bim/BIMCDHomePageTreeService.java @@ -1,6 +1,7 @@ package com.sipai.service.bim; import com.sipai.entity.bim.BIMCDHomePageTree; + import java.util.List; import java.util.Map; diff --git a/src/main/java/com/sipai/service/bim/BIMCameraService.java b/src/main/java/com/sipai/service/bim/BIMCameraService.java index 00d58153..919029e8 100644 --- a/src/main/java/com/sipai/service/bim/BIMCameraService.java +++ b/src/main/java/com/sipai/service/bim/BIMCameraService.java @@ -1,6 +1,7 @@ package com.sipai.service.bim; import com.sipai.entity.bim.BIMCamera; + import java.util.List; public interface BIMCameraService { diff --git a/src/main/java/com/sipai/service/bim/BIMCurrencyService.java b/src/main/java/com/sipai/service/bim/BIMCurrencyService.java index c43784f6..68c06c24 100644 --- a/src/main/java/com/sipai/service/bim/BIMCurrencyService.java +++ b/src/main/java/com/sipai/service/bim/BIMCurrencyService.java @@ -1,9 +1,9 @@ package com.sipai.service.bim; -import java.util.List; - import com.sipai.entity.bim.BIMCurrency; +import java.util.List; + public interface BIMCurrencyService { public abstract BIMCurrency selectById(String id); diff --git a/src/main/java/com/sipai/service/bim/BimRouteDataService.java b/src/main/java/com/sipai/service/bim/BimRouteDataService.java index b421e9db..86261daf 100644 --- a/src/main/java/com/sipai/service/bim/BimRouteDataService.java +++ b/src/main/java/com/sipai/service/bim/BimRouteDataService.java @@ -1,9 +1,9 @@ package com.sipai.service.bim; -import java.util.List; - import com.sipai.entity.bim.BimRouteData; +import java.util.List; + public interface BimRouteDataService { public abstract BimRouteData selectById(String id); diff --git a/src/main/java/com/sipai/service/bim/BimRouteEqDataService.java b/src/main/java/com/sipai/service/bim/BimRouteEqDataService.java index 7b1c7087..cfa0722a 100644 --- a/src/main/java/com/sipai/service/bim/BimRouteEqDataService.java +++ b/src/main/java/com/sipai/service/bim/BimRouteEqDataService.java @@ -1,9 +1,9 @@ package com.sipai.service.bim; -import java.util.List; - import com.sipai.entity.bim.BimRouteEqData; +import java.util.List; + public interface BimRouteEqDataService { public abstract BimRouteEqData selectById(String id); diff --git a/src/main/java/com/sipai/service/bim/RobotService.java b/src/main/java/com/sipai/service/bim/RobotService.java index 38787843..84815473 100644 --- a/src/main/java/com/sipai/service/bim/RobotService.java +++ b/src/main/java/com/sipai/service/bim/RobotService.java @@ -1,6 +1,5 @@ package com.sipai.service.bim; -import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; public interface RobotService { diff --git a/src/main/java/com/sipai/service/bim/impl/BIMCDHomePageTreeServiceImpl.java b/src/main/java/com/sipai/service/bim/impl/BIMCDHomePageTreeServiceImpl.java index 528b3f89..2641c3bf 100644 --- a/src/main/java/com/sipai/service/bim/impl/BIMCDHomePageTreeServiceImpl.java +++ b/src/main/java/com/sipai/service/bim/impl/BIMCDHomePageTreeServiceImpl.java @@ -2,17 +2,11 @@ package com.sipai.service.bim.impl; import com.sipai.dao.bim.BIMCDHomePageTreeDao; import com.sipai.entity.bim.BIMCDHomePageTree; -import com.sipai.entity.data.CurveMpoint; -import com.sipai.entity.user.Unit; import com.sipai.service.bim.BIMCDHomePageTreeService; -import com.sipai.tools.CommString; - import net.sf.json.JSONArray; - import org.springframework.stereotype.Service; import javax.annotation.Resource; - import java.util.ArrayList; import java.util.HashMap; import java.util.List; diff --git a/src/main/java/com/sipai/service/bim/impl/BIMCameraServiceImpl.java b/src/main/java/com/sipai/service/bim/impl/BIMCameraServiceImpl.java index 24062b74..db435354 100644 --- a/src/main/java/com/sipai/service/bim/impl/BIMCameraServiceImpl.java +++ b/src/main/java/com/sipai/service/bim/impl/BIMCameraServiceImpl.java @@ -4,6 +4,7 @@ import com.sipai.dao.bim.BIMCameraDao; import com.sipai.entity.bim.BIMCamera; import com.sipai.service.bim.BIMCameraService; import org.springframework.stereotype.Service; + import javax.annotation.Resource; import java.util.List; diff --git a/src/main/java/com/sipai/service/bim/impl/BIMCurrencyServiceImpl.java b/src/main/java/com/sipai/service/bim/impl/BIMCurrencyServiceImpl.java index dc5d7d95..b3a4d647 100644 --- a/src/main/java/com/sipai/service/bim/impl/BIMCurrencyServiceImpl.java +++ b/src/main/java/com/sipai/service/bim/impl/BIMCurrencyServiceImpl.java @@ -1,14 +1,12 @@ package com.sipai.service.bim.impl; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.sipai.dao.bim.BIMCurrencyDao; import com.sipai.entity.bim.BIMCurrency; import com.sipai.service.bim.BIMCurrencyService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class BIMCurrencyServiceImpl implements BIMCurrencyService { diff --git a/src/main/java/com/sipai/service/bim/impl/BimRouteDataServiceImpl.java b/src/main/java/com/sipai/service/bim/impl/BimRouteDataServiceImpl.java index 995681b9..459ffac2 100644 --- a/src/main/java/com/sipai/service/bim/impl/BimRouteDataServiceImpl.java +++ b/src/main/java/com/sipai/service/bim/impl/BimRouteDataServiceImpl.java @@ -1,14 +1,12 @@ package com.sipai.service.bim.impl; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.sipai.dao.bim.BimRouteDataDao; import com.sipai.entity.bim.BimRouteData; import com.sipai.service.bim.BimRouteDataService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service("bimRouteDataService") public class BimRouteDataServiceImpl implements BimRouteDataService { diff --git a/src/main/java/com/sipai/service/bim/impl/BimRouteEqDataServiceImpl.java b/src/main/java/com/sipai/service/bim/impl/BimRouteEqDataServiceImpl.java index b20f9561..b73501b4 100644 --- a/src/main/java/com/sipai/service/bim/impl/BimRouteEqDataServiceImpl.java +++ b/src/main/java/com/sipai/service/bim/impl/BimRouteEqDataServiceImpl.java @@ -1,15 +1,12 @@ package com.sipai.service.bim.impl; -import java.util.List; - -import javax.annotation.Resource; - -import com.sipai.service.scada.ProAlarmService; -import org.springframework.stereotype.Service; - import com.sipai.dao.bim.BimRouteEqDataDao; import com.sipai.entity.bim.BimRouteEqData; import com.sipai.service.bim.BimRouteEqDataService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service("bimRouteEqDataService") public class BimRouteEqDataServiceImpl implements BimRouteEqDataService { diff --git a/src/main/java/com/sipai/service/bim/impl/YsAlarmRecordServiceImpl.java b/src/main/java/com/sipai/service/bim/impl/YsAlarmRecordServiceImpl.java index cd845a79..c837b68e 100644 --- a/src/main/java/com/sipai/service/bim/impl/YsAlarmRecordServiceImpl.java +++ b/src/main/java/com/sipai/service/bim/impl/YsAlarmRecordServiceImpl.java @@ -1,7 +1,6 @@ package com.sipai.service.bim.impl; import com.sipai.dao.bim.YsAlarmRecordDao; -import com.sipai.entity.bim.BimRouteData; import com.sipai.entity.bim.YsAlarmRecord; import com.sipai.service.bim.YsAlarmRecordService; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/sipai/service/bot/Botservice.java b/src/main/java/com/sipai/service/bot/Botservice.java index 84c5ca48..16d73f9d 100644 --- a/src/main/java/com/sipai/service/bot/Botservice.java +++ b/src/main/java/com/sipai/service/bot/Botservice.java @@ -1,9 +1,9 @@ package com.sipai.service.bot; -import java.util.List; - import com.sipai.entity.bot.Bot; +import java.util.List; + public interface Botservice { public Bot selectById(String t); diff --git a/src/main/java/com/sipai/service/bot/BotserviceImpl.java b/src/main/java/com/sipai/service/bot/BotserviceImpl.java index 1d3fa553..d0727704 100644 --- a/src/main/java/com/sipai/service/bot/BotserviceImpl.java +++ b/src/main/java/com/sipai/service/bot/BotserviceImpl.java @@ -1,13 +1,11 @@ package com.sipai.service.bot; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.sipai.dao.bot.BotDao; import com.sipai.entity.bot.Bot; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service("botService") public class BotserviceImpl implements Botservice{ diff --git a/src/main/java/com/sipai/service/business/BusinessUnitDeptApplyService.java b/src/main/java/com/sipai/service/business/BusinessUnitDeptApplyService.java index f9a00e1a..5f8a3a8d 100644 --- a/src/main/java/com/sipai/service/business/BusinessUnitDeptApplyService.java +++ b/src/main/java/com/sipai/service/business/BusinessUnitDeptApplyService.java @@ -1,16 +1,12 @@ package com.sipai.service.business; -import java.util.List; -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - -import com.sipai.dao.business.BusinessUnitDao; import com.sipai.dao.business.BusinessUnitDeptApplyDao; -import com.sipai.entity.business.BusinessUnit; -import com.sipai.entity.business.BusinessUnitDeptApply; import com.sipai.entity.business.BusinessUnitDeptApply; import com.sipai.tools.CommService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class BusinessUnitDeptApplyService implements CommService{ diff --git a/src/main/java/com/sipai/service/business/BusinessUnitHandleDetailService.java b/src/main/java/com/sipai/service/business/BusinessUnitHandleDetailService.java index f307a2cd..92251c72 100644 --- a/src/main/java/com/sipai/service/business/BusinessUnitHandleDetailService.java +++ b/src/main/java/com/sipai/service/business/BusinessUnitHandleDetailService.java @@ -1,27 +1,11 @@ package com.sipai.service.business; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import javax.annotation.Resource; - -import net.sf.json.JSONArray; -import net.sf.json.JSONObject; - -import org.springframework.stereotype.Service; - -import com.sipai.dao.business.BusinessUnitDao; -import com.sipai.dao.business.BusinessUnitHandleDao; import com.sipai.dao.business.BusinessUnitHandleDetailDao; -import com.sipai.dao.maintenance.MaintenanceDetailDao; -import com.sipai.entity.business.BusinessUnit; -import com.sipai.entity.business.BusinessUnitHandle; import com.sipai.entity.business.BusinessUnitHandleDetail; import com.sipai.entity.equipment.EquipmentCard; import com.sipai.entity.maintenance.LibraryFaultBloc; import com.sipai.entity.maintenance.Maintenance; import com.sipai.entity.maintenance.MaintenanceDetail; -import com.sipai.entity.user.ExtSystem; import com.sipai.entity.user.ProcessSection; import com.sipai.entity.user.User; import com.sipai.service.equipment.EquipmentCardService; @@ -32,6 +16,10 @@ import com.sipai.service.user.ExtSystemService; import com.sipai.service.user.ProcessSectionService; import com.sipai.service.user.UserService; import com.sipai.tools.CommService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class BusinessUnitHandleDetailService implements CommService{ diff --git a/src/main/java/com/sipai/service/business/BusinessUnitHandleService.java b/src/main/java/com/sipai/service/business/BusinessUnitHandleService.java index e806e93a..84f333a2 100644 --- a/src/main/java/com/sipai/service/business/BusinessUnitHandleService.java +++ b/src/main/java/com/sipai/service/business/BusinessUnitHandleService.java @@ -1,15 +1,12 @@ package com.sipai.service.business; -import java.util.List; -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - -import com.sipai.dao.business.BusinessUnitDao; import com.sipai.dao.business.BusinessUnitHandleDao; -import com.sipai.entity.business.BusinessUnit; import com.sipai.entity.business.BusinessUnitHandle; import com.sipai.tools.CommService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class BusinessUnitHandleService implements CommService{ diff --git a/src/main/java/com/sipai/service/business/BusinessUnitInquiryService.java b/src/main/java/com/sipai/service/business/BusinessUnitInquiryService.java index c3c6f2e4..d74c376b 100644 --- a/src/main/java/com/sipai/service/business/BusinessUnitInquiryService.java +++ b/src/main/java/com/sipai/service/business/BusinessUnitInquiryService.java @@ -1,17 +1,12 @@ package com.sipai.service.business; -import java.util.List; -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - -import com.sipai.dao.business.BusinessUnitDao; import com.sipai.dao.business.BusinessUnitInquiryDao; -import com.sipai.dao.business.BusinessUnitInquiryDao; -import com.sipai.entity.business.BusinessUnit; -import com.sipai.entity.business.BusinessUnitInquiry; import com.sipai.entity.business.BusinessUnitInquiry; import com.sipai.tools.CommService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class BusinessUnitInquiryService implements CommService{ diff --git a/src/main/java/com/sipai/service/business/BusinessUnitIssueService.java b/src/main/java/com/sipai/service/business/BusinessUnitIssueService.java index f8fcaccc..9420c21b 100644 --- a/src/main/java/com/sipai/service/business/BusinessUnitIssueService.java +++ b/src/main/java/com/sipai/service/business/BusinessUnitIssueService.java @@ -1,15 +1,12 @@ package com.sipai.service.business; -import java.util.List; -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - -import com.sipai.dao.business.BusinessUnitDao; import com.sipai.dao.business.BusinessUnitIssueDao; -import com.sipai.entity.business.BusinessUnit; import com.sipai.entity.business.BusinessUnitIssue; import com.sipai.tools.CommService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class BusinessUnitIssueService implements CommService{ diff --git a/src/main/java/com/sipai/service/business/BusinessUnitService.java b/src/main/java/com/sipai/service/business/BusinessUnitService.java index 51078b3d..e6a7303e 100644 --- a/src/main/java/com/sipai/service/business/BusinessUnitService.java +++ b/src/main/java/com/sipai/service/business/BusinessUnitService.java @@ -1,11 +1,8 @@ package com.sipai.service.business; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import javax.annotation.Resource; +import com.sipai.dao.business.BusinessUnitDao; +import com.sipai.entity.business.BusinessUnit; +import com.sipai.tools.CommService; import org.activiti.engine.HistoryService; import org.activiti.engine.RepositoryService; import org.activiti.engine.RuntimeService; @@ -21,16 +18,15 @@ import org.activiti.engine.impl.pvm.process.ProcessDefinitionImpl; import org.activiti.engine.impl.pvm.process.TransitionImpl; import org.activiti.engine.runtime.ProcessInstance; import org.activiti.engine.task.Task; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.StringUtils; -import com.sipai.dao.business.BusinessUnitDao; -import com.sipai.entity.base.BusinessUnitAdapter; -import com.sipai.entity.business.BusinessUnit; -import com.sipai.entity.business.BusinessUnitAudit; -import com.sipai.tools.CommService; +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; @Service public class BusinessUnitService implements CommService{ diff --git a/src/main/java/com/sipai/service/cmd/impl/CmdServiceImpl.java b/src/main/java/com/sipai/service/cmd/impl/CmdServiceImpl.java index 478c1aed..a752f7f8 100644 --- a/src/main/java/com/sipai/service/cmd/impl/CmdServiceImpl.java +++ b/src/main/java/com/sipai/service/cmd/impl/CmdServiceImpl.java @@ -2,7 +2,6 @@ package com.sipai.service.cmd.impl; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import com.google.api.client.json.Json; import com.sipai.entity.Listener.ListenerHis; import com.sipai.entity.Listener.ListenerMessage; import com.sipai.entity.equipment.EquipmentCard; diff --git a/src/main/java/com/sipai/service/command/EmergencyConfigureDetailService.java b/src/main/java/com/sipai/service/command/EmergencyConfigureDetailService.java index 23435d8a..34f7f61c 100644 --- a/src/main/java/com/sipai/service/command/EmergencyConfigureDetailService.java +++ b/src/main/java/com/sipai/service/command/EmergencyConfigureDetailService.java @@ -1,9 +1,8 @@ package com.sipai.service.command; -import java.util.List; - import com.sipai.entity.command.EmergencyConfigureDetail; -import com.sipai.entity.command.EmergencyConfigureInfo; + +import java.util.List; public interface EmergencyConfigureDetailService { diff --git a/src/main/java/com/sipai/service/command/EmergencyConfigureDetailServiceImpl.java b/src/main/java/com/sipai/service/command/EmergencyConfigureDetailServiceImpl.java index 23cf64c3..0b39b3c9 100644 --- a/src/main/java/com/sipai/service/command/EmergencyConfigureDetailServiceImpl.java +++ b/src/main/java/com/sipai/service/command/EmergencyConfigureDetailServiceImpl.java @@ -1,14 +1,11 @@ package com.sipai.service.command; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.sipai.dao.command.EmergencyConfigureDetailDao; import com.sipai.entity.command.EmergencyConfigureDetail; -import com.sipai.entity.command.EmergencyConfigureInfo; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service("emergencyConfigureDetailService") diff --git a/src/main/java/com/sipai/service/command/EmergencyConfigureInfoService.java b/src/main/java/com/sipai/service/command/EmergencyConfigureInfoService.java index 09a653ea..9af85b9a 100644 --- a/src/main/java/com/sipai/service/command/EmergencyConfigureInfoService.java +++ b/src/main/java/com/sipai/service/command/EmergencyConfigureInfoService.java @@ -1,9 +1,9 @@ package com.sipai.service.command; -import java.util.List; - import com.sipai.entity.command.EmergencyConfigureInfo; +import java.util.List; + diff --git a/src/main/java/com/sipai/service/command/EmergencyConfigureInfoServiceImpl.java b/src/main/java/com/sipai/service/command/EmergencyConfigureInfoServiceImpl.java index 0a6eb0a6..1980b9d5 100644 --- a/src/main/java/com/sipai/service/command/EmergencyConfigureInfoServiceImpl.java +++ b/src/main/java/com/sipai/service/command/EmergencyConfigureInfoServiceImpl.java @@ -1,15 +1,14 @@ package com.sipai.service.command; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.sipai.dao.command.EmergencyConfigureInfoDao; import com.sipai.entity.command.EmergencyConfigureInfo; -import com.sipai.service.command.EmergencyConfigureInfoService; -import org.springframework.transaction.annotation.Transactional;; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; +import java.util.List; + +; @Service("emergencyConfigureInfoService") public class EmergencyConfigureInfoServiceImpl implements EmergencyConfigureInfoService { diff --git a/src/main/java/com/sipai/service/command/EmergencyConfigureService.java b/src/main/java/com/sipai/service/command/EmergencyConfigureService.java index a99da349..f7285924 100644 --- a/src/main/java/com/sipai/service/command/EmergencyConfigureService.java +++ b/src/main/java/com/sipai/service/command/EmergencyConfigureService.java @@ -1,15 +1,11 @@ package com.sipai.service.command; -import java.util.List; -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; - +import com.sipai.entity.command.EmergencyConfigure; import org.springframework.web.multipart.MultipartFile; -import com.sipai.entity.command.EmergencyConfigure; -import com.sipai.entity.command.EmergencyConfigureInfo; -import com.sipai.entity.user.Menu; +import javax.servlet.http.HttpServletRequest; +import java.util.List; +import java.util.Map; public interface EmergencyConfigureService{ diff --git a/src/main/java/com/sipai/service/command/EmergencyConfigureServiceImpl.java b/src/main/java/com/sipai/service/command/EmergencyConfigureServiceImpl.java index 337f82e6..c61be9a1 100644 --- a/src/main/java/com/sipai/service/command/EmergencyConfigureServiceImpl.java +++ b/src/main/java/com/sipai/service/command/EmergencyConfigureServiceImpl.java @@ -1,5 +1,13 @@ package com.sipai.service.command; +import com.sipai.dao.command.EmergencyConfigureDao; +import com.sipai.entity.command.EmergencyConfigure; +import net.sf.json.JSONArray; +import org.springframework.stereotype.Service; +import org.springframework.web.multipart.MultipartFile; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; import java.io.File; import java.io.IOException; import java.util.ArrayList; @@ -7,21 +15,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; - -import org.springframework.stereotype.Service; -import org.springframework.web.multipart.MultipartFile; - -import net.sf.json.JSONArray; - -import com.sipai.dao.command.EmergencyConfigureDao; -import com.sipai.entity.command.EmergencyConfigure; -import com.sipai.entity.command.EmergencyConfigureInfo; -import com.sipai.entity.user.Menu; -import com.sipai.service.command.EmergencyConfigureService; -import com.sipai.entity.base.SQLAdapter; - @Service("emergencyConfigureService") public class EmergencyConfigureServiceImpl implements EmergencyConfigureService { diff --git a/src/main/java/com/sipai/service/command/EmergencyConfigureWorkOrderService.java b/src/main/java/com/sipai/service/command/EmergencyConfigureWorkOrderService.java index a9c21985..c42dc09f 100644 --- a/src/main/java/com/sipai/service/command/EmergencyConfigureWorkOrderService.java +++ b/src/main/java/com/sipai/service/command/EmergencyConfigureWorkOrderService.java @@ -1,9 +1,8 @@ package com.sipai.service.command; -import java.util.List; - import com.sipai.entity.command.EmergencyConfigureWorkOrder; -import com.sipai.entity.command.EmergencyRecords; + +import java.util.List; public interface EmergencyConfigureWorkOrderService { public List selectListByWhere(String where); diff --git a/src/main/java/com/sipai/service/command/EmergencyConfigureWorkOrderServiceImpl.java b/src/main/java/com/sipai/service/command/EmergencyConfigureWorkOrderServiceImpl.java index e1b6222d..4416af9b 100644 --- a/src/main/java/com/sipai/service/command/EmergencyConfigureWorkOrderServiceImpl.java +++ b/src/main/java/com/sipai/service/command/EmergencyConfigureWorkOrderServiceImpl.java @@ -1,16 +1,11 @@ package com.sipai.service.command; -import java.util.List; - -import javax.annotation.Resource; - +import com.sipai.dao.command.EmergencyConfigureWorkOrderDao; +import com.sipai.entity.command.EmergencyConfigureWorkOrder; import org.springframework.stereotype.Service; -import com.sipai.dao.command.EmergencyConfigureWorkOrderDao; -import com.sipai.dao.command.EmergencyRecordsDetailDao; -import com.sipai.entity.command.EmergencyConfigureWorkOrder; -import com.sipai.entity.command.EmergencyRecords; -import com.sipai.entity.command.EmergencyRecordsDetail; +import javax.annotation.Resource; +import java.util.List; @Service("emergencyConfigureWorkOrderService") public class EmergencyConfigureWorkOrderServiceImpl implements EmergencyConfigureWorkOrderService{ diff --git a/src/main/java/com/sipai/service/command/EmergencyConfigurefileService.java b/src/main/java/com/sipai/service/command/EmergencyConfigurefileService.java index fa9fd606..c5e59a51 100644 --- a/src/main/java/com/sipai/service/command/EmergencyConfigurefileService.java +++ b/src/main/java/com/sipai/service/command/EmergencyConfigurefileService.java @@ -1,9 +1,9 @@ package com.sipai.service.command; -import java.util.List; - import com.sipai.entity.command.EmergencyConfigurefile; +import java.util.List; + public interface EmergencyConfigurefileService { public List selectListByWhere(String where); diff --git a/src/main/java/com/sipai/service/command/EmergencyConfigurefileServiceImpl.java b/src/main/java/com/sipai/service/command/EmergencyConfigurefileServiceImpl.java index b5cf6157..35cb556c 100644 --- a/src/main/java/com/sipai/service/command/EmergencyConfigurefileServiceImpl.java +++ b/src/main/java/com/sipai/service/command/EmergencyConfigurefileServiceImpl.java @@ -1,13 +1,11 @@ package com.sipai.service.command; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.sipai.dao.command.EmergencyConfigurefileDao; import com.sipai.entity.command.EmergencyConfigurefile; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service("emergencyConfigurefileService") public class EmergencyConfigurefileServiceImpl implements EmergencyConfigurefileService{ diff --git a/src/main/java/com/sipai/service/command/EmergencyRecordsDetailService.java b/src/main/java/com/sipai/service/command/EmergencyRecordsDetailService.java index 8eab0da4..4c31c814 100644 --- a/src/main/java/com/sipai/service/command/EmergencyRecordsDetailService.java +++ b/src/main/java/com/sipai/service/command/EmergencyRecordsDetailService.java @@ -1,14 +1,9 @@ package com.sipai.service.command; -import java.util.List; - - - - - -import com.sipai.entity.command.EmergencyRecords; import com.sipai.entity.command.EmergencyRecordsDetail; +import java.util.List; + public interface EmergencyRecordsDetailService { public int save(EmergencyRecordsDetail emergencyRecordsDetail); diff --git a/src/main/java/com/sipai/service/command/EmergencyRecordsDetailServiceImpl.java b/src/main/java/com/sipai/service/command/EmergencyRecordsDetailServiceImpl.java index f677d8af..f81450cc 100644 --- a/src/main/java/com/sipai/service/command/EmergencyRecordsDetailServiceImpl.java +++ b/src/main/java/com/sipai/service/command/EmergencyRecordsDetailServiceImpl.java @@ -1,16 +1,11 @@ package com.sipai.service.command; -import java.util.List; - -import javax.annotation.Resource; - +import com.sipai.dao.command.EmergencyRecordsDetailDao; +import com.sipai.entity.command.EmergencyRecordsDetail; import org.springframework.stereotype.Service; -import com.sipai.dao.command.EmergencyRecordsDao; -import com.sipai.dao.command.EmergencyRecordsDetailDao; -import com.sipai.entity.command.EmergencyConfigureInfo; -import com.sipai.entity.command.EmergencyRecords; -import com.sipai.entity.command.EmergencyRecordsDetail; +import javax.annotation.Resource; +import java.util.List; @Service("emergencyRecordsDetailService") public class EmergencyRecordsDetailServiceImpl implements EmergencyRecordsDetailService { diff --git a/src/main/java/com/sipai/service/command/EmergencyRecordsService.java b/src/main/java/com/sipai/service/command/EmergencyRecordsService.java index 6808697c..5b5494d6 100644 --- a/src/main/java/com/sipai/service/command/EmergencyRecordsService.java +++ b/src/main/java/com/sipai/service/command/EmergencyRecordsService.java @@ -1,12 +1,10 @@ package com.sipai.service.command; -import java.util.List; - -import com.sipai.entity.command.EmergencyConfigure; -import com.sipai.entity.command.EmergencyConfigureDetail; import com.sipai.entity.command.EmergencyRecords; import com.sipai.entity.user.User; +import java.util.List; + public interface EmergencyRecordsService { public int save(EmergencyRecords emergencyRecords); diff --git a/src/main/java/com/sipai/service/command/EmergencyRecordsWorkOrderService.java b/src/main/java/com/sipai/service/command/EmergencyRecordsWorkOrderService.java index 67cafa16..4568ac4d 100644 --- a/src/main/java/com/sipai/service/command/EmergencyRecordsWorkOrderService.java +++ b/src/main/java/com/sipai/service/command/EmergencyRecordsWorkOrderService.java @@ -1,10 +1,9 @@ package com.sipai.service.command; -import java.util.List; - -import com.sipai.entity.command.EmergencyConfigure; import com.sipai.entity.command.EmergencyRecordsWorkOrder; +import java.util.List; + public interface EmergencyRecordsWorkOrderService { public int save(EmergencyRecordsWorkOrder emergencyRecordsWorkOrder); diff --git a/src/main/java/com/sipai/service/company/CompanyService.java b/src/main/java/com/sipai/service/company/CompanyService.java index 01e32ead..e4d0e5e8 100644 --- a/src/main/java/com/sipai/service/company/CompanyService.java +++ b/src/main/java/com/sipai/service/company/CompanyService.java @@ -1,12 +1,12 @@ package com.sipai.service.company; -import java.util.List; -import java.util.Map; - import com.alibaba.fastjson.JSONArray; import com.sipai.entity.equipment.EquipmentCardTree; import com.sipai.entity.user.Company; +import java.util.List; +import java.util.Map; + public interface CompanyService { Company selectByPrimaryKey(String companyId); diff --git a/src/main/java/com/sipai/service/company/CompanyServiceImpl.java b/src/main/java/com/sipai/service/company/CompanyServiceImpl.java index dcb16275..dd0a3f2d 100644 --- a/src/main/java/com/sipai/service/company/CompanyServiceImpl.java +++ b/src/main/java/com/sipai/service/company/CompanyServiceImpl.java @@ -1,15 +1,5 @@ package com.sipai.service.company; -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 org.springframework.stereotype.Service; - import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.sipai.dao.user.CompanyDao; @@ -23,6 +13,10 @@ import com.sipai.service.equipment.EquipmentBelongService; import com.sipai.service.equipment.EquipmentCardService; import com.sipai.service.equipment.EquipmentClassService; import com.sipai.service.user.ProcessSectionService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.*; @Service("companyService") public class CompanyServiceImpl implements CompanyService{ diff --git a/src/main/java/com/sipai/service/cqbyt/CqbytSampleValueService.java b/src/main/java/com/sipai/service/cqbyt/CqbytSampleValueService.java index 8862a924..f9aa533b 100644 --- a/src/main/java/com/sipai/service/cqbyt/CqbytSampleValueService.java +++ b/src/main/java/com/sipai/service/cqbyt/CqbytSampleValueService.java @@ -1,14 +1,12 @@ package com.sipai.service.cqbyt; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.sipai.dao.cqbyt.CqbytSampleValueDao; import com.sipai.entity.cqbyt.CqbytSampleValue; import com.sipai.tools.CommService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class CqbytSampleValueService implements CommService { diff --git a/src/main/java/com/sipai/service/cqbyt/CqbytVISITOUTINDATAService.java b/src/main/java/com/sipai/service/cqbyt/CqbytVISITOUTINDATAService.java index 6a201729..c4fce321 100644 --- a/src/main/java/com/sipai/service/cqbyt/CqbytVISITOUTINDATAService.java +++ b/src/main/java/com/sipai/service/cqbyt/CqbytVISITOUTINDATAService.java @@ -1,14 +1,12 @@ package com.sipai.service.cqbyt; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.sipai.dao.cqbyt.CqbytVISITOUTINDATADao; import com.sipai.entity.cqbyt.CqbytVISITOUTINDATA; import com.sipai.tools.CommService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class CqbytVISITOUTINDATAService implements CommService { diff --git a/src/main/java/com/sipai/service/cqbyt/KpiAnalysisService.java b/src/main/java/com/sipai/service/cqbyt/KpiAnalysisService.java index deb5421d..3b0a6334 100644 --- a/src/main/java/com/sipai/service/cqbyt/KpiAnalysisService.java +++ b/src/main/java/com/sipai/service/cqbyt/KpiAnalysisService.java @@ -1,8 +1,9 @@ package com.sipai.service.cqbyt; -import java.util.List; import com.sipai.entity.cqbyt.KpiAnalysis; +import java.util.List; + public interface KpiAnalysisService{ public KpiAnalysis selectById(String id); diff --git a/src/main/java/com/sipai/service/cqbyt/KpiAnalysisServiceImpl.java b/src/main/java/com/sipai/service/cqbyt/KpiAnalysisServiceImpl.java index 2d28c012..9bb0b4f6 100644 --- a/src/main/java/com/sipai/service/cqbyt/KpiAnalysisServiceImpl.java +++ b/src/main/java/com/sipai/service/cqbyt/KpiAnalysisServiceImpl.java @@ -1,17 +1,16 @@ package com.sipai.service.cqbyt; -import java.io.IOException; -import java.math.BigDecimal; -import java.net.URISyntaxException; -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.List; -import java.util.Locale; - -import javax.annotation.Resource; - +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import com.sipai.dao.cqbyt.KpiAnalysisDao; +import com.sipai.entity.cqbyt.KpiAnalysis; +import com.sipai.entity.scada.MPoint; +import com.sipai.entity.scada.MPointHistory; +import com.sipai.service.scada.MPointHistoryService; +import com.sipai.service.scada.MPointService; +import com.sipai.tools.CommUtil; import org.apache.http.HttpEntity; -import org.apache.http.NameValuePair; import org.apache.http.ParseException; import org.apache.http.client.methods.CloseableHttpResponse; import org.apache.http.client.methods.HttpGet; @@ -27,18 +26,14 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; -import com.sipai.dao.cqbyt.KpiAnalysisDao; -import com.sipai.entity.cqbyt.KpiAnalysis; -import com.sipai.entity.scada.MPoint; -import com.sipai.entity.scada.MPointHistory; -import com.sipai.service.scada.MPointHistoryService; -import com.sipai.service.scada.MPointService; -import com.sipai.tools.CommService; -import com.sipai.tools.CommUtil; -import com.sipai.tools.SpringContextUtil; +import javax.annotation.Resource; +import java.io.IOException; +import java.math.BigDecimal; +import java.net.URISyntaxException; +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.List; +import java.util.Locale; @Service("kpiAnalysisService") public class KpiAnalysisServiceImpl implements KpiAnalysisService { diff --git a/src/main/java/com/sipai/service/cqbyt/TestReportDetailsService.java b/src/main/java/com/sipai/service/cqbyt/TestReportDetailsService.java index b271f826..19a3b3a5 100644 --- a/src/main/java/com/sipai/service/cqbyt/TestReportDetailsService.java +++ b/src/main/java/com/sipai/service/cqbyt/TestReportDetailsService.java @@ -3,10 +3,11 @@ package com.sipai.service.cqbyt; import com.sipai.dao.cqbyt.TestReportDetailsDao; import com.sipai.entity.cqbyt.TestReportDetails; import com.sipai.tools.CommService; -import java.util.List; -import javax.annotation.Resource; import org.springframework.stereotype.Service; +import javax.annotation.Resource; +import java.util.List; + @Service public class TestReportDetailsService implements CommService { @Resource diff --git a/src/main/java/com/sipai/service/cqbyt/TestReportService.java b/src/main/java/com/sipai/service/cqbyt/TestReportService.java index 947ba626..850f5ad0 100644 --- a/src/main/java/com/sipai/service/cqbyt/TestReportService.java +++ b/src/main/java/com/sipai/service/cqbyt/TestReportService.java @@ -4,10 +4,11 @@ import com.sipai.dao.cqbyt.TestReportDao; import com.sipai.entity.cqbyt.TestReport; import com.sipai.entity.cqbyt.TestReportDetails; import com.sipai.tools.CommService; -import java.util.List; -import javax.annotation.Resource; import org.springframework.stereotype.Service; +import javax.annotation.Resource; +import java.util.List; + @Service public class TestReportService implements CommService { @Resource diff --git a/src/main/java/com/sipai/service/cqbyt/YtsjService.java b/src/main/java/com/sipai/service/cqbyt/YtsjService.java index 6f66f362..2886589f 100644 --- a/src/main/java/com/sipai/service/cqbyt/YtsjService.java +++ b/src/main/java/com/sipai/service/cqbyt/YtsjService.java @@ -3,10 +3,11 @@ package com.sipai.service.cqbyt; import com.sipai.dao.cqbyt.YtsjDao; import com.sipai.entity.cqbyt.Ytsj; import com.sipai.tools.CommService; -import java.util.List; -import javax.annotation.Resource; import org.springframework.stereotype.Service; +import javax.annotation.Resource; +import java.util.List; + @Service public class YtsjService implements CommService { @Resource diff --git a/src/main/java/com/sipai/service/data/CurveMpointService.java b/src/main/java/com/sipai/service/data/CurveMpointService.java index 9a3c98b7..f6a319e5 100644 --- a/src/main/java/com/sipai/service/data/CurveMpointService.java +++ b/src/main/java/com/sipai/service/data/CurveMpointService.java @@ -1,18 +1,14 @@ package com.sipai.service.data; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.sipai.dao.data.CurveMpointDao; import com.sipai.entity.data.CurveMpoint; - import com.sipai.entity.scada.MPoint; - import com.sipai.service.scada.MPointService; import com.sipai.tools.CommService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class CurveMpointService implements CommService { diff --git a/src/main/java/com/sipai/service/data/CurveRemarkFileService.java b/src/main/java/com/sipai/service/data/CurveRemarkFileService.java index 97d56b48..83cd0148 100644 --- a/src/main/java/com/sipai/service/data/CurveRemarkFileService.java +++ b/src/main/java/com/sipai/service/data/CurveRemarkFileService.java @@ -1,9 +1,9 @@ package com.sipai.service.data; -import java.util.List; - import com.sipai.entity.data.CurveRemarkFile; +import java.util.List; + public interface CurveRemarkFileService { public abstract CurveRemarkFile selectById(String id); diff --git a/src/main/java/com/sipai/service/data/CurveRemarkService.java b/src/main/java/com/sipai/service/data/CurveRemarkService.java index cf637f44..76e6ed8b 100644 --- a/src/main/java/com/sipai/service/data/CurveRemarkService.java +++ b/src/main/java/com/sipai/service/data/CurveRemarkService.java @@ -1,9 +1,9 @@ package com.sipai.service.data; -import java.util.List; - import com.sipai.entity.data.CurveRemark; +import java.util.List; + public interface CurveRemarkService { public abstract CurveRemark selectById(String id); diff --git a/src/main/java/com/sipai/service/data/DataCleaningConditionService.java b/src/main/java/com/sipai/service/data/DataCleaningConditionService.java index 2a58be2d..feb41bd3 100644 --- a/src/main/java/com/sipai/service/data/DataCleaningConditionService.java +++ b/src/main/java/com/sipai/service/data/DataCleaningConditionService.java @@ -1,9 +1,9 @@ package com.sipai.service.data; -import java.util.List; - import com.sipai.entity.data.DataCleaningCondition; +import java.util.List; + public interface DataCleaningConditionService { public abstract DataCleaningCondition selectById(String id); diff --git a/src/main/java/com/sipai/service/data/DataCleaningConfigureService.java b/src/main/java/com/sipai/service/data/DataCleaningConfigureService.java index 2e7210c7..eb5c847e 100644 --- a/src/main/java/com/sipai/service/data/DataCleaningConfigureService.java +++ b/src/main/java/com/sipai/service/data/DataCleaningConfigureService.java @@ -1,9 +1,9 @@ package com.sipai.service.data; -import java.util.List; - import com.sipai.entity.data.DataCleaningConfigure; +import java.util.List; + public interface DataCleaningConfigureService { public abstract DataCleaningConfigure selectById(String id); diff --git a/src/main/java/com/sipai/service/data/DataCleaningHistoryService.java b/src/main/java/com/sipai/service/data/DataCleaningHistoryService.java index 18be6396..b3d1bc74 100644 --- a/src/main/java/com/sipai/service/data/DataCleaningHistoryService.java +++ b/src/main/java/com/sipai/service/data/DataCleaningHistoryService.java @@ -1,9 +1,9 @@ package com.sipai.service.data; -import java.util.List; - import com.sipai.entity.data.DataCleaningHistory; +import java.util.List; + public interface DataCleaningHistoryService { public abstract DataCleaningHistory selectById(String id); diff --git a/src/main/java/com/sipai/service/data/DataCleaningPointService.java b/src/main/java/com/sipai/service/data/DataCleaningPointService.java index e6d14dd1..017e2cc2 100644 --- a/src/main/java/com/sipai/service/data/DataCleaningPointService.java +++ b/src/main/java/com/sipai/service/data/DataCleaningPointService.java @@ -1,9 +1,9 @@ package com.sipai.service.data; -import java.util.List; - import com.sipai.entity.data.DataCleaningPoint; +import java.util.List; + public interface DataCleaningPointService { public abstract DataCleaningPoint selectById(String id); diff --git a/src/main/java/com/sipai/service/data/DataCurveService.java b/src/main/java/com/sipai/service/data/DataCurveService.java index b69a1692..733d036b 100644 --- a/src/main/java/com/sipai/service/data/DataCurveService.java +++ b/src/main/java/com/sipai/service/data/DataCurveService.java @@ -1,44 +1,23 @@ package com.sipai.service.data; -import java.io.BufferedReader; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.io.OutputStream; -import java.net.URLEncoder; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Properties; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletResponse; - -import org.apache.poi.hssf.usermodel.HSSFCell; -import org.apache.poi.hssf.usermodel.HSSFCellStyle; -import org.apache.poi.hssf.usermodel.HSSFClientAnchor; -import org.apache.poi.hssf.usermodel.HSSFComment; -import org.apache.poi.hssf.usermodel.HSSFFont; -import org.apache.poi.hssf.usermodel.HSSFPatriarch; -import org.apache.poi.hssf.usermodel.HSSFRichTextString; -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.ss.util.CellRangeAddress; -import org.apache.poi.hssf.util.HSSFColor; -import org.springframework.stereotype.Service; - import com.sipai.dao.data.DataCurveDao; import com.sipai.entity.data.CurveMpoint; import com.sipai.entity.data.DataCurve; import com.sipai.service.msg.MsgService; import com.sipai.tools.CommService; import com.sipai.tools.CommUtil; - import net.sf.json.JSONArray; import net.sf.json.JSONObject; +import org.apache.poi.hssf.usermodel.*; +import org.apache.poi.ss.usermodel.*; +import org.apache.poi.ss.util.CellRangeAddress; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import java.io.*; +import java.net.URLEncoder; +import java.util.*; @Service public class DataCurveService implements CommService { diff --git a/src/main/java/com/sipai/service/data/XServerService.java b/src/main/java/com/sipai/service/data/XServerService.java index 1c58a4f5..62583b40 100644 --- a/src/main/java/com/sipai/service/data/XServerService.java +++ b/src/main/java/com/sipai/service/data/XServerService.java @@ -1,9 +1,9 @@ package com.sipai.service.data; -import java.util.List; - import com.sipai.entity.data.XServer; +import java.util.List; + public interface XServerService { public abstract XServer selectById(String id); diff --git a/src/main/java/com/sipai/service/data/impl/CurveRemarkFileServiceImpl.java b/src/main/java/com/sipai/service/data/impl/CurveRemarkFileServiceImpl.java index 5cf5929c..c6893076 100644 --- a/src/main/java/com/sipai/service/data/impl/CurveRemarkFileServiceImpl.java +++ b/src/main/java/com/sipai/service/data/impl/CurveRemarkFileServiceImpl.java @@ -1,14 +1,12 @@ package com.sipai.service.data.impl; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.sipai.dao.data.CurveRemarkFileDao; import com.sipai.entity.data.CurveRemarkFile; import com.sipai.service.data.CurveRemarkFileService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class CurveRemarkFileServiceImpl implements CurveRemarkFileService { diff --git a/src/main/java/com/sipai/service/data/impl/CurveRemarkServiceImpl.java b/src/main/java/com/sipai/service/data/impl/CurveRemarkServiceImpl.java index c8e02d8e..abfe242e 100644 --- a/src/main/java/com/sipai/service/data/impl/CurveRemarkServiceImpl.java +++ b/src/main/java/com/sipai/service/data/impl/CurveRemarkServiceImpl.java @@ -1,16 +1,13 @@ package com.sipai.service.data.impl; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.sipai.dao.data.CurveRemarkDao; import com.sipai.entity.data.CurveRemark; import com.sipai.service.data.CurveRemarkService; import com.sipai.service.scada.MPointService; -import com.sipai.tools.CommString; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service diff --git a/src/main/java/com/sipai/service/data/impl/DataCleaningConditionServiceImpl.java b/src/main/java/com/sipai/service/data/impl/DataCleaningConditionServiceImpl.java index 1083ea19..4b06b97f 100644 --- a/src/main/java/com/sipai/service/data/impl/DataCleaningConditionServiceImpl.java +++ b/src/main/java/com/sipai/service/data/impl/DataCleaningConditionServiceImpl.java @@ -1,14 +1,12 @@ package com.sipai.service.data.impl; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.sipai.dao.data.DataCleaningConditionDao; import com.sipai.entity.data.DataCleaningCondition; import com.sipai.service.data.DataCleaningConditionService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service("dataCleaningConditionService") public class DataCleaningConditionServiceImpl implements DataCleaningConditionService { diff --git a/src/main/java/com/sipai/service/data/impl/DataCleaningConfigureServiceImpl.java b/src/main/java/com/sipai/service/data/impl/DataCleaningConfigureServiceImpl.java index 22d5f544..1b5542bc 100644 --- a/src/main/java/com/sipai/service/data/impl/DataCleaningConfigureServiceImpl.java +++ b/src/main/java/com/sipai/service/data/impl/DataCleaningConfigureServiceImpl.java @@ -1,14 +1,12 @@ package com.sipai.service.data.impl; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.sipai.dao.data.DataCleaningConfigureDao; import com.sipai.entity.data.DataCleaningConfigure; import com.sipai.service.data.DataCleaningConfigureService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service("dataCleaningConfigureService") public class DataCleaningConfigureServiceImpl implements DataCleaningConfigureService { diff --git a/src/main/java/com/sipai/service/data/impl/DataCleaningHistoryServiceImpl.java b/src/main/java/com/sipai/service/data/impl/DataCleaningHistoryServiceImpl.java index 8bacda60..3f1e8565 100644 --- a/src/main/java/com/sipai/service/data/impl/DataCleaningHistoryServiceImpl.java +++ b/src/main/java/com/sipai/service/data/impl/DataCleaningHistoryServiceImpl.java @@ -1,18 +1,14 @@ package com.sipai.service.data.impl; -import java.util.List; - -import javax.annotation.Resource; - -import com.sipai.entity.scada.MPoint; -import com.sipai.entity.user.Unit; -import com.sipai.service.scada.MPointService; -import com.sipai.service.user.UnitService; -import org.springframework.stereotype.Service; - import com.sipai.dao.data.DataCleaningHistoryDao; import com.sipai.entity.data.DataCleaningHistory; import com.sipai.service.data.DataCleaningHistoryService; +import com.sipai.service.scada.MPointService; +import com.sipai.service.user.UnitService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service("dataCleaningHistoryService") public class DataCleaningHistoryServiceImpl implements DataCleaningHistoryService { diff --git a/src/main/java/com/sipai/service/data/impl/DataCleaningPointServiceImpl.java b/src/main/java/com/sipai/service/data/impl/DataCleaningPointServiceImpl.java index c2a2bb82..71c8117d 100644 --- a/src/main/java/com/sipai/service/data/impl/DataCleaningPointServiceImpl.java +++ b/src/main/java/com/sipai/service/data/impl/DataCleaningPointServiceImpl.java @@ -1,18 +1,16 @@ package com.sipai.service.data.impl; -import java.util.List; - -import javax.annotation.Resource; - +import com.sipai.dao.data.DataCleaningPointDao; +import com.sipai.entity.data.DataCleaningPoint; import com.sipai.entity.scada.MPoint; import com.sipai.entity.user.Unit; +import com.sipai.service.data.DataCleaningPointService; import com.sipai.service.scada.MPointService; import com.sipai.service.user.UnitService; import org.springframework.stereotype.Service; -import com.sipai.dao.data.DataCleaningPointDao; -import com.sipai.entity.data.DataCleaningPoint; -import com.sipai.service.data.DataCleaningPointService; +import javax.annotation.Resource; +import java.util.List; @Service("dataCleaningPointService") public class DataCleaningPointServiceImpl implements DataCleaningPointService { diff --git a/src/main/java/com/sipai/service/data/impl/XServerServiceImpl.java b/src/main/java/com/sipai/service/data/impl/XServerServiceImpl.java index ebc7516f..74961b2d 100644 --- a/src/main/java/com/sipai/service/data/impl/XServerServiceImpl.java +++ b/src/main/java/com/sipai/service/data/impl/XServerServiceImpl.java @@ -1,17 +1,15 @@ package com.sipai.service.data.impl; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.sipai.dao.data.XServerDao; import com.sipai.entity.data.XServer; import com.sipai.entity.user.Company; import com.sipai.service.data.XServerService; import com.sipai.service.user.UnitService; import com.sipai.service.user.UserService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class XServerServiceImpl implements XServerService { diff --git a/src/main/java/com/sipai/service/document/DataService.java b/src/main/java/com/sipai/service/document/DataService.java index 155b2ae2..ccb907e1 100644 --- a/src/main/java/com/sipai/service/document/DataService.java +++ b/src/main/java/com/sipai/service/document/DataService.java @@ -1,19 +1,16 @@ package com.sipai.service.document; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import javax.annotation.Resource; - -import net.sf.json.JSONArray; - -import org.springframework.stereotype.Service; - import com.sipai.dao.document.DataDao; import com.sipai.entity.document.Data; import com.sipai.tools.CommService; +import net.sf.json.JSONArray; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; @Service public class DataService implements CommService{ diff --git a/src/main/java/com/sipai/service/document/DocFileRelationService.java b/src/main/java/com/sipai/service/document/DocFileRelationService.java index af23f3e1..b0fdaf60 100644 --- a/src/main/java/com/sipai/service/document/DocFileRelationService.java +++ b/src/main/java/com/sipai/service/document/DocFileRelationService.java @@ -1,18 +1,16 @@ package com.sipai.service.document; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; import com.sipai.dao.document.DocFileRelationDao; import com.sipai.entity.base.CommonFile; -import com.sipai.entity.document.Data; import com.sipai.entity.document.DocFileRelation; import com.sipai.entity.user.User; import com.sipai.service.base.CommonFileService; import com.sipai.service.user.UserService; import com.sipai.tools.CommService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class DocFileRelationService implements CommService{ diff --git a/src/main/java/com/sipai/service/efficiency/ConstituteConfigureDetailService.java b/src/main/java/com/sipai/service/efficiency/ConstituteConfigureDetailService.java index 74d8dfe0..907d671a 100644 --- a/src/main/java/com/sipai/service/efficiency/ConstituteConfigureDetailService.java +++ b/src/main/java/com/sipai/service/efficiency/ConstituteConfigureDetailService.java @@ -1,9 +1,9 @@ package com.sipai.service.efficiency; -import java.util.List; - import com.sipai.entity.efficiency.ConstituteConfigureDetail; +import java.util.List; + public interface ConstituteConfigureDetailService { public abstract ConstituteConfigureDetail selectById(String id); diff --git a/src/main/java/com/sipai/service/efficiency/ConstituteConfigureService.java b/src/main/java/com/sipai/service/efficiency/ConstituteConfigureService.java index 4edc7773..3813ceb0 100644 --- a/src/main/java/com/sipai/service/efficiency/ConstituteConfigureService.java +++ b/src/main/java/com/sipai/service/efficiency/ConstituteConfigureService.java @@ -1,11 +1,11 @@ package com.sipai.service.efficiency; -import java.util.List; -import java.util.Map; - import com.sipai.entity.efficiency.ConstituteConfigure; import net.sf.json.JSONArray; +import java.util.List; +import java.util.Map; + public interface ConstituteConfigureService { public abstract ConstituteConfigure selectById(String id); diff --git a/src/main/java/com/sipai/service/efficiency/EfficiencyOverviewConfigureAssemblyService.java b/src/main/java/com/sipai/service/efficiency/EfficiencyOverviewConfigureAssemblyService.java index 59707eb3..d3c4412b 100644 --- a/src/main/java/com/sipai/service/efficiency/EfficiencyOverviewConfigureAssemblyService.java +++ b/src/main/java/com/sipai/service/efficiency/EfficiencyOverviewConfigureAssemblyService.java @@ -1,10 +1,10 @@ package com.sipai.service.efficiency; +import com.sipai.entity.efficiency.EfficiencyOverviewConfigureAssembly; + import java.util.List; import java.util.Map; -import com.sipai.entity.efficiency.EfficiencyOverviewConfigureAssembly; - public interface EfficiencyOverviewConfigureAssemblyService { public abstract EfficiencyOverviewConfigureAssembly selectById(String id); diff --git a/src/main/java/com/sipai/service/efficiency/EfficiencyOverviewConfigureService.java b/src/main/java/com/sipai/service/efficiency/EfficiencyOverviewConfigureService.java index 7d4c99cd..370ae6b7 100644 --- a/src/main/java/com/sipai/service/efficiency/EfficiencyOverviewConfigureService.java +++ b/src/main/java/com/sipai/service/efficiency/EfficiencyOverviewConfigureService.java @@ -1,14 +1,9 @@ package com.sipai.service.efficiency; -import java.util.List; -import java.util.Map; - -import javax.servlet.http.HttpServletResponse; - -import net.sf.json.JSONArray; - import com.sipai.entity.efficiency.EfficiencyOverviewConfigure; +import java.util.List; + public interface EfficiencyOverviewConfigureService { public abstract EfficiencyOverviewConfigure selectById(String id); diff --git a/src/main/java/com/sipai/service/efficiency/EfficiencyOverviewMpConfigureService.java b/src/main/java/com/sipai/service/efficiency/EfficiencyOverviewMpConfigureService.java index 917c05ea..292ce000 100644 --- a/src/main/java/com/sipai/service/efficiency/EfficiencyOverviewMpConfigureService.java +++ b/src/main/java/com/sipai/service/efficiency/EfficiencyOverviewMpConfigureService.java @@ -1,14 +1,9 @@ package com.sipai.service.efficiency; -import java.util.List; -import java.util.Map; - -import javax.servlet.http.HttpServletResponse; - -import net.sf.json.JSONArray; - import com.sipai.entity.efficiency.EfficiencyOverviewMpConfigure; +import java.util.List; + public interface EfficiencyOverviewMpConfigureService { public abstract EfficiencyOverviewMpConfigure selectById(String id); diff --git a/src/main/java/com/sipai/service/efficiency/EfficiencyStatisticsService.java b/src/main/java/com/sipai/service/efficiency/EfficiencyStatisticsService.java index fc288ddc..bea41245 100644 --- a/src/main/java/com/sipai/service/efficiency/EfficiencyStatisticsService.java +++ b/src/main/java/com/sipai/service/efficiency/EfficiencyStatisticsService.java @@ -1,12 +1,11 @@ package com.sipai.service.efficiency; -import java.io.IOException; -import java.util.List; -import java.util.Map; - import com.sipai.entity.efficiency.EfficiencyStatistics; import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.List; +import java.util.Map; public interface EfficiencyStatisticsService { diff --git a/src/main/java/com/sipai/service/efficiency/WaterSpreadDataConfigureService.java b/src/main/java/com/sipai/service/efficiency/WaterSpreadDataConfigureService.java index eba7b97f..f81d8b30 100644 --- a/src/main/java/com/sipai/service/efficiency/WaterSpreadDataConfigureService.java +++ b/src/main/java/com/sipai/service/efficiency/WaterSpreadDataConfigureService.java @@ -1,14 +1,9 @@ package com.sipai.service.efficiency; -import java.util.List; -import java.util.Map; - -import javax.servlet.http.HttpServletResponse; - -import net.sf.json.JSONArray; - import com.sipai.entity.efficiency.WaterSpreadDataConfigure; +import java.util.List; + public interface WaterSpreadDataConfigureService { public abstract WaterSpreadDataConfigure selectById(String id); diff --git a/src/main/java/com/sipai/service/efficiency/impl/ConstituteConfigureDetailServiceImpl.java b/src/main/java/com/sipai/service/efficiency/impl/ConstituteConfigureDetailServiceImpl.java index f1c561be..4d7c68ee 100644 --- a/src/main/java/com/sipai/service/efficiency/impl/ConstituteConfigureDetailServiceImpl.java +++ b/src/main/java/com/sipai/service/efficiency/impl/ConstituteConfigureDetailServiceImpl.java @@ -1,14 +1,12 @@ package com.sipai.service.efficiency.impl; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.sipai.dao.efficiency.ConstituteConfigureDetailDao; import com.sipai.entity.efficiency.ConstituteConfigureDetail; import com.sipai.service.efficiency.ConstituteConfigureDetailService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class ConstituteConfigureDetailServiceImpl implements ConstituteConfigureDetailService { diff --git a/src/main/java/com/sipai/service/efficiency/impl/ConstituteConfigureSchemeServiceImpl.java b/src/main/java/com/sipai/service/efficiency/impl/ConstituteConfigureSchemeServiceImpl.java index edc6fbfd..ff1b9ddc 100644 --- a/src/main/java/com/sipai/service/efficiency/impl/ConstituteConfigureSchemeServiceImpl.java +++ b/src/main/java/com/sipai/service/efficiency/impl/ConstituteConfigureSchemeServiceImpl.java @@ -1,14 +1,12 @@ package com.sipai.service.efficiency.impl; -import java.util.List; - -import javax.annotation.Resource; - +import com.sipai.dao.efficiency.ConstituteConfigureSchemeDao; import com.sipai.entity.efficiency.ConstituteConfigureScheme; +import com.sipai.service.efficiency.ConstituteConfigureSchemeService; import org.springframework.stereotype.Service; -import com.sipai.dao.efficiency.ConstituteConfigureSchemeDao; -import com.sipai.service.efficiency.ConstituteConfigureSchemeService; +import javax.annotation.Resource; +import java.util.List; @Service public class ConstituteConfigureSchemeServiceImpl implements ConstituteConfigureSchemeService { diff --git a/src/main/java/com/sipai/service/efficiency/impl/ConstituteConfigureServiceImpl.java b/src/main/java/com/sipai/service/efficiency/impl/ConstituteConfigureServiceImpl.java index c3cb1810..f1e1b064 100644 --- a/src/main/java/com/sipai/service/efficiency/impl/ConstituteConfigureServiceImpl.java +++ b/src/main/java/com/sipai/service/efficiency/impl/ConstituteConfigureServiceImpl.java @@ -1,19 +1,16 @@ package com.sipai.service.efficiency.impl; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import javax.annotation.Resource; - -import net.sf.json.JSONArray; - -import org.springframework.stereotype.Service; - import com.sipai.dao.efficiency.ConstituteConfigureDao; import com.sipai.entity.efficiency.ConstituteConfigure; import com.sipai.service.efficiency.ConstituteConfigureService; +import net.sf.json.JSONArray; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; @Service public class ConstituteConfigureServiceImpl implements ConstituteConfigureService { diff --git a/src/main/java/com/sipai/service/efficiency/impl/EfficiencyOverviewConfigureAssemblyServiceImpl.java b/src/main/java/com/sipai/service/efficiency/impl/EfficiencyOverviewConfigureAssemblyServiceImpl.java index a016e5e0..fc62d1b1 100644 --- a/src/main/java/com/sipai/service/efficiency/impl/EfficiencyOverviewConfigureAssemblyServiceImpl.java +++ b/src/main/java/com/sipai/service/efficiency/impl/EfficiencyOverviewConfigureAssemblyServiceImpl.java @@ -1,19 +1,16 @@ package com.sipai.service.efficiency.impl; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import javax.annotation.Resource; - -import net.sf.json.JSONArray; - -import org.springframework.stereotype.Service; - import com.sipai.dao.efficiency.EfficiencyOverviewConfigureAssemblyDao; import com.sipai.entity.efficiency.EfficiencyOverviewConfigureAssembly; import com.sipai.service.efficiency.EfficiencyOverviewConfigureAssemblyService; +import net.sf.json.JSONArray; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; @Service public class EfficiencyOverviewConfigureAssemblyServiceImpl implements EfficiencyOverviewConfigureAssemblyService { diff --git a/src/main/java/com/sipai/service/efficiency/impl/EfficiencyOverviewConfigureServiceImpl.java b/src/main/java/com/sipai/service/efficiency/impl/EfficiencyOverviewConfigureServiceImpl.java index 51532e81..b775a3b7 100644 --- a/src/main/java/com/sipai/service/efficiency/impl/EfficiencyOverviewConfigureServiceImpl.java +++ b/src/main/java/com/sipai/service/efficiency/impl/EfficiencyOverviewConfigureServiceImpl.java @@ -1,20 +1,12 @@ package com.sipai.service.efficiency.impl; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletResponse; - -import net.sf.json.JSONArray; - -import org.springframework.stereotype.Service; - import com.sipai.dao.efficiency.EfficiencyOverviewConfigureDao; import com.sipai.entity.efficiency.EfficiencyOverviewConfigure; import com.sipai.service.efficiency.EfficiencyOverviewConfigureService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class EfficiencyOverviewConfigureServiceImpl implements EfficiencyOverviewConfigureService { diff --git a/src/main/java/com/sipai/service/efficiency/impl/EfficiencyOverviewMpConfigureServiceImpl.java b/src/main/java/com/sipai/service/efficiency/impl/EfficiencyOverviewMpConfigureServiceImpl.java index b6fe6262..67c142e6 100644 --- a/src/main/java/com/sipai/service/efficiency/impl/EfficiencyOverviewMpConfigureServiceImpl.java +++ b/src/main/java/com/sipai/service/efficiency/impl/EfficiencyOverviewMpConfigureServiceImpl.java @@ -1,37 +1,17 @@ package com.sipai.service.efficiency.impl; -import java.math.BigDecimal; -import java.text.DecimalFormat; -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 net.sf.json.JSONArray; - -import org.springframework.stereotype.Service; -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.sipai.dao.efficiency.EfficiencyOverviewMpConfigureDao; -import com.sipai.entity.achievement.AcceptanceModelMPoint; -import com.sipai.entity.data.CurveRemark; import com.sipai.entity.efficiency.EfficiencyOverviewConfigureAssembly; import com.sipai.entity.efficiency.EfficiencyOverviewMpConfigure; import com.sipai.entity.scada.MPoint; -import com.sipai.entity.scada.MPointHistory; -import com.sipai.entity.user.User; import com.sipai.service.efficiency.EfficiencyOverviewConfigureAssemblyService; import com.sipai.service.efficiency.EfficiencyOverviewMpConfigureService; -import com.sipai.service.scada.MPointHistoryService; import com.sipai.service.scada.MPointService; -import com.sipai.tools.CommUtil; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.text.DecimalFormat; +import java.util.List; @Service public class EfficiencyOverviewMpConfigureServiceImpl implements EfficiencyOverviewMpConfigureService { diff --git a/src/main/java/com/sipai/service/efficiency/impl/EfficiencyStatisticsServiceImpl.java b/src/main/java/com/sipai/service/efficiency/impl/EfficiencyStatisticsServiceImpl.java index 88f33d1d..888a4568 100644 --- a/src/main/java/com/sipai/service/efficiency/impl/EfficiencyStatisticsServiceImpl.java +++ b/src/main/java/com/sipai/service/efficiency/impl/EfficiencyStatisticsServiceImpl.java @@ -1,5 +1,20 @@ package com.sipai.service.efficiency.impl; +import com.sipai.dao.efficiency.EfficiencyStatisticsDao; +import com.sipai.entity.efficiency.EfficiencyNumber; +import com.sipai.entity.efficiency.EfficiencyStatistics; +import com.sipai.entity.scada.MPointHistory; +import com.sipai.service.efficiency.EfficiencyStatisticsService; +import com.sipai.service.scada.MPointHistoryService; +import com.sipai.service.scada.MPointService; +import net.sf.json.JSONArray; +import org.apache.poi.hssf.usermodel.*; +import org.apache.poi.ss.usermodel.*; +import org.apache.poi.ss.util.CellRangeAddress; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.OutputStream; import java.math.BigDecimal; @@ -9,24 +24,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletResponse; - -import com.sipai.entity.efficiency.EfficiencyNumber; -import net.sf.json.JSONArray; - -import org.apache.poi.hssf.usermodel.*; -import org.apache.poi.ss.usermodel.*; -import org.apache.poi.ss.util.CellRangeAddress; -import org.springframework.stereotype.Service; - -import com.sipai.dao.efficiency.EfficiencyStatisticsDao; -import com.sipai.entity.efficiency.EfficiencyStatistics; -import com.sipai.entity.scada.MPointHistory; -import com.sipai.service.efficiency.EfficiencyStatisticsService; -import com.sipai.service.scada.MPointHistoryService; -import com.sipai.service.scada.MPointService; - @Service public class EfficiencyStatisticsServiceImpl implements EfficiencyStatisticsService { @Resource diff --git a/src/main/java/com/sipai/service/efficiency/impl/WaterSpreadDataConfigureServiceImpl.java b/src/main/java/com/sipai/service/efficiency/impl/WaterSpreadDataConfigureServiceImpl.java index 920fd465..afad2b47 100644 --- a/src/main/java/com/sipai/service/efficiency/impl/WaterSpreadDataConfigureServiceImpl.java +++ b/src/main/java/com/sipai/service/efficiency/impl/WaterSpreadDataConfigureServiceImpl.java @@ -1,35 +1,14 @@ package com.sipai.service.efficiency.impl; -import java.math.BigDecimal; -import java.text.DecimalFormat; -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 net.sf.json.JSONArray; - -import org.springframework.stereotype.Service; -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.sipai.dao.efficiency.WaterSpreadDataConfigureDao; -import com.sipai.entity.achievement.AcceptanceModelMPoint; -import com.sipai.entity.data.CurveRemark; import com.sipai.entity.efficiency.WaterSpreadDataConfigure; import com.sipai.entity.scada.MPoint; -import com.sipai.entity.scada.MPointHistory; -import com.sipai.entity.user.User; import com.sipai.service.efficiency.WaterSpreadDataConfigureService; -import com.sipai.service.scada.MPointHistoryService; import com.sipai.service.scada.MPointService; -import com.sipai.tools.CommUtil; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class WaterSpreadDataConfigureServiceImpl implements WaterSpreadDataConfigureService { diff --git a/src/main/java/com/sipai/service/equipment/AssetClassService.java b/src/main/java/com/sipai/service/equipment/AssetClassService.java index 403906e8..ca332c54 100644 --- a/src/main/java/com/sipai/service/equipment/AssetClassService.java +++ b/src/main/java/com/sipai/service/equipment/AssetClassService.java @@ -1,25 +1,14 @@ package com.sipai.service.equipment; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import javax.annotation.Resource; - -import net.sf.json.JSONArray; - -import org.springframework.stereotype.Service; - import com.sipai.dao.equipment.AssetClassDao; import com.sipai.entity.equipment.AssetClass; import com.sipai.entity.equipment.EquipmentBelong; -import com.sipai.entity.equipment.EquipmentClass; -import com.sipai.entity.timeefficiency.TimeEfficiencyCommStr; -import com.sipai.entity.user.Unit; import com.sipai.tools.CommService; -import com.sipai.tools.CommString; +import net.sf.json.JSONArray; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.*; @Service public class AssetClassService implements CommService{ @Resource diff --git a/src/main/java/com/sipai/service/equipment/CharacteristicService.java b/src/main/java/com/sipai/service/equipment/CharacteristicService.java index cf1ccade..8669d408 100644 --- a/src/main/java/com/sipai/service/equipment/CharacteristicService.java +++ b/src/main/java/com/sipai/service/equipment/CharacteristicService.java @@ -1,25 +1,12 @@ package com.sipai.service.equipment; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import javax.annotation.Resource; - -import net.sf.json.JSONArray; - -import org.springframework.stereotype.Service; - import com.sipai.dao.equipment.CharacteristicDao; import com.sipai.entity.equipment.Characteristic; -import com.sipai.entity.equipment.EquipmentBelong; -import com.sipai.entity.equipment.EquipmentClass; -import com.sipai.entity.timeefficiency.TimeEfficiencyCommStr; -import com.sipai.entity.user.Unit; import com.sipai.tools.CommService; -import com.sipai.tools.CommString; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class CharacteristicService implements CommService{ @Resource diff --git a/src/main/java/com/sipai/service/equipment/EquipmentAcceptanceApplyDetailService.java b/src/main/java/com/sipai/service/equipment/EquipmentAcceptanceApplyDetailService.java index 2981830e..d59eaca7 100644 --- a/src/main/java/com/sipai/service/equipment/EquipmentAcceptanceApplyDetailService.java +++ b/src/main/java/com/sipai/service/equipment/EquipmentAcceptanceApplyDetailService.java @@ -1,14 +1,12 @@ package com.sipai.service.equipment; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.sipai.dao.equipment.EquipmentAcceptanceApplyDetailDao; import com.sipai.entity.equipment.EquipmentAcceptanceApplyDetail; import com.sipai.tools.CommService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service diff --git a/src/main/java/com/sipai/service/equipment/EquipmentAcceptanceApplyService.java b/src/main/java/com/sipai/service/equipment/EquipmentAcceptanceApplyService.java index c526131f..2786e3ad 100644 --- a/src/main/java/com/sipai/service/equipment/EquipmentAcceptanceApplyService.java +++ b/src/main/java/com/sipai/service/equipment/EquipmentAcceptanceApplyService.java @@ -1,18 +1,5 @@ package com.sipai.service.equipment; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import javax.annotation.Resource; - -import org.activiti.engine.RuntimeService; -import org.activiti.engine.repository.ProcessDefinition; -import org.activiti.engine.runtime.ProcessInstance; -import org.activiti.engine.task.Task; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - import com.sipai.dao.equipment.EquipmentAcceptanceApplyDao; import com.sipai.entity.activiti.ProcessType; import com.sipai.entity.base.BusinessUnitAdapter; @@ -24,6 +11,17 @@ import com.sipai.service.activiti.WorkflowProcessDefinitionService; import com.sipai.service.activiti.WorkflowService; import com.sipai.service.business.BusinessUnitAuditService; import com.sipai.tools.CommService; +import org.activiti.engine.RuntimeService; +import org.activiti.engine.repository.ProcessDefinition; +import org.activiti.engine.runtime.ProcessInstance; +import org.activiti.engine.task.Task; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; +import java.util.HashMap; +import java.util.List; +import java.util.Map; @Service public class EquipmentAcceptanceApplyService implements CommService{ diff --git a/src/main/java/com/sipai/service/equipment/EquipmentAccidentDetailService.java b/src/main/java/com/sipai/service/equipment/EquipmentAccidentDetailService.java index ed93718c..bfba0dcf 100644 --- a/src/main/java/com/sipai/service/equipment/EquipmentAccidentDetailService.java +++ b/src/main/java/com/sipai/service/equipment/EquipmentAccidentDetailService.java @@ -1,11 +1,12 @@ package com.sipai.service.equipment; -import java.util.List; -import javax.annotation.Resource; -import org.springframework.stereotype.Service; import com.sipai.dao.equipment.EquipmentAccidentDetailDao; import com.sipai.entity.equipment.EquipmentAccidentDetail; import com.sipai.tools.CommService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class EquipmentAccidentDetailService implements diff --git a/src/main/java/com/sipai/service/equipment/EquipmentAccidentService.java b/src/main/java/com/sipai/service/equipment/EquipmentAccidentService.java index e8d756de..a7673655 100644 --- a/src/main/java/com/sipai/service/equipment/EquipmentAccidentService.java +++ b/src/main/java/com/sipai/service/equipment/EquipmentAccidentService.java @@ -1,14 +1,12 @@ package com.sipai.service.equipment; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.sipai.dao.equipment.EquipmentAccidentDao; import com.sipai.entity.equipment.EquipmentAccident; import com.sipai.tools.CommService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class EquipmentAccidentService implements CommService{ diff --git a/src/main/java/com/sipai/service/equipment/EquipmentArrangementService.java b/src/main/java/com/sipai/service/equipment/EquipmentArrangementService.java index a60f6af1..9f429341 100644 --- a/src/main/java/com/sipai/service/equipment/EquipmentArrangementService.java +++ b/src/main/java/com/sipai/service/equipment/EquipmentArrangementService.java @@ -1,18 +1,16 @@ package com.sipai.service.equipment; -import java.util.Iterator; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.sipai.dao.equipment.EquipmentArrangementDao; import com.sipai.entity.equipment.EquipmentArrangement; import com.sipai.entity.work.GroupManage; import com.sipai.service.work.GroupManageService; import com.sipai.tools.CommService; import com.sipai.tools.CommUtil; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Iterator; +import java.util.List; @Service public class EquipmentArrangementService implements CommService{ @Resource diff --git a/src/main/java/com/sipai/service/equipment/EquipmentBelongService.java b/src/main/java/com/sipai/service/equipment/EquipmentBelongService.java index f10ff461..c38ce916 100644 --- a/src/main/java/com/sipai/service/equipment/EquipmentBelongService.java +++ b/src/main/java/com/sipai/service/equipment/EquipmentBelongService.java @@ -1,14 +1,12 @@ package com.sipai.service.equipment; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.sipai.dao.equipment.EquipmentBelongDao; import com.sipai.entity.equipment.EquipmentBelong; import com.sipai.tools.CommService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service diff --git a/src/main/java/com/sipai/service/equipment/EquipmentCardCameraService.java b/src/main/java/com/sipai/service/equipment/EquipmentCardCameraService.java index 5915f407..aa3f5f05 100644 --- a/src/main/java/com/sipai/service/equipment/EquipmentCardCameraService.java +++ b/src/main/java/com/sipai/service/equipment/EquipmentCardCameraService.java @@ -1,17 +1,15 @@ package com.sipai.service.equipment; -import java.util.List; - -import javax.annotation.Resource; - -import com.sipai.entity.equipment.EquipmentCard; -import org.springframework.stereotype.Service; - import com.sipai.dao.equipment.EquipmentCardCameraDao; +import com.sipai.entity.equipment.EquipmentCard; import com.sipai.entity.equipment.EquipmentCardCamera; import com.sipai.entity.work.Camera; import com.sipai.service.work.CameraService; import com.sipai.tools.CommService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service("equipmentCardCameraService") public class EquipmentCardCameraService implements CommService { diff --git a/src/main/java/com/sipai/service/equipment/EquipmentCardLinksParameterService.java b/src/main/java/com/sipai/service/equipment/EquipmentCardLinksParameterService.java index 4ceb620a..a10b95b4 100644 --- a/src/main/java/com/sipai/service/equipment/EquipmentCardLinksParameterService.java +++ b/src/main/java/com/sipai/service/equipment/EquipmentCardLinksParameterService.java @@ -1,14 +1,12 @@ package com.sipai.service.equipment; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.sipai.dao.equipment.EquipmentCardLinksParameterDao; import com.sipai.entity.equipment.EquipmentCardLinksParameter; import com.sipai.tools.CommService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class EquipmentCardLinksParameterService implements CommService{ diff --git a/src/main/java/com/sipai/service/equipment/EquipmentCardPropService.java b/src/main/java/com/sipai/service/equipment/EquipmentCardPropService.java index f6bd28da..e0cb40f8 100644 --- a/src/main/java/com/sipai/service/equipment/EquipmentCardPropService.java +++ b/src/main/java/com/sipai/service/equipment/EquipmentCardPropService.java @@ -1,21 +1,15 @@ package com.sipai.service.equipment; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.sipai.dao.equipment.EquipmentCardPropDao; -import com.sipai.entity.equipment.EquipmentAge; -import com.sipai.entity.equipment.EquipmentCard; -import com.sipai.entity.equipment.EquipmentCardProp; -import com.sipai.entity.equipment.EquipmentSpecification; -import com.sipai.entity.equipment.EquipmentTypeNumber; +import com.sipai.entity.equipment.*; import com.sipai.entity.sparepart.Contract; import com.sipai.service.sparepart.ContractService; import com.sipai.tools.CommService; import com.sipai.tools.CommUtil; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class EquipmentCardPropService implements CommService{ @Resource diff --git a/src/main/java/com/sipai/service/equipment/EquipmentCardService.java b/src/main/java/com/sipai/service/equipment/EquipmentCardService.java index e8513cda..6ab76630 100644 --- a/src/main/java/com/sipai/service/equipment/EquipmentCardService.java +++ b/src/main/java/com/sipai/service/equipment/EquipmentCardService.java @@ -33,12 +33,13 @@ import com.sipai.service.user.ExtSystemService; import com.sipai.service.user.ProcessSectionService; import com.sipai.service.user.UnitService; import com.sipai.service.workorder.WorkorderDetailService; -import com.sipai.tools.*; +import com.sipai.tools.CommService; +import com.sipai.tools.CommString; +import com.sipai.tools.CommUtil; import net.sf.json.JSONArray; import net.sf.json.JSONObject; import org.apache.commons.lang3.StringUtils; import org.apache.poi.hssf.usermodel.*; -import org.apache.poi.ss.usermodel.DateUtil; import org.apache.poi.ss.usermodel.*; import org.apache.poi.ss.util.CellRangeAddress; import org.apache.poi.ss.util.CellRangeAddressList; diff --git a/src/main/java/com/sipai/service/equipment/EquipmentClassPropService.java b/src/main/java/com/sipai/service/equipment/EquipmentClassPropService.java index 7ecec873..a021c8ea 100644 --- a/src/main/java/com/sipai/service/equipment/EquipmentClassPropService.java +++ b/src/main/java/com/sipai/service/equipment/EquipmentClassPropService.java @@ -1,16 +1,12 @@ package com.sipai.service.equipment; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.sipai.dao.equipment.EquipmentClassPropDao; -import com.sipai.entity.equipment.EquipmentCard; import com.sipai.entity.equipment.EquipmentClassProp; import com.sipai.tools.CommService; -import com.sipai.tools.CommUtil; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class EquipmentClassPropService implements CommService{ @Resource diff --git a/src/main/java/com/sipai/service/equipment/EquipmentClassService.java b/src/main/java/com/sipai/service/equipment/EquipmentClassService.java index 65ba2d29..fbc53b00 100644 --- a/src/main/java/com/sipai/service/equipment/EquipmentClassService.java +++ b/src/main/java/com/sipai/service/equipment/EquipmentClassService.java @@ -1,17 +1,15 @@ package com.sipai.service.equipment; +import com.sipai.entity.equipment.EquipmentCard; +import com.sipai.entity.equipment.EquipmentClass; + +import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.InputStream; import java.util.List; import java.util.Map; import java.util.TreeSet; -import javax.servlet.http.HttpServletResponse; - -import com.sipai.entity.equipment.EquipmentCard; -import com.sipai.entity.equipment.EquipmentClass; -import com.sipai.entity.user.Unit; - public interface EquipmentClassService { public abstract EquipmentClass selectById(String id); diff --git a/src/main/java/com/sipai/service/equipment/EquipmentCodeLibraryService.java b/src/main/java/com/sipai/service/equipment/EquipmentCodeLibraryService.java index 0a86b30f..7bb37de6 100644 --- a/src/main/java/com/sipai/service/equipment/EquipmentCodeLibraryService.java +++ b/src/main/java/com/sipai/service/equipment/EquipmentCodeLibraryService.java @@ -1,14 +1,12 @@ package com.sipai.service.equipment; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.sipai.dao.equipment.EquipmentCodeLibraryDao; import com.sipai.entity.equipment.EquipmentCodeLibrary; import com.sipai.tools.CommService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service diff --git a/src/main/java/com/sipai/service/equipment/EquipmentCodeRuleService.java b/src/main/java/com/sipai/service/equipment/EquipmentCodeRuleService.java index 403e739e..66c4afed 100644 --- a/src/main/java/com/sipai/service/equipment/EquipmentCodeRuleService.java +++ b/src/main/java/com/sipai/service/equipment/EquipmentCodeRuleService.java @@ -1,15 +1,13 @@ package com.sipai.service.equipment; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.sipai.dao.equipment.EquipmentCodeRuleDao; import com.sipai.entity.equipment.DynamicCodeCondition; import com.sipai.entity.equipment.EquipmentCodeRule; import com.sipai.tools.CommService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class EquipmentCodeRuleService implements CommService{ diff --git a/src/main/java/com/sipai/service/equipment/EquipmentCodeService.java b/src/main/java/com/sipai/service/equipment/EquipmentCodeService.java index 1a42c24b..fa021faa 100644 --- a/src/main/java/com/sipai/service/equipment/EquipmentCodeService.java +++ b/src/main/java/com/sipai/service/equipment/EquipmentCodeService.java @@ -1,14 +1,12 @@ package com.sipai.service.equipment; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.sipai.dao.equipment.EquipmentCodeDao; import com.sipai.entity.equipment.EquipmentCode; import com.sipai.tools.CommService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class EquipmentCodeService implements CommService{ diff --git a/src/main/java/com/sipai/service/equipment/EquipmentDialinService.java b/src/main/java/com/sipai/service/equipment/EquipmentDialinService.java index 3c739843..70a60a51 100644 --- a/src/main/java/com/sipai/service/equipment/EquipmentDialinService.java +++ b/src/main/java/com/sipai/service/equipment/EquipmentDialinService.java @@ -1,38 +1,8 @@ package com.sipai.service.equipment; -import java.io.IOException; -import java.io.InputStream; -import java.math.BigDecimal; -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.List; - -import javax.annotation.Resource; - -import org.apache.poi.hssf.usermodel.HSSFCell; -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.Cell; -import org.apache.poi.ss.usermodel.CellType; -import org.apache.poi.ss.usermodel.DateUtil; -import org.apache.poi.xssf.usermodel.XSSFCell; -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.Service; - import com.sipai.dao.equipment.EquipmentCardDao; import com.sipai.dao.equipment.EquipmentDialinDao; -import com.sipai.entity.equipment.AssetClass; -import com.sipai.entity.equipment.EquipmentBelong; -import com.sipai.entity.equipment.EquipmentCard; -import com.sipai.entity.equipment.EquipmentCardProp; -import com.sipai.entity.equipment.EquipmentClass; -import com.sipai.entity.equipment.EquipmentDialin; -import com.sipai.entity.equipment.EquipmentLevel; -import com.sipai.entity.equipment.EquipmentSpecification; -import com.sipai.entity.equipment.EquipmentTypeNumber; +import com.sipai.entity.equipment.*; import com.sipai.entity.scada.MPoint; import com.sipai.entity.user.Company; import com.sipai.entity.user.ProcessSection; @@ -49,8 +19,26 @@ import com.sipai.service.user.UnitService; import com.sipai.service.user.UserService; import com.sipai.tools.CommService; import com.sipai.tools.CommUtil; +import org.apache.poi.hssf.usermodel.HSSFCell; +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.DateUtil; +import org.apache.poi.xssf.usermodel.XSSFCell; +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.Service; -import static org.apache.poi.ss.usermodel.CellType.*; +import javax.annotation.Resource; +import java.io.IOException; +import java.io.InputStream; +import java.math.BigDecimal; +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.List; + +import static org.apache.poi.ss.usermodel.CellType.STRING; @Service public class EquipmentDialinService implements CommService{ diff --git a/src/main/java/com/sipai/service/equipment/EquipmentFileService.java b/src/main/java/com/sipai/service/equipment/EquipmentFileService.java index 386d355d..18d8afd6 100644 --- a/src/main/java/com/sipai/service/equipment/EquipmentFileService.java +++ b/src/main/java/com/sipai/service/equipment/EquipmentFileService.java @@ -1,18 +1,12 @@ package com.sipai.service.equipment; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - -import com.sipai.dao.equipment.EquipmentClassDao; import com.sipai.dao.equipment.EquipmentFileDao; -import com.sipai.entity.equipment.EquipmentCard; -import com.sipai.entity.equipment.EquipmentClass; import com.sipai.entity.equipment.EquipmentFile; import com.sipai.tools.CommService; -import com.sipai.tools.CommUtil; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class EquipmentFileService implements CommService{ @Resource diff --git a/src/main/java/com/sipai/service/equipment/EquipmentFittingsService.java b/src/main/java/com/sipai/service/equipment/EquipmentFittingsService.java index 75fa5168..eae63c72 100644 --- a/src/main/java/com/sipai/service/equipment/EquipmentFittingsService.java +++ b/src/main/java/com/sipai/service/equipment/EquipmentFittingsService.java @@ -1,9 +1,9 @@ package com.sipai.service.equipment; -import java.util.List; - import com.sipai.entity.equipment.EquipmentFittings; +import java.util.List; + public interface EquipmentFittingsService { public abstract EquipmentFittings selectById(String id); diff --git a/src/main/java/com/sipai/service/equipment/EquipmentIncreaseValueService.java b/src/main/java/com/sipai/service/equipment/EquipmentIncreaseValueService.java index b75fb058..b3f16a0e 100644 --- a/src/main/java/com/sipai/service/equipment/EquipmentIncreaseValueService.java +++ b/src/main/java/com/sipai/service/equipment/EquipmentIncreaseValueService.java @@ -1,16 +1,12 @@ package com.sipai.service.equipment; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.sipai.dao.equipment.EquipmentIncreaseValueDao; -import com.sipai.entity.equipment.EquipmentCard; import com.sipai.entity.equipment.EquipmentIncreaseValue; import com.sipai.tools.CommService; -import com.sipai.tools.CommUtil; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class EquipmentIncreaseValueService implements CommService{ @Resource diff --git a/src/main/java/com/sipai/service/equipment/EquipmentLevelService.java b/src/main/java/com/sipai/service/equipment/EquipmentLevelService.java index cf36e899..f2775fc6 100644 --- a/src/main/java/com/sipai/service/equipment/EquipmentLevelService.java +++ b/src/main/java/com/sipai/service/equipment/EquipmentLevelService.java @@ -1,14 +1,12 @@ package com.sipai.service.equipment; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.sipai.dao.equipment.EquipmentLevelDao; import com.sipai.entity.equipment.EquipmentLevel; import com.sipai.tools.CommService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class EquipmentLevelService implements CommService{ @Resource diff --git a/src/main/java/com/sipai/service/equipment/EquipmentLoseApplyDetailService.java b/src/main/java/com/sipai/service/equipment/EquipmentLoseApplyDetailService.java index be59afaf..5607a49d 100644 --- a/src/main/java/com/sipai/service/equipment/EquipmentLoseApplyDetailService.java +++ b/src/main/java/com/sipai/service/equipment/EquipmentLoseApplyDetailService.java @@ -1,14 +1,12 @@ package com.sipai.service.equipment; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.sipai.dao.equipment.EquipmentLoseApplyDetailDao; import com.sipai.entity.equipment.EquipmentLoseApplyDetail; import com.sipai.tools.CommService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class EquipmentLoseApplyDetailService implements CommService{ diff --git a/src/main/java/com/sipai/service/equipment/EquipmentLoseApplyService.java b/src/main/java/com/sipai/service/equipment/EquipmentLoseApplyService.java index df12fc41..6e19f06a 100644 --- a/src/main/java/com/sipai/service/equipment/EquipmentLoseApplyService.java +++ b/src/main/java/com/sipai/service/equipment/EquipmentLoseApplyService.java @@ -1,18 +1,5 @@ package com.sipai.service.equipment; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import javax.annotation.Resource; - -import org.activiti.engine.TaskService; -import org.activiti.engine.repository.ProcessDefinition; -import org.activiti.engine.runtime.ProcessInstance; -import org.activiti.engine.task.Task; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - import com.sipai.dao.equipment.EquipmentLoseApplyDao; import com.sipai.entity.activiti.ProcessType; import com.sipai.entity.base.BusinessUnitAdapter; @@ -21,11 +8,21 @@ import com.sipai.entity.business.BusinessUnitRecord; import com.sipai.entity.equipment.EquipmentLoseApply; import com.sipai.entity.maintenance.MaintenanceCommString; import com.sipai.entity.sparepart.SparePartCommString; -import com.sipai.entity.sparepart.StockCheck; import com.sipai.service.activiti.WorkflowProcessDefinitionService; import com.sipai.service.activiti.WorkflowService; import com.sipai.service.business.BusinessUnitAuditService; import com.sipai.tools.CommService; +import org.activiti.engine.TaskService; +import org.activiti.engine.repository.ProcessDefinition; +import org.activiti.engine.runtime.ProcessInstance; +import org.activiti.engine.task.Task; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; +import java.util.HashMap; +import java.util.List; +import java.util.Map; @Service public class EquipmentLoseApplyService implements CommService{ diff --git a/src/main/java/com/sipai/service/equipment/EquipmentMaintainService.java b/src/main/java/com/sipai/service/equipment/EquipmentMaintainService.java index 85f295ab..cec847dc 100644 --- a/src/main/java/com/sipai/service/equipment/EquipmentMaintainService.java +++ b/src/main/java/com/sipai/service/equipment/EquipmentMaintainService.java @@ -1,43 +1,12 @@ package com.sipai.service.equipment; -import java.io.BufferedReader; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.io.OutputStream; -import java.net.URLEncoder; -import java.util.List; -import java.util.Properties; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletResponse; - -import org.apache.poi.hssf.usermodel.HSSFCell; -import org.apache.poi.hssf.usermodel.HSSFCellStyle; -import org.apache.poi.hssf.usermodel.HSSFClientAnchor; -import org.apache.poi.hssf.usermodel.HSSFComment; -import org.apache.poi.hssf.usermodel.HSSFFont; -import org.apache.poi.hssf.usermodel.HSSFPatriarch; -import org.apache.poi.hssf.usermodel.HSSFRichTextString; -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.util.CellRangeAddress; -import org.apache.poi.hssf.util.HSSFColor; +import com.sipai.dao.equipment.EquipmentMaintainDao; +import com.sipai.entity.equipment.EquipmentMaintain; +import com.sipai.tools.CommService; import org.springframework.stereotype.Service; - - - - - - -import com.sipai.dao.equipment.EquipmentMaintainDao; -import com.sipai.entity.equipment.EquipmentCard; -import com.sipai.entity.equipment.EquipmentMaintain; -import com.sipai.service.msg.MsgServiceImpl; -import com.sipai.tools.CommService; -import com.sipai.tools.CommUtil; +import javax.annotation.Resource; +import java.util.List; @Service public class EquipmentMaintainService implements CommService{ @Resource diff --git a/src/main/java/com/sipai/service/equipment/EquipmentParamsetDetailService.java b/src/main/java/com/sipai/service/equipment/EquipmentParamsetDetailService.java index 66215b68..1bc81bec 100644 --- a/src/main/java/com/sipai/service/equipment/EquipmentParamsetDetailService.java +++ b/src/main/java/com/sipai/service/equipment/EquipmentParamsetDetailService.java @@ -1,16 +1,13 @@ package com.sipai.service.equipment; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.sipai.dao.equipment.EquipmentParamsetDetailDao; -import com.sipai.entity.equipment.EquipmentParamset; import com.sipai.entity.equipment.EquipmentParamsetDetail; import com.sipai.entity.equipment.EquipmentParamsetValue; import com.sipai.tools.CommService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class EquipmentParamsetDetailService implements CommService{ diff --git a/src/main/java/com/sipai/service/equipment/EquipmentParamsetService.java b/src/main/java/com/sipai/service/equipment/EquipmentParamsetService.java index 1a19a157..0aebfd72 100644 --- a/src/main/java/com/sipai/service/equipment/EquipmentParamsetService.java +++ b/src/main/java/com/sipai/service/equipment/EquipmentParamsetService.java @@ -1,17 +1,15 @@ package com.sipai.service.equipment; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.sipai.dao.equipment.EquipmentParamsetDao; import com.sipai.entity.equipment.EquipmentParamSetVO; import com.sipai.entity.equipment.EquipmentParamset; import com.sipai.tools.CommService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class EquipmentParamsetService implements CommService{ diff --git a/src/main/java/com/sipai/service/equipment/EquipmentParamsetStatusEvaluationService.java b/src/main/java/com/sipai/service/equipment/EquipmentParamsetStatusEvaluationService.java index f497100e..17633891 100644 --- a/src/main/java/com/sipai/service/equipment/EquipmentParamsetStatusEvaluationService.java +++ b/src/main/java/com/sipai/service/equipment/EquipmentParamsetStatusEvaluationService.java @@ -1,14 +1,12 @@ package com.sipai.service.equipment; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.sipai.dao.equipment.EquipmentParamsetStatusEvaluationDao; import com.sipai.entity.equipment.EquipmentParamsetStatusEvaluation; import com.sipai.tools.CommService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class EquipmentParamsetStatusEvaluationService implements CommService{ diff --git a/src/main/java/com/sipai/service/equipment/EquipmentParamsetValueService.java b/src/main/java/com/sipai/service/equipment/EquipmentParamsetValueService.java index 26d0f3d5..66c96f6b 100644 --- a/src/main/java/com/sipai/service/equipment/EquipmentParamsetValueService.java +++ b/src/main/java/com/sipai/service/equipment/EquipmentParamsetValueService.java @@ -1,14 +1,12 @@ package com.sipai.service.equipment; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.sipai.dao.equipment.EquipmentParamsetValueDao; import com.sipai.entity.equipment.EquipmentParamsetValue; import com.sipai.tools.CommService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class EquipmentParamsetValueService implements CommService{ diff --git a/src/main/java/com/sipai/service/equipment/EquipmentPointService.java b/src/main/java/com/sipai/service/equipment/EquipmentPointService.java index 286be286..acb653c7 100644 --- a/src/main/java/com/sipai/service/equipment/EquipmentPointService.java +++ b/src/main/java/com/sipai/service/equipment/EquipmentPointService.java @@ -1,20 +1,12 @@ package com.sipai.service.equipment; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - - - - - - - import com.sipai.dao.equipment.EquipmentPointDao; import com.sipai.entity.equipment.EquipmentPoint; import com.sipai.tools.CommService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class EquipmentPointService implements CommService{ diff --git a/src/main/java/com/sipai/service/equipment/EquipmentRemarkService.java b/src/main/java/com/sipai/service/equipment/EquipmentRemarkService.java index 8f4adee0..79dfdcb0 100644 --- a/src/main/java/com/sipai/service/equipment/EquipmentRemarkService.java +++ b/src/main/java/com/sipai/service/equipment/EquipmentRemarkService.java @@ -1,16 +1,15 @@ package com.sipai.service.equipment; import com.sipai.dao.equipment.EquipmentCardRemarkDao; -import com.sipai.entity.equipment.*; +import com.sipai.entity.equipment.EquipmentCardRemark; import com.sipai.entity.user.User; import com.sipai.service.user.UserService; -import com.sipai.tools.*; +import com.sipai.tools.CommService; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import javax.annotation.Resource; -import java.io.*; -import java.util.*; +import java.util.List; @Service("equipmentRemarkService") diff --git a/src/main/java/com/sipai/service/equipment/EquipmentRepairPlanService.java b/src/main/java/com/sipai/service/equipment/EquipmentRepairPlanService.java index 60c8fea9..f43ae803 100644 --- a/src/main/java/com/sipai/service/equipment/EquipmentRepairPlanService.java +++ b/src/main/java/com/sipai/service/equipment/EquipmentRepairPlanService.java @@ -1,43 +1,15 @@ package com.sipai.service.equipment; -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.Calendar; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import javax.annotation.Resource; - -import org.activiti.engine.RuntimeService; -import org.activiti.engine.TaskService; -import org.activiti.engine.repository.ProcessDefinition; -import org.activiti.engine.runtime.ProcessInstance; -import org.activiti.engine.task.Task; -import org.h2.table.Plan; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.itextpdf.text.pdf.PdfStructTreeController.returnType; -import com.sipai.dao.equipment.EquipmentLevelDao; import com.sipai.dao.equipment.EquipmentRepairPlanDao; -import com.sipai.dao.equipment.MaintenancePlanDao; import com.sipai.entity.activiti.ProcessType; import com.sipai.entity.base.BusinessUnitAdapter; import com.sipai.entity.business.BusinessUnitAudit; import com.sipai.entity.business.BusinessUnitRecord; -import com.sipai.entity.equipment.AssetClass; import com.sipai.entity.equipment.EquipmentCard; -import com.sipai.entity.equipment.EquipmentLevel; -import com.sipai.entity.equipment.EquipmentLoseApply; import com.sipai.entity.equipment.EquipmentRepairPlan; -import com.sipai.entity.equipment.MaintenancePlan; import com.sipai.entity.maintenance.MaintenanceCommString; import com.sipai.entity.maintenance.MaintenanceDetail; import com.sipai.entity.maintenance.PlanRecordAbnormity; -import com.sipai.entity.sparepart.OutStockRecord; -import com.sipai.entity.sparepart.SparePartCommString; import com.sipai.entity.timeefficiency.PatrolType; import com.sipai.entity.user.Company; import com.sipai.entity.user.ProcessSection; @@ -52,8 +24,18 @@ import com.sipai.service.user.RoleService; import com.sipai.service.user.UnitService; import com.sipai.service.user.UserService; import com.sipai.tools.CommService; -import com.sipai.tools.CommString; import com.sipai.tools.CommUtil; +import org.activiti.engine.RuntimeService; +import org.activiti.engine.TaskService; +import org.activiti.engine.repository.ProcessDefinition; +import org.activiti.engine.runtime.ProcessInstance; +import org.activiti.engine.task.Task; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; +import java.text.SimpleDateFormat; +import java.util.*; @Service public class EquipmentRepairPlanService implements CommService{ @Resource diff --git a/src/main/java/com/sipai/service/equipment/EquipmentSaleApplyDetailService.java b/src/main/java/com/sipai/service/equipment/EquipmentSaleApplyDetailService.java index 024ebf0b..376e0f47 100644 --- a/src/main/java/com/sipai/service/equipment/EquipmentSaleApplyDetailService.java +++ b/src/main/java/com/sipai/service/equipment/EquipmentSaleApplyDetailService.java @@ -1,14 +1,12 @@ package com.sipai.service.equipment; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.sipai.dao.equipment.EquipmentSaleApplyDetailDao; import com.sipai.entity.equipment.EquipmentSaleApplyDetail; import com.sipai.tools.CommService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class EquipmentSaleApplyDetailService implements CommService{ diff --git a/src/main/java/com/sipai/service/equipment/EquipmentSaleApplyService.java b/src/main/java/com/sipai/service/equipment/EquipmentSaleApplyService.java index 6f8691fb..ed08732b 100644 --- a/src/main/java/com/sipai/service/equipment/EquipmentSaleApplyService.java +++ b/src/main/java/com/sipai/service/equipment/EquipmentSaleApplyService.java @@ -1,11 +1,17 @@ package com.sipai.service.equipment; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import javax.annotation.Resource; - +import com.sipai.dao.equipment.EquipmentSaleApplyDao; +import com.sipai.entity.activiti.ProcessType; +import com.sipai.entity.base.BusinessUnitAdapter; +import com.sipai.entity.business.BusinessUnitAudit; +import com.sipai.entity.business.BusinessUnitRecord; +import com.sipai.entity.equipment.EquipmentSaleApply; +import com.sipai.entity.maintenance.MaintenanceCommString; +import com.sipai.entity.sparepart.SparePartCommString; +import com.sipai.service.activiti.WorkflowProcessDefinitionService; +import com.sipai.service.activiti.WorkflowService; +import com.sipai.service.business.BusinessUnitAuditService; +import com.sipai.tools.CommService; import org.activiti.engine.TaskService; import org.activiti.engine.repository.ProcessDefinition; import org.activiti.engine.runtime.ProcessInstance; @@ -13,20 +19,10 @@ import org.activiti.engine.task.Task; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import com.sipai.dao.equipment.EquipmentSaleApplyDao; -import com.sipai.entity.activiti.ProcessType; -import com.sipai.entity.base.BusinessUnitAdapter; -import com.sipai.entity.business.BusinessUnitAudit; -import com.sipai.entity.business.BusinessUnitRecord; -import com.sipai.entity.equipment.EquipmentLoseApply; -import com.sipai.entity.equipment.EquipmentSaleApply; -import com.sipai.entity.equipment.EquipmentScrapApply; -import com.sipai.entity.maintenance.MaintenanceCommString; -import com.sipai.entity.sparepart.SparePartCommString; -import com.sipai.service.activiti.WorkflowProcessDefinitionService; -import com.sipai.service.activiti.WorkflowService; -import com.sipai.service.business.BusinessUnitAuditService; -import com.sipai.tools.CommService; +import javax.annotation.Resource; +import java.util.HashMap; +import java.util.List; +import java.util.Map; @Service public class EquipmentSaleApplyService implements CommService{ @Resource diff --git a/src/main/java/com/sipai/service/equipment/EquipmentScrapApplyDetailService.java b/src/main/java/com/sipai/service/equipment/EquipmentScrapApplyDetailService.java index 0a34ff19..b29f07db 100644 --- a/src/main/java/com/sipai/service/equipment/EquipmentScrapApplyDetailService.java +++ b/src/main/java/com/sipai/service/equipment/EquipmentScrapApplyDetailService.java @@ -1,14 +1,12 @@ package com.sipai.service.equipment; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.sipai.dao.equipment.EquipmentScrapApplyDetailDao; import com.sipai.entity.equipment.EquipmentScrapApplyDetail; import com.sipai.tools.CommService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class EquipmentScrapApplyDetailService implements CommService{ diff --git a/src/main/java/com/sipai/service/equipment/EquipmentScrapApplyService.java b/src/main/java/com/sipai/service/equipment/EquipmentScrapApplyService.java index c70c5470..f70dec68 100644 --- a/src/main/java/com/sipai/service/equipment/EquipmentScrapApplyService.java +++ b/src/main/java/com/sipai/service/equipment/EquipmentScrapApplyService.java @@ -1,20 +1,19 @@ package com.sipai.service.equipment; -import java.io.IOException; -import java.io.OutputStream; -import java.math.BigDecimal; -import java.net.URLEncoder; -import java.util.*; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import com.sipai.entity.enums.AbnormityStatusEnum; -import com.sipai.entity.enums.AbnormityTypeEnum; +import com.sipai.dao.equipment.EquipmentScrapApplyDao; +import com.sipai.entity.activiti.ProcessType; +import com.sipai.entity.base.BusinessUnitAdapter; +import com.sipai.entity.business.BusinessUnitAudit; +import com.sipai.entity.business.BusinessUnitRecord; import com.sipai.entity.equipment.*; import com.sipai.entity.maintenance.Abnormity; +import com.sipai.entity.maintenance.MaintenanceCommString; +import com.sipai.entity.sparepart.SparePartCommString; +import com.sipai.service.activiti.WorkflowProcessDefinitionService; +import com.sipai.service.activiti.WorkflowService; +import com.sipai.service.business.BusinessUnitAuditService; import com.sipai.service.business.BusinessUnitHandleDetailService; +import com.sipai.tools.CommService; import net.sf.json.JSONObject; import org.activiti.engine.RuntimeService; import org.activiti.engine.TaskService; @@ -27,17 +26,14 @@ import org.apache.poi.ss.util.CellRangeAddress; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import com.sipai.dao.equipment.EquipmentScrapApplyDao; -import com.sipai.entity.activiti.ProcessType; -import com.sipai.entity.base.BusinessUnitAdapter; -import com.sipai.entity.business.BusinessUnitAudit; -import com.sipai.entity.business.BusinessUnitRecord; -import com.sipai.entity.maintenance.MaintenanceCommString; -import com.sipai.entity.sparepart.SparePartCommString; -import com.sipai.service.activiti.WorkflowProcessDefinitionService; -import com.sipai.service.activiti.WorkflowService; -import com.sipai.service.business.BusinessUnitAuditService; -import com.sipai.tools.CommService; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.io.OutputStream; +import java.math.BigDecimal; +import java.net.URLEncoder; +import java.util.*; @Service public class EquipmentScrapApplyService implements CommService{ diff --git a/src/main/java/com/sipai/service/equipment/EquipmentSpecificationService.java b/src/main/java/com/sipai/service/equipment/EquipmentSpecificationService.java index 026f2138..f8dada1d 100644 --- a/src/main/java/com/sipai/service/equipment/EquipmentSpecificationService.java +++ b/src/main/java/com/sipai/service/equipment/EquipmentSpecificationService.java @@ -1,14 +1,12 @@ package com.sipai.service.equipment; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.sipai.dao.equipment.EquipmentSpecificationDao; import com.sipai.entity.equipment.EquipmentSpecification; import com.sipai.tools.CommService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class EquipmentSpecificationService implements CommService{ @Resource diff --git a/src/main/java/com/sipai/service/equipment/EquipmentStatisticsService.java b/src/main/java/com/sipai/service/equipment/EquipmentStatisticsService.java index 8df61d00..253997bd 100644 --- a/src/main/java/com/sipai/service/equipment/EquipmentStatisticsService.java +++ b/src/main/java/com/sipai/service/equipment/EquipmentStatisticsService.java @@ -1,14 +1,12 @@ package com.sipai.service.equipment; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.sipai.dao.equipment.EquipmentStatisticsDao; import com.sipai.entity.equipment.EquipmentStatistics; import com.sipai.tools.CommService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class EquipmentStatisticsService implements CommService{ @Resource diff --git a/src/main/java/com/sipai/service/equipment/EquipmentStatusManagementService.java b/src/main/java/com/sipai/service/equipment/EquipmentStatusManagementService.java index 2c83b402..e19e8b76 100644 --- a/src/main/java/com/sipai/service/equipment/EquipmentStatusManagementService.java +++ b/src/main/java/com/sipai/service/equipment/EquipmentStatusManagementService.java @@ -1,14 +1,12 @@ package com.sipai.service.equipment; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.sipai.dao.equipment.EquipmentStatusManagementDao; import com.sipai.entity.equipment.EquipmentStatusManagement; import com.sipai.tools.CommService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service diff --git a/src/main/java/com/sipai/service/equipment/EquipmentStopRecordDetailService.java b/src/main/java/com/sipai/service/equipment/EquipmentStopRecordDetailService.java index 699987cb..bb321940 100644 --- a/src/main/java/com/sipai/service/equipment/EquipmentStopRecordDetailService.java +++ b/src/main/java/com/sipai/service/equipment/EquipmentStopRecordDetailService.java @@ -1,14 +1,12 @@ package com.sipai.service.equipment; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.sipai.dao.equipment.EquipmentStopRecordDetailDao; import com.sipai.entity.equipment.EquipmentStopRecordDetail; import com.sipai.tools.CommService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service diff --git a/src/main/java/com/sipai/service/equipment/EquipmentStopRecordService.java b/src/main/java/com/sipai/service/equipment/EquipmentStopRecordService.java index 3c79a604..80e2c935 100644 --- a/src/main/java/com/sipai/service/equipment/EquipmentStopRecordService.java +++ b/src/main/java/com/sipai/service/equipment/EquipmentStopRecordService.java @@ -1,27 +1,11 @@ package com.sipai.service.equipment; -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 org.activiti.engine.TaskService; -import org.activiti.engine.repository.ProcessDefinition; -import org.activiti.engine.runtime.ProcessInstance; -import org.activiti.engine.task.Task; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - import com.sipai.dao.equipment.EquipmentStopRecordDao; import com.sipai.entity.activiti.ProcessType; import com.sipai.entity.base.BusinessUnitAdapter; import com.sipai.entity.business.BusinessUnitAudit; import com.sipai.entity.business.BusinessUnitRecord; import com.sipai.entity.equipment.EquipmentCard; -import com.sipai.entity.equipment.EquipmentLoseApply; import com.sipai.entity.equipment.EquipmentStopRecord; import com.sipai.entity.equipment.EquipmentStopRecordDetail; import com.sipai.entity.maintenance.MaintenanceCommString; @@ -30,6 +14,17 @@ import com.sipai.service.activiti.WorkflowProcessDefinitionService; import com.sipai.service.activiti.WorkflowService; import com.sipai.service.business.BusinessUnitAuditService; import com.sipai.tools.CommService; +import org.activiti.engine.TaskService; +import org.activiti.engine.repository.ProcessDefinition; +import org.activiti.engine.runtime.ProcessInstance; +import org.activiti.engine.task.Task; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; +import java.util.HashMap; +import java.util.List; +import java.util.Map; @Service diff --git a/src/main/java/com/sipai/service/equipment/EquipmentTransfersApplyDetailService.java b/src/main/java/com/sipai/service/equipment/EquipmentTransfersApplyDetailService.java index 1e33ede7..7f072984 100644 --- a/src/main/java/com/sipai/service/equipment/EquipmentTransfersApplyDetailService.java +++ b/src/main/java/com/sipai/service/equipment/EquipmentTransfersApplyDetailService.java @@ -1,14 +1,12 @@ package com.sipai.service.equipment; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.sipai.dao.equipment.EquipmentTransfersApplyDetailDao; import com.sipai.entity.equipment.EquipmentTransfersApplyDetail; import com.sipai.tools.CommService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class EquipmentTransfersApplyDetailService implements CommService{ diff --git a/src/main/java/com/sipai/service/equipment/EquipmentTransfersApplyService.java b/src/main/java/com/sipai/service/equipment/EquipmentTransfersApplyService.java index 7cd99b94..b70c5c03 100644 --- a/src/main/java/com/sipai/service/equipment/EquipmentTransfersApplyService.java +++ b/src/main/java/com/sipai/service/equipment/EquipmentTransfersApplyService.java @@ -1,32 +1,11 @@ package com.sipai.service.equipment; -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.HttpServletRequestWrapper; - -import org.activiti.engine.TaskService; -import org.activiti.engine.repository.ProcessDefinition; -import org.activiti.engine.runtime.ProcessInstance; -import org.activiti.engine.task.Task; -import org.springframework.http.HttpRequest; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.web.context.request.RequestContextHolder; -import org.springframework.web.context.request.ServletRequestAttributes; - -import com.sipai.controller.equipment.EquipmentTransfersApplyController; import com.sipai.dao.equipment.EquipmentTransfersApplyDao; import com.sipai.entity.activiti.ProcessType; import com.sipai.entity.base.BusinessUnitAdapter; import com.sipai.entity.business.BusinessUnitAudit; import com.sipai.entity.business.BusinessUnitRecord; import com.sipai.entity.equipment.EquipmentCard; -import com.sipai.entity.equipment.EquipmentSaleApply; -import com.sipai.entity.equipment.EquipmentScrapApply; import com.sipai.entity.equipment.EquipmentTransfersApply; import com.sipai.entity.equipment.EquipmentTransfersApplyCollect; import com.sipai.entity.equipment.EquipmentTransfersApplyDetail; @@ -38,6 +17,17 @@ import com.sipai.service.activiti.WorkflowService; import com.sipai.service.business.BusinessUnitAuditService; import com.sipai.tools.CommService; import com.sipai.tools.CommUtil; +import org.activiti.engine.TaskService; +import org.activiti.engine.repository.ProcessDefinition; +import org.activiti.engine.runtime.ProcessInstance; +import org.activiti.engine.task.Task; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; +import java.util.HashMap; +import java.util.List; +import java.util.Map; @Service public class EquipmentTransfersApplyService implements CommService{ diff --git a/src/main/java/com/sipai/service/equipment/EquipmentTypeNumberService.java b/src/main/java/com/sipai/service/equipment/EquipmentTypeNumberService.java index fcf41e8a..59ffba7b 100644 --- a/src/main/java/com/sipai/service/equipment/EquipmentTypeNumberService.java +++ b/src/main/java/com/sipai/service/equipment/EquipmentTypeNumberService.java @@ -1,5 +1,20 @@ package com.sipai.service.equipment; +import com.sipai.dao.equipment.EquipmentTypeNumberDao; +import com.sipai.entity.equipment.EquipmentClass; +import com.sipai.entity.equipment.EquipmentTypeNumber; +import com.sipai.tools.CommService; +import com.sipai.tools.CommString; +import com.sipai.tools.CommUtil; +import net.sf.json.JSONObject; +import org.apache.poi.hssf.usermodel.*; +import org.apache.poi.ss.usermodel.*; +import org.apache.poi.ss.util.CellRangeAddress; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; @@ -9,47 +24,7 @@ import java.util.Date; import java.util.Iterator; import java.util.List; -import javax.annotation.Resource; -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.HSSFClientAnchor; -import org.apache.poi.hssf.usermodel.HSSFComment; -import org.apache.poi.hssf.usermodel.HSSFDataFormat; -import org.apache.poi.hssf.usermodel.HSSFFont; -import org.apache.poi.hssf.usermodel.HSSFPatriarch; -import org.apache.poi.hssf.usermodel.HSSFRichTextString; -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.ss.util.CellRangeAddress; -import org.apache.poi.hssf.util.HSSFColor; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.sipai.dao.equipment.EquipmentTypeNumberDao; -import com.sipai.entity.equipment.EquipmentClass; -import com.sipai.entity.equipment.EquipmentTypeNumber; -import com.sipai.entity.maintenance.LibraryFaultBloc; -import com.sipai.entity.maintenance.LibraryOverhaulContentBloc; -import com.sipai.entity.maintenance.LibraryOverhaulContentModelBloc; -import com.sipai.entity.maintenance.LibraryOverhaulProjectBloc; -import com.sipai.entity.maintenance.LibraryOverhaulProjectModelBloc; -import com.sipai.entity.maintenance.LibraryRepairBloc; -import com.sipai.entity.maintenance.LibraryRepairModelBloc; -import com.sipai.entity.maintenance.MaintainCommStr; -import com.sipai.entity.user.Company; -import com.sipai.tools.CommService; -import com.sipai.tools.CommString; -import com.sipai.tools.CommUtil; - -import static org.apache.poi.ss.usermodel.CellType.*; -import static org.apache.poi.ss.usermodel.CellType.NUMERIC; +import static org.apache.poi.ss.usermodel.CellType.STRING; @Service public class EquipmentTypeNumberService implements CommService{ diff --git a/src/main/java/com/sipai/service/equipment/EquipmentUseAgeService.java b/src/main/java/com/sipai/service/equipment/EquipmentUseAgeService.java index 71ff957d..3836b68c 100644 --- a/src/main/java/com/sipai/service/equipment/EquipmentUseAgeService.java +++ b/src/main/java/com/sipai/service/equipment/EquipmentUseAgeService.java @@ -1,14 +1,12 @@ package com.sipai.service.equipment; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.sipai.dao.equipment.EquipmentUseAgeDao; import com.sipai.entity.equipment.EquipmentUseAge; import com.sipai.tools.CommService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class EquipmentUseAgeService implements CommService{ @Resource diff --git a/src/main/java/com/sipai/service/equipment/FacilitiesCardService.java b/src/main/java/com/sipai/service/equipment/FacilitiesCardService.java index a17179b3..5b841bfc 100644 --- a/src/main/java/com/sipai/service/equipment/FacilitiesCardService.java +++ b/src/main/java/com/sipai/service/equipment/FacilitiesCardService.java @@ -1,14 +1,11 @@ package com.sipai.service.equipment; +import com.sipai.entity.equipment.FacilitiesCard; + +import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.InputStream; import java.util.List; -import java.util.Map; - -import javax.servlet.http.HttpServletResponse; - -import com.sipai.entity.equipment.EquipmentClass; -import com.sipai.entity.equipment.FacilitiesCard; public interface FacilitiesCardService { diff --git a/src/main/java/com/sipai/service/equipment/FacilitiesClassService.java b/src/main/java/com/sipai/service/equipment/FacilitiesClassService.java index eb51c158..5f260b48 100644 --- a/src/main/java/com/sipai/service/equipment/FacilitiesClassService.java +++ b/src/main/java/com/sipai/service/equipment/FacilitiesClassService.java @@ -1,11 +1,11 @@ package com.sipai.service.equipment; +import com.sipai.entity.equipment.FacilitiesClass; + import java.util.List; import java.util.Map; import java.util.TreeSet; -import com.sipai.entity.equipment.FacilitiesClass; - public interface FacilitiesClassService { public abstract FacilitiesClass selectById(String id); diff --git a/src/main/java/com/sipai/service/equipment/GeographyAreaService.java b/src/main/java/com/sipai/service/equipment/GeographyAreaService.java index 8bacf72a..c75619bd 100644 --- a/src/main/java/com/sipai/service/equipment/GeographyAreaService.java +++ b/src/main/java/com/sipai/service/equipment/GeographyAreaService.java @@ -1,15 +1,12 @@ package com.sipai.service.equipment; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.sipai.dao.equipment.GeographyAreaDao; -import com.sipai.entity.equipment.EquipmentClass; import com.sipai.entity.equipment.GeographyArea; import com.sipai.tools.CommService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service diff --git a/src/main/java/com/sipai/service/equipment/HomePageService.java b/src/main/java/com/sipai/service/equipment/HomePageService.java index b640427e..008421e8 100644 --- a/src/main/java/com/sipai/service/equipment/HomePageService.java +++ b/src/main/java/com/sipai/service/equipment/HomePageService.java @@ -1,19 +1,11 @@ package com.sipai.service.equipment; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import javax.annotation.Resource; - -import net.sf.json.JSONArray; - -import org.springframework.stereotype.Service; - import com.sipai.dao.equipment.EquipmentCardDao; import com.sipai.entity.equipment.EquipmentCard; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class HomePageService { diff --git a/src/main/java/com/sipai/service/equipment/MaintenancePlanService.java b/src/main/java/com/sipai/service/equipment/MaintenancePlanService.java index 968788da..f462b7b7 100644 --- a/src/main/java/com/sipai/service/equipment/MaintenancePlanService.java +++ b/src/main/java/com/sipai/service/equipment/MaintenancePlanService.java @@ -1,41 +1,15 @@ package com.sipai.service.equipment; -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.Calendar; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import javax.annotation.Resource; - -import org.activiti.engine.RuntimeService; -import org.activiti.engine.TaskService; -import org.activiti.engine.repository.ProcessDefinition; -import org.activiti.engine.runtime.ProcessInstance; -import org.activiti.engine.task.Task; -import org.h2.table.Plan; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.itextpdf.text.pdf.PdfStructTreeController.returnType; -import com.sipai.dao.equipment.EquipmentLevelDao; import com.sipai.dao.equipment.MaintenancePlanDao; import com.sipai.entity.activiti.ProcessType; import com.sipai.entity.base.BusinessUnitAdapter; import com.sipai.entity.business.BusinessUnitAudit; import com.sipai.entity.business.BusinessUnitRecord; -import com.sipai.entity.equipment.AssetClass; import com.sipai.entity.equipment.EquipmentCard; -import com.sipai.entity.equipment.EquipmentLevel; -import com.sipai.entity.equipment.EquipmentLoseApply; import com.sipai.entity.equipment.MaintenancePlan; import com.sipai.entity.maintenance.MaintenanceCommString; import com.sipai.entity.maintenance.MaintenanceDetail; import com.sipai.entity.maintenance.PlanRecordAbnormity; -import com.sipai.entity.sparepart.OutStockRecord; -import com.sipai.entity.sparepart.SparePartCommString; import com.sipai.entity.timeefficiency.PatrolType; import com.sipai.entity.user.Company; import com.sipai.entity.user.ProcessSection; @@ -50,8 +24,18 @@ import com.sipai.service.user.RoleService; import com.sipai.service.user.UnitService; import com.sipai.service.user.UserService; import com.sipai.tools.CommService; -import com.sipai.tools.CommString; import com.sipai.tools.CommUtil; +import org.activiti.engine.RuntimeService; +import org.activiti.engine.TaskService; +import org.activiti.engine.repository.ProcessDefinition; +import org.activiti.engine.runtime.ProcessInstance; +import org.activiti.engine.task.Task; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; +import java.text.SimpleDateFormat; +import java.util.*; @Service public class MaintenancePlanService implements CommService{ @Resource diff --git a/src/main/java/com/sipai/service/equipment/SpecialEquipmentService.java b/src/main/java/com/sipai/service/equipment/SpecialEquipmentService.java index c0f4a81b..9a11932b 100644 --- a/src/main/java/com/sipai/service/equipment/SpecialEquipmentService.java +++ b/src/main/java/com/sipai/service/equipment/SpecialEquipmentService.java @@ -1,15 +1,13 @@ package com.sipai.service.equipment; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.sipai.dao.equipment.SpecialEquipmentDao; import com.sipai.entity.equipment.EquipmentCard; import com.sipai.entity.equipment.SpecialEquipment; import com.sipai.tools.CommService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class SpecialEquipmentService implements CommService{ diff --git a/src/main/java/com/sipai/service/equipment/impl/EquipmentClassServiceImpl.java b/src/main/java/com/sipai/service/equipment/impl/EquipmentClassServiceImpl.java index 372774a7..3780016f 100644 --- a/src/main/java/com/sipai/service/equipment/impl/EquipmentClassServiceImpl.java +++ b/src/main/java/com/sipai/service/equipment/impl/EquipmentClassServiceImpl.java @@ -1,64 +1,36 @@ package com.sipai.service.equipment.impl; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.net.URLEncoder; -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Date; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.TreeSet; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletResponse; - -import com.sipai.tools.LibraryTool; -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.HSSFClientAnchor; -import org.apache.poi.hssf.usermodel.HSSFComment; -import org.apache.poi.hssf.usermodel.HSSFDataFormat; -import org.apache.poi.hssf.usermodel.HSSFFont; -import org.apache.poi.hssf.usermodel.HSSFPatriarch; -import org.apache.poi.hssf.usermodel.HSSFRichTextString; -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.ss.util.CellRangeAddress; -import org.apache.poi.hssf.util.HSSFColor; -import org.apache.poi.xssf.usermodel.XSSFCell; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - import com.sipai.dao.equipment.EquipmentClassDao; import com.sipai.entity.equipment.EquipmentCard; import com.sipai.entity.equipment.EquipmentClass; import com.sipai.entity.equipment.EquipmentTypeNumber; -import com.sipai.entity.maintenance.LibraryOverhaulContentBloc; -import com.sipai.entity.maintenance.LibraryOverhaulProjectBloc; -import com.sipai.entity.maintenance.MaintainCommStr; import com.sipai.entity.timeefficiency.TimeEfficiencyCommStr; -import com.sipai.entity.user.Company; -import com.sipai.entity.user.Unit; import com.sipai.service.equipment.EquipmentCardService; import com.sipai.service.equipment.EquipmentClassPropService; import com.sipai.service.equipment.EquipmentClassService; import com.sipai.service.equipment.EquipmentTypeNumberService; import com.sipai.tools.CommString; import com.sipai.tools.CommUtil; +import com.sipai.tools.LibraryTool; +import net.sf.json.JSONArray; +import net.sf.json.JSONObject; +import org.apache.poi.hssf.usermodel.*; +import org.apache.poi.ss.usermodel.*; +import org.apache.poi.ss.util.CellRangeAddress; +import org.apache.poi.xssf.usermodel.XSSFCell; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; -import static org.apache.poi.ss.usermodel.CellType.*; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.net.URLEncoder; +import java.text.SimpleDateFormat; +import java.util.*; + +import static org.apache.poi.ss.usermodel.CellType.STRING; @Service public class EquipmentClassServiceImpl implements EquipmentClassService { diff --git a/src/main/java/com/sipai/service/equipment/impl/EquipmentFittingsServiceImpl.java b/src/main/java/com/sipai/service/equipment/impl/EquipmentFittingsServiceImpl.java index 02c86237..a87a6a29 100644 --- a/src/main/java/com/sipai/service/equipment/impl/EquipmentFittingsServiceImpl.java +++ b/src/main/java/com/sipai/service/equipment/impl/EquipmentFittingsServiceImpl.java @@ -1,19 +1,16 @@ package com.sipai.service.equipment.impl; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.sipai.dao.equipment.EquipmentFittingsDao; -import com.sipai.entity.equipment.EquipmentCard; import com.sipai.entity.equipment.EquipmentFittings; import com.sipai.entity.sparepart.Stock; import com.sipai.service.equipment.EquipmentCardService; import com.sipai.service.equipment.EquipmentFittingsService; import com.sipai.service.sparepart.GoodsService; import com.sipai.service.sparepart.StockService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class EquipmentFittingsServiceImpl implements EquipmentFittingsService{ diff --git a/src/main/java/com/sipai/service/equipment/impl/FacilitiesCardServiceImpl.java b/src/main/java/com/sipai/service/equipment/impl/FacilitiesCardServiceImpl.java index 6b7c1bde..8474d426 100644 --- a/src/main/java/com/sipai/service/equipment/impl/FacilitiesCardServiceImpl.java +++ b/src/main/java/com/sipai/service/equipment/impl/FacilitiesCardServiceImpl.java @@ -1,48 +1,9 @@ package com.sipai.service.equipment.impl; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.net.URLEncoder; -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Date; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; - -import javax.annotation.Resource; -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.HSSFClientAnchor; -import org.apache.poi.hssf.usermodel.HSSFComment; -import org.apache.poi.hssf.usermodel.HSSFDataFormat; -import org.apache.poi.hssf.usermodel.HSSFFont; -import org.apache.poi.hssf.usermodel.HSSFPatriarch; -import org.apache.poi.hssf.usermodel.HSSFRichTextString; -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.ss.util.CellRangeAddress; -import org.apache.poi.hssf.util.HSSFColor; -import org.apache.poi.xssf.usermodel.XSSFCell; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - import com.sipai.dao.equipment.FacilitiesCardDao; -import com.sipai.entity.equipment.AssetClass; import com.sipai.entity.equipment.EquipmentStatusManagement; import com.sipai.entity.equipment.FacilitiesCard; -import com.sipai.entity.equipment.FacilitiesCard; import com.sipai.entity.equipment.FacilitiesClass; -import com.sipai.entity.timeefficiency.PatrolContentsStandard; import com.sipai.entity.user.Company; import com.sipai.service.company.CompanyService; import com.sipai.service.equipment.AssetClassService; @@ -50,8 +11,24 @@ import com.sipai.service.equipment.EquipmentStatusManagementService; import com.sipai.service.equipment.FacilitiesCardService; import com.sipai.service.equipment.FacilitiesClassService; import com.sipai.tools.CommUtil; +import org.apache.poi.hssf.usermodel.*; +import org.apache.poi.ss.usermodel.*; +import org.apache.poi.ss.util.CellRangeAddress; +import org.apache.poi.xssf.usermodel.XSSFCell; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; -import static org.apache.poi.ss.usermodel.CellType.*; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.net.URLEncoder; +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.List; + +import static org.apache.poi.ss.usermodel.CellType.STRING; @Service public class FacilitiesCardServiceImpl implements FacilitiesCardService{ diff --git a/src/main/java/com/sipai/service/equipment/impl/FacilitiesClassServiceImpl.java b/src/main/java/com/sipai/service/equipment/impl/FacilitiesClassServiceImpl.java index a3dbd3b8..bdacc871 100644 --- a/src/main/java/com/sipai/service/equipment/impl/FacilitiesClassServiceImpl.java +++ b/src/main/java/com/sipai/service/equipment/impl/FacilitiesClassServiceImpl.java @@ -1,23 +1,13 @@ package com.sipai.service.equipment.impl; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.TreeSet; - -import javax.annotation.Resource; - +import com.sipai.dao.equipment.FacilitiesClassDao; +import com.sipai.entity.equipment.FacilitiesClass; +import com.sipai.service.equipment.FacilitiesClassService; import net.sf.json.JSONArray; - import org.springframework.stereotype.Service; -import com.sipai.dao.equipment.FacilitiesClassDao; -import com.sipai.entity.equipment.EquipmentClass; -import com.sipai.entity.equipment.FacilitiesClass; -import com.sipai.entity.timeefficiency.TimeEfficiencyCommStr; -import com.sipai.service.equipment.FacilitiesClassService; -import com.sipai.tools.CommString; +import javax.annotation.Resource; +import java.util.*; @Service public class FacilitiesClassServiceImpl implements FacilitiesClassService{ diff --git a/src/main/java/com/sipai/service/equipment/impl/OverhaulItemContentServiceImpl.java b/src/main/java/com/sipai/service/equipment/impl/OverhaulItemContentServiceImpl.java index 157051ef..96890829 100644 --- a/src/main/java/com/sipai/service/equipment/impl/OverhaulItemContentServiceImpl.java +++ b/src/main/java/com/sipai/service/equipment/impl/OverhaulItemContentServiceImpl.java @@ -4,6 +4,7 @@ import com.sipai.dao.workorder.OverhaulItemContentDao; import com.sipai.entity.workorder.OverhaulItemContent; import com.sipai.service.workorder.OverhaulItemContentService; import org.springframework.stereotype.Service; + import javax.annotation.Resource; import java.util.List; diff --git a/src/main/java/com/sipai/service/evaluation/EvaluationCriterionService.java b/src/main/java/com/sipai/service/evaluation/EvaluationCriterionService.java index 229bcf44..02ed34c1 100644 --- a/src/main/java/com/sipai/service/evaluation/EvaluationCriterionService.java +++ b/src/main/java/com/sipai/service/evaluation/EvaluationCriterionService.java @@ -1,14 +1,12 @@ package com.sipai.service.evaluation; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.sipai.dao.evaluation.EvaluationCriterionDao; import com.sipai.entity.evaluation.EvaluationCriterion; import com.sipai.tools.CommService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class EvaluationCriterionService implements CommService{ diff --git a/src/main/java/com/sipai/service/evaluation/EvaluationIndexDayService.java b/src/main/java/com/sipai/service/evaluation/EvaluationIndexDayService.java index 38683c94..8f1453f2 100644 --- a/src/main/java/com/sipai/service/evaluation/EvaluationIndexDayService.java +++ b/src/main/java/com/sipai/service/evaluation/EvaluationIndexDayService.java @@ -1,14 +1,12 @@ package com.sipai.service.evaluation; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.sipai.dao.evaluation.EvaluationIndexDayDao; import com.sipai.entity.evaluation.EvaluationIndexDay; import com.sipai.tools.CommService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class EvaluationIndexDayService implements CommService{ diff --git a/src/main/java/com/sipai/service/evaluation/EvaluationIndexMService.java b/src/main/java/com/sipai/service/evaluation/EvaluationIndexMService.java index a6fd49b3..0ef50c54 100644 --- a/src/main/java/com/sipai/service/evaluation/EvaluationIndexMService.java +++ b/src/main/java/com/sipai/service/evaluation/EvaluationIndexMService.java @@ -1,15 +1,13 @@ package com.sipai.service.evaluation; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.sipai.dao.evaluation.EvaluationIndexMDao; import com.sipai.entity.evaluation.EvaluationCriterion; import com.sipai.entity.evaluation.EvaluationIndexM; import com.sipai.tools.CommService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class EvaluationIndexMService implements CommService{ diff --git a/src/main/java/com/sipai/service/evaluation/EvaluationIndexMonthService.java b/src/main/java/com/sipai/service/evaluation/EvaluationIndexMonthService.java index 2bb325e4..cc8152b9 100644 --- a/src/main/java/com/sipai/service/evaluation/EvaluationIndexMonthService.java +++ b/src/main/java/com/sipai/service/evaluation/EvaluationIndexMonthService.java @@ -1,14 +1,12 @@ package com.sipai.service.evaluation; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.sipai.dao.evaluation.EvaluationIndexMontDao; import com.sipai.entity.evaluation.EvaluationIndexMonth; import com.sipai.tools.CommService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class EvaluationIndexMonthService implements CommService{ diff --git a/src/main/java/com/sipai/service/evaluation/EvaluationIndexService.java b/src/main/java/com/sipai/service/evaluation/EvaluationIndexService.java index 793646bb..ab28d7f8 100644 --- a/src/main/java/com/sipai/service/evaluation/EvaluationIndexService.java +++ b/src/main/java/com/sipai/service/evaluation/EvaluationIndexService.java @@ -1,18 +1,13 @@ package com.sipai.service.evaluation; -import java.util.List; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - -import com.sipai.dao.evaluation.EvaluationCriterionDao; import com.sipai.dao.evaluation.EvaluationIndexDao; import com.sipai.entity.evaluation.EvaluationCriterion; import com.sipai.entity.evaluation.EvaluationIndex; import com.sipai.tools.CommService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class EvaluationIndexService implements CommService{ diff --git a/src/main/java/com/sipai/service/evaluation/EvaluationIndexYService.java b/src/main/java/com/sipai/service/evaluation/EvaluationIndexYService.java index 35ae277f..f665d25b 100644 --- a/src/main/java/com/sipai/service/evaluation/EvaluationIndexYService.java +++ b/src/main/java/com/sipai/service/evaluation/EvaluationIndexYService.java @@ -1,15 +1,13 @@ package com.sipai.service.evaluation; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.sipai.dao.evaluation.EvaluationIndexYDao; import com.sipai.entity.evaluation.EvaluationCriterion; import com.sipai.entity.evaluation.EvaluationIndexY; import com.sipai.tools.CommService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class EvaluationIndexYService implements CommService{ diff --git a/src/main/java/com/sipai/service/evaluation/EvaluationIndexYearService.java b/src/main/java/com/sipai/service/evaluation/EvaluationIndexYearService.java index 403252f7..38e547a3 100644 --- a/src/main/java/com/sipai/service/evaluation/EvaluationIndexYearService.java +++ b/src/main/java/com/sipai/service/evaluation/EvaluationIndexYearService.java @@ -1,14 +1,12 @@ package com.sipai.service.evaluation; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.sipai.dao.evaluation.EvaluationIndexYearDao; import com.sipai.entity.evaluation.EvaluationIndexYear; import com.sipai.tools.CommService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class EvaluationIndexYearService implements CommService{ diff --git a/src/main/java/com/sipai/service/fangzhen/FangZhenBalanceService.java b/src/main/java/com/sipai/service/fangzhen/FangZhenBalanceService.java index ee8243cd..1d5cd296 100644 --- a/src/main/java/com/sipai/service/fangzhen/FangZhenBalanceService.java +++ b/src/main/java/com/sipai/service/fangzhen/FangZhenBalanceService.java @@ -1,7 +1,6 @@ package com.sipai.service.fangzhen; import com.sipai.entity.fangzhen.FangZhenBalance; -import org.springframework.stereotype.Service; import java.util.List; diff --git a/src/main/java/com/sipai/service/fangzhen/FangZhenEquipmentService.java b/src/main/java/com/sipai/service/fangzhen/FangZhenEquipmentService.java index ef6f19bf..2e617e71 100644 --- a/src/main/java/com/sipai/service/fangzhen/FangZhenEquipmentService.java +++ b/src/main/java/com/sipai/service/fangzhen/FangZhenEquipmentService.java @@ -1,7 +1,6 @@ package com.sipai.service.fangzhen; import com.sipai.entity.fangzhen.FangZhenEquipment; -import org.springframework.stereotype.Service; import java.util.List; diff --git a/src/main/java/com/sipai/service/fangzhen/FangZhenHeadUIService.java b/src/main/java/com/sipai/service/fangzhen/FangZhenHeadUIService.java index bc680897..48ab4136 100644 --- a/src/main/java/com/sipai/service/fangzhen/FangZhenHeadUIService.java +++ b/src/main/java/com/sipai/service/fangzhen/FangZhenHeadUIService.java @@ -1,7 +1,6 @@ package com.sipai.service.fangzhen; import com.sipai.entity.fangzhen.FangZhenHeadUI; -import org.springframework.stereotype.Service; import java.util.List; diff --git a/src/main/java/com/sipai/service/fangzhen/FangZhenPipeService.java b/src/main/java/com/sipai/service/fangzhen/FangZhenPipeService.java index da498b2c..66936796 100644 --- a/src/main/java/com/sipai/service/fangzhen/FangZhenPipeService.java +++ b/src/main/java/com/sipai/service/fangzhen/FangZhenPipeService.java @@ -1,7 +1,6 @@ package com.sipai.service.fangzhen; import com.sipai.entity.fangzhen.FangZhenPipe; -import org.springframework.stereotype.Service; import java.util.List; diff --git a/src/main/java/com/sipai/service/fangzhen/FangZhenStationService.java b/src/main/java/com/sipai/service/fangzhen/FangZhenStationService.java index d39c2d79..8c2daf60 100644 --- a/src/main/java/com/sipai/service/fangzhen/FangZhenStationService.java +++ b/src/main/java/com/sipai/service/fangzhen/FangZhenStationService.java @@ -1,8 +1,6 @@ package com.sipai.service.fangzhen; -import com.sipai.entity.fangzhen.FangZhenPipe; import com.sipai.entity.fangzhen.FangZhenStation; -import org.springframework.stereotype.Service; import java.util.List; diff --git a/src/main/java/com/sipai/service/fangzhen/FangZhenWaterService.java b/src/main/java/com/sipai/service/fangzhen/FangZhenWaterService.java index 342a453b..bdecd15b 100644 --- a/src/main/java/com/sipai/service/fangzhen/FangZhenWaterService.java +++ b/src/main/java/com/sipai/service/fangzhen/FangZhenWaterService.java @@ -1,7 +1,6 @@ package com.sipai.service.fangzhen; import com.sipai.entity.fangzhen.FangZhenWater; -import org.springframework.stereotype.Service; import java.util.List; diff --git a/src/main/java/com/sipai/service/fangzhen/FangZhenXeomaService.java b/src/main/java/com/sipai/service/fangzhen/FangZhenXeomaService.java index f114cfa3..67a93724 100644 --- a/src/main/java/com/sipai/service/fangzhen/FangZhenXeomaService.java +++ b/src/main/java/com/sipai/service/fangzhen/FangZhenXeomaService.java @@ -1,8 +1,6 @@ package com.sipai.service.fangzhen; -import com.sipai.entity.fangzhen.FangZhenWater; import com.sipai.entity.fangzhen.FangZhenXeoma; -import org.springframework.stereotype.Service; import java.util.List; diff --git a/src/main/java/com/sipai/service/fangzhen/impl/FangZhenBalanceServiceImpl.java b/src/main/java/com/sipai/service/fangzhen/impl/FangZhenBalanceServiceImpl.java index 50b76b53..107584fe 100644 --- a/src/main/java/com/sipai/service/fangzhen/impl/FangZhenBalanceServiceImpl.java +++ b/src/main/java/com/sipai/service/fangzhen/impl/FangZhenBalanceServiceImpl.java @@ -2,7 +2,6 @@ package com.sipai.service.fangzhen.impl; import com.sipai.dao.fangzhen.FangZhenBalanceDao; import com.sipai.entity.fangzhen.FangZhenBalance; -import com.sipai.entity.workorder.WorkorderDetail; import com.sipai.service.fangzhen.FangZhenBalanceService; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/sipai/service/fangzhen/impl/FangZhenXeomaServiceImpl.java b/src/main/java/com/sipai/service/fangzhen/impl/FangZhenXeomaServiceImpl.java index 3bc66403..73ba52f6 100644 --- a/src/main/java/com/sipai/service/fangzhen/impl/FangZhenXeomaServiceImpl.java +++ b/src/main/java/com/sipai/service/fangzhen/impl/FangZhenXeomaServiceImpl.java @@ -1,6 +1,5 @@ package com.sipai.service.fangzhen.impl; -import com.sipai.entity.fangzhen.FangZhenXeoma; import com.sipai.entity.fangzhen.FangZhenXeoma; import com.sipai.service.fangzhen.FangZhenXeomaService; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/sipai/service/finance/FinanceEquipmentDeptInfoService.java b/src/main/java/com/sipai/service/finance/FinanceEquipmentDeptInfoService.java index e99d5276..57109a70 100644 --- a/src/main/java/com/sipai/service/finance/FinanceEquipmentDeptInfoService.java +++ b/src/main/java/com/sipai/service/finance/FinanceEquipmentDeptInfoService.java @@ -1,15 +1,12 @@ package com.sipai.service.finance; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.sipai.dao.finance.FinanceEquipmentDeptInfoDao; -import com.sipai.entity.equipment.AssetClass; import com.sipai.entity.finance.FinanceEquipmentDeptInfo; import com.sipai.tools.CommService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class FinanceEquipmentDeptInfoService implements CommService{ diff --git a/src/main/java/com/sipai/service/fwk/MenunumberService.java b/src/main/java/com/sipai/service/fwk/MenunumberService.java index 4eba7adc..766cb939 100644 --- a/src/main/java/com/sipai/service/fwk/MenunumberService.java +++ b/src/main/java/com/sipai/service/fwk/MenunumberService.java @@ -1,9 +1,9 @@ package com.sipai.service.fwk; -import java.util.List; - import com.sipai.entity.fwk.Menunumber; +import java.util.List; + public interface MenunumberService { public Menunumber selectById(String t); diff --git a/src/main/java/com/sipai/service/fwk/UserToMenuService.java b/src/main/java/com/sipai/service/fwk/UserToMenuService.java index b49e0d4b..19be16a3 100644 --- a/src/main/java/com/sipai/service/fwk/UserToMenuService.java +++ b/src/main/java/com/sipai/service/fwk/UserToMenuService.java @@ -1,9 +1,9 @@ package com.sipai.service.fwk; -import java.util.List; - import com.sipai.entity.fwk.UserToMenu; +import java.util.List; + public interface UserToMenuService { public UserToMenu selectById(String t); diff --git a/src/main/java/com/sipai/service/fwk/WeatherHistoryService.java b/src/main/java/com/sipai/service/fwk/WeatherHistoryService.java index 551e8916..e88c543a 100644 --- a/src/main/java/com/sipai/service/fwk/WeatherHistoryService.java +++ b/src/main/java/com/sipai/service/fwk/WeatherHistoryService.java @@ -1,9 +1,9 @@ package com.sipai.service.fwk; -import java.util.List; - import com.sipai.entity.fwk.WeatherHistory; +import java.util.List; + public interface WeatherHistoryService { public WeatherHistory selectById(String t); diff --git a/src/main/java/com/sipai/service/fwk/impl/MenunumberServiceImpl.java b/src/main/java/com/sipai/service/fwk/impl/MenunumberServiceImpl.java index e282fb66..c0fc054c 100644 --- a/src/main/java/com/sipai/service/fwk/impl/MenunumberServiceImpl.java +++ b/src/main/java/com/sipai/service/fwk/impl/MenunumberServiceImpl.java @@ -1,18 +1,15 @@ package com.sipai.service.fwk.impl; -import java.util.ArrayList; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - import com.sipai.dao.fwk.MenunumberDao; import com.sipai.entity.fwk.Menunumber; import com.sipai.entity.user.Menu; import com.sipai.service.fwk.MenunumberService; import com.sipai.service.user.MenuService; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; +import java.util.List; @Service("menunumberService") public class MenunumberServiceImpl implements MenunumberService{ diff --git a/src/main/java/com/sipai/service/fwk/impl/UserToMenuServiceImpl.java b/src/main/java/com/sipai/service/fwk/impl/UserToMenuServiceImpl.java index b8f076c6..5d185f92 100644 --- a/src/main/java/com/sipai/service/fwk/impl/UserToMenuServiceImpl.java +++ b/src/main/java/com/sipai/service/fwk/impl/UserToMenuServiceImpl.java @@ -1,15 +1,13 @@ package com.sipai.service.fwk.impl; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - import com.sipai.dao.fwk.UserToMenuDao; import com.sipai.entity.fwk.UserToMenu; import com.sipai.service.fwk.UserToMenuService; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; +import java.util.List; @Service("userToMenuService") public class UserToMenuServiceImpl implements UserToMenuService{ diff --git a/src/main/java/com/sipai/service/fwk/impl/WeatherHistoryServiceImpl.java b/src/main/java/com/sipai/service/fwk/impl/WeatherHistoryServiceImpl.java index f45960e0..8bfd28f1 100644 --- a/src/main/java/com/sipai/service/fwk/impl/WeatherHistoryServiceImpl.java +++ b/src/main/java/com/sipai/service/fwk/impl/WeatherHistoryServiceImpl.java @@ -1,15 +1,13 @@ package com.sipai.service.fwk.impl; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - import com.sipai.dao.fwk.WeatherHistoryDao; import com.sipai.entity.fwk.WeatherHistory; import com.sipai.service.fwk.WeatherHistoryService; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; +import java.util.List; @Service("weatherHistoryService") public class WeatherHistoryServiceImpl implements WeatherHistoryService{ diff --git a/src/main/java/com/sipai/service/hqconfig/HQAlarmRecordService.java b/src/main/java/com/sipai/service/hqconfig/HQAlarmRecordService.java index 93960788..9a9d0751 100644 --- a/src/main/java/com/sipai/service/hqconfig/HQAlarmRecordService.java +++ b/src/main/java/com/sipai/service/hqconfig/HQAlarmRecordService.java @@ -14,7 +14,6 @@ import com.sipai.service.scada.MPointService; import com.sipai.service.user.UnitService; import com.sipai.service.work.AreaManageService; import com.sipai.tools.*; -import io.swagger.models.auth.In; import net.sf.json.JSONArray; import net.sf.json.JSONObject; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/sipai/service/hqconfig/WorkModelService.java b/src/main/java/com/sipai/service/hqconfig/WorkModelService.java index 5f17fead..12541951 100644 --- a/src/main/java/com/sipai/service/hqconfig/WorkModelService.java +++ b/src/main/java/com/sipai/service/hqconfig/WorkModelService.java @@ -1,17 +1,15 @@ package com.sipai.service.hqconfig; -import java.util.List; - -import javax.annotation.Resource; - -import com.sipai.entity.work.CameraDetail; -import com.sipai.service.work.CameraDetailService; -import org.apache.commons.lang3.StringUtils; -import org.springframework.stereotype.Service; - import com.sipai.dao.hqconfig.WorkModelDao; import com.sipai.entity.hqconfig.WorkModel; +import com.sipai.entity.work.CameraDetail; +import com.sipai.service.work.CameraDetailService; import com.sipai.tools.CommService; +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class WorkModelService implements CommService{ diff --git a/src/main/java/com/sipai/service/info/InfoRecvService.java b/src/main/java/com/sipai/service/info/InfoRecvService.java index c5a314a5..7259915b 100644 --- a/src/main/java/com/sipai/service/info/InfoRecvService.java +++ b/src/main/java/com/sipai/service/info/InfoRecvService.java @@ -1,15 +1,13 @@ package com.sipai.service.info; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.sipai.dao.info.InfoRecvDao; import com.sipai.entity.info.InfoRecv; import com.sipai.service.user.UnitService; import com.sipai.tools.CommService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class InfoRecvService implements CommService{ diff --git a/src/main/java/com/sipai/service/info/InfoService.java b/src/main/java/com/sipai/service/info/InfoService.java index db0a87e4..10d73f53 100644 --- a/src/main/java/com/sipai/service/info/InfoService.java +++ b/src/main/java/com/sipai/service/info/InfoService.java @@ -1,26 +1,20 @@ package com.sipai.service.info; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.sipai.dao.info.InfoDao; import com.sipai.entity.info.Info; -import com.sipai.entity.maintenance.Maintenance; -import com.sipai.entity.user.Company; -import com.sipai.entity.user.Unit; import com.sipai.entity.user.User; import com.sipai.service.msg.MsgServiceImpl; import com.sipai.service.user.UnitService; import com.sipai.service.user.UserService; import com.sipai.tools.CommService; -import com.sipai.tools.CommUtil; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.regex.Matcher; +import java.util.regex.Pattern; @Service public class InfoService implements CommService{ diff --git a/src/main/java/com/sipai/service/jsyw/JsywCompanyService.java b/src/main/java/com/sipai/service/jsyw/JsywCompanyService.java index c6557597..cc209254 100644 --- a/src/main/java/com/sipai/service/jsyw/JsywCompanyService.java +++ b/src/main/java/com/sipai/service/jsyw/JsywCompanyService.java @@ -1,14 +1,12 @@ package com.sipai.service.jsyw; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.sipai.dao.jsyw.JsywCompanyDao; import com.sipai.entity.jsyw.JsywCompany; import com.sipai.tools.CommService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class JsywCompanyService implements CommService { diff --git a/src/main/java/com/sipai/service/jsyw/JsywPointService.java b/src/main/java/com/sipai/service/jsyw/JsywPointService.java index e421eb11..3bbdbeab 100644 --- a/src/main/java/com/sipai/service/jsyw/JsywPointService.java +++ b/src/main/java/com/sipai/service/jsyw/JsywPointService.java @@ -1,14 +1,12 @@ package com.sipai.service.jsyw; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.sipai.dao.jsyw.JsywPointDao; import com.sipai.entity.jsyw.JsywPoint; import com.sipai.tools.CommService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class JsywPointService implements CommService { diff --git a/src/main/java/com/sipai/service/kpi/KpiPlanDetailReadListenner.java b/src/main/java/com/sipai/service/kpi/KpiPlanDetailReadListenner.java index 166bb21e..6a366662 100644 --- a/src/main/java/com/sipai/service/kpi/KpiPlanDetailReadListenner.java +++ b/src/main/java/com/sipai/service/kpi/KpiPlanDetailReadListenner.java @@ -4,17 +4,9 @@ import com.alibaba.excel.context.AnalysisContext; import com.alibaba.excel.metadata.CellExtra; import com.alibaba.excel.metadata.data.ReadCellData; import com.alibaba.excel.read.listener.ReadListener; -import com.sipai.dao.kpi.KpiPlanDetailDao; -import com.sipai.entity.kpi.KpiPlan; import com.sipai.entity.kpi.KpiPlanDetail; -import com.sipai.tools.DateUtil; import lombok.Data; -import org.springframework.stereotype.Component; -import org.springframework.stereotype.Service; -import javax.annotation.Resource; -import java.util.Date; -import java.util.List; import java.util.Map; @Data diff --git a/src/main/java/com/sipai/service/maintenance/AbnormityService.java b/src/main/java/com/sipai/service/maintenance/AbnormityService.java index 0500150f..ef3c6ae8 100644 --- a/src/main/java/com/sipai/service/maintenance/AbnormityService.java +++ b/src/main/java/com/sipai/service/maintenance/AbnormityService.java @@ -1,35 +1,40 @@ package com.sipai.service.maintenance; -import java.io.IOException; -import java.io.OutputStream; -import java.net.URLEncoder; -import java.text.SimpleDateFormat; -import java.util.*; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - +import com.sipai.dao.maintenance.AbnormityDao; import com.sipai.entity.activiti.ProcessType; import com.sipai.entity.business.BusinessUnitRecord; -import com.sipai.entity.enums.AbnormityTypeEnum; import com.sipai.entity.enums.AbnormityStatusEnum; -import com.sipai.entity.maintenance.*; -import com.sipai.entity.timeefficiency.*; +import com.sipai.entity.enums.AbnormityTypeEnum; +import com.sipai.entity.equipment.EquipmentCard; +import com.sipai.entity.maintenance.Abnormity; +import com.sipai.entity.maintenance.MaintenanceCommString; +import com.sipai.entity.maintenance.MaintenanceDetail; +import com.sipai.entity.maintenance.PlanRecordAbnormity; +import com.sipai.entity.timeefficiency.PatrolRecord; +import com.sipai.entity.timeefficiency.PatrolRecordPatrolRoute; +import com.sipai.entity.timeefficiency.TimeEfficiencyCommStr; +import com.sipai.entity.user.Company; +import com.sipai.entity.user.ProcessSection; +import com.sipai.entity.user.Unit; +import com.sipai.entity.user.User; import com.sipai.entity.workorder.WorkorderDetail; import com.sipai.service.activiti.WorkflowProcessDefinitionService; import com.sipai.service.activiti.WorkflowService; import com.sipai.service.business.BusinessUnitHandleDetailService; import com.sipai.service.company.CompanyService; +import com.sipai.service.equipment.EquipmentCardService; import com.sipai.service.timeefficiency.PatrolRecordPatrolRouteService; import com.sipai.service.timeefficiency.PatrolRecordService; - +import com.sipai.service.user.ProcessSectionService; +import com.sipai.service.user.UnitService; +import com.sipai.service.user.UserService; import com.sipai.service.workorder.WorkorderDetailService; -import com.sipai.tools.*; +import com.sipai.tools.CommService; +import com.sipai.tools.CommString; +import com.sipai.tools.CommUtil; import com.sipai.tools.DateUtil; import net.sf.json.JSONArray; import net.sf.json.JSONObject; - import org.activiti.engine.RuntimeService; import org.activiti.engine.repository.ProcessDefinition; import org.activiti.engine.runtime.ProcessInstance; @@ -40,16 +45,14 @@ import org.apache.poi.ss.util.CellRangeAddress; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import com.sipai.dao.maintenance.AbnormityDao; -import com.sipai.entity.equipment.EquipmentCard; -import com.sipai.entity.user.Company; -import com.sipai.entity.user.ProcessSection; -import com.sipai.entity.user.Unit; -import com.sipai.entity.user.User; -import com.sipai.service.equipment.EquipmentCardService; -import com.sipai.service.user.ProcessSectionService; -import com.sipai.service.user.UnitService; -import com.sipai.service.user.UserService; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.io.OutputStream; +import java.net.URLEncoder; +import java.text.SimpleDateFormat; +import java.util.*; @Service("abnormityService") public class AbnormityService implements CommService { diff --git a/src/main/java/com/sipai/service/maintenance/AnticorrosiveLibraryEquipmentService.java b/src/main/java/com/sipai/service/maintenance/AnticorrosiveLibraryEquipmentService.java index 2b3276d2..f4ab189e 100644 --- a/src/main/java/com/sipai/service/maintenance/AnticorrosiveLibraryEquipmentService.java +++ b/src/main/java/com/sipai/service/maintenance/AnticorrosiveLibraryEquipmentService.java @@ -1,9 +1,9 @@ package com.sipai.service.maintenance; -import java.util.List; - import com.sipai.entity.maintenance.AnticorrosiveLibraryEquipment; +import java.util.List; + public interface AnticorrosiveLibraryEquipmentService { public abstract AnticorrosiveLibraryEquipment selectById(String id); diff --git a/src/main/java/com/sipai/service/maintenance/AnticorrosiveLibraryMaterialService.java b/src/main/java/com/sipai/service/maintenance/AnticorrosiveLibraryMaterialService.java index db2e3a82..37769a8e 100644 --- a/src/main/java/com/sipai/service/maintenance/AnticorrosiveLibraryMaterialService.java +++ b/src/main/java/com/sipai/service/maintenance/AnticorrosiveLibraryMaterialService.java @@ -1,9 +1,9 @@ package com.sipai.service.maintenance; -import java.util.List; - import com.sipai.entity.maintenance.AnticorrosiveLibraryMaterial; +import java.util.List; + public interface AnticorrosiveLibraryMaterialService { public abstract AnticorrosiveLibraryMaterial selectById(String id); diff --git a/src/main/java/com/sipai/service/maintenance/AnticorrosiveLibraryService.java b/src/main/java/com/sipai/service/maintenance/AnticorrosiveLibraryService.java index 151abab3..1f5cd93f 100644 --- a/src/main/java/com/sipai/service/maintenance/AnticorrosiveLibraryService.java +++ b/src/main/java/com/sipai/service/maintenance/AnticorrosiveLibraryService.java @@ -1,8 +1,9 @@ package com.sipai.service.maintenance; -import java.util.List; import com.sipai.entity.maintenance.AnticorrosiveLibrary; +import java.util.List; + public interface AnticorrosiveLibraryService { public abstract AnticorrosiveLibrary selectById(String id); diff --git a/src/main/java/com/sipai/service/maintenance/AnticorrosiveMaterialService.java b/src/main/java/com/sipai/service/maintenance/AnticorrosiveMaterialService.java index 0e547b67..3881b560 100644 --- a/src/main/java/com/sipai/service/maintenance/AnticorrosiveMaterialService.java +++ b/src/main/java/com/sipai/service/maintenance/AnticorrosiveMaterialService.java @@ -1,9 +1,9 @@ package com.sipai.service.maintenance; -import java.util.List; - import com.sipai.entity.maintenance.AnticorrosiveMaterial; +import java.util.List; + public interface AnticorrosiveMaterialService { public abstract AnticorrosiveMaterial selectById(String id); diff --git a/src/main/java/com/sipai/service/maintenance/EquipmentPlanEquService.java b/src/main/java/com/sipai/service/maintenance/EquipmentPlanEquService.java index c329741b..fa182b19 100644 --- a/src/main/java/com/sipai/service/maintenance/EquipmentPlanEquService.java +++ b/src/main/java/com/sipai/service/maintenance/EquipmentPlanEquService.java @@ -1,9 +1,9 @@ package com.sipai.service.maintenance; -import java.util.List; - import com.sipai.entity.maintenance.EquipmentPlanEqu; +import java.util.List; + public interface EquipmentPlanEquService { public abstract EquipmentPlanEqu selectById(String id); diff --git a/src/main/java/com/sipai/service/maintenance/EquipmentPlanMainYearDetailService.java b/src/main/java/com/sipai/service/maintenance/EquipmentPlanMainYearDetailService.java index a2d741bc..b11b367d 100644 --- a/src/main/java/com/sipai/service/maintenance/EquipmentPlanMainYearDetailService.java +++ b/src/main/java/com/sipai/service/maintenance/EquipmentPlanMainYearDetailService.java @@ -1,21 +1,14 @@ package com.sipai.service.maintenance; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import javax.annotation.Resource; - -import net.sf.json.JSONArray; - -import org.springframework.stereotype.Service; import com.sipai.dao.maintenance.EquipmentPlanMainYearDetailDao; import com.sipai.entity.maintenance.EquipmentPlanMainYearDetail; -import com.sipai.entity.user.Company; import com.sipai.service.equipment.EquipmentCardService; import com.sipai.service.user.UnitService; import com.sipai.tools.CommService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class EquipmentPlanMainYearDetailService implements CommService{ diff --git a/src/main/java/com/sipai/service/maintenance/EquipmentPlanMainYearService.java b/src/main/java/com/sipai/service/maintenance/EquipmentPlanMainYearService.java index 323d9ef9..20a46cce 100644 --- a/src/main/java/com/sipai/service/maintenance/EquipmentPlanMainYearService.java +++ b/src/main/java/com/sipai/service/maintenance/EquipmentPlanMainYearService.java @@ -1,31 +1,19 @@ package com.sipai.service.maintenance; -import java.io.File; -import java.io.FileInputStream; -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.servlet.ServletOutputStream; -import javax.servlet.http.HttpServletResponse; - -import com.sipai.entity.equipment.EquipmentCardProp; +import com.sipai.dao.maintenance.EquipmentPlanMainYearDao; +import com.sipai.entity.equipment.EquipmentCard; +import com.sipai.entity.maintenance.EquipmentPlanMainYear; +import com.sipai.entity.maintenance.EquipmentPlanMainYearDetail; +import com.sipai.entity.maintenance.EquipmentPlanType; +import com.sipai.entity.user.User; +import com.sipai.service.equipment.EquipmentCardService; +import com.sipai.service.user.UnitService; import com.sipai.service.user.UserService; -import net.sf.json.JSONArray; - +import com.sipai.tools.CommService; +import com.sipai.tools.CommUtil; import org.apache.poi.hssf.usermodel.*; import org.apache.poi.ss.usermodel.*; import org.apache.poi.ss.util.CellRangeAddress; -import org.apache.poi.hssf.util.HSSFColor; import org.apache.poi.ss.util.CellRangeAddressList; import org.apache.poi.xssf.usermodel.XSSFCell; import org.apache.poi.xssf.usermodel.XSSFRow; @@ -34,20 +22,20 @@ import org.apache.poi.xssf.usermodel.XSSFWorkbook; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import com.sipai.dao.maintenance.EquipmentPlanMainYearDao; -import com.sipai.dao.maintenance.EquipmentPlanMainYearDetailDao; -import com.sipai.entity.equipment.EquipmentCard; -import com.sipai.entity.maintenance.EquipmentPlanMainYear; -import com.sipai.entity.maintenance.EquipmentPlanMainYearDetail; -import com.sipai.entity.maintenance.EquipmentPlanType; -import com.sipai.entity.user.Company; -import com.sipai.entity.user.User; -import com.sipai.service.equipment.EquipmentCardService; -import com.sipai.service.user.UnitService; -import com.sipai.tools.CommService; -import com.sipai.tools.CommUtil; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +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.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; -import static org.apache.poi.ss.usermodel.CellType.*; +import static org.apache.poi.ss.usermodel.CellType.STRING; @Service public class EquipmentPlanMainYearService implements CommService { diff --git a/src/main/java/com/sipai/service/maintenance/EquipmentPlanService.java b/src/main/java/com/sipai/service/maintenance/EquipmentPlanService.java index 4beab9bf..4013b128 100644 --- a/src/main/java/com/sipai/service/maintenance/EquipmentPlanService.java +++ b/src/main/java/com/sipai/service/maintenance/EquipmentPlanService.java @@ -1,14 +1,12 @@ package com.sipai.service.maintenance; -import java.io.IOException; -import java.util.List; - import com.sipai.entity.business.BusinessUnitAudit; import com.sipai.entity.maintenance.EquipmentPlan; -import com.sipai.entity.maintenance.EquipmentPlanEqu; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.List; public interface EquipmentPlanService { diff --git a/src/main/java/com/sipai/service/maintenance/EquipmentPlanTypeService.java b/src/main/java/com/sipai/service/maintenance/EquipmentPlanTypeService.java index 1ef66707..e8dfd28e 100644 --- a/src/main/java/com/sipai/service/maintenance/EquipmentPlanTypeService.java +++ b/src/main/java/com/sipai/service/maintenance/EquipmentPlanTypeService.java @@ -1,9 +1,9 @@ package com.sipai.service.maintenance; -import java.util.List; - import com.sipai.entity.maintenance.EquipmentPlanType; +import java.util.List; + public interface EquipmentPlanTypeService { public abstract EquipmentPlanType selectById(String id); diff --git a/src/main/java/com/sipai/service/maintenance/FaultLibraryService.java b/src/main/java/com/sipai/service/maintenance/FaultLibraryService.java index a72dc59b..e9e97f2e 100644 --- a/src/main/java/com/sipai/service/maintenance/FaultLibraryService.java +++ b/src/main/java/com/sipai/service/maintenance/FaultLibraryService.java @@ -1,33 +1,17 @@ package com.sipai.service.maintenance; + +import com.sipai.dao.maintenance.FaultLibraryDao; +import com.sipai.entity.maintenance.FaultLibrary; +import com.sipai.tools.CommService; +import net.sf.json.JSONArray; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.annotation.Resource; - -import net.sf.json.JSONArray; - -import org.springframework.stereotype.Service; - -import com.sipai.dao.maintenance.FaultLibraryDao; -import com.sipai.dao.maintenance.MaintainerDao; -import com.sipai.dao.maintenance.MaintenanceDao; -import com.sipai.dao.user.MenuDao; -import com.sipai.dao.user.UserPowerDao; -import com.sipai.dao.work.GroupMemberDao; -import com.sipai.entity.maintenance.FaultLibrary; -import com.sipai.entity.maintenance.Maintainer; -import com.sipai.entity.maintenance.MaintainerType; -import com.sipai.entity.maintenance.Maintenance; -import com.sipai.entity.user.Menu; -import com.sipai.entity.user.RoleMenu; -import com.sipai.entity.user.UserPower; -import com.sipai.entity.work.Group; -import com.sipai.entity.work.GroupMember; -import com.sipai.service.user.RoleService; -import com.sipai.tools.CommService; - @Service public class FaultLibraryService implements CommService{ @Resource diff --git a/src/main/java/com/sipai/service/maintenance/LibraryAddResetProjectBizService.java b/src/main/java/com/sipai/service/maintenance/LibraryAddResetProjectBizService.java index 170335ab..6538717f 100644 --- a/src/main/java/com/sipai/service/maintenance/LibraryAddResetProjectBizService.java +++ b/src/main/java/com/sipai/service/maintenance/LibraryAddResetProjectBizService.java @@ -1,9 +1,9 @@ package com.sipai.service.maintenance; -import java.util.List; - import com.sipai.entity.maintenance.LibraryAddResetProjectBiz; +import java.util.List; + public interface LibraryAddResetProjectBizService { public abstract LibraryAddResetProjectBiz selectById(String id); diff --git a/src/main/java/com/sipai/service/maintenance/LibraryAddResetProjectBlocService.java b/src/main/java/com/sipai/service/maintenance/LibraryAddResetProjectBlocService.java index cdb1c86f..8cec933a 100644 --- a/src/main/java/com/sipai/service/maintenance/LibraryAddResetProjectBlocService.java +++ b/src/main/java/com/sipai/service/maintenance/LibraryAddResetProjectBlocService.java @@ -1,8 +1,9 @@ package com.sipai.service.maintenance; -import java.util.List; import com.sipai.entity.maintenance.LibraryAddResetProjectBloc; +import java.util.List; + public interface LibraryAddResetProjectBlocService { public abstract LibraryAddResetProjectBloc selectById(String id); diff --git a/src/main/java/com/sipai/service/maintenance/LibraryAddResetProjectService.java b/src/main/java/com/sipai/service/maintenance/LibraryAddResetProjectService.java index 97c46fee..f78ac6d8 100644 --- a/src/main/java/com/sipai/service/maintenance/LibraryAddResetProjectService.java +++ b/src/main/java/com/sipai/service/maintenance/LibraryAddResetProjectService.java @@ -1,13 +1,13 @@ package com.sipai.service.maintenance; -import java.io.IOException; -import java.io.InputStream; -import java.util.List; -import javax.servlet.http.HttpServletResponse; - import com.sipai.entity.equipment.EquipmentClass; import com.sipai.entity.maintenance.LibraryAddResetProject; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.io.InputStream; +import java.util.List; + public interface LibraryAddResetProjectService { public abstract LibraryAddResetProject selectById(String id); diff --git a/src/main/java/com/sipai/service/maintenance/LibraryFaultBlocService.java b/src/main/java/com/sipai/service/maintenance/LibraryFaultBlocService.java index a2554dd0..47126f50 100644 --- a/src/main/java/com/sipai/service/maintenance/LibraryFaultBlocService.java +++ b/src/main/java/com/sipai/service/maintenance/LibraryFaultBlocService.java @@ -1,16 +1,13 @@ package com.sipai.service.maintenance; + +import com.sipai.entity.equipment.EquipmentClass; +import com.sipai.entity.maintenance.LibraryFaultBloc; + +import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.InputStream; import java.util.List; import java.util.Map; -import java.util.TreeSet; - -import javax.servlet.http.HttpServletResponse; - -import com.sipai.entity.equipment.EquipmentClass; -import com.sipai.entity.maintenance.LibraryFaultBloc; -import com.sipai.entity.maintenance.LibraryOverhaulProjectBloc; -import com.sipai.entity.workorder.WorkorderDetail; public interface LibraryFaultBlocService{ diff --git a/src/main/java/com/sipai/service/maintenance/LibraryMaintainCarDetailService.java b/src/main/java/com/sipai/service/maintenance/LibraryMaintainCarDetailService.java index df4d59f2..493d351c 100644 --- a/src/main/java/com/sipai/service/maintenance/LibraryMaintainCarDetailService.java +++ b/src/main/java/com/sipai/service/maintenance/LibraryMaintainCarDetailService.java @@ -1,9 +1,9 @@ package com.sipai.service.maintenance; -import java.util.List; - import com.sipai.entity.maintenance.LibraryMaintainCarDetail; +import java.util.List; + public interface LibraryMaintainCarDetailService { public abstract LibraryMaintainCarDetail selectById(String id); diff --git a/src/main/java/com/sipai/service/maintenance/LibraryMaintainCarService.java b/src/main/java/com/sipai/service/maintenance/LibraryMaintainCarService.java index 8e8e17a8..cff390b5 100644 --- a/src/main/java/com/sipai/service/maintenance/LibraryMaintainCarService.java +++ b/src/main/java/com/sipai/service/maintenance/LibraryMaintainCarService.java @@ -1,9 +1,9 @@ package com.sipai.service.maintenance; -import java.util.List; - import com.sipai.entity.maintenance.LibraryMaintainCar; +import java.util.List; + public interface LibraryMaintainCarService { public abstract LibraryMaintainCar selectById(String id); diff --git a/src/main/java/com/sipai/service/maintenance/LibraryMaintenanceCommonContentService.java b/src/main/java/com/sipai/service/maintenance/LibraryMaintenanceCommonContentService.java index 7e709f13..22146c84 100644 --- a/src/main/java/com/sipai/service/maintenance/LibraryMaintenanceCommonContentService.java +++ b/src/main/java/com/sipai/service/maintenance/LibraryMaintenanceCommonContentService.java @@ -1,9 +1,8 @@ package com.sipai.service.maintenance; -import java.util.List; - import com.sipai.entity.maintenance.LibraryMaintenanceCommonContent; -import com.sipai.entity.maintenance.LibraryRepairBloc; + +import java.util.List; public interface LibraryMaintenanceCommonContentService { diff --git a/src/main/java/com/sipai/service/maintenance/LibraryMaintenanceCommonService.java b/src/main/java/com/sipai/service/maintenance/LibraryMaintenanceCommonService.java index 776de0d3..098a7cf8 100644 --- a/src/main/java/com/sipai/service/maintenance/LibraryMaintenanceCommonService.java +++ b/src/main/java/com/sipai/service/maintenance/LibraryMaintenanceCommonService.java @@ -1,11 +1,12 @@ package com.sipai.service.maintenance; +import com.sipai.entity.equipment.EquipmentClass; +import com.sipai.entity.maintenance.LibraryMaintenanceCommon; + +import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.InputStream; import java.util.List; -import javax.servlet.http.HttpServletResponse; -import com.sipai.entity.equipment.EquipmentClass; -import com.sipai.entity.maintenance.LibraryMaintenanceCommon; public interface LibraryMaintenanceCommonService { diff --git a/src/main/java/com/sipai/service/maintenance/LibraryMaintenanceLubricationService.java b/src/main/java/com/sipai/service/maintenance/LibraryMaintenanceLubricationService.java index ad4e3f4c..3368b1b2 100644 --- a/src/main/java/com/sipai/service/maintenance/LibraryMaintenanceLubricationService.java +++ b/src/main/java/com/sipai/service/maintenance/LibraryMaintenanceLubricationService.java @@ -1,11 +1,12 @@ package com.sipai.service.maintenance; +import com.sipai.entity.equipment.EquipmentClass; +import com.sipai.entity.maintenance.LibraryMaintenanceLubrication; + +import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.InputStream; import java.util.List; -import javax.servlet.http.HttpServletResponse; -import com.sipai.entity.equipment.EquipmentClass; -import com.sipai.entity.maintenance.LibraryMaintenanceLubrication; public interface LibraryMaintenanceLubricationService { diff --git a/src/main/java/com/sipai/service/maintenance/LibraryMaterialQuotaService.java b/src/main/java/com/sipai/service/maintenance/LibraryMaterialQuotaService.java index 91e04b0f..63ff2aba 100644 --- a/src/main/java/com/sipai/service/maintenance/LibraryMaterialQuotaService.java +++ b/src/main/java/com/sipai/service/maintenance/LibraryMaterialQuotaService.java @@ -1,9 +1,9 @@ package com.sipai.service.maintenance; -import java.util.List; - import com.sipai.entity.maintenance.LibraryMaterialQuota; +import java.util.List; + public interface LibraryMaterialQuotaService { public abstract LibraryMaterialQuota selectById(String id); diff --git a/src/main/java/com/sipai/service/maintenance/LibraryOverhaulContentBlocService.java b/src/main/java/com/sipai/service/maintenance/LibraryOverhaulContentBlocService.java index b57e1d17..2959a86a 100644 --- a/src/main/java/com/sipai/service/maintenance/LibraryOverhaulContentBlocService.java +++ b/src/main/java/com/sipai/service/maintenance/LibraryOverhaulContentBlocService.java @@ -1,9 +1,9 @@ package com.sipai.service.maintenance; -import java.util.List; - import com.sipai.entity.maintenance.LibraryOverhaulContentBloc; +import java.util.List; + public interface LibraryOverhaulContentBlocService { public abstract LibraryOverhaulContentBloc selectById(String id); diff --git a/src/main/java/com/sipai/service/maintenance/LibraryOverhaulContentEquBizService.java b/src/main/java/com/sipai/service/maintenance/LibraryOverhaulContentEquBizService.java index 0e5036c2..a2264fcf 100644 --- a/src/main/java/com/sipai/service/maintenance/LibraryOverhaulContentEquBizService.java +++ b/src/main/java/com/sipai/service/maintenance/LibraryOverhaulContentEquBizService.java @@ -1,9 +1,9 @@ package com.sipai.service.maintenance; -import java.util.List; - import com.sipai.entity.maintenance.LibraryOverhaulContentEquBiz; +import java.util.List; + public interface LibraryOverhaulContentEquBizService { public abstract LibraryOverhaulContentEquBiz selectById(String id); diff --git a/src/main/java/com/sipai/service/maintenance/LibraryOverhaulContentModelBlocService.java b/src/main/java/com/sipai/service/maintenance/LibraryOverhaulContentModelBlocService.java index 77133c4c..23cc7f70 100644 --- a/src/main/java/com/sipai/service/maintenance/LibraryOverhaulContentModelBlocService.java +++ b/src/main/java/com/sipai/service/maintenance/LibraryOverhaulContentModelBlocService.java @@ -1,9 +1,9 @@ package com.sipai.service.maintenance; -import java.util.List; - import com.sipai.entity.maintenance.LibraryOverhaulContentModelBloc; +import java.util.List; + public interface LibraryOverhaulContentModelBlocService { public abstract LibraryOverhaulContentModelBloc selectById(String id); diff --git a/src/main/java/com/sipai/service/maintenance/LibraryOverhaulProjectBlocService.java b/src/main/java/com/sipai/service/maintenance/LibraryOverhaulProjectBlocService.java index 87177873..8ff2b9b9 100644 --- a/src/main/java/com/sipai/service/maintenance/LibraryOverhaulProjectBlocService.java +++ b/src/main/java/com/sipai/service/maintenance/LibraryOverhaulProjectBlocService.java @@ -1,16 +1,13 @@ package com.sipai.service.maintenance; +import com.sipai.entity.equipment.EquipmentClass; +import com.sipai.entity.maintenance.LibraryOverhaulProjectBloc; + +import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.InputStream; import java.util.List; -import javax.servlet.http.HttpServletResponse; - -import com.sipai.entity.equipment.EquipmentCard; -import com.sipai.entity.equipment.EquipmentClass; -import com.sipai.entity.maintenance.LibraryOverhaulContentBloc; -import com.sipai.entity.maintenance.LibraryOverhaulProjectBloc; - public interface LibraryOverhaulProjectBlocService { public abstract LibraryOverhaulProjectBloc selectById(String id); diff --git a/src/main/java/com/sipai/service/maintenance/LibraryOverhaulProjectEquBizService.java b/src/main/java/com/sipai/service/maintenance/LibraryOverhaulProjectEquBizService.java index aad3bec2..ace5fc05 100644 --- a/src/main/java/com/sipai/service/maintenance/LibraryOverhaulProjectEquBizService.java +++ b/src/main/java/com/sipai/service/maintenance/LibraryOverhaulProjectEquBizService.java @@ -1,9 +1,9 @@ package com.sipai.service.maintenance; -import java.util.List; - import com.sipai.entity.maintenance.LibraryOverhaulProjectEquBiz; +import java.util.List; + public interface LibraryOverhaulProjectEquBizService { public abstract LibraryOverhaulProjectEquBiz selectById(String id); diff --git a/src/main/java/com/sipai/service/maintenance/LibraryOverhaulProjectModelBlocService.java b/src/main/java/com/sipai/service/maintenance/LibraryOverhaulProjectModelBlocService.java index 22d2752c..f868508e 100644 --- a/src/main/java/com/sipai/service/maintenance/LibraryOverhaulProjectModelBlocService.java +++ b/src/main/java/com/sipai/service/maintenance/LibraryOverhaulProjectModelBlocService.java @@ -1,9 +1,9 @@ package com.sipai.service.maintenance; -import java.util.List; - import com.sipai.entity.maintenance.LibraryOverhaulProjectModelBloc; +import java.util.List; + public interface LibraryOverhaulProjectModelBlocService { public abstract LibraryOverhaulProjectModelBloc selectById(String id); diff --git a/src/main/java/com/sipai/service/maintenance/LibraryRepairBlocService.java b/src/main/java/com/sipai/service/maintenance/LibraryRepairBlocService.java index 7c97c552..f82b32db 100644 --- a/src/main/java/com/sipai/service/maintenance/LibraryRepairBlocService.java +++ b/src/main/java/com/sipai/service/maintenance/LibraryRepairBlocService.java @@ -1,11 +1,9 @@ package com.sipai.service.maintenance; -import java.util.List; -import java.util.TreeSet; - -import com.sipai.entity.maintenance.LibraryOverhaulContentBloc; import com.sipai.entity.maintenance.LibraryRepairBloc; +import java.util.List; + public interface LibraryRepairBlocService { public abstract LibraryRepairBloc selectById(String id); diff --git a/src/main/java/com/sipai/service/maintenance/LibraryRepairEquBizService.java b/src/main/java/com/sipai/service/maintenance/LibraryRepairEquBizService.java index c2874c11..40b827bc 100644 --- a/src/main/java/com/sipai/service/maintenance/LibraryRepairEquBizService.java +++ b/src/main/java/com/sipai/service/maintenance/LibraryRepairEquBizService.java @@ -1,10 +1,9 @@ package com.sipai.service.maintenance; -import java.util.List; - -import com.sipai.entity.maintenance.LibraryRepairBloc; import com.sipai.entity.maintenance.LibraryRepairEquBiz; +import java.util.List; + public interface LibraryRepairEquBizService { public abstract LibraryRepairEquBiz selectById(String id); diff --git a/src/main/java/com/sipai/service/maintenance/LibraryRepairModelBlocService.java b/src/main/java/com/sipai/service/maintenance/LibraryRepairModelBlocService.java index 885f5ec9..647536ab 100644 --- a/src/main/java/com/sipai/service/maintenance/LibraryRepairModelBlocService.java +++ b/src/main/java/com/sipai/service/maintenance/LibraryRepairModelBlocService.java @@ -1,9 +1,9 @@ package com.sipai.service.maintenance; -import java.util.List; - import com.sipai.entity.maintenance.LibraryRepairModelBloc; +import java.util.List; + public interface LibraryRepairModelBlocService { public abstract LibraryRepairModelBloc selectById(String id); diff --git a/src/main/java/com/sipai/service/maintenance/MaintainCarService.java b/src/main/java/com/sipai/service/maintenance/MaintainCarService.java index 0ed9b3e8..8679a7f4 100644 --- a/src/main/java/com/sipai/service/maintenance/MaintainCarService.java +++ b/src/main/java/com/sipai/service/maintenance/MaintainCarService.java @@ -1,10 +1,10 @@ package com.sipai.service.maintenance; -import java.util.List; - import com.sipai.entity.business.BusinessUnitAudit; import com.sipai.entity.maintenance.MaintainCar; +import java.util.List; + public interface MaintainCarService { public abstract MaintainCar selectById(String id); diff --git a/src/main/java/com/sipai/service/maintenance/MaintainPlanService.java b/src/main/java/com/sipai/service/maintenance/MaintainPlanService.java index 0cfc43c2..d8fe8d8a 100644 --- a/src/main/java/com/sipai/service/maintenance/MaintainPlanService.java +++ b/src/main/java/com/sipai/service/maintenance/MaintainPlanService.java @@ -1,14 +1,4 @@ package com.sipai.service.maintenance; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import javax.annotation.Resource; - -import net.sf.json.JSONArray; - -import org.springframework.stereotype.Service; import com.sipai.dao.maintenance.MaintainPlanDao; import com.sipai.entity.maintenance.MaintainPlan; @@ -16,6 +6,10 @@ import com.sipai.entity.maintenance.Maintainer; import com.sipai.entity.user.Company; import com.sipai.service.user.UnitService; import com.sipai.tools.CommService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class MaintainPlanService implements CommService{ diff --git a/src/main/java/com/sipai/service/maintenance/MaintainService.java b/src/main/java/com/sipai/service/maintenance/MaintainService.java index f2f302c8..d6c99c34 100644 --- a/src/main/java/com/sipai/service/maintenance/MaintainService.java +++ b/src/main/java/com/sipai/service/maintenance/MaintainService.java @@ -1,8 +1,9 @@ package com.sipai.service.maintenance; -import java.util.List; import com.sipai.entity.maintenance.Maintain; +import java.util.List; + public interface MaintainService { public abstract Maintain selectById(String id); diff --git a/src/main/java/com/sipai/service/maintenance/MaintainerSelectTypeService.java b/src/main/java/com/sipai/service/maintenance/MaintainerSelectTypeService.java index 6084faf8..8081fcf3 100644 --- a/src/main/java/com/sipai/service/maintenance/MaintainerSelectTypeService.java +++ b/src/main/java/com/sipai/service/maintenance/MaintainerSelectTypeService.java @@ -1,31 +1,15 @@ package com.sipai.service.maintenance; -import java.util.ArrayList; -import java.util.List; -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - -import com.sipai.dao.maintenance.MaintainerCompanyDao; -import com.sipai.dao.maintenance.MaintainerDao; import com.sipai.dao.maintenance.MaintainerSelectTypeDao; -import com.sipai.dao.maintenance.MaintenanceDao; -import com.sipai.dao.user.CompanyDao; -import com.sipai.dao.work.GroupMemberDao; import com.sipai.entity.maintenance.Maintainer; -import com.sipai.entity.maintenance.MaintainerCompany; import com.sipai.entity.maintenance.MaintainerSelectType; import com.sipai.entity.maintenance.MaintainerType; -import com.sipai.entity.maintenance.Maintenance; -import com.sipai.entity.user.Company; -import com.sipai.entity.user.Unit; -import com.sipai.entity.user.UserRole; -import com.sipai.entity.work.Group; -import com.sipai.entity.work.GroupMember; -import com.sipai.service.user.UnitService; import com.sipai.tools.CommService; -import com.sipai.tools.CommString; -import com.sipai.tools.CommUtil; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; @Service public class MaintainerSelectTypeService implements CommService{ diff --git a/src/main/java/com/sipai/service/maintenance/MaintainerService.java b/src/main/java/com/sipai/service/maintenance/MaintainerService.java index b4bcb4dc..ede43e15 100644 --- a/src/main/java/com/sipai/service/maintenance/MaintainerService.java +++ b/src/main/java/com/sipai/service/maintenance/MaintainerService.java @@ -1,44 +1,24 @@ package com.sipai.service.maintenance; -import java.sql.Date; -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Calendar; -import java.util.List; -import javax.annotation.Resource; - -import net.sf.json.JSONArray; -import net.sf.json.JSONObject; - -import org.apache.axis2.databinding.utils.reader.NullXMLStreamReader; -//import org.apache.naming.java.javaURLContextFactory; -import org.springframework.stereotype.Service; - -import com.google.gson.JsonArray; -import com.google.gson.JsonObject; import com.sipai.dao.maintenance.MaintainerCompanyDao; import com.sipai.dao.maintenance.MaintainerDao; -import com.sipai.dao.maintenance.MaintenanceDao; import com.sipai.dao.user.CompanyDao; -import com.sipai.dao.work.GroupMemberDao; import com.sipai.entity.maintenance.Maintainer; import com.sipai.entity.maintenance.MaintainerCompany; import com.sipai.entity.maintenance.MaintainerType; -import com.sipai.entity.maintenance.Maintenance; import com.sipai.entity.user.Company; -import com.sipai.entity.user.Unit; import com.sipai.entity.user.User; -import com.sipai.entity.user.UserRole; -import com.sipai.entity.work.Group; -import com.sipai.entity.work.GroupMember; -import com.sipai.service.user.UnitService; import com.sipai.service.user.UserService; import com.sipai.tools.CommService; import com.sipai.tools.CommString; import com.sipai.tools.CommUtil; -import com.sipai.webservice.server.user.UserServer; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.List; @Service public class MaintainerService implements CommService{ diff --git a/src/main/java/com/sipai/service/maintenance/MaintainerTypeService.java b/src/main/java/com/sipai/service/maintenance/MaintainerTypeService.java index 8f0b243e..8a669a59 100644 --- a/src/main/java/com/sipai/service/maintenance/MaintainerTypeService.java +++ b/src/main/java/com/sipai/service/maintenance/MaintainerTypeService.java @@ -1,20 +1,12 @@ package com.sipai.service.maintenance; -import java.util.List; - -import javax.annotation.Resource; +import com.sipai.dao.maintenance.MaintainerTypeDao; +import com.sipai.entity.maintenance.MaintainerType; +import com.sipai.tools.CommService; import org.springframework.stereotype.Service; -import com.sipai.dao.maintenance.MaintainerDao; -import com.sipai.dao.maintenance.MaintainerTypeDao; -import com.sipai.dao.maintenance.MaintenanceDao; -import com.sipai.dao.work.GroupMemberDao; -import com.sipai.entity.maintenance.Maintainer; -import com.sipai.entity.maintenance.MaintainerType; -import com.sipai.entity.maintenance.Maintenance; -import com.sipai.entity.work.Group; -import com.sipai.entity.work.GroupMember; -import com.sipai.tools.CommService; +import javax.annotation.Resource; +import java.util.List; @Service public class MaintainerTypeService implements CommService{ diff --git a/src/main/java/com/sipai/service/maintenance/MaintenanceDetailService.java b/src/main/java/com/sipai/service/maintenance/MaintenanceDetailService.java index 67702b4c..56850133 100644 --- a/src/main/java/com/sipai/service/maintenance/MaintenanceDetailService.java +++ b/src/main/java/com/sipai/service/maintenance/MaintenanceDetailService.java @@ -1,62 +1,15 @@ package com.sipai.service.maintenance; -import java.io.BufferedReader; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.io.OutputStream; -import java.net.URLEncoder; -import java.text.SimpleDateFormat; -import java.util.Calendar; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Properties; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletResponse; - -import com.sipai.entity.user.Unit; -import com.sipai.entity.workorder.WorkorderDetail; -import com.sipai.entity.workorder.WorkorderRepairContent; -import net.sf.json.JSONArray; -import net.sf.json.JSONObject; - -import org.activiti.engine.RuntimeService; -import org.activiti.engine.history.HistoricActivityInstance; -import org.activiti.engine.impl.pvm.process.ActivityImpl; -import org.activiti.engine.repository.ProcessDefinition; -import org.activiti.engine.runtime.ProcessInstance; -import org.activiti.engine.task.Task; -import org.apache.poi.hssf.usermodel.*; -import org.apache.poi.ss.usermodel.*; -import org.apache.poi.ss.util.CellRangeAddress; -import org.apache.poi.hssf.util.HSSFColor; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.sipai.dao.maintenance.MaintenanceDao; import com.sipai.dao.maintenance.MaintenanceDetailDao; -import com.sipai.dao.work.GroupMemberDao; import com.sipai.entity.activiti.ProcessType; import com.sipai.entity.base.BusinessUnitAdapter; import com.sipai.entity.business.BusinessUnitAudit; import com.sipai.entity.business.BusinessUnitRecord; import com.sipai.entity.equipment.EquipmentCard; -import com.sipai.entity.equipment.EquipmentMaintain; -import com.sipai.entity.equipment.MaintenancePlan; -import com.sipai.entity.maintenance.Abnormity; -import com.sipai.entity.maintenance.LibraryFaultBloc; -import com.sipai.entity.maintenance.Maintenance; -import com.sipai.entity.maintenance.MaintenanceCommString; -import com.sipai.entity.maintenance.MaintenanceDetail; -import com.sipai.entity.maintenance.PlanRecordAbnormity; +import com.sipai.entity.maintenance.*; import com.sipai.entity.user.Company; import com.sipai.entity.user.ProcessSection; import com.sipai.entity.user.User; -import com.sipai.entity.work.Group; -import com.sipai.entity.work.GroupMember; import com.sipai.service.activiti.WorkflowProcessDefinitionService; import com.sipai.service.activiti.WorkflowService; import com.sipai.service.business.BusinessUnitAuditService; @@ -65,14 +18,29 @@ import com.sipai.service.company.CompanyService; import com.sipai.service.equipment.EquipmentCardService; import com.sipai.service.equipment.MaintenancePlanService; import com.sipai.service.msg.MsgServiceImpl; -import com.sipai.service.user.BonusPointService; -import com.sipai.service.user.ProcessSectionService; -import com.sipai.service.user.RoleService; -import com.sipai.service.user.UnitService; -import com.sipai.service.user.UserService; +import com.sipai.service.user.*; import com.sipai.tools.CommService; -import com.sipai.tools.CommString; import com.sipai.tools.CommUtil; +import net.sf.json.JSONArray; +import net.sf.json.JSONObject; +import org.activiti.engine.RuntimeService; +import org.activiti.engine.repository.ProcessDefinition; +import org.activiti.engine.runtime.ProcessInstance; +import org.activiti.engine.task.Task; +import org.apache.poi.hssf.usermodel.*; +import org.apache.poi.ss.usermodel.*; +import org.apache.poi.ss.util.CellRangeAddress; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import java.io.*; +import java.net.URLEncoder; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Properties; @Service public class MaintenanceDetailService implements CommService { diff --git a/src/main/java/com/sipai/service/maintenance/MaintenanceRecordService.java b/src/main/java/com/sipai/service/maintenance/MaintenanceRecordService.java index 674ef717..7844b125 100644 --- a/src/main/java/com/sipai/service/maintenance/MaintenanceRecordService.java +++ b/src/main/java/com/sipai/service/maintenance/MaintenanceRecordService.java @@ -1,24 +1,18 @@ package com.sipai.service.maintenance; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; import com.sipai.dao.maintenance.MaintenanceRecordDao; -import com.sipai.dao.work.GroupMemberDao; -import com.sipai.entity.maintenance.Maintainer; -import com.sipai.entity.maintenance.MaintainerType; import com.sipai.entity.maintenance.Maintenance; import com.sipai.entity.maintenance.MaintenanceRecord; 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.service.user.UnitService; import com.sipai.service.user.UserService; import com.sipai.tools.CommService; import com.sipai.tools.CommUtil; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class MaintenanceRecordService implements CommService{ diff --git a/src/main/java/com/sipai/service/maintenance/MaintenanceService.java b/src/main/java/com/sipai/service/maintenance/MaintenanceService.java index af5e15c0..f235ab7b 100644 --- a/src/main/java/com/sipai/service/maintenance/MaintenanceService.java +++ b/src/main/java/com/sipai/service/maintenance/MaintenanceService.java @@ -1,16 +1,4 @@ package com.sipai.service.maintenance; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import javax.annotation.Resource; - -import org.activiti.engine.IdentityService; -import org.activiti.engine.TaskService; -import org.activiti.engine.runtime.ProcessInstance; -import org.activiti.engine.task.Task; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; import com.sipai.dao.maintenance.MaintenanceDao; import com.sipai.dao.maintenance.MaintenanceEquipmentDao; @@ -27,6 +15,17 @@ import com.sipai.service.user.UnitService; import com.sipai.service.user.UserService; import com.sipai.tools.CommService; import com.sipai.tools.CommUtil; +import org.activiti.engine.IdentityService; +import org.activiti.engine.TaskService; +import org.activiti.engine.runtime.ProcessInstance; +import org.activiti.engine.task.Task; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; +import java.util.HashMap; +import java.util.List; +import java.util.Map; @Service public class MaintenanceService implements CommService{ diff --git a/src/main/java/com/sipai/service/maintenance/PlanRecordAbnormityService.java b/src/main/java/com/sipai/service/maintenance/PlanRecordAbnormityService.java index b0293d40..b3f1314e 100644 --- a/src/main/java/com/sipai/service/maintenance/PlanRecordAbnormityService.java +++ b/src/main/java/com/sipai/service/maintenance/PlanRecordAbnormityService.java @@ -1,20 +1,14 @@ package com.sipai.service.maintenance; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - -import com.itextpdf.text.pdf.PdfStructTreeController.returnType; -import com.sipai.dao.equipment.AssetClassDao; -import com.sipai.dao.maintenance.AbnormityDao; import com.sipai.dao.maintenance.PlanRecordAbnormityDao; -import com.sipai.entity.equipment.AssetClass; import com.sipai.entity.maintenance.Abnormity; import com.sipai.entity.maintenance.MaintenanceDetail; import com.sipai.entity.maintenance.PlanRecordAbnormity; import com.sipai.tools.CommService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class PlanRecordAbnormityService implements CommService{ @Resource diff --git a/src/main/java/com/sipai/service/maintenance/RepairCarService.java b/src/main/java/com/sipai/service/maintenance/RepairCarService.java index ff45764a..f6eac4d1 100644 --- a/src/main/java/com/sipai/service/maintenance/RepairCarService.java +++ b/src/main/java/com/sipai/service/maintenance/RepairCarService.java @@ -1,10 +1,10 @@ package com.sipai.service.maintenance; -import java.util.List; - import com.sipai.entity.business.BusinessUnitAudit; import com.sipai.entity.maintenance.RepairCar; +import java.util.List; + public interface RepairCarService { public abstract RepairCar selectById(String id); diff --git a/src/main/java/com/sipai/service/maintenance/RepairService.java b/src/main/java/com/sipai/service/maintenance/RepairService.java index fb3831d2..50bef643 100644 --- a/src/main/java/com/sipai/service/maintenance/RepairService.java +++ b/src/main/java/com/sipai/service/maintenance/RepairService.java @@ -1,10 +1,10 @@ package com.sipai.service.maintenance; -import java.util.List; - import com.sipai.entity.business.BusinessUnitAudit; import com.sipai.entity.maintenance.Repair; +import java.util.List; + public interface RepairService { public abstract Repair selectById(String id); diff --git a/src/main/java/com/sipai/service/maintenance/WorkorderLibraryMaintainService.java b/src/main/java/com/sipai/service/maintenance/WorkorderLibraryMaintainService.java index bf466fc1..f55228bb 100644 --- a/src/main/java/com/sipai/service/maintenance/WorkorderLibraryMaintainService.java +++ b/src/main/java/com/sipai/service/maintenance/WorkorderLibraryMaintainService.java @@ -1,8 +1,9 @@ package com.sipai.service.maintenance; -import java.util.List; import com.sipai.entity.maintenance.WorkorderLibraryMaintain; +import java.util.List; + public interface WorkorderLibraryMaintainService { public abstract WorkorderLibraryMaintain selectById(String id); diff --git a/src/main/java/com/sipai/service/maintenance/impl/AnticorrosiveLibraryEquipmentServiceImpl.java b/src/main/java/com/sipai/service/maintenance/impl/AnticorrosiveLibraryEquipmentServiceImpl.java index 12cb22d9..868568b0 100644 --- a/src/main/java/com/sipai/service/maintenance/impl/AnticorrosiveLibraryEquipmentServiceImpl.java +++ b/src/main/java/com/sipai/service/maintenance/impl/AnticorrosiveLibraryEquipmentServiceImpl.java @@ -1,16 +1,14 @@ package com.sipai.service.maintenance.impl; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.sipai.dao.maintenance.AnticorrosiveLibraryEquipmentDao; import com.sipai.entity.equipment.EquipmentCard; import com.sipai.entity.maintenance.AnticorrosiveLibraryEquipment; import com.sipai.service.equipment.EquipmentCardService; import com.sipai.service.maintenance.AnticorrosiveLibraryEquipmentService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class AnticorrosiveLibraryEquipmentServiceImpl implements AnticorrosiveLibraryEquipmentService{ diff --git a/src/main/java/com/sipai/service/maintenance/impl/AnticorrosiveLibraryMaterialServiceImpl.java b/src/main/java/com/sipai/service/maintenance/impl/AnticorrosiveLibraryMaterialServiceImpl.java index 2dca5dba..6810403d 100644 --- a/src/main/java/com/sipai/service/maintenance/impl/AnticorrosiveLibraryMaterialServiceImpl.java +++ b/src/main/java/com/sipai/service/maintenance/impl/AnticorrosiveLibraryMaterialServiceImpl.java @@ -1,16 +1,14 @@ package com.sipai.service.maintenance.impl; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.sipai.dao.maintenance.AnticorrosiveLibraryMaterialDao; import com.sipai.dao.maintenance.AnticorrosiveMaterialDao; import com.sipai.entity.maintenance.AnticorrosiveLibraryMaterial; import com.sipai.entity.maintenance.AnticorrosiveMaterial; import com.sipai.service.maintenance.AnticorrosiveLibraryMaterialService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class AnticorrosiveLibraryMaterialServiceImpl implements AnticorrosiveLibraryMaterialService{ diff --git a/src/main/java/com/sipai/service/maintenance/impl/AnticorrosiveLibraryServiceImpl.java b/src/main/java/com/sipai/service/maintenance/impl/AnticorrosiveLibraryServiceImpl.java index d0c1d095..fcb6c859 100644 --- a/src/main/java/com/sipai/service/maintenance/impl/AnticorrosiveLibraryServiceImpl.java +++ b/src/main/java/com/sipai/service/maintenance/impl/AnticorrosiveLibraryServiceImpl.java @@ -1,14 +1,12 @@ package com.sipai.service.maintenance.impl; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.sipai.dao.maintenance.AnticorrosiveLibraryDao; import com.sipai.entity.maintenance.AnticorrosiveLibrary; import com.sipai.service.maintenance.AnticorrosiveLibraryService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class AnticorrosiveLibraryServiceImpl implements AnticorrosiveLibraryService{ diff --git a/src/main/java/com/sipai/service/maintenance/impl/AnticorrosiveMaterialServiceImpl.java b/src/main/java/com/sipai/service/maintenance/impl/AnticorrosiveMaterialServiceImpl.java index 97f2cc21..173df89f 100644 --- a/src/main/java/com/sipai/service/maintenance/impl/AnticorrosiveMaterialServiceImpl.java +++ b/src/main/java/com/sipai/service/maintenance/impl/AnticorrosiveMaterialServiceImpl.java @@ -1,15 +1,12 @@ package com.sipai.service.maintenance.impl; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.sipai.dao.maintenance.AnticorrosiveMaterialDao; -import com.sipai.entity.maintenance.AnticorrosiveLibrary; import com.sipai.entity.maintenance.AnticorrosiveMaterial; import com.sipai.service.maintenance.AnticorrosiveMaterialService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class AnticorrosiveMaterialServiceImpl implements AnticorrosiveMaterialService{ diff --git a/src/main/java/com/sipai/service/maintenance/impl/EquipmentPlanEquServiceImpl.java b/src/main/java/com/sipai/service/maintenance/impl/EquipmentPlanEquServiceImpl.java index 699d9b62..f9ed62d0 100644 --- a/src/main/java/com/sipai/service/maintenance/impl/EquipmentPlanEquServiceImpl.java +++ b/src/main/java/com/sipai/service/maintenance/impl/EquipmentPlanEquServiceImpl.java @@ -1,17 +1,16 @@ package com.sipai.service.maintenance.impl; -import java.util.List; - -import javax.annotation.Resource; - -import com.sipai.entity.business.BusinessUnitRecord; +import com.sipai.dao.maintenance.EquipmentPlanEquDao; +import com.sipai.entity.equipment.EquipmentCard; import com.sipai.entity.maintenance.EquipmentPlan; +import com.sipai.entity.maintenance.EquipmentPlanEqu; import com.sipai.entity.maintenance.EquipmentPlanType; import com.sipai.entity.user.Company; -import com.sipai.entity.work.GroupDetail; import com.sipai.entity.workorder.WorkorderDetail; import com.sipai.entity.workorder.WorkorderRepairContent; import com.sipai.service.company.CompanyService; +import com.sipai.service.equipment.EquipmentCardService; +import com.sipai.service.maintenance.EquipmentPlanEquService; import com.sipai.service.maintenance.EquipmentPlanService; import com.sipai.service.maintenance.EquipmentPlanTypeService; import com.sipai.service.user.UserService; @@ -20,14 +19,11 @@ import com.sipai.service.workorder.WorkorderDetailService; import com.sipai.service.workorder.WorkorderRepairContentService; import com.sipai.tools.CommUtil; import org.springframework.stereotype.Service; - -import com.sipai.dao.maintenance.EquipmentPlanEquDao; -import com.sipai.entity.equipment.EquipmentCard; -import com.sipai.entity.maintenance.EquipmentPlanEqu; -import com.sipai.service.equipment.EquipmentCardService; -import com.sipai.service.maintenance.EquipmentPlanEquService; import org.springframework.transaction.annotation.Transactional; +import javax.annotation.Resource; +import java.util.List; + @Service("equipmentPlanEquService") public class EquipmentPlanEquServiceImpl implements EquipmentPlanEquService { @Resource diff --git a/src/main/java/com/sipai/service/maintenance/impl/EquipmentPlanServiceImpl.java b/src/main/java/com/sipai/service/maintenance/impl/EquipmentPlanServiceImpl.java index 0d8fed91..2b3db51d 100644 --- a/src/main/java/com/sipai/service/maintenance/impl/EquipmentPlanServiceImpl.java +++ b/src/main/java/com/sipai/service/maintenance/impl/EquipmentPlanServiceImpl.java @@ -1,30 +1,34 @@ package com.sipai.service.maintenance.impl; -import java.io.IOException; -import java.io.OutputStream; -import java.math.BigDecimal; -import java.net.URLEncoder; -import java.util.*; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - +import com.sipai.dao.maintenance.EquipmentPlanDao; +import com.sipai.entity.activiti.ProcessType; +import com.sipai.entity.base.BusinessUnitAdapter; +import com.sipai.entity.business.BusinessUnitAudit; +import com.sipai.entity.business.BusinessUnitRecord; +import com.sipai.entity.equipment.EquipmentRepairPlan; import com.sipai.entity.equipment.MaintenancePlan; import com.sipai.entity.maintenance.*; +import com.sipai.entity.user.Company; import com.sipai.entity.user.User; import com.sipai.entity.work.GroupDetail; -import com.sipai.entity.workorder.WorkTimeRespDto; import com.sipai.entity.workorder.WorkorderDetail; +import com.sipai.service.activiti.WorkflowProcessDefinitionService; +import com.sipai.service.activiti.WorkflowService; +import com.sipai.service.business.BusinessUnitAuditService; import com.sipai.service.business.BusinessUnitHandleDetailService; +import com.sipai.service.company.CompanyService; import com.sipai.service.equipment.EquipmentRepairPlanService; import com.sipai.service.equipment.MaintenancePlanService; import com.sipai.service.maintenance.EquipmentPlanEquService; import com.sipai.service.maintenance.EquipmentPlanMainYearService; +import com.sipai.service.maintenance.EquipmentPlanService; +import com.sipai.service.maintenance.EquipmentPlanTypeService; import com.sipai.service.user.UserService; import com.sipai.service.work.GroupDetailService; import com.sipai.service.workorder.WorkorderDetailService; -import com.sipai.tools.*; +import com.sipai.tools.CommUtil; +import com.sipai.tools.SpringContextUtil; +import com.sipai.tools.Work; import org.activiti.engine.RuntimeService; import org.activiti.engine.TaskService; import org.activiti.engine.repository.ProcessDefinition; @@ -36,22 +40,17 @@ import org.apache.poi.ss.usermodel.*; import org.apache.poi.ss.util.CellRangeAddress; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; - -import com.sipai.dao.maintenance.EquipmentPlanDao; -import com.sipai.entity.activiti.ProcessType; -import com.sipai.entity.base.BusinessUnitAdapter; -import com.sipai.entity.business.BusinessUnitAudit; -import com.sipai.entity.business.BusinessUnitRecord; -import com.sipai.entity.equipment.EquipmentRepairPlan; -import com.sipai.entity.user.Company; -import com.sipai.service.activiti.WorkflowProcessDefinitionService; -import com.sipai.service.activiti.WorkflowService; -import com.sipai.service.business.BusinessUnitAuditService; -import com.sipai.service.company.CompanyService; -import com.sipai.service.maintenance.EquipmentPlanService; -import com.sipai.service.maintenance.EquipmentPlanTypeService; import org.springframework.util.CollectionUtils; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.io.OutputStream; +import java.math.BigDecimal; +import java.net.URLEncoder; +import java.util.*; + @Service("equipmentPlanService") public class EquipmentPlanServiceImpl implements EquipmentPlanService { @Resource diff --git a/src/main/java/com/sipai/service/maintenance/impl/EquipmentPlanTypeServiceImpl.java b/src/main/java/com/sipai/service/maintenance/impl/EquipmentPlanTypeServiceImpl.java index 88dfba3c..a97dc358 100644 --- a/src/main/java/com/sipai/service/maintenance/impl/EquipmentPlanTypeServiceImpl.java +++ b/src/main/java/com/sipai/service/maintenance/impl/EquipmentPlanTypeServiceImpl.java @@ -1,14 +1,12 @@ package com.sipai.service.maintenance.impl; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.sipai.dao.maintenance.EquipmentPlanTypeDao; import com.sipai.entity.maintenance.EquipmentPlanType; import com.sipai.service.maintenance.EquipmentPlanTypeService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service("equipmentPlanTypeService") public class EquipmentPlanTypeServiceImpl implements EquipmentPlanTypeService{ diff --git a/src/main/java/com/sipai/service/maintenance/impl/LibraryAddResetProjectBizServiceImpl.java b/src/main/java/com/sipai/service/maintenance/impl/LibraryAddResetProjectBizServiceImpl.java index dbf48f98..25553455 100644 --- a/src/main/java/com/sipai/service/maintenance/impl/LibraryAddResetProjectBizServiceImpl.java +++ b/src/main/java/com/sipai/service/maintenance/impl/LibraryAddResetProjectBizServiceImpl.java @@ -1,11 +1,12 @@ package com.sipai.service.maintenance.impl; -import java.util.List; -import javax.annotation.Resource; -import org.springframework.stereotype.Service; import com.sipai.dao.maintenance.LibraryAddResetProjectBizDao; import com.sipai.entity.maintenance.LibraryAddResetProjectBiz; import com.sipai.service.maintenance.LibraryAddResetProjectBizService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class LibraryAddResetProjectBizServiceImpl implements LibraryAddResetProjectBizService{ diff --git a/src/main/java/com/sipai/service/maintenance/impl/LibraryAddResetProjectBlocServiceImpl.java b/src/main/java/com/sipai/service/maintenance/impl/LibraryAddResetProjectBlocServiceImpl.java index 013297f0..959feaee 100644 --- a/src/main/java/com/sipai/service/maintenance/impl/LibraryAddResetProjectBlocServiceImpl.java +++ b/src/main/java/com/sipai/service/maintenance/impl/LibraryAddResetProjectBlocServiceImpl.java @@ -1,14 +1,12 @@ package com.sipai.service.maintenance.impl; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.sipai.dao.maintenance.LibraryAddResetProjectBlocDao; import com.sipai.entity.maintenance.LibraryAddResetProjectBloc; import com.sipai.service.maintenance.LibraryAddResetProjectBlocService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class LibraryAddResetProjectBlocServiceImpl implements LibraryAddResetProjectBlocService{ @Resource diff --git a/src/main/java/com/sipai/service/maintenance/impl/LibraryAddResetProjectServiceImpl.java b/src/main/java/com/sipai/service/maintenance/impl/LibraryAddResetProjectServiceImpl.java index bfed08e9..9b88a78a 100644 --- a/src/main/java/com/sipai/service/maintenance/impl/LibraryAddResetProjectServiceImpl.java +++ b/src/main/java/com/sipai/service/maintenance/impl/LibraryAddResetProjectServiceImpl.java @@ -1,5 +1,29 @@ package com.sipai.service.maintenance.impl; +import com.sipai.dao.maintenance.LibraryAddResetProjectDao; +import com.sipai.entity.equipment.EquipmentClass; +import com.sipai.entity.maintenance.LibraryAddResetProject; +import com.sipai.entity.maintenance.LibraryAddResetProjectBiz; +import com.sipai.entity.maintenance.LibraryAddResetProjectBloc; +import com.sipai.entity.maintenance.MaintainCommStr; +import com.sipai.entity.user.Company; +import com.sipai.service.company.CompanyService; +import com.sipai.service.maintenance.LibraryAddResetProjectBizService; +import com.sipai.service.maintenance.LibraryAddResetProjectBlocService; +import com.sipai.service.maintenance.LibraryAddResetProjectService; +import com.sipai.tools.CommString; +import com.sipai.tools.CommUtil; +import net.sf.json.JSONArray; +import net.sf.json.JSONObject; +import org.apache.poi.hssf.usermodel.*; +import org.apache.poi.ss.usermodel.*; +import org.apache.poi.ss.util.CellRangeAddress; +import org.apache.poi.xssf.usermodel.XSSFCell; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; @@ -9,49 +33,7 @@ import java.util.Date; import java.util.Iterator; import java.util.List; -import javax.annotation.Resource; -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.HSSFClientAnchor; -import org.apache.poi.hssf.usermodel.HSSFComment; -import org.apache.poi.hssf.usermodel.HSSFDataFormat; -import org.apache.poi.hssf.usermodel.HSSFFont; -import org.apache.poi.hssf.usermodel.HSSFPatriarch; -import org.apache.poi.hssf.usermodel.HSSFRichTextString; -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.ss.util.CellRangeAddress; -import org.apache.poi.hssf.util.HSSFColor; -import org.apache.poi.xssf.usermodel.XSSFCell; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.sipai.dao.maintenance.LibraryAddResetProjectDao; -import com.sipai.entity.equipment.EquipmentClass; -import com.sipai.entity.maintenance.LibraryAddResetProject; -import com.sipai.entity.maintenance.LibraryAddResetProjectBiz; -import com.sipai.entity.maintenance.LibraryAddResetProjectBloc; -import com.sipai.entity.maintenance.LibraryOverhaulContentBloc; -import com.sipai.entity.maintenance.LibraryOverhaulContentModelBloc; -import com.sipai.entity.maintenance.LibraryOverhaulProjectBloc; -import com.sipai.entity.maintenance.LibraryOverhaulProjectModelBloc; -import com.sipai.entity.maintenance.MaintainCommStr; -import com.sipai.entity.user.Company; -import com.sipai.service.company.CompanyService; -import com.sipai.service.maintenance.LibraryAddResetProjectBizService; -import com.sipai.service.maintenance.LibraryAddResetProjectBlocService; -import com.sipai.service.maintenance.LibraryAddResetProjectService; -import com.sipai.tools.CommString; -import com.sipai.tools.CommUtil; - -import static org.apache.poi.ss.usermodel.CellType.*; +import static org.apache.poi.ss.usermodel.CellType.STRING; @Service public class LibraryAddResetProjectServiceImpl implements LibraryAddResetProjectService { diff --git a/src/main/java/com/sipai/service/maintenance/impl/LibraryFaultBlocServiceImpl.java b/src/main/java/com/sipai/service/maintenance/impl/LibraryFaultBlocServiceImpl.java index e0626148..e157e9b5 100644 --- a/src/main/java/com/sipai/service/maintenance/impl/LibraryFaultBlocServiceImpl.java +++ b/src/main/java/com/sipai/service/maintenance/impl/LibraryFaultBlocServiceImpl.java @@ -1,59 +1,35 @@ package com.sipai.service.maintenance.impl; +import com.sipai.dao.maintenance.LibraryFaultBlocDao; +import com.sipai.entity.equipment.EquipmentClass; +import com.sipai.entity.maintenance.*; +import com.sipai.entity.user.Company; +import com.sipai.service.company.CompanyService; +import com.sipai.service.equipment.EquipmentClassService; +import com.sipai.service.maintenance.*; +import com.sipai.service.workorder.WorkorderRepairContentService; +import com.sipai.tools.CommUtil; +import com.sipai.tools.LibraryTool; +import com.sipai.tools.SpringContextUtil; +import net.sf.json.JSONArray; +import net.sf.json.JSONObject; +import org.apache.poi.hssf.usermodel.*; +import org.apache.poi.ss.usermodel.*; +import org.apache.poi.ss.util.CellRangeAddress; +import org.apache.poi.xssf.usermodel.XSSFCell; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; import java.net.URLEncoder; import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Date; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; +import java.util.*; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletResponse; - -import com.sipai.entity.equipment.EquipmentCard; -import com.sipai.entity.maintenance.*; -import com.sipai.entity.workorder.WorkorderDetail; -import com.sipai.entity.workorder.WorkorderRepairContent; -import com.sipai.service.equipment.EquipmentClassService; -import com.sipai.service.maintenance.*; -import com.sipai.service.scada.MPointHistoryService; -import com.sipai.service.workorder.WorkorderRepairContentService; -import com.sipai.tools.LibraryTool; -import com.sipai.tools.SpringContextUtil; -import com.sipai.tools.Work; -import org.apache.poi.hssf.usermodel.HSSFCell; -import org.apache.poi.hssf.usermodel.HSSFCellStyle; -import org.apache.poi.hssf.usermodel.HSSFClientAnchor; -import org.apache.poi.hssf.usermodel.HSSFComment; -import org.apache.poi.hssf.usermodel.HSSFDataFormat; -import org.apache.poi.hssf.usermodel.HSSFFont; -import org.apache.poi.hssf.usermodel.HSSFPatriarch; -import org.apache.poi.hssf.usermodel.HSSFRichTextString; -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.ss.util.CellRangeAddress; -import org.apache.poi.hssf.util.HSSFColor; -import org.apache.poi.xssf.usermodel.XSSFCell; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import net.sf.json.JSONArray; -import net.sf.json.JSONObject; - -import com.sipai.dao.maintenance.LibraryFaultBlocDao; -import com.sipai.entity.equipment.EquipmentClass; -import com.sipai.entity.user.Company; -import com.sipai.service.company.CompanyService; -import com.sipai.tools.CommUtil; - -import static org.apache.poi.ss.usermodel.CellType.*; +import static org.apache.poi.ss.usermodel.CellType.STRING; @Service public class LibraryFaultBlocServiceImpl implements LibraryFaultBlocService { diff --git a/src/main/java/com/sipai/service/maintenance/impl/LibraryMaintainCarDetailServiceImpl.java b/src/main/java/com/sipai/service/maintenance/impl/LibraryMaintainCarDetailServiceImpl.java index e6de6ede..98b9b5f4 100644 --- a/src/main/java/com/sipai/service/maintenance/impl/LibraryMaintainCarDetailServiceImpl.java +++ b/src/main/java/com/sipai/service/maintenance/impl/LibraryMaintainCarDetailServiceImpl.java @@ -1,14 +1,12 @@ package com.sipai.service.maintenance.impl; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.sipai.dao.maintenance.LibraryMaintainCarDetailDao; import com.sipai.entity.maintenance.LibraryMaintainCarDetail; import com.sipai.service.maintenance.LibraryMaintainCarDetailService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class LibraryMaintainCarDetailServiceImpl implements LibraryMaintainCarDetailService { diff --git a/src/main/java/com/sipai/service/maintenance/impl/LibraryMaintainCarServiceImpl.java b/src/main/java/com/sipai/service/maintenance/impl/LibraryMaintainCarServiceImpl.java index ac1c1f9f..dfc233d3 100644 --- a/src/main/java/com/sipai/service/maintenance/impl/LibraryMaintainCarServiceImpl.java +++ b/src/main/java/com/sipai/service/maintenance/impl/LibraryMaintainCarServiceImpl.java @@ -1,14 +1,12 @@ package com.sipai.service.maintenance.impl; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.sipai.dao.maintenance.LibraryMaintainCarDao; import com.sipai.entity.maintenance.LibraryMaintainCar; import com.sipai.service.maintenance.LibraryMaintainCarService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class LibraryMaintainCarServiceImpl implements LibraryMaintainCarService { diff --git a/src/main/java/com/sipai/service/maintenance/impl/LibraryMaintenanceCommonContentServiceImpl.java b/src/main/java/com/sipai/service/maintenance/impl/LibraryMaintenanceCommonContentServiceImpl.java index 2c017ffb..9720a8a8 100644 --- a/src/main/java/com/sipai/service/maintenance/impl/LibraryMaintenanceCommonContentServiceImpl.java +++ b/src/main/java/com/sipai/service/maintenance/impl/LibraryMaintenanceCommonContentServiceImpl.java @@ -1,14 +1,12 @@ package com.sipai.service.maintenance.impl; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.sipai.dao.maintenance.LibraryMaintenanceCommonContentDao; import com.sipai.entity.maintenance.LibraryMaintenanceCommonContent; import com.sipai.service.maintenance.LibraryMaintenanceCommonContentService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class LibraryMaintenanceCommonContentServiceImpl implements LibraryMaintenanceCommonContentService{ diff --git a/src/main/java/com/sipai/service/maintenance/impl/LibraryMaintenanceCommonServiceImpl.java b/src/main/java/com/sipai/service/maintenance/impl/LibraryMaintenanceCommonServiceImpl.java index 7856a490..d00b7e2b 100644 --- a/src/main/java/com/sipai/service/maintenance/impl/LibraryMaintenanceCommonServiceImpl.java +++ b/src/main/java/com/sipai/service/maintenance/impl/LibraryMaintenanceCommonServiceImpl.java @@ -1,5 +1,27 @@ package com.sipai.service.maintenance.impl; +import com.sipai.dao.maintenance.LibraryMaintenanceCommonDao; +import com.sipai.entity.equipment.EquipmentClass; +import com.sipai.entity.maintenance.LibraryBase; +import com.sipai.entity.maintenance.LibraryMaintenanceCommon; +import com.sipai.entity.maintenance.LibraryMaintenanceCommonContent; +import com.sipai.entity.maintenance.MaintainCommStr; +import com.sipai.service.equipment.EquipmentClassService; +import com.sipai.service.maintenance.LibraryBaseService; +import com.sipai.service.maintenance.LibraryMaintenanceCommonContentService; +import com.sipai.service.maintenance.LibraryMaintenanceCommonService; +import com.sipai.service.user.UserService; +import com.sipai.tools.CommUtil; +import net.sf.json.JSONArray; +import net.sf.json.JSONObject; +import org.apache.poi.hssf.usermodel.*; +import org.apache.poi.ss.usermodel.*; +import org.apache.poi.ss.util.CellRangeAddress; +import org.apache.poi.xssf.usermodel.XSSFCell; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; @@ -9,43 +31,7 @@ import java.util.Date; import java.util.Iterator; import java.util.List; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletResponse; - -import com.sipai.entity.maintenance.*; -import com.sipai.service.maintenance.LibraryBaseService; -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.HSSFClientAnchor; -import org.apache.poi.hssf.usermodel.HSSFComment; -import org.apache.poi.hssf.usermodel.HSSFDataFormat; -import org.apache.poi.hssf.usermodel.HSSFFont; -import org.apache.poi.hssf.usermodel.HSSFPatriarch; -import org.apache.poi.hssf.usermodel.HSSFRichTextString; -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.ss.util.CellRangeAddress; -import org.apache.poi.hssf.util.HSSFColor; -import org.apache.poi.xssf.usermodel.XSSFCell; -import org.springframework.stereotype.Service; - -import com.sipai.dao.maintenance.LibraryMaintenanceCommonDao; -import com.sipai.entity.equipment.EquipmentClass; -import com.sipai.entity.maintenance.LibraryMaintenanceCommon; -import com.sipai.entity.maintenance.LibraryMaintenanceCommonContent; -import com.sipai.entity.user.Company; -import com.sipai.service.equipment.EquipmentClassService; -import com.sipai.service.maintenance.LibraryMaintenanceCommonContentService; -import com.sipai.service.maintenance.LibraryMaintenanceCommonService; -import com.sipai.service.user.UserService; -import com.sipai.tools.CommUtil; - -import static org.apache.poi.ss.usermodel.CellType.*; +import static org.apache.poi.ss.usermodel.CellType.STRING; @Service public class LibraryMaintenanceCommonServiceImpl implements LibraryMaintenanceCommonService{ diff --git a/src/main/java/com/sipai/service/maintenance/impl/LibraryMaintenanceLubricationServiceImpl.java b/src/main/java/com/sipai/service/maintenance/impl/LibraryMaintenanceLubricationServiceImpl.java index eff0c3c3..5789e6de 100644 --- a/src/main/java/com/sipai/service/maintenance/impl/LibraryMaintenanceLubricationServiceImpl.java +++ b/src/main/java/com/sipai/service/maintenance/impl/LibraryMaintenanceLubricationServiceImpl.java @@ -1,37 +1,5 @@ package com.sipai.service.maintenance.impl; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.net.URLEncoder; -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.Iterator; -import java.util.List; - -import javax.annotation.Resource; -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.HSSFClientAnchor; -import org.apache.poi.hssf.usermodel.HSSFComment; -import org.apache.poi.hssf.usermodel.HSSFDataFormat; -import org.apache.poi.hssf.usermodel.HSSFFont; -import org.apache.poi.hssf.usermodel.HSSFPatriarch; -import org.apache.poi.hssf.usermodel.HSSFRichTextString; -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.ss.util.CellRangeAddress; -import org.apache.poi.hssf.util.HSSFColor; -import org.apache.poi.xssf.usermodel.XSSFCell; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; import com.sipai.dao.maintenance.LibraryMaintenanceLubricationDao; import com.sipai.entity.equipment.EquipmentClass; import com.sipai.entity.maintenance.LibraryMaintenanceLubrication; @@ -42,8 +10,27 @@ import com.sipai.service.equipment.EquipmentClassService; import com.sipai.service.maintenance.LibraryMaintenanceLubricationService; import com.sipai.service.user.UserService; import com.sipai.tools.CommUtil; +import net.sf.json.JSONArray; +import net.sf.json.JSONObject; +import org.apache.poi.hssf.usermodel.*; +import org.apache.poi.ss.usermodel.*; +import org.apache.poi.ss.util.CellRangeAddress; +import org.apache.poi.xssf.usermodel.XSSFCell; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; -import static org.apache.poi.ss.usermodel.CellType.*; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.net.URLEncoder; +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.Iterator; +import java.util.List; + +import static org.apache.poi.ss.usermodel.CellType.STRING; @Service public class LibraryMaintenanceLubricationServiceImpl implements LibraryMaintenanceLubricationService{ diff --git a/src/main/java/com/sipai/service/maintenance/impl/LibraryMaterialQuotaServiceImpl.java b/src/main/java/com/sipai/service/maintenance/impl/LibraryMaterialQuotaServiceImpl.java index ff580dce..045cb391 100644 --- a/src/main/java/com/sipai/service/maintenance/impl/LibraryMaterialQuotaServiceImpl.java +++ b/src/main/java/com/sipai/service/maintenance/impl/LibraryMaterialQuotaServiceImpl.java @@ -1,15 +1,13 @@ package com.sipai.service.maintenance.impl; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.sipai.dao.maintenance.LibraryMaterialQuotaDao; import com.sipai.entity.maintenance.LibraryMaterialQuota; import com.sipai.service.maintenance.LibraryMaterialQuotaService; import com.sipai.service.sparepart.GoodsService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class LibraryMaterialQuotaServiceImpl implements LibraryMaterialQuotaService{ diff --git a/src/main/java/com/sipai/service/maintenance/impl/LibraryOverhaulContentBlocServiceImpl.java b/src/main/java/com/sipai/service/maintenance/impl/LibraryOverhaulContentBlocServiceImpl.java index 3ca7bb6c..712e5a89 100644 --- a/src/main/java/com/sipai/service/maintenance/impl/LibraryOverhaulContentBlocServiceImpl.java +++ b/src/main/java/com/sipai/service/maintenance/impl/LibraryOverhaulContentBlocServiceImpl.java @@ -1,28 +1,18 @@ package com.sipai.service.maintenance.impl; -import java.util.List; - -import javax.annotation.Resource; - -import com.sipai.entity.user.Company; -import com.sipai.service.company.CompanyService; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - import com.sipai.dao.maintenance.LibraryOverhaulContentBlocDao; import com.sipai.entity.maintenance.LibraryOverhaulContentBloc; import com.sipai.entity.maintenance.LibraryOverhaulContentEquBiz; import com.sipai.entity.maintenance.LibraryOverhaulContentModelBloc; -import com.sipai.entity.maintenance.LibraryOverhaulProjectBloc; -import com.sipai.entity.maintenance.LibraryOverhaulProjectEquBiz; -import com.sipai.entity.maintenance.LibraryOverhaulProjectModelBloc; -import com.sipai.service.maintenance.LibraryOverhaulContentBlocService; -import com.sipai.service.maintenance.LibraryOverhaulContentEquBizService; -import com.sipai.service.maintenance.LibraryOverhaulContentModelBlocService; -import com.sipai.service.maintenance.LibraryOverhaulProjectBlocService; -import com.sipai.service.maintenance.LibraryOverhaulProjectEquBizService; -import com.sipai.service.maintenance.LibraryOverhaulProjectModelBlocService; +import com.sipai.entity.user.Company; +import com.sipai.service.company.CompanyService; +import com.sipai.service.maintenance.*; import com.sipai.tools.CommUtil; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; +import java.util.List; @Service public class LibraryOverhaulContentBlocServiceImpl implements LibraryOverhaulContentBlocService { diff --git a/src/main/java/com/sipai/service/maintenance/impl/LibraryOverhaulContentEquBizServiceImpl.java b/src/main/java/com/sipai/service/maintenance/impl/LibraryOverhaulContentEquBizServiceImpl.java index 4e2225ae..c618b8d8 100644 --- a/src/main/java/com/sipai/service/maintenance/impl/LibraryOverhaulContentEquBizServiceImpl.java +++ b/src/main/java/com/sipai/service/maintenance/impl/LibraryOverhaulContentEquBizServiceImpl.java @@ -1,11 +1,5 @@ package com.sipai.service.maintenance.impl; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.sipai.dao.maintenance.LibraryOverhaulContentEquBizDao; import com.sipai.entity.equipment.EquipmentCard; import com.sipai.entity.maintenance.LibraryOverhaulContentEquBiz; @@ -13,6 +7,10 @@ import com.sipai.entity.user.Company; import com.sipai.service.company.CompanyService; import com.sipai.service.equipment.EquipmentCardService; import com.sipai.service.maintenance.LibraryOverhaulContentEquBizService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class LibraryOverhaulContentEquBizServiceImpl implements LibraryOverhaulContentEquBizService{ diff --git a/src/main/java/com/sipai/service/maintenance/impl/LibraryOverhaulContentModelBlocServiceImpl.java b/src/main/java/com/sipai/service/maintenance/impl/LibraryOverhaulContentModelBlocServiceImpl.java index 065e181e..7f695911 100644 --- a/src/main/java/com/sipai/service/maintenance/impl/LibraryOverhaulContentModelBlocServiceImpl.java +++ b/src/main/java/com/sipai/service/maintenance/impl/LibraryOverhaulContentModelBlocServiceImpl.java @@ -1,14 +1,12 @@ package com.sipai.service.maintenance.impl; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.sipai.dao.maintenance.LibraryOverhaulContentModelBlocDao; import com.sipai.entity.maintenance.LibraryOverhaulContentModelBloc; import com.sipai.service.maintenance.LibraryOverhaulContentModelBlocService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class LibraryOverhaulContentModelBlocServiceImpl implements LibraryOverhaulContentModelBlocService{ diff --git a/src/main/java/com/sipai/service/maintenance/impl/LibraryOverhaulProjectBlocServiceImpl.java b/src/main/java/com/sipai/service/maintenance/impl/LibraryOverhaulProjectBlocServiceImpl.java index 21991568..b0d67a6f 100644 --- a/src/main/java/com/sipai/service/maintenance/impl/LibraryOverhaulProjectBlocServiceImpl.java +++ b/src/main/java/com/sipai/service/maintenance/impl/LibraryOverhaulProjectBlocServiceImpl.java @@ -13,7 +13,6 @@ import com.sipai.tools.CommUtil; import net.sf.json.JSONArray; import net.sf.json.JSONObject; import org.apache.poi.hssf.usermodel.*; -import org.apache.poi.hssf.util.HSSFColor; import org.apache.poi.ss.usermodel.*; import org.apache.poi.ss.util.CellRangeAddress; import org.apache.poi.xssf.usermodel.XSSFCell; @@ -30,7 +29,7 @@ import java.util.Iterator; import java.util.List; import java.util.Properties; -import static org.apache.poi.ss.usermodel.CellType.*; +import static org.apache.poi.ss.usermodel.CellType.STRING; @Service public class LibraryOverhaulProjectBlocServiceImpl implements LibraryOverhaulProjectBlocService { diff --git a/src/main/java/com/sipai/service/maintenance/impl/LibraryOverhaulProjectEquBizServiceImpl.java b/src/main/java/com/sipai/service/maintenance/impl/LibraryOverhaulProjectEquBizServiceImpl.java index 6e361cd4..e1ae10f8 100644 --- a/src/main/java/com/sipai/service/maintenance/impl/LibraryOverhaulProjectEquBizServiceImpl.java +++ b/src/main/java/com/sipai/service/maintenance/impl/LibraryOverhaulProjectEquBizServiceImpl.java @@ -1,11 +1,5 @@ package com.sipai.service.maintenance.impl; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.sipai.dao.maintenance.LibraryOverhaulProjectEquBizDao; import com.sipai.entity.equipment.EquipmentCard; import com.sipai.entity.maintenance.LibraryOverhaulProjectEquBiz; @@ -13,6 +7,10 @@ import com.sipai.entity.user.Company; import com.sipai.service.company.CompanyService; import com.sipai.service.equipment.EquipmentCardService; import com.sipai.service.maintenance.LibraryOverhaulProjectEquBizService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class LibraryOverhaulProjectEquBizServiceImpl implements LibraryOverhaulProjectEquBizService{ diff --git a/src/main/java/com/sipai/service/maintenance/impl/LibraryOverhaulProjectModelBlocServiceImpl.java b/src/main/java/com/sipai/service/maintenance/impl/LibraryOverhaulProjectModelBlocServiceImpl.java index aa4424d7..20433582 100644 --- a/src/main/java/com/sipai/service/maintenance/impl/LibraryOverhaulProjectModelBlocServiceImpl.java +++ b/src/main/java/com/sipai/service/maintenance/impl/LibraryOverhaulProjectModelBlocServiceImpl.java @@ -1,14 +1,12 @@ package com.sipai.service.maintenance.impl; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.sipai.dao.maintenance.LibraryOverhaulProjectModelBlocDao; import com.sipai.entity.maintenance.LibraryOverhaulProjectModelBloc; import com.sipai.service.maintenance.LibraryOverhaulProjectModelBlocService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class LibraryOverhaulProjectModelBlocServiceImpl implements LibraryOverhaulProjectModelBlocService{ diff --git a/src/main/java/com/sipai/service/maintenance/impl/LibraryRepairBlocServiceImpl.java b/src/main/java/com/sipai/service/maintenance/impl/LibraryRepairBlocServiceImpl.java index 58f51fe4..cbe61206 100644 --- a/src/main/java/com/sipai/service/maintenance/impl/LibraryRepairBlocServiceImpl.java +++ b/src/main/java/com/sipai/service/maintenance/impl/LibraryRepairBlocServiceImpl.java @@ -1,21 +1,20 @@ package com.sipai.service.maintenance.impl; -import java.util.List; -import java.util.TreeSet; - -import javax.annotation.Resource; - -import com.sipai.entity.equipment.EquipmentClass; -import com.sipai.entity.maintenance.*; -import com.sipai.service.maintenance.LibraryFaultBlocService; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - import com.sipai.dao.maintenance.LibraryRepairBlocDao; +import com.sipai.entity.maintenance.LibraryFaultBloc; +import com.sipai.entity.maintenance.LibraryRepairBloc; +import com.sipai.entity.maintenance.LibraryRepairEquBiz; +import com.sipai.entity.maintenance.LibraryRepairModelBloc; +import com.sipai.service.maintenance.LibraryFaultBlocService; import com.sipai.service.maintenance.LibraryRepairBlocService; import com.sipai.service.maintenance.LibraryRepairEquBizService; import com.sipai.service.maintenance.LibraryRepairModelBlocService; import com.sipai.tools.CommUtil; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; +import java.util.List; @Service public class LibraryRepairBlocServiceImpl implements LibraryRepairBlocService { diff --git a/src/main/java/com/sipai/service/maintenance/impl/LibraryRepairEquBizServiceImpl.java b/src/main/java/com/sipai/service/maintenance/impl/LibraryRepairEquBizServiceImpl.java index 9873baa0..4e216252 100644 --- a/src/main/java/com/sipai/service/maintenance/impl/LibraryRepairEquBizServiceImpl.java +++ b/src/main/java/com/sipai/service/maintenance/impl/LibraryRepairEquBizServiceImpl.java @@ -1,19 +1,16 @@ package com.sipai.service.maintenance.impl; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.sipai.dao.maintenance.LibraryRepairEquBizDao; import com.sipai.entity.equipment.EquipmentCard; -import com.sipai.entity.maintenance.LibraryOverhaulContentEquBiz; import com.sipai.entity.maintenance.LibraryRepairEquBiz; import com.sipai.entity.user.Company; import com.sipai.service.company.CompanyService; import com.sipai.service.equipment.EquipmentCardService; import com.sipai.service.maintenance.LibraryRepairEquBizService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class LibraryRepairEquBizServiceImpl implements LibraryRepairEquBizService{ diff --git a/src/main/java/com/sipai/service/maintenance/impl/LibraryRepairModelBlocServiceImpl.java b/src/main/java/com/sipai/service/maintenance/impl/LibraryRepairModelBlocServiceImpl.java index 4690633f..8d1e786f 100644 --- a/src/main/java/com/sipai/service/maintenance/impl/LibraryRepairModelBlocServiceImpl.java +++ b/src/main/java/com/sipai/service/maintenance/impl/LibraryRepairModelBlocServiceImpl.java @@ -1,14 +1,12 @@ package com.sipai.service.maintenance.impl; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.sipai.dao.maintenance.LibraryRepairModelBlocDao; import com.sipai.entity.maintenance.LibraryRepairModelBloc; import com.sipai.service.maintenance.LibraryRepairModelBlocService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class LibraryRepairModelBlocServiceImpl implements LibraryRepairModelBlocService{ diff --git a/src/main/java/com/sipai/service/maintenance/impl/MaintainCarServiceImpl.java b/src/main/java/com/sipai/service/maintenance/impl/MaintainCarServiceImpl.java index b7450e7f..c404eaf3 100644 --- a/src/main/java/com/sipai/service/maintenance/impl/MaintainCarServiceImpl.java +++ b/src/main/java/com/sipai/service/maintenance/impl/MaintainCarServiceImpl.java @@ -1,17 +1,5 @@ package com.sipai.service.maintenance.impl; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import javax.annotation.Resource; - -import org.activiti.engine.repository.ProcessDefinition; -import org.activiti.engine.runtime.ProcessInstance; -import org.activiti.engine.task.Task; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - import com.sipai.dao.maintenance.MaintainCarDao; import com.sipai.entity.activiti.ProcessType; import com.sipai.entity.base.BusinessUnitAdapter; @@ -19,15 +7,22 @@ import com.sipai.entity.business.BusinessUnitAudit; import com.sipai.entity.business.BusinessUnitRecord; import com.sipai.entity.maintenance.MaintainCar; import com.sipai.entity.maintenance.MaintenanceCommString; -import com.sipai.entity.maintenance.RepairCar; -import com.sipai.entity.sparepart.InStockRecord; -import com.sipai.entity.sparepart.SparePartCommString; import com.sipai.service.activiti.WorkflowProcessDefinitionService; import com.sipai.service.activiti.WorkflowService; import com.sipai.service.business.BusinessUnitAuditService; import com.sipai.service.maintenance.LibraryMaintainCarDetailService; import com.sipai.service.maintenance.LibraryMaintainCarService; import com.sipai.service.maintenance.MaintainCarService; +import org.activiti.engine.repository.ProcessDefinition; +import org.activiti.engine.runtime.ProcessInstance; +import org.activiti.engine.task.Task; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; +import java.util.HashMap; +import java.util.List; +import java.util.Map; @Service public class MaintainCarServiceImpl implements MaintainCarService { diff --git a/src/main/java/com/sipai/service/maintenance/impl/MaintainServiceImpl.java b/src/main/java/com/sipai/service/maintenance/impl/MaintainServiceImpl.java index 83dd4bfa..a72b1d0f 100644 --- a/src/main/java/com/sipai/service/maintenance/impl/MaintainServiceImpl.java +++ b/src/main/java/com/sipai/service/maintenance/impl/MaintainServiceImpl.java @@ -1,11 +1,5 @@ package com.sipai.service.maintenance.impl; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.sipai.dao.maintenance.MaintainDao; import com.sipai.entity.equipment.EquipmentCard; import com.sipai.entity.maintenance.EquipmentPlanType; @@ -17,6 +11,10 @@ import com.sipai.service.equipment.EquipmentCardService; import com.sipai.service.maintenance.EquipmentPlanTypeService; import com.sipai.service.maintenance.MaintainService; import com.sipai.service.user.UserService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service diff --git a/src/main/java/com/sipai/service/maintenance/impl/RepairCarServiceImpl.java b/src/main/java/com/sipai/service/maintenance/impl/RepairCarServiceImpl.java index 305f7264..6fb1224a 100644 --- a/src/main/java/com/sipai/service/maintenance/impl/RepairCarServiceImpl.java +++ b/src/main/java/com/sipai/service/maintenance/impl/RepairCarServiceImpl.java @@ -1,17 +1,5 @@ package com.sipai.service.maintenance.impl; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import javax.annotation.Resource; - -import org.activiti.engine.repository.ProcessDefinition; -import org.activiti.engine.runtime.ProcessInstance; -import org.activiti.engine.task.Task; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - import com.sipai.dao.maintenance.RepairCarDao; import com.sipai.entity.activiti.ProcessType; import com.sipai.entity.base.BusinessUnitAdapter; @@ -19,12 +7,21 @@ import com.sipai.entity.business.BusinessUnitAudit; import com.sipai.entity.business.BusinessUnitRecord; import com.sipai.entity.maintenance.MaintenanceCommString; import com.sipai.entity.maintenance.RepairCar; -import com.sipai.entity.sparepart.InStockRecord; import com.sipai.service.activiti.WorkflowProcessDefinitionService; import com.sipai.service.activiti.WorkflowService; import com.sipai.service.business.BusinessUnitAuditService; import com.sipai.service.maintenance.LibraryMaintainCarService; import com.sipai.service.maintenance.RepairCarService; +import org.activiti.engine.repository.ProcessDefinition; +import org.activiti.engine.runtime.ProcessInstance; +import org.activiti.engine.task.Task; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; +import java.util.HashMap; +import java.util.List; +import java.util.Map; @Service public class RepairCarServiceImpl implements RepairCarService { diff --git a/src/main/java/com/sipai/service/maintenance/impl/RepairServiceImpl.java b/src/main/java/com/sipai/service/maintenance/impl/RepairServiceImpl.java index cc4a2bc9..8a590528 100644 --- a/src/main/java/com/sipai/service/maintenance/impl/RepairServiceImpl.java +++ b/src/main/java/com/sipai/service/maintenance/impl/RepairServiceImpl.java @@ -1,12 +1,5 @@ package com.sipai.service.maintenance.impl; -import java.util.List; - -import javax.annotation.Resource; - -import org.activiti.engine.task.Task; -import org.springframework.stereotype.Service; - import com.sipai.dao.maintenance.RepairDao; import com.sipai.entity.base.BusinessUnitAdapter; import com.sipai.entity.business.BusinessUnitAudit; @@ -14,7 +7,6 @@ import com.sipai.entity.equipment.EquipmentCard; import com.sipai.entity.maintenance.EquipmentPlanType; import com.sipai.entity.maintenance.Repair; import com.sipai.entity.sparepart.SparePartCommString; -import com.sipai.entity.sparepart.StockCheck; import com.sipai.entity.user.User; import com.sipai.service.activiti.WorkflowService; import com.sipai.service.business.BusinessUnitAuditService; @@ -22,6 +14,11 @@ import com.sipai.service.equipment.EquipmentCardService; import com.sipai.service.maintenance.EquipmentPlanTypeService; import com.sipai.service.maintenance.RepairService; import com.sipai.service.user.UserService; +import org.activiti.engine.task.Task; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class RepairServiceImpl implements RepairService{ diff --git a/src/main/java/com/sipai/service/maintenance/impl/WorkorderLibraryMaintainServiceImpl.java b/src/main/java/com/sipai/service/maintenance/impl/WorkorderLibraryMaintainServiceImpl.java index bbb553ac..81dd95b8 100644 --- a/src/main/java/com/sipai/service/maintenance/impl/WorkorderLibraryMaintainServiceImpl.java +++ b/src/main/java/com/sipai/service/maintenance/impl/WorkorderLibraryMaintainServiceImpl.java @@ -1,18 +1,19 @@ package com.sipai.service.maintenance.impl; -import java.util.List; - -import javax.annotation.Resource; - +import com.sipai.dao.maintenance.WorkorderLibraryMaintainDao; import com.sipai.entity.maintenance.*; import com.sipai.entity.user.Company; import com.sipai.service.company.CompanyService; -import com.sipai.service.maintenance.*; +import com.sipai.service.maintenance.LibraryMaintenanceCommonService; +import com.sipai.service.maintenance.LibraryMaintenanceLubricationService; +import com.sipai.service.maintenance.LibraryRepairBlocService; +import com.sipai.service.maintenance.WorkorderLibraryMaintainService; +import com.sipai.tools.CommUtil; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import com.sipai.dao.maintenance.WorkorderLibraryMaintainDao; -import com.sipai.tools.CommUtil; +import javax.annotation.Resource; +import java.util.List; @Service public class WorkorderLibraryMaintainServiceImpl implements WorkorderLibraryMaintainService{ @Resource diff --git a/src/main/java/com/sipai/service/msg/EmppAdminService.java b/src/main/java/com/sipai/service/msg/EmppAdminService.java index 370b1e4c..9507d839 100644 --- a/src/main/java/com/sipai/service/msg/EmppAdminService.java +++ b/src/main/java/com/sipai/service/msg/EmppAdminService.java @@ -1,13 +1,12 @@ package com.sipai.service.msg; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; import com.sipai.dao.msg.EmppAdminDao; import com.sipai.entity.msg.EmppAdmin; import com.sipai.tools.CommService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class EmppAdminService implements CommService{ diff --git a/src/main/java/com/sipai/service/msg/EmppSendService.java b/src/main/java/com/sipai/service/msg/EmppSendService.java index 56e6ceaf..a0080c0f 100644 --- a/src/main/java/com/sipai/service/msg/EmppSendService.java +++ b/src/main/java/com/sipai/service/msg/EmppSendService.java @@ -1,17 +1,16 @@ package com.sipai.service.msg; -import java.util.ArrayList; -import java.util.List; -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - -import com.sipai.entity.msg.EmppAdmin; import com.sipai.dao.msg.EmppSendDao; +import com.sipai.entity.msg.EmppAdmin; import com.sipai.entity.msg.EmppSend; import com.sipai.tools.CommService; import com.wondertek.esmp.esms.empp.EMPPConnectResp; import com.wondertek.esmp.esms.empp.EmppApi; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; @Service public class EmppSendService implements CommService{ diff --git a/src/main/java/com/sipai/service/msg/EmppSendUserService.java b/src/main/java/com/sipai/service/msg/EmppSendUserService.java index d1415877..d39ee457 100644 --- a/src/main/java/com/sipai/service/msg/EmppSendUserService.java +++ b/src/main/java/com/sipai/service/msg/EmppSendUserService.java @@ -1,15 +1,14 @@ package com.sipai.service.msg; -import java.util.List; - -import javax.annotation.Resource; - -import com.sipai.entity.user.User; -import com.sipai.service.user.UserService; -import org.springframework.stereotype.Service; import com.sipai.dao.msg.EmppSendUserDao; import com.sipai.entity.msg.EmppSendUser; +import com.sipai.entity.user.User; +import com.sipai.service.user.UserService; import com.sipai.tools.CommService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class EmppSendUserService implements CommService { diff --git a/src/main/java/com/sipai/service/msg/MsgAlarmlevelService.java b/src/main/java/com/sipai/service/msg/MsgAlarmlevelService.java index f0c60d34..c6f14c71 100644 --- a/src/main/java/com/sipai/service/msg/MsgAlarmlevelService.java +++ b/src/main/java/com/sipai/service/msg/MsgAlarmlevelService.java @@ -1,25 +1,17 @@ package com.sipai.service.msg; -import java.util.Date; -import java.util.List; - -import javax.annotation.Resource; - +import com.sipai.dao.msg.MsgAlarmlevelDao; +import com.sipai.entity.msg.MsgAlarmlevel; +import com.sipai.entity.msg.Msguser; +import com.sipai.entity.msg.Smsuser; +import com.sipai.tools.CommService; +import com.sipai.tools.CommUtil; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import com.fasterxml.jackson.annotation.JsonTypeInfo.Id; -import com.sipai.dao.msg.MsgAlarmlevelDao; -import com.sipai.dao.msg.MsguserDao; -import com.sipai.dao.msg.SmsuserDao; -import com.sipai.entity.msg.MsgAlarmlevel; -import com.sipai.entity.msg.MsgType; -import com.sipai.entity.msg.Msguser; -import com.sipai.entity.msg.Smsuser; -import com.sipai.entity.work.ScadaPic_MPoint_Expression; -import com.sipai.service.msg.MsgTypeService; -import com.sipai.tools.CommService; -import com.sipai.tools.CommUtil; +import javax.annotation.Resource; +import java.util.Date; +import java.util.List; @Service public class MsgAlarmlevelService implements CommService{ diff --git a/src/main/java/com/sipai/service/msg/MsgRecvService.java b/src/main/java/com/sipai/service/msg/MsgRecvService.java index 368b3c95..49f76ba1 100644 --- a/src/main/java/com/sipai/service/msg/MsgRecvService.java +++ b/src/main/java/com/sipai/service/msg/MsgRecvService.java @@ -1,9 +1,9 @@ package com.sipai.service.msg; -import java.util.List; - import com.sipai.entity.msg.MsgRecv; +import java.util.List; + public interface MsgRecvService { public MsgRecv getMsgRecvById(String msgrecv); diff --git a/src/main/java/com/sipai/service/msg/MsgRecvServiceImpl.java b/src/main/java/com/sipai/service/msg/MsgRecvServiceImpl.java index 7a1dd2e5..df7d4923 100644 --- a/src/main/java/com/sipai/service/msg/MsgRecvServiceImpl.java +++ b/src/main/java/com/sipai/service/msg/MsgRecvServiceImpl.java @@ -1,16 +1,13 @@ package com.sipai.service.msg; -import java.util.Date; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.sipai.dao.msg.MsgRecvDao; -import com.sipai.entity.equipment.EquipmentClass; import com.sipai.entity.msg.MsgRecv; import com.sipai.tools.CommUtil; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Date; +import java.util.List; @Service public class MsgRecvServiceImpl implements MsgRecvService{ diff --git a/src/main/java/com/sipai/service/msg/MsgService.java b/src/main/java/com/sipai/service/msg/MsgService.java index e5e4d734..7c7cbaf6 100644 --- a/src/main/java/com/sipai/service/msg/MsgService.java +++ b/src/main/java/com/sipai/service/msg/MsgService.java @@ -1,9 +1,9 @@ package com.sipai.service.msg; -import java.util.List; - import com.sipai.entity.msg.Msg; +import java.util.List; + public interface MsgService { public Msg getMsgById(String msg); diff --git a/src/main/java/com/sipai/service/msg/MsgServiceImpl.java b/src/main/java/com/sipai/service/msg/MsgServiceImpl.java index 915acfff..2ab9be8a 100644 --- a/src/main/java/com/sipai/service/msg/MsgServiceImpl.java +++ b/src/main/java/com/sipai/service/msg/MsgServiceImpl.java @@ -1,50 +1,26 @@ package com.sipai.service.msg; -import java.io.BufferedInputStream; -import java.io.File; -import java.io.FileInputStream; -import java.io.IOException; -import java.io.InputStream; -import java.util.ArrayList; -import java.util.Date; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Properties; - -import javax.annotation.Resource; - +import com.sipai.controller.msg.Client; +import com.sipai.dao.msg.MsgDao; +import com.sipai.entity.alarm.AlarmInformationAlarmModeEnum; import com.sipai.entity.business.BusinessUnitRecord; -import com.sipai.tools.MqttUtil; +import com.sipai.entity.msg.*; +import com.sipai.entity.user.User; +import com.sipai.service.user.UserService; +import com.sipai.tools.CommUtil; +import com.sipai.tools.WeChatAuthUtil; +import com.sipai.websocket.MsgWebSocket; import net.sf.json.JSONException; import net.sf.json.JSONObject; - import org.apache.http.client.ClientProtocolException; -import org.aspectj.weaver.patterns.ThisOrTargetAnnotationPointcut; import org.redisson.api.RMap; import org.redisson.api.RedissonClient; import org.springframework.stereotype.Service; -import com.google.gson.JsonObject; -import com.sipai.controller.msg.Client; -import com.sipai.dao.msg.MsgDao; -import com.sipai.entity.msg.EmppAdmin; -import com.sipai.entity.msg.EmppSendUser; -import com.sipai.entity.msg.Msg; -import com.sipai.entity.msg.MsgAlarmlevel; -import com.sipai.entity.msg.MsgRecv; -import com.sipai.entity.msg.MsgType; -import com.sipai.entity.msg.Msguser; -import com.sipai.entity.msg.Smsuser; -import com.sipai.entity.user.User; -import com.sipai.entity.alarm.AlarmInformationAlarmModeEnum; -import com.sipai.entity.base.ServerObject; -import com.sipai.service.user.UserService; -import com.sipai.tools.CommString; -import com.sipai.tools.CommUtil; -import com.sipai.tools.WeChatAuthUtil; -import com.sipai.websocket.MsgWebSocket; -import com.sipai.websocket.ScadaWebSocket; +import javax.annotation.Resource; +import java.io.IOException; +import java.io.InputStream; +import java.util.*; @Service("msgService") public class MsgServiceImpl implements MsgService { diff --git a/src/main/java/com/sipai/service/msg/MsgTypeService.java b/src/main/java/com/sipai/service/msg/MsgTypeService.java index 5c162245..db300f49 100644 --- a/src/main/java/com/sipai/service/msg/MsgTypeService.java +++ b/src/main/java/com/sipai/service/msg/MsgTypeService.java @@ -1,9 +1,9 @@ package com.sipai.service.msg; -import java.util.List; - import com.sipai.entity.msg.MsgType; +import java.util.List; + public interface MsgTypeService { public MsgType getMsgTypeById(String msgtype); diff --git a/src/main/java/com/sipai/service/msg/MsgTypeServiceImpl.java b/src/main/java/com/sipai/service/msg/MsgTypeServiceImpl.java index 6c9ac991..a119a1f0 100644 --- a/src/main/java/com/sipai/service/msg/MsgTypeServiceImpl.java +++ b/src/main/java/com/sipai/service/msg/MsgTypeServiceImpl.java @@ -1,23 +1,19 @@ package com.sipai.service.msg; -import java.util.Date; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.sipai.dao.msg.MsgRoleDao; import com.sipai.dao.msg.MsgTypeDao; import com.sipai.dao.msg.MsguserDao; import com.sipai.dao.msg.SmsuserDao; -import com.sipai.entity.msg.Msg; -import com.sipai.entity.msg.MsgRecv; import com.sipai.entity.msg.MsgRole; import com.sipai.entity.msg.MsgType; import com.sipai.entity.msg.Msguser; import com.sipai.entity.msg.Smsuser; import com.sipai.tools.CommUtil; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Date; +import java.util.List; diff --git a/src/main/java/com/sipai/service/msg/MsguserService.java b/src/main/java/com/sipai/service/msg/MsguserService.java index 627fe61b..83f51896 100644 --- a/src/main/java/com/sipai/service/msg/MsguserService.java +++ b/src/main/java/com/sipai/service/msg/MsguserService.java @@ -1,16 +1,14 @@ package com.sipai.service.msg; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; import com.sipai.dao.msg.MsguserDao; import com.sipai.entity.msg.Msguser; import com.sipai.entity.user.User; import com.sipai.service.user.UserService; import com.sipai.tools.CommService; -import com.sipai.webservice.server.user.UserServer; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class MsguserService implements CommService{ diff --git a/src/main/java/com/sipai/service/msg/RecvListener.java b/src/main/java/com/sipai/service/msg/RecvListener.java index d0069f8a..77db8256 100644 --- a/src/main/java/com/sipai/service/msg/RecvListener.java +++ b/src/main/java/com/sipai/service/msg/RecvListener.java @@ -1,20 +1,8 @@ package com.sipai.service.msg; -import java.math.BigInteger; -import java.util.ArrayList; - -import com.wondertek.esmp.esms.empp.EMPPAnswer; -import com.wondertek.esmp.esms.empp.EMPPChangePassResp; -import com.wondertek.esmp.esms.empp.EMPPDeliver; -import com.wondertek.esmp.esms.empp.EMPPDeliverReport; import com.wondertek.esmp.esms.empp.EMPPObject; import com.wondertek.esmp.esms.empp.EMPPRecvListener; -import com.wondertek.esmp.esms.empp.EMPPReqNoticeResp; -import com.wondertek.esmp.esms.empp.EMPPSubmitSM; -import com.wondertek.esmp.esms.empp.EMPPSubmitSMResp; -import com.wondertek.esmp.esms.empp.EMPPSyncAddrBookResp; import com.wondertek.esmp.esms.empp.EMPPTerminate; -import com.wondertek.esmp.esms.empp.EMPPUnAuthorization; import com.wondertek.esmp.esms.empp.EmppApi; /** diff --git a/src/main/java/com/sipai/service/msg/SmsuserService.java b/src/main/java/com/sipai/service/msg/SmsuserService.java index 851829e9..8a6129e0 100644 --- a/src/main/java/com/sipai/service/msg/SmsuserService.java +++ b/src/main/java/com/sipai/service/msg/SmsuserService.java @@ -1,19 +1,14 @@ package com.sipai.service.msg; -import java.util.List; -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - -import com.sipai.dao.msg.MsguserDao; import com.sipai.dao.msg.SmsuserDao; -import com.sipai.entity.msg.Msguser; -import com.sipai.entity.msg.Smsuser; import com.sipai.entity.msg.Smsuser; import com.sipai.entity.user.User; import com.sipai.service.user.UserService; import com.sipai.tools.CommService; -import com.sipai.webservice.server.user.UserServer; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class SmsuserService implements CommService{ diff --git a/src/main/java/com/sipai/service/process/DataPatrolResultDataService.java b/src/main/java/com/sipai/service/process/DataPatrolResultDataService.java index ebaba0df..e2e717c7 100644 --- a/src/main/java/com/sipai/service/process/DataPatrolResultDataService.java +++ b/src/main/java/com/sipai/service/process/DataPatrolResultDataService.java @@ -1,10 +1,9 @@ package com.sipai.service.process; -import java.util.List; -import java.util.Map; - import com.sipai.entity.process.DataPatrolResultData; +import java.util.List; + public interface DataPatrolResultDataService { public abstract DataPatrolResultData selectById(String id); diff --git a/src/main/java/com/sipai/service/process/DataPatrolService.java b/src/main/java/com/sipai/service/process/DataPatrolService.java index e1f0061d..08d3d9de 100644 --- a/src/main/java/com/sipai/service/process/DataPatrolService.java +++ b/src/main/java/com/sipai/service/process/DataPatrolService.java @@ -1,10 +1,10 @@ package com.sipai.service.process; +import com.sipai.entity.process.DataPatrol; + import java.util.List; import java.util.Map; -import com.sipai.entity.process.DataPatrol; - public interface DataPatrolService { public abstract DataPatrol selectById(String id); diff --git a/src/main/java/com/sipai/service/process/DataVisualBarChartSeriesService.java b/src/main/java/com/sipai/service/process/DataVisualBarChartSeriesService.java index 5b060640..be52dc92 100644 --- a/src/main/java/com/sipai/service/process/DataVisualBarChartSeriesService.java +++ b/src/main/java/com/sipai/service/process/DataVisualBarChartSeriesService.java @@ -1,10 +1,9 @@ package com.sipai.service.process; -import java.util.List; -import java.util.Map; - import com.sipai.entity.process.DataVisualBarChartSeries; +import java.util.List; + public interface DataVisualBarChartSeriesService { public abstract DataVisualBarChartSeries selectById(String id); diff --git a/src/main/java/com/sipai/service/process/DataVisualBarChartService.java b/src/main/java/com/sipai/service/process/DataVisualBarChartService.java index 39a6ca6f..672a9895 100644 --- a/src/main/java/com/sipai/service/process/DataVisualBarChartService.java +++ b/src/main/java/com/sipai/service/process/DataVisualBarChartService.java @@ -1,10 +1,9 @@ package com.sipai.service.process; -import java.util.List; -import java.util.Map; - import com.sipai.entity.process.DataVisualBarChart; +import java.util.List; + public interface DataVisualBarChartService { public abstract DataVisualBarChart selectById(String id); diff --git a/src/main/java/com/sipai/service/process/DataVisualBarChartYAxisService.java b/src/main/java/com/sipai/service/process/DataVisualBarChartYAxisService.java index 6d654b22..83e07a59 100644 --- a/src/main/java/com/sipai/service/process/DataVisualBarChartYAxisService.java +++ b/src/main/java/com/sipai/service/process/DataVisualBarChartYAxisService.java @@ -1,10 +1,9 @@ package com.sipai.service.process; -import java.util.List; -import java.util.Map; - import com.sipai.entity.process.DataVisualBarChartYAxis; +import java.util.List; + public interface DataVisualBarChartYAxisService { public abstract DataVisualBarChartYAxis selectById(String id); diff --git a/src/main/java/com/sipai/service/process/DataVisualCameraAlarmService.java b/src/main/java/com/sipai/service/process/DataVisualCameraAlarmService.java index 1ce8c545..89c59d48 100644 --- a/src/main/java/com/sipai/service/process/DataVisualCameraAlarmService.java +++ b/src/main/java/com/sipai/service/process/DataVisualCameraAlarmService.java @@ -1,10 +1,9 @@ package com.sipai.service.process; -import java.util.List; -import java.util.Map; - import com.sipai.entity.process.DataVisualCameraAlarm; +import java.util.List; + public interface DataVisualCameraAlarmService { public abstract DataVisualCameraAlarm selectById(String id); diff --git a/src/main/java/com/sipai/service/process/DataVisualCameraService.java b/src/main/java/com/sipai/service/process/DataVisualCameraService.java index d8e2490c..454081fc 100644 --- a/src/main/java/com/sipai/service/process/DataVisualCameraService.java +++ b/src/main/java/com/sipai/service/process/DataVisualCameraService.java @@ -1,9 +1,9 @@ package com.sipai.service.process; -import java.util.List; - import com.sipai.entity.process.DataVisualCamera; +import java.util.List; + public interface DataVisualCameraService { public abstract DataVisualCamera selectById(String id); diff --git a/src/main/java/com/sipai/service/process/DataVisualContentService.java b/src/main/java/com/sipai/service/process/DataVisualContentService.java index 3a0703e4..a759cb66 100644 --- a/src/main/java/com/sipai/service/process/DataVisualContentService.java +++ b/src/main/java/com/sipai/service/process/DataVisualContentService.java @@ -1,11 +1,10 @@ package com.sipai.service.process; -import java.util.List; -import java.util.Map; - import com.sipai.entity.process.DataVisualContent; import com.sipai.entity.scada.MPoint; +import java.util.List; + public interface DataVisualContentService { public abstract DataVisualContent selectById(String id); diff --git a/src/main/java/com/sipai/service/process/DataVisualDateSelectService.java b/src/main/java/com/sipai/service/process/DataVisualDateSelectService.java index dbc55cb2..bc05e138 100644 --- a/src/main/java/com/sipai/service/process/DataVisualDateSelectService.java +++ b/src/main/java/com/sipai/service/process/DataVisualDateSelectService.java @@ -1,9 +1,9 @@ package com.sipai.service.process; -import java.util.List; - import com.sipai.entity.process.DataVisualDateSelect; +import java.util.List; + public interface DataVisualDateSelectService { public abstract DataVisualDateSelect selectById(String id); diff --git a/src/main/java/com/sipai/service/process/DataVisualDateService.java b/src/main/java/com/sipai/service/process/DataVisualDateService.java index 62f87b6f..6ec9400e 100644 --- a/src/main/java/com/sipai/service/process/DataVisualDateService.java +++ b/src/main/java/com/sipai/service/process/DataVisualDateService.java @@ -1,9 +1,9 @@ package com.sipai.service.process; -import java.util.List; - import com.sipai.entity.process.DataVisualDate; +import java.util.List; + public interface DataVisualDateService { public abstract DataVisualDate selectById(String id); diff --git a/src/main/java/com/sipai/service/process/DataVisualEqPointsService.java b/src/main/java/com/sipai/service/process/DataVisualEqPointsService.java index e4ffef1b..51c630b7 100644 --- a/src/main/java/com/sipai/service/process/DataVisualEqPointsService.java +++ b/src/main/java/com/sipai/service/process/DataVisualEqPointsService.java @@ -1,9 +1,9 @@ package com.sipai.service.process; -import java.util.List; - import com.sipai.entity.process.DataVisualEqPoints; +import java.util.List; + public interface DataVisualEqPointsService { public abstract DataVisualEqPoints selectById(String id); diff --git a/src/main/java/com/sipai/service/process/DataVisualFormService.java b/src/main/java/com/sipai/service/process/DataVisualFormService.java index 8da1ad66..89592472 100644 --- a/src/main/java/com/sipai/service/process/DataVisualFormService.java +++ b/src/main/java/com/sipai/service/process/DataVisualFormService.java @@ -1,10 +1,10 @@ package com.sipai.service.process; +import com.sipai.entity.process.DataVisualForm; + import java.util.HashMap; import java.util.List; -import com.sipai.entity.process.DataVisualForm; - public interface DataVisualFormService { public abstract DataVisualForm selectById(String id); diff --git a/src/main/java/com/sipai/service/process/DataVisualFormShowStyleService.java b/src/main/java/com/sipai/service/process/DataVisualFormShowStyleService.java index 9aed7179..c55fe5fa 100644 --- a/src/main/java/com/sipai/service/process/DataVisualFormShowStyleService.java +++ b/src/main/java/com/sipai/service/process/DataVisualFormShowStyleService.java @@ -1,10 +1,9 @@ package com.sipai.service.process; -import java.util.HashMap; -import java.util.List; - import com.sipai.entity.process.DataVisualFormShowStyle; +import java.util.List; + public interface DataVisualFormShowStyleService { public abstract DataVisualFormShowStyle selectById(String id); diff --git a/src/main/java/com/sipai/service/process/DataVisualFormSqlPointService.java b/src/main/java/com/sipai/service/process/DataVisualFormSqlPointService.java index 69948a8c..a1840481 100644 --- a/src/main/java/com/sipai/service/process/DataVisualFormSqlPointService.java +++ b/src/main/java/com/sipai/service/process/DataVisualFormSqlPointService.java @@ -1,10 +1,9 @@ package com.sipai.service.process; -import java.util.HashMap; -import java.util.List; - import com.sipai.entity.process.DataVisualFormSqlPoint; +import java.util.List; + public interface DataVisualFormSqlPointService { public abstract DataVisualFormSqlPoint selectById(String id); diff --git a/src/main/java/com/sipai/service/process/DataVisualFrameContainerService.java b/src/main/java/com/sipai/service/process/DataVisualFrameContainerService.java index bce7362b..c9bedc22 100644 --- a/src/main/java/com/sipai/service/process/DataVisualFrameContainerService.java +++ b/src/main/java/com/sipai/service/process/DataVisualFrameContainerService.java @@ -1,9 +1,9 @@ package com.sipai.service.process; -import java.util.List; - import com.sipai.entity.process.DataVisualFrameContainer; +import java.util.List; + public interface DataVisualFrameContainerService { public abstract DataVisualFrameContainer selectById(String id); diff --git a/src/main/java/com/sipai/service/process/DataVisualFrameService.java b/src/main/java/com/sipai/service/process/DataVisualFrameService.java index ea40de82..2a6f00d8 100644 --- a/src/main/java/com/sipai/service/process/DataVisualFrameService.java +++ b/src/main/java/com/sipai/service/process/DataVisualFrameService.java @@ -1,12 +1,10 @@ package com.sipai.service.process; +import com.sipai.entity.process.DataVisualFrame; + import java.util.List; import java.util.Map; -import org.springframework.stereotype.Service; - -import com.sipai.entity.process.DataVisualFrame; - public interface DataVisualFrameService { public abstract DataVisualFrame selectById(String id); diff --git a/src/main/java/com/sipai/service/process/DataVisualGaugeChartService.java b/src/main/java/com/sipai/service/process/DataVisualGaugeChartService.java index 89aaddef..62b68ec5 100644 --- a/src/main/java/com/sipai/service/process/DataVisualGaugeChartService.java +++ b/src/main/java/com/sipai/service/process/DataVisualGaugeChartService.java @@ -1,10 +1,9 @@ package com.sipai.service.process; -import java.util.List; -import java.util.Map; - import com.sipai.entity.process.DataVisualGaugeChart; +import java.util.List; + public interface DataVisualGaugeChartService { public abstract DataVisualGaugeChart selectById(String id); diff --git a/src/main/java/com/sipai/service/process/DataVisualLineChartSeriesService.java b/src/main/java/com/sipai/service/process/DataVisualLineChartSeriesService.java index e295328e..62e3a961 100644 --- a/src/main/java/com/sipai/service/process/DataVisualLineChartSeriesService.java +++ b/src/main/java/com/sipai/service/process/DataVisualLineChartSeriesService.java @@ -1,10 +1,9 @@ package com.sipai.service.process; -import java.util.List; -import java.util.Map; - import com.sipai.entity.process.DataVisualLineChartSeries; +import java.util.List; + public interface DataVisualLineChartSeriesService { public abstract DataVisualLineChartSeries selectById(String id); diff --git a/src/main/java/com/sipai/service/process/DataVisualLineChartService.java b/src/main/java/com/sipai/service/process/DataVisualLineChartService.java index c1cd5168..dcc959f4 100644 --- a/src/main/java/com/sipai/service/process/DataVisualLineChartService.java +++ b/src/main/java/com/sipai/service/process/DataVisualLineChartService.java @@ -1,10 +1,9 @@ package com.sipai.service.process; -import java.util.List; -import java.util.Map; - import com.sipai.entity.process.DataVisualLineChart; +import java.util.List; + public interface DataVisualLineChartService { public abstract DataVisualLineChart selectById(String id); diff --git a/src/main/java/com/sipai/service/process/DataVisualLineChartYAxisService.java b/src/main/java/com/sipai/service/process/DataVisualLineChartYAxisService.java index 35957e84..24a7d7f4 100644 --- a/src/main/java/com/sipai/service/process/DataVisualLineChartYAxisService.java +++ b/src/main/java/com/sipai/service/process/DataVisualLineChartYAxisService.java @@ -1,10 +1,9 @@ package com.sipai.service.process; -import java.util.List; -import java.util.Map; - import com.sipai.entity.process.DataVisualLineChartYAxis; +import java.util.List; + public interface DataVisualLineChartYAxisService { public abstract DataVisualLineChartYAxis selectById(String id); diff --git a/src/main/java/com/sipai/service/process/DataVisualMPointService.java b/src/main/java/com/sipai/service/process/DataVisualMPointService.java index 1ef03ace..707040b7 100644 --- a/src/main/java/com/sipai/service/process/DataVisualMPointService.java +++ b/src/main/java/com/sipai/service/process/DataVisualMPointService.java @@ -1,10 +1,9 @@ package com.sipai.service.process; -import java.util.List; -import java.util.Map; - import com.sipai.entity.process.DataVisualMPoint; +import java.util.List; + public interface DataVisualMPointService { public abstract DataVisualMPoint selectById(String id); diff --git a/src/main/java/com/sipai/service/process/DataVisualMPointWarehouseService.java b/src/main/java/com/sipai/service/process/DataVisualMPointWarehouseService.java index e9035895..eeb44d3f 100644 --- a/src/main/java/com/sipai/service/process/DataVisualMPointWarehouseService.java +++ b/src/main/java/com/sipai/service/process/DataVisualMPointWarehouseService.java @@ -1,10 +1,9 @@ package com.sipai.service.process; -import java.util.List; -import java.util.Map; - import com.sipai.entity.process.DataVisualMPointWarehouse; +import java.util.List; + public interface DataVisualMPointWarehouseService { public abstract DataVisualMPointWarehouse selectById(String id); diff --git a/src/main/java/com/sipai/service/process/DataVisualMpViewService.java b/src/main/java/com/sipai/service/process/DataVisualMpViewService.java index 5458ba95..b2e4af75 100644 --- a/src/main/java/com/sipai/service/process/DataVisualMpViewService.java +++ b/src/main/java/com/sipai/service/process/DataVisualMpViewService.java @@ -1,10 +1,9 @@ package com.sipai.service.process; -import java.util.List; -import java.util.Map; - import com.sipai.entity.process.DataVisualMpView; +import java.util.List; + public interface DataVisualMpViewService { public abstract DataVisualMpView selectById(String id); diff --git a/src/main/java/com/sipai/service/process/DataVisualPercentChartService.java b/src/main/java/com/sipai/service/process/DataVisualPercentChartService.java index a8107d1e..3e8b826f 100644 --- a/src/main/java/com/sipai/service/process/DataVisualPercentChartService.java +++ b/src/main/java/com/sipai/service/process/DataVisualPercentChartService.java @@ -1,10 +1,9 @@ package com.sipai.service.process; -import java.util.List; -import java.util.Map; - import com.sipai.entity.process.DataVisualPercentChart; +import java.util.List; + public interface DataVisualPercentChartService { public abstract DataVisualPercentChart selectById(String id); diff --git a/src/main/java/com/sipai/service/process/DataVisualPersonnelPositioningService.java b/src/main/java/com/sipai/service/process/DataVisualPersonnelPositioningService.java index 247a4309..fca32e7d 100644 --- a/src/main/java/com/sipai/service/process/DataVisualPersonnelPositioningService.java +++ b/src/main/java/com/sipai/service/process/DataVisualPersonnelPositioningService.java @@ -1,10 +1,9 @@ package com.sipai.service.process; -import java.util.List; -import java.util.Map; - import com.sipai.entity.process.DataVisualPersonnelPositioning; +import java.util.List; + public interface DataVisualPersonnelPositioningService { public abstract DataVisualPersonnelPositioning selectById(String id); diff --git a/src/main/java/com/sipai/service/process/DataVisualPieChartSeriesService.java b/src/main/java/com/sipai/service/process/DataVisualPieChartSeriesService.java index e839cd04..e0b70f02 100644 --- a/src/main/java/com/sipai/service/process/DataVisualPieChartSeriesService.java +++ b/src/main/java/com/sipai/service/process/DataVisualPieChartSeriesService.java @@ -1,10 +1,9 @@ package com.sipai.service.process; -import java.util.List; -import java.util.Map; - import com.sipai.entity.process.DataVisualPieChartSeries; +import java.util.List; + public interface DataVisualPieChartSeriesService { public abstract DataVisualPieChartSeries selectById(String id); diff --git a/src/main/java/com/sipai/service/process/DataVisualPieChartService.java b/src/main/java/com/sipai/service/process/DataVisualPieChartService.java index 1a6499cc..0cda8ad7 100644 --- a/src/main/java/com/sipai/service/process/DataVisualPieChartService.java +++ b/src/main/java/com/sipai/service/process/DataVisualPieChartService.java @@ -1,10 +1,9 @@ package com.sipai.service.process; -import java.util.List; -import java.util.Map; - import com.sipai.entity.process.DataVisualPieChart; +import java.util.List; + public interface DataVisualPieChartService { public abstract DataVisualPieChart selectById(String id); diff --git a/src/main/java/com/sipai/service/process/DataVisualPolarCoordinatesSeriesService.java b/src/main/java/com/sipai/service/process/DataVisualPolarCoordinatesSeriesService.java index d3e17658..1d9b4dc0 100644 --- a/src/main/java/com/sipai/service/process/DataVisualPolarCoordinatesSeriesService.java +++ b/src/main/java/com/sipai/service/process/DataVisualPolarCoordinatesSeriesService.java @@ -1,10 +1,9 @@ package com.sipai.service.process; -import java.util.List; -import java.util.Map; - import com.sipai.entity.process.DataVisualPolarCoordinatesSeries; +import java.util.List; + public interface DataVisualPolarCoordinatesSeriesService { public abstract DataVisualPolarCoordinatesSeries selectById(String id); diff --git a/src/main/java/com/sipai/service/process/DataVisualPolarCoordinatesService.java b/src/main/java/com/sipai/service/process/DataVisualPolarCoordinatesService.java index e0c5da1c..bd4ff2e3 100644 --- a/src/main/java/com/sipai/service/process/DataVisualPolarCoordinatesService.java +++ b/src/main/java/com/sipai/service/process/DataVisualPolarCoordinatesService.java @@ -1,10 +1,9 @@ package com.sipai.service.process; -import java.util.List; -import java.util.Map; - import com.sipai.entity.process.DataVisualPolarCoordinates; +import java.util.List; + public interface DataVisualPolarCoordinatesService { public abstract DataVisualPolarCoordinates selectById(String id); diff --git a/src/main/java/com/sipai/service/process/DataVisualProgressBarChartService.java b/src/main/java/com/sipai/service/process/DataVisualProgressBarChartService.java index 357c4f15..f017a2bc 100644 --- a/src/main/java/com/sipai/service/process/DataVisualProgressBarChartService.java +++ b/src/main/java/com/sipai/service/process/DataVisualProgressBarChartService.java @@ -1,9 +1,9 @@ package com.sipai.service.process; -import java.util.List; - import com.sipai.entity.process.DataVisualProgressBarChart; +import java.util.List; + public interface DataVisualProgressBarChartService { public abstract DataVisualProgressBarChart selectById(String id); diff --git a/src/main/java/com/sipai/service/process/DataVisualRadarChartAxisService.java b/src/main/java/com/sipai/service/process/DataVisualRadarChartAxisService.java index 09ae9714..85063c93 100644 --- a/src/main/java/com/sipai/service/process/DataVisualRadarChartAxisService.java +++ b/src/main/java/com/sipai/service/process/DataVisualRadarChartAxisService.java @@ -1,10 +1,9 @@ package com.sipai.service.process; -import java.util.List; -import java.util.Map; - import com.sipai.entity.process.DataVisualRadarChartAxis; +import java.util.List; + public interface DataVisualRadarChartAxisService { public abstract DataVisualRadarChartAxis selectById(String id); diff --git a/src/main/java/com/sipai/service/process/DataVisualRadarChartSeriesService.java b/src/main/java/com/sipai/service/process/DataVisualRadarChartSeriesService.java index 95659a52..2e5f9ff0 100644 --- a/src/main/java/com/sipai/service/process/DataVisualRadarChartSeriesService.java +++ b/src/main/java/com/sipai/service/process/DataVisualRadarChartSeriesService.java @@ -1,10 +1,9 @@ package com.sipai.service.process; -import java.util.List; -import java.util.Map; - import com.sipai.entity.process.DataVisualRadarChartSeries; +import java.util.List; + public interface DataVisualRadarChartSeriesService { public abstract DataVisualRadarChartSeries selectById(String id); diff --git a/src/main/java/com/sipai/service/process/DataVisualRadarChartService.java b/src/main/java/com/sipai/service/process/DataVisualRadarChartService.java index 955cb644..d0d7f4d7 100644 --- a/src/main/java/com/sipai/service/process/DataVisualRadarChartService.java +++ b/src/main/java/com/sipai/service/process/DataVisualRadarChartService.java @@ -1,10 +1,9 @@ package com.sipai.service.process; -import java.util.List; -import java.util.Map; - import com.sipai.entity.process.DataVisualRadarChart; +import java.util.List; + public interface DataVisualRadarChartService { public abstract DataVisualRadarChart selectById(String id); diff --git a/src/main/java/com/sipai/service/process/DataVisualSelectService.java b/src/main/java/com/sipai/service/process/DataVisualSelectService.java index 50b1f0a1..874c3bc7 100644 --- a/src/main/java/com/sipai/service/process/DataVisualSelectService.java +++ b/src/main/java/com/sipai/service/process/DataVisualSelectService.java @@ -1,9 +1,9 @@ package com.sipai.service.process; -import java.util.List; - import com.sipai.entity.process.DataVisualSelect; +import java.util.List; + public interface DataVisualSelectService { public abstract DataVisualSelect selectById(String id); diff --git a/src/main/java/com/sipai/service/process/DataVisualSuspensionFrameService.java b/src/main/java/com/sipai/service/process/DataVisualSuspensionFrameService.java index b6225127..b07042d9 100644 --- a/src/main/java/com/sipai/service/process/DataVisualSuspensionFrameService.java +++ b/src/main/java/com/sipai/service/process/DataVisualSuspensionFrameService.java @@ -1,10 +1,9 @@ package com.sipai.service.process; -import java.util.List; -import java.util.Map; - import com.sipai.entity.process.DataVisualSuspensionFrame; +import java.util.List; + public interface DataVisualSuspensionFrameService { public abstract DataVisualSuspensionFrame selectById(String id); diff --git a/src/main/java/com/sipai/service/process/DataVisualSvgAlarmService.java b/src/main/java/com/sipai/service/process/DataVisualSvgAlarmService.java index 61be7e95..14421d5f 100644 --- a/src/main/java/com/sipai/service/process/DataVisualSvgAlarmService.java +++ b/src/main/java/com/sipai/service/process/DataVisualSvgAlarmService.java @@ -1,9 +1,9 @@ package com.sipai.service.process; -import java.util.List; - import com.sipai.entity.process.DataVisualSvgAlarm; +import java.util.List; + public interface DataVisualSvgAlarmService { public abstract DataVisualSvgAlarm selectById(String id); diff --git a/src/main/java/com/sipai/service/process/DataVisualSvgService.java b/src/main/java/com/sipai/service/process/DataVisualSvgService.java index d1433596..6632c649 100644 --- a/src/main/java/com/sipai/service/process/DataVisualSvgService.java +++ b/src/main/java/com/sipai/service/process/DataVisualSvgService.java @@ -1,9 +1,9 @@ package com.sipai.service.process; -import java.util.List; - import com.sipai.entity.process.DataVisualSvg; +import java.util.List; + public interface DataVisualSvgService { public abstract DataVisualSvg selectById(String id); diff --git a/src/main/java/com/sipai/service/process/DataVisualSwitchPointService.java b/src/main/java/com/sipai/service/process/DataVisualSwitchPointService.java index 58e04dfd..220151df 100644 --- a/src/main/java/com/sipai/service/process/DataVisualSwitchPointService.java +++ b/src/main/java/com/sipai/service/process/DataVisualSwitchPointService.java @@ -1,9 +1,9 @@ package com.sipai.service.process; -import java.util.List; - import com.sipai.entity.process.DataVisualSwitchPoint; +import java.util.List; + public interface DataVisualSwitchPointService { public abstract DataVisualSwitchPoint selectById(String id); diff --git a/src/main/java/com/sipai/service/process/DataVisualSwitchService.java b/src/main/java/com/sipai/service/process/DataVisualSwitchService.java index 51ade278..c49e9c65 100644 --- a/src/main/java/com/sipai/service/process/DataVisualSwitchService.java +++ b/src/main/java/com/sipai/service/process/DataVisualSwitchService.java @@ -1,9 +1,9 @@ package com.sipai.service.process; -import java.util.List; - import com.sipai.entity.process.DataVisualSwitch; +import java.util.List; + public interface DataVisualSwitchService { public abstract DataVisualSwitch selectById(String id); diff --git a/src/main/java/com/sipai/service/process/DataVisualTabService.java b/src/main/java/com/sipai/service/process/DataVisualTabService.java index 8b0d840f..9737f03d 100644 --- a/src/main/java/com/sipai/service/process/DataVisualTabService.java +++ b/src/main/java/com/sipai/service/process/DataVisualTabService.java @@ -1,10 +1,9 @@ package com.sipai.service.process; -import java.util.List; -import java.util.Map; - import com.sipai.entity.process.DataVisualTab; +import java.util.List; + public interface DataVisualTabService { public abstract DataVisualTab selectById(String id); diff --git a/src/main/java/com/sipai/service/process/DataVisualTaskPointsService.java b/src/main/java/com/sipai/service/process/DataVisualTaskPointsService.java index 7bd89a88..ef7cbb34 100644 --- a/src/main/java/com/sipai/service/process/DataVisualTaskPointsService.java +++ b/src/main/java/com/sipai/service/process/DataVisualTaskPointsService.java @@ -1,9 +1,9 @@ package com.sipai.service.process; -import java.util.List; - import com.sipai.entity.process.DataVisualTaskPoints; +import java.util.List; + public interface DataVisualTaskPointsService { public abstract DataVisualTaskPoints selectById(String id); diff --git a/src/main/java/com/sipai/service/process/DataVisualTextService.java b/src/main/java/com/sipai/service/process/DataVisualTextService.java index 820a1d2b..e9605463 100644 --- a/src/main/java/com/sipai/service/process/DataVisualTextService.java +++ b/src/main/java/com/sipai/service/process/DataVisualTextService.java @@ -1,10 +1,9 @@ package com.sipai.service.process; -import java.util.List; -import java.util.Map; - import com.sipai.entity.process.DataVisualText; +import java.util.List; + public interface DataVisualTextService { public abstract DataVisualText selectById(String id); diff --git a/src/main/java/com/sipai/service/process/DataVisualTextWarehouseService.java b/src/main/java/com/sipai/service/process/DataVisualTextWarehouseService.java index a61c4b0d..03fb0fa2 100644 --- a/src/main/java/com/sipai/service/process/DataVisualTextWarehouseService.java +++ b/src/main/java/com/sipai/service/process/DataVisualTextWarehouseService.java @@ -1,10 +1,9 @@ package com.sipai.service.process; -import java.util.List; -import java.util.Map; - import com.sipai.entity.process.DataVisualTextWarehouse; +import java.util.List; + public interface DataVisualTextWarehouseService { public abstract DataVisualTextWarehouse selectById(String id); diff --git a/src/main/java/com/sipai/service/process/DataVisualWeatherService.java b/src/main/java/com/sipai/service/process/DataVisualWeatherService.java index 2e1620be..11e307b9 100644 --- a/src/main/java/com/sipai/service/process/DataVisualWeatherService.java +++ b/src/main/java/com/sipai/service/process/DataVisualWeatherService.java @@ -1,10 +1,9 @@ package com.sipai.service.process; -import java.util.List; -import java.util.Map; - import com.sipai.entity.process.DataVisualWeather; +import java.util.List; + public interface DataVisualWeatherService { public abstract DataVisualWeather selectById(String id); diff --git a/src/main/java/com/sipai/service/process/DecisionExpertBaseService.java b/src/main/java/com/sipai/service/process/DecisionExpertBaseService.java index f5f16db4..d689940f 100644 --- a/src/main/java/com/sipai/service/process/DecisionExpertBaseService.java +++ b/src/main/java/com/sipai/service/process/DecisionExpertBaseService.java @@ -1,10 +1,10 @@ package com.sipai.service.process; +import com.sipai.entity.process.DecisionExpertBase; + import java.util.List; import java.util.Map; -import com.sipai.entity.process.DecisionExpertBase; - public interface DecisionExpertBaseService { public abstract DecisionExpertBase selectById(String id); diff --git a/src/main/java/com/sipai/service/process/DecisionExpertBaseTextService.java b/src/main/java/com/sipai/service/process/DecisionExpertBaseTextService.java index f91836c1..4e0c792d 100644 --- a/src/main/java/com/sipai/service/process/DecisionExpertBaseTextService.java +++ b/src/main/java/com/sipai/service/process/DecisionExpertBaseTextService.java @@ -1,11 +1,10 @@ package com.sipai.service.process; -import java.util.List; -import java.util.Map; - import com.sipai.entity.process.DecisionExpertBase; import com.sipai.entity.process.DecisionExpertBaseText; +import java.util.List; + public interface DecisionExpertBaseTextService { public abstract DecisionExpertBaseText selectById(String id); diff --git a/src/main/java/com/sipai/service/process/EquipmentAdjustmentDetailService.java b/src/main/java/com/sipai/service/process/EquipmentAdjustmentDetailService.java index b7b304a2..c45ae07a 100644 --- a/src/main/java/com/sipai/service/process/EquipmentAdjustmentDetailService.java +++ b/src/main/java/com/sipai/service/process/EquipmentAdjustmentDetailService.java @@ -1,17 +1,15 @@ package com.sipai.service.process; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.sipai.dao.process.EquipmentAdjustmentDetailDao; import com.sipai.entity.process.EquipmentAdjustmentDetail; import com.sipai.service.equipment.EquipmentCardService; import com.sipai.service.user.UnitService; import com.sipai.service.user.UserService; import com.sipai.tools.CommService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class EquipmentAdjustmentDetailService implements CommService{ diff --git a/src/main/java/com/sipai/service/process/EquipmentAdjustmentService.java b/src/main/java/com/sipai/service/process/EquipmentAdjustmentService.java index 1900e28f..8fdfa049 100644 --- a/src/main/java/com/sipai/service/process/EquipmentAdjustmentService.java +++ b/src/main/java/com/sipai/service/process/EquipmentAdjustmentService.java @@ -1,16 +1,14 @@ package com.sipai.service.process; -import java.util.List; - -import javax.annotation.Resource; - -import com.sipai.entity.process.EquipmentAdjustment; -import org.springframework.stereotype.Service; - import com.sipai.dao.process.EquipmentAdjustmentDao; +import com.sipai.entity.process.EquipmentAdjustment; import com.sipai.service.user.UnitService; import com.sipai.service.user.UserService; import com.sipai.tools.CommService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class EquipmentAdjustmentService implements CommService{ diff --git a/src/main/java/com/sipai/service/process/LibraryProcessAdjustmentService.java b/src/main/java/com/sipai/service/process/LibraryProcessAdjustmentService.java index d7110762..3e647754 100644 --- a/src/main/java/com/sipai/service/process/LibraryProcessAdjustmentService.java +++ b/src/main/java/com/sipai/service/process/LibraryProcessAdjustmentService.java @@ -1,13 +1,12 @@ package com.sipai.service.process; +import com.sipai.entity.process.LibraryProcessAdjustment; + +import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.InputStream; import java.util.List; -import javax.servlet.http.HttpServletResponse; - -import com.sipai.entity.process.LibraryProcessAdjustment; - public interface LibraryProcessAdjustmentService { public abstract LibraryProcessAdjustment selectById(String id); diff --git a/src/main/java/com/sipai/service/process/LibraryProcessManageService.java b/src/main/java/com/sipai/service/process/LibraryProcessManageService.java index 8647d3b8..6a29799a 100644 --- a/src/main/java/com/sipai/service/process/LibraryProcessManageService.java +++ b/src/main/java/com/sipai/service/process/LibraryProcessManageService.java @@ -1,6 +1,7 @@ package com.sipai.service.process; import com.sipai.entity.process.LibraryProcessManage; + import java.util.List; public interface LibraryProcessManageService { diff --git a/src/main/java/com/sipai/service/process/LibraryProcessManageTypeService.java b/src/main/java/com/sipai/service/process/LibraryProcessManageTypeService.java index bc37b9ea..95252383 100644 --- a/src/main/java/com/sipai/service/process/LibraryProcessManageTypeService.java +++ b/src/main/java/com/sipai/service/process/LibraryProcessManageTypeService.java @@ -1,9 +1,9 @@ package com.sipai.service.process; -import java.util.List; - import com.sipai.entity.process.LibraryProcessManageType; +import java.util.List; + public interface LibraryProcessManageTypeService { public abstract LibraryProcessManageType selectById(String id); diff --git a/src/main/java/com/sipai/service/process/LibraryProcessManageWorkOrderService.java b/src/main/java/com/sipai/service/process/LibraryProcessManageWorkOrderService.java index 97f5676f..8d642038 100644 --- a/src/main/java/com/sipai/service/process/LibraryProcessManageWorkOrderService.java +++ b/src/main/java/com/sipai/service/process/LibraryProcessManageWorkOrderService.java @@ -1,9 +1,9 @@ package com.sipai.service.process; -import java.util.List; - import com.sipai.entity.process.LibraryProcessManageWorkOrder; +import java.util.List; + public interface LibraryProcessManageWorkOrderService { public abstract LibraryProcessManageWorkOrder selectById(String id); diff --git a/src/main/java/com/sipai/service/process/LibraryRoutineWorkService.java b/src/main/java/com/sipai/service/process/LibraryRoutineWorkService.java index af3f13f2..08bed660 100644 --- a/src/main/java/com/sipai/service/process/LibraryRoutineWorkService.java +++ b/src/main/java/com/sipai/service/process/LibraryRoutineWorkService.java @@ -1,14 +1,13 @@ package com.sipai.service.process; +import com.sipai.entity.process.LibraryRoutineWork; + +import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.InputStream; import java.util.List; -import javax.servlet.http.HttpServletResponse; - -import com.sipai.entity.process.LibraryRoutineWork; - public interface LibraryRoutineWorkService { diff --git a/src/main/java/com/sipai/service/process/LibraryWaterTestService.java b/src/main/java/com/sipai/service/process/LibraryWaterTestService.java index 33694bda..4675fa35 100644 --- a/src/main/java/com/sipai/service/process/LibraryWaterTestService.java +++ b/src/main/java/com/sipai/service/process/LibraryWaterTestService.java @@ -2,12 +2,11 @@ package com.sipai.service.process; import com.sipai.entity.process.LibraryWaterTest; +import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.InputStream; import java.util.List; -import javax.servlet.http.HttpServletResponse; - public interface LibraryWaterTestService { public abstract LibraryWaterTest selectById(String id); diff --git a/src/main/java/com/sipai/service/process/MeterCheckLibraryService.java b/src/main/java/com/sipai/service/process/MeterCheckLibraryService.java index 04bdcfe2..130c8685 100644 --- a/src/main/java/com/sipai/service/process/MeterCheckLibraryService.java +++ b/src/main/java/com/sipai/service/process/MeterCheckLibraryService.java @@ -1,10 +1,9 @@ package com.sipai.service.process; -import java.util.List; -import java.util.Map; - import com.sipai.entity.process.MeterCheckLibrary; +import java.util.List; + public interface MeterCheckLibraryService { public abstract MeterCheckLibrary selectById(String id); diff --git a/src/main/java/com/sipai/service/process/MeterCheckService.java b/src/main/java/com/sipai/service/process/MeterCheckService.java index 3688b0b6..0c448977 100644 --- a/src/main/java/com/sipai/service/process/MeterCheckService.java +++ b/src/main/java/com/sipai/service/process/MeterCheckService.java @@ -1,10 +1,9 @@ package com.sipai.service.process; -import java.util.List; -import java.util.Map; - import com.sipai.entity.process.MeterCheck; +import java.util.List; + public interface MeterCheckService { public abstract MeterCheck selectById(String id); diff --git a/src/main/java/com/sipai/service/process/ProcessAdjustmentService.java b/src/main/java/com/sipai/service/process/ProcessAdjustmentService.java index f6658bf9..6b9d0b35 100644 --- a/src/main/java/com/sipai/service/process/ProcessAdjustmentService.java +++ b/src/main/java/com/sipai/service/process/ProcessAdjustmentService.java @@ -2,6 +2,7 @@ package com.sipai.service.process; import com.sipai.entity.business.BusinessUnitAudit; import com.sipai.entity.process.ProcessAdjustment; + import java.util.List; public interface ProcessAdjustmentService { diff --git a/src/main/java/com/sipai/service/process/ProcessAdjustmentTypeService.java b/src/main/java/com/sipai/service/process/ProcessAdjustmentTypeService.java index cfbe2fa3..d7aa92c6 100644 --- a/src/main/java/com/sipai/service/process/ProcessAdjustmentTypeService.java +++ b/src/main/java/com/sipai/service/process/ProcessAdjustmentTypeService.java @@ -1,9 +1,8 @@ package com.sipai.service.process; -import com.sipai.entity.equipment.EquipmentClass; import com.sipai.entity.process.ProcessAdjustmentType; + import java.util.List; -import java.util.Map; public interface ProcessAdjustmentTypeService { diff --git a/src/main/java/com/sipai/service/process/ProcessSectionInformationService.java b/src/main/java/com/sipai/service/process/ProcessSectionInformationService.java index 0998535a..7cd32e29 100644 --- a/src/main/java/com/sipai/service/process/ProcessSectionInformationService.java +++ b/src/main/java/com/sipai/service/process/ProcessSectionInformationService.java @@ -1,16 +1,14 @@ package com.sipai.service.process; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.sipai.dao.process.ProcessSectionInformationDao; import com.sipai.entity.process.ProcessSectionInformation; import com.sipai.entity.user.ProcessSection; import com.sipai.service.user.ProcessSectionService; import com.sipai.tools.CommService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class ProcessSectionInformationService implements CommService{ diff --git a/src/main/java/com/sipai/service/process/ProcessWebsiteService.java b/src/main/java/com/sipai/service/process/ProcessWebsiteService.java index a9257fe2..9fab473f 100644 --- a/src/main/java/com/sipai/service/process/ProcessWebsiteService.java +++ b/src/main/java/com/sipai/service/process/ProcessWebsiteService.java @@ -1,14 +1,12 @@ package com.sipai.service.process; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.sipai.dao.process.ProcessWebsiteDao; import com.sipai.entity.process.ProcessWebsite; import com.sipai.tools.CommService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class ProcessWebsiteService implements CommService{ diff --git a/src/main/java/com/sipai/service/process/RoutineWorkService.java b/src/main/java/com/sipai/service/process/RoutineWorkService.java index f82bb881..5a00df37 100644 --- a/src/main/java/com/sipai/service/process/RoutineWorkService.java +++ b/src/main/java/com/sipai/service/process/RoutineWorkService.java @@ -2,6 +2,7 @@ package com.sipai.service.process; import com.sipai.entity.business.BusinessUnitAudit; import com.sipai.entity.process.RoutineWork; + import java.util.List; public interface RoutineWorkService { diff --git a/src/main/java/com/sipai/service/process/TestIndexManageService.java b/src/main/java/com/sipai/service/process/TestIndexManageService.java index 9a314476..30c3b0d5 100644 --- a/src/main/java/com/sipai/service/process/TestIndexManageService.java +++ b/src/main/java/com/sipai/service/process/TestIndexManageService.java @@ -1,9 +1,9 @@ package com.sipai.service.process; -import java.util.List; - import com.sipai.entity.process.TestIndexManage; +import java.util.List; + public interface TestIndexManageService { public abstract TestIndexManage selectById(String id); diff --git a/src/main/java/com/sipai/service/process/TestMethodsService.java b/src/main/java/com/sipai/service/process/TestMethodsService.java index b6938054..ac5cc871 100644 --- a/src/main/java/com/sipai/service/process/TestMethodsService.java +++ b/src/main/java/com/sipai/service/process/TestMethodsService.java @@ -1,9 +1,9 @@ package com.sipai.service.process; -import java.util.List; - import com.sipai.entity.process.TestMethods; +import java.util.List; + public interface TestMethodsService { public abstract TestMethods selectById(String id); diff --git a/src/main/java/com/sipai/service/process/TestTaskService.java b/src/main/java/com/sipai/service/process/TestTaskService.java index 10641724..b71f0100 100644 --- a/src/main/java/com/sipai/service/process/TestTaskService.java +++ b/src/main/java/com/sipai/service/process/TestTaskService.java @@ -1,9 +1,9 @@ package com.sipai.service.process; -import java.util.List; - import com.sipai.entity.process.TestTask; +import java.util.List; + public interface TestTaskService { public abstract TestTask selectById(String id); diff --git a/src/main/java/com/sipai/service/process/WaterTestDetailService.java b/src/main/java/com/sipai/service/process/WaterTestDetailService.java index fadf72ff..3c77315b 100644 --- a/src/main/java/com/sipai/service/process/WaterTestDetailService.java +++ b/src/main/java/com/sipai/service/process/WaterTestDetailService.java @@ -1,6 +1,7 @@ package com.sipai.service.process; import com.sipai.entity.process.WaterTestDetail; + import java.util.List; public interface WaterTestDetailService { diff --git a/src/main/java/com/sipai/service/process/WaterTestService.java b/src/main/java/com/sipai/service/process/WaterTestService.java index 00e37f76..decb721a 100644 --- a/src/main/java/com/sipai/service/process/WaterTestService.java +++ b/src/main/java/com/sipai/service/process/WaterTestService.java @@ -1,8 +1,8 @@ package com.sipai.service.process; import com.sipai.entity.business.BusinessUnitAudit; -import com.sipai.entity.process.RoutineWork; import com.sipai.entity.process.WaterTest; + import java.util.List; public interface WaterTestService { diff --git a/src/main/java/com/sipai/service/process/impl/DataPatrolResultDataServiceImpl.java b/src/main/java/com/sipai/service/process/impl/DataPatrolResultDataServiceImpl.java index 23c2f3e0..482cb9fe 100644 --- a/src/main/java/com/sipai/service/process/impl/DataPatrolResultDataServiceImpl.java +++ b/src/main/java/com/sipai/service/process/impl/DataPatrolResultDataServiceImpl.java @@ -1,19 +1,13 @@ package com.sipai.service.process.impl; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import javax.annotation.Resource; - -import com.sipai.entity.scada.MPoint; -import com.sipai.service.scada.MPointService; -import net.sf.json.JSONArray; -import org.springframework.stereotype.Service; import com.sipai.dao.process.DataPatrolResultDataDao; import com.sipai.entity.process.DataPatrolResultData; import com.sipai.service.process.DataPatrolResultDataService; +import com.sipai.service.scada.MPointService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class DataPatrolResultDataServiceImpl implements DataPatrolResultDataService { diff --git a/src/main/java/com/sipai/service/process/impl/DataPatrolServiceImpl.java b/src/main/java/com/sipai/service/process/impl/DataPatrolServiceImpl.java index 2ab7b076..cfb10f06 100644 --- a/src/main/java/com/sipai/service/process/impl/DataPatrolServiceImpl.java +++ b/src/main/java/com/sipai/service/process/impl/DataPatrolServiceImpl.java @@ -1,19 +1,12 @@ package com.sipai.service.process.impl; -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 com.sipai.entity.alarm.AlarmMoldCodeEnum; +import com.sipai.dao.process.DataPatrolDao; +import com.sipai.entity.process.DataPatrol; import com.sipai.entity.process.DataPatrolResultData; import com.sipai.entity.scada.MPoint; import com.sipai.entity.scada.MPointHistory; -import com.sipai.entity.scada.ProAlarm; import com.sipai.service.process.DataPatrolResultDataService; +import com.sipai.service.process.DataPatrolService; import com.sipai.service.scada.MPointHistoryService; import com.sipai.service.scada.MPointService; import com.sipai.service.scada.ProAlarmService; @@ -21,9 +14,13 @@ import com.sipai.tools.CommUtil; import net.sf.json.JSONArray; import net.sf.json.JSONObject; import org.springframework.stereotype.Service; -import com.sipai.dao.process.DataPatrolDao; -import com.sipai.entity.process.DataPatrol; -import com.sipai.service.process.DataPatrolService; + +import javax.annotation.Resource; +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; @Service("dataPatrolService") public class DataPatrolServiceImpl implements DataPatrolService { diff --git a/src/main/java/com/sipai/service/process/impl/DataVisualBarChartSeriesServiceImpl.java b/src/main/java/com/sipai/service/process/impl/DataVisualBarChartSeriesServiceImpl.java index 1ba27ff7..1ee3c495 100644 --- a/src/main/java/com/sipai/service/process/impl/DataVisualBarChartSeriesServiceImpl.java +++ b/src/main/java/com/sipai/service/process/impl/DataVisualBarChartSeriesServiceImpl.java @@ -1,13 +1,12 @@ package com.sipai.service.process.impl; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; import com.sipai.dao.process.DataVisualBarChartSeriesDao; import com.sipai.entity.process.DataVisualBarChartSeries; import com.sipai.service.process.DataVisualBarChartSeriesService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class DataVisualBarChartSeriesServiceImpl implements DataVisualBarChartSeriesService { diff --git a/src/main/java/com/sipai/service/process/impl/DataVisualBarChartServiceImpl.java b/src/main/java/com/sipai/service/process/impl/DataVisualBarChartServiceImpl.java index db1c6888..78c4e13c 100644 --- a/src/main/java/com/sipai/service/process/impl/DataVisualBarChartServiceImpl.java +++ b/src/main/java/com/sipai/service/process/impl/DataVisualBarChartServiceImpl.java @@ -1,13 +1,12 @@ package com.sipai.service.process.impl; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; import com.sipai.dao.process.DataVisualBarChartDao; import com.sipai.entity.process.DataVisualBarChart; import com.sipai.service.process.DataVisualBarChartService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class DataVisualBarChartServiceImpl implements DataVisualBarChartService { diff --git a/src/main/java/com/sipai/service/process/impl/DataVisualBarChartYAxisServiceImpl.java b/src/main/java/com/sipai/service/process/impl/DataVisualBarChartYAxisServiceImpl.java index 0302c94f..989022d8 100644 --- a/src/main/java/com/sipai/service/process/impl/DataVisualBarChartYAxisServiceImpl.java +++ b/src/main/java/com/sipai/service/process/impl/DataVisualBarChartYAxisServiceImpl.java @@ -1,13 +1,12 @@ package com.sipai.service.process.impl; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; import com.sipai.dao.process.DataVisualBarChartYAxisDao; import com.sipai.entity.process.DataVisualBarChartYAxis; import com.sipai.service.process.DataVisualBarChartYAxisService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class DataVisualBarChartYAxisServiceImpl implements DataVisualBarChartYAxisService { diff --git a/src/main/java/com/sipai/service/process/impl/DataVisualCameraAlarmServiceImpl.java b/src/main/java/com/sipai/service/process/impl/DataVisualCameraAlarmServiceImpl.java index a72f670b..dd0c92bd 100644 --- a/src/main/java/com/sipai/service/process/impl/DataVisualCameraAlarmServiceImpl.java +++ b/src/main/java/com/sipai/service/process/impl/DataVisualCameraAlarmServiceImpl.java @@ -1,13 +1,12 @@ package com.sipai.service.process.impl; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; import com.sipai.dao.process.DataVisualCameraAlarmDao; import com.sipai.entity.process.DataVisualCameraAlarm; import com.sipai.service.process.DataVisualCameraAlarmService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class DataVisualCameraAlarmServiceImpl implements DataVisualCameraAlarmService { diff --git a/src/main/java/com/sipai/service/process/impl/DataVisualCameraServiceImpl.java b/src/main/java/com/sipai/service/process/impl/DataVisualCameraServiceImpl.java index 1870bbe7..47260b4d 100644 --- a/src/main/java/com/sipai/service/process/impl/DataVisualCameraServiceImpl.java +++ b/src/main/java/com/sipai/service/process/impl/DataVisualCameraServiceImpl.java @@ -1,20 +1,14 @@ package com.sipai.service.process.impl; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import javax.annotation.Resource; - -import net.sf.json.JSONArray; - -import org.springframework.stereotype.Service; import com.sipai.dao.process.DataVisualCameraDao; import com.sipai.entity.process.DataVisualCamera; import com.sipai.entity.work.Camera; import com.sipai.service.process.DataVisualCameraService; import com.sipai.service.work.CameraService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class DataVisualCameraServiceImpl implements DataVisualCameraService { diff --git a/src/main/java/com/sipai/service/process/impl/DataVisualContentServiceImpl.java b/src/main/java/com/sipai/service/process/impl/DataVisualContentServiceImpl.java index 68373b6f..4c79d699 100644 --- a/src/main/java/com/sipai/service/process/impl/DataVisualContentServiceImpl.java +++ b/src/main/java/com/sipai/service/process/impl/DataVisualContentServiceImpl.java @@ -1,15 +1,8 @@ package com.sipai.service.process.impl; -import java.io.File; -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 com.sipai.dao.process.DataVisualContentDao; import com.sipai.entity.base.CommonFile; +import com.sipai.entity.process.DataVisualContent; import com.sipai.entity.process.DataVisualTab; import com.sipai.entity.scada.MPoint; import com.sipai.entity.scada.MPointHistory; @@ -17,13 +10,14 @@ import com.sipai.service.base.CommonFileService; import com.sipai.service.process.*; import com.sipai.service.scada.MPointHistoryService; import com.sipai.service.scada.MPointService; -import com.sipai.service.work.WeatherNewService; import com.sipai.tools.CommUtil; -import net.sf.json.JSONArray; - import org.springframework.stereotype.Service; -import com.sipai.dao.process.DataVisualContentDao; -import com.sipai.entity.process.DataVisualContent; + +import javax.annotation.Resource; +import java.io.File; +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.List; @Service("dataVisualContentService") public class DataVisualContentServiceImpl implements DataVisualContentService { diff --git a/src/main/java/com/sipai/service/process/impl/DataVisualDateSelectServiceImpl.java b/src/main/java/com/sipai/service/process/impl/DataVisualDateSelectServiceImpl.java index d90b6105..9f610095 100644 --- a/src/main/java/com/sipai/service/process/impl/DataVisualDateSelectServiceImpl.java +++ b/src/main/java/com/sipai/service/process/impl/DataVisualDateSelectServiceImpl.java @@ -1,18 +1,12 @@ package com.sipai.service.process.impl; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import javax.annotation.Resource; - -import net.sf.json.JSONArray; - -import org.springframework.stereotype.Service; import com.sipai.dao.process.DataVisualDateSelectDao; import com.sipai.entity.process.DataVisualDateSelect; import com.sipai.service.process.DataVisualDateSelectService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class DataVisualDateSelectServiceImpl implements DataVisualDateSelectService { diff --git a/src/main/java/com/sipai/service/process/impl/DataVisualDateServiceImpl.java b/src/main/java/com/sipai/service/process/impl/DataVisualDateServiceImpl.java index 124e6bdb..1dff15fe 100644 --- a/src/main/java/com/sipai/service/process/impl/DataVisualDateServiceImpl.java +++ b/src/main/java/com/sipai/service/process/impl/DataVisualDateServiceImpl.java @@ -1,18 +1,12 @@ package com.sipai.service.process.impl; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import javax.annotation.Resource; - -import net.sf.json.JSONArray; - -import org.springframework.stereotype.Service; import com.sipai.dao.process.DataVisualDateDao; import com.sipai.entity.process.DataVisualDate; import com.sipai.service.process.DataVisualDateService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class DataVisualDateServiceImpl implements DataVisualDateService { diff --git a/src/main/java/com/sipai/service/process/impl/DataVisualEqPointsServiceImpl.java b/src/main/java/com/sipai/service/process/impl/DataVisualEqPointsServiceImpl.java index 3878188d..5fa62775 100644 --- a/src/main/java/com/sipai/service/process/impl/DataVisualEqPointsServiceImpl.java +++ b/src/main/java/com/sipai/service/process/impl/DataVisualEqPointsServiceImpl.java @@ -1,16 +1,14 @@ package com.sipai.service.process.impl; -import java.util.HashMap; -import java.util.List; +import com.sipai.dao.process.DataVisualEqPointsDao; +import com.sipai.entity.equipment.EquipmentCard; +import com.sipai.entity.process.DataVisualEqPoints; +import com.sipai.service.equipment.EquipmentCardService; +import com.sipai.service.process.DataVisualEqPointsService; +import org.springframework.stereotype.Service; import javax.annotation.Resource; - -import com.sipai.entity.equipment.EquipmentCard; -import com.sipai.service.equipment.EquipmentCardService; -import org.springframework.stereotype.Service; -import com.sipai.dao.process.DataVisualEqPointsDao; -import com.sipai.entity.process.DataVisualEqPoints; -import com.sipai.service.process.DataVisualEqPointsService; +import java.util.List; @Service public class DataVisualEqPointsServiceImpl implements DataVisualEqPointsService { diff --git a/src/main/java/com/sipai/service/process/impl/DataVisualFormServiceImpl.java b/src/main/java/com/sipai/service/process/impl/DataVisualFormServiceImpl.java index 3c10216b..446202dc 100644 --- a/src/main/java/com/sipai/service/process/impl/DataVisualFormServiceImpl.java +++ b/src/main/java/com/sipai/service/process/impl/DataVisualFormServiceImpl.java @@ -1,18 +1,13 @@ package com.sipai.service.process.impl; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import javax.annotation.Resource; - -import net.sf.json.JSONArray; - -import org.springframework.stereotype.Service; import com.sipai.dao.process.DataVisualFormDao; import com.sipai.entity.process.DataVisualForm; import com.sipai.service.process.DataVisualFormService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.HashMap; +import java.util.List; @Service public class DataVisualFormServiceImpl implements DataVisualFormService { diff --git a/src/main/java/com/sipai/service/process/impl/DataVisualFormShowStyleServiceImpl.java b/src/main/java/com/sipai/service/process/impl/DataVisualFormShowStyleServiceImpl.java index a4b0c718..62d8d2da 100644 --- a/src/main/java/com/sipai/service/process/impl/DataVisualFormShowStyleServiceImpl.java +++ b/src/main/java/com/sipai/service/process/impl/DataVisualFormShowStyleServiceImpl.java @@ -1,13 +1,12 @@ package com.sipai.service.process.impl; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; import com.sipai.dao.process.DataVisualFormShowStyleDao; import com.sipai.entity.process.DataVisualFormShowStyle; import com.sipai.service.process.DataVisualFormShowStyleService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class DataVisualFormShowStyleServiceImpl implements DataVisualFormShowStyleService { diff --git a/src/main/java/com/sipai/service/process/impl/DataVisualFormSqlPointServiceImpl.java b/src/main/java/com/sipai/service/process/impl/DataVisualFormSqlPointServiceImpl.java index 424a1e83..5d3c36e7 100644 --- a/src/main/java/com/sipai/service/process/impl/DataVisualFormSqlPointServiceImpl.java +++ b/src/main/java/com/sipai/service/process/impl/DataVisualFormSqlPointServiceImpl.java @@ -1,18 +1,12 @@ package com.sipai.service.process.impl; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import javax.annotation.Resource; - -import net.sf.json.JSONArray; - -import org.springframework.stereotype.Service; import com.sipai.dao.process.DataVisualFormSqlPointDao; import com.sipai.entity.process.DataVisualFormSqlPoint; import com.sipai.service.process.DataVisualFormSqlPointService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class DataVisualFormSqlPointServiceImpl implements DataVisualFormSqlPointService { diff --git a/src/main/java/com/sipai/service/process/impl/DataVisualFrameContainerServiceImpl.java b/src/main/java/com/sipai/service/process/impl/DataVisualFrameContainerServiceImpl.java index 464e4869..60af1b82 100644 --- a/src/main/java/com/sipai/service/process/impl/DataVisualFrameContainerServiceImpl.java +++ b/src/main/java/com/sipai/service/process/impl/DataVisualFrameContainerServiceImpl.java @@ -1,18 +1,12 @@ package com.sipai.service.process.impl; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import javax.annotation.Resource; - -import net.sf.json.JSONArray; - -import org.springframework.stereotype.Service; import com.sipai.dao.process.DataVisualFrameContainerDao; import com.sipai.entity.process.DataVisualFrameContainer; import com.sipai.service.process.DataVisualFrameContainerService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service("dataVisualFrameContainerService") public class DataVisualFrameContainerServiceImpl implements DataVisualFrameContainerService { diff --git a/src/main/java/com/sipai/service/process/impl/DataVisualFrameServiceImpl.java b/src/main/java/com/sipai/service/process/impl/DataVisualFrameServiceImpl.java index 04841dcf..76fa4e61 100644 --- a/src/main/java/com/sipai/service/process/impl/DataVisualFrameServiceImpl.java +++ b/src/main/java/com/sipai/service/process/impl/DataVisualFrameServiceImpl.java @@ -1,13 +1,7 @@ package com.sipai.service.process.impl; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import javax.annotation.Resource; - import com.alibaba.fastjson.JSONObject; +import com.sipai.dao.process.DataVisualFrameDao; import com.sipai.entity.process.*; import com.sipai.entity.scada.MPoint; import com.sipai.service.base.CommonFileService; @@ -17,11 +11,14 @@ import com.sipai.service.user.UserService; import com.sipai.service.work.WeatherNewService; import com.sipai.tools.CommUtil; import net.sf.json.JSONArray; - import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; -import com.sipai.dao.process.DataVisualFrameDao; -import com.sipai.entity.data.CurveMpoint; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; @Service("dataVisualFrameService") public class DataVisualFrameServiceImpl implements DataVisualFrameService { diff --git a/src/main/java/com/sipai/service/process/impl/DataVisualGaugeChartServiceImpl.java b/src/main/java/com/sipai/service/process/impl/DataVisualGaugeChartServiceImpl.java index f538a2b4..6ba51469 100644 --- a/src/main/java/com/sipai/service/process/impl/DataVisualGaugeChartServiceImpl.java +++ b/src/main/java/com/sipai/service/process/impl/DataVisualGaugeChartServiceImpl.java @@ -1,13 +1,12 @@ package com.sipai.service.process.impl; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; import com.sipai.dao.process.DataVisualGaugeChartDao; import com.sipai.entity.process.DataVisualGaugeChart; import com.sipai.service.process.DataVisualGaugeChartService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class DataVisualGaugeChartServiceImpl implements DataVisualGaugeChartService { diff --git a/src/main/java/com/sipai/service/process/impl/DataVisualLineChartSeriesServiceImpl.java b/src/main/java/com/sipai/service/process/impl/DataVisualLineChartSeriesServiceImpl.java index 00025a9d..a7bf3826 100644 --- a/src/main/java/com/sipai/service/process/impl/DataVisualLineChartSeriesServiceImpl.java +++ b/src/main/java/com/sipai/service/process/impl/DataVisualLineChartSeriesServiceImpl.java @@ -1,13 +1,12 @@ package com.sipai.service.process.impl; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; import com.sipai.dao.process.DataVisualLineChartSeriesDao; import com.sipai.entity.process.DataVisualLineChartSeries; import com.sipai.service.process.DataVisualLineChartSeriesService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class DataVisualLineChartSeriesServiceImpl implements DataVisualLineChartSeriesService { diff --git a/src/main/java/com/sipai/service/process/impl/DataVisualLineChartServiceImpl.java b/src/main/java/com/sipai/service/process/impl/DataVisualLineChartServiceImpl.java index 29b25050..5ebabc37 100644 --- a/src/main/java/com/sipai/service/process/impl/DataVisualLineChartServiceImpl.java +++ b/src/main/java/com/sipai/service/process/impl/DataVisualLineChartServiceImpl.java @@ -1,13 +1,12 @@ package com.sipai.service.process.impl; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; import com.sipai.dao.process.DataVisualLineChartDao; import com.sipai.entity.process.DataVisualLineChart; import com.sipai.service.process.DataVisualLineChartService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class DataVisualLineChartServiceImpl implements DataVisualLineChartService { diff --git a/src/main/java/com/sipai/service/process/impl/DataVisualLineChartYAxisServiceImpl.java b/src/main/java/com/sipai/service/process/impl/DataVisualLineChartYAxisServiceImpl.java index bac6c736..d12d67ca 100644 --- a/src/main/java/com/sipai/service/process/impl/DataVisualLineChartYAxisServiceImpl.java +++ b/src/main/java/com/sipai/service/process/impl/DataVisualLineChartYAxisServiceImpl.java @@ -1,13 +1,12 @@ package com.sipai.service.process.impl; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; import com.sipai.dao.process.DataVisualLineChartYAxisDao; import com.sipai.entity.process.DataVisualLineChartYAxis; import com.sipai.service.process.DataVisualLineChartYAxisService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class DataVisualLineChartYAxisServiceImpl implements DataVisualLineChartYAxisService { diff --git a/src/main/java/com/sipai/service/process/impl/DataVisualMPointServiceImpl.java b/src/main/java/com/sipai/service/process/impl/DataVisualMPointServiceImpl.java index a8269761..440b6bc1 100644 --- a/src/main/java/com/sipai/service/process/impl/DataVisualMPointServiceImpl.java +++ b/src/main/java/com/sipai/service/process/impl/DataVisualMPointServiceImpl.java @@ -1,22 +1,16 @@ package com.sipai.service.process.impl; -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 net.sf.json.JSONArray; - -import org.springframework.stereotype.Service; import com.sipai.dao.process.DataVisualMPointDao; import com.sipai.entity.process.DataVisualMPoint; import com.sipai.entity.scada.MPoint; import com.sipai.service.process.DataVisualMPointService; import com.sipai.service.scada.MPointService; import com.sipai.tools.CommUtil; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.math.BigDecimal; +import java.util.List; @Service public class DataVisualMPointServiceImpl implements DataVisualMPointService { diff --git a/src/main/java/com/sipai/service/process/impl/DataVisualMPointWarehouseServiceImpl.java b/src/main/java/com/sipai/service/process/impl/DataVisualMPointWarehouseServiceImpl.java index 289afef6..d039f8a2 100644 --- a/src/main/java/com/sipai/service/process/impl/DataVisualMPointWarehouseServiceImpl.java +++ b/src/main/java/com/sipai/service/process/impl/DataVisualMPointWarehouseServiceImpl.java @@ -1,18 +1,12 @@ package com.sipai.service.process.impl; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import javax.annotation.Resource; - -import net.sf.json.JSONArray; - -import org.springframework.stereotype.Service; import com.sipai.dao.process.DataVisualMPointWarehouseDao; import com.sipai.entity.process.DataVisualMPointWarehouse; import com.sipai.service.process.DataVisualMPointWarehouseService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class DataVisualMPointWarehouseServiceImpl implements DataVisualMPointWarehouseService { diff --git a/src/main/java/com/sipai/service/process/impl/DataVisualMpViewServiceImpl.java b/src/main/java/com/sipai/service/process/impl/DataVisualMpViewServiceImpl.java index a50f8919..1d19ab8b 100644 --- a/src/main/java/com/sipai/service/process/impl/DataVisualMpViewServiceImpl.java +++ b/src/main/java/com/sipai/service/process/impl/DataVisualMpViewServiceImpl.java @@ -1,18 +1,12 @@ package com.sipai.service.process.impl; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import javax.annotation.Resource; - -import net.sf.json.JSONArray; - -import org.springframework.stereotype.Service; import com.sipai.dao.process.DataVisualMpViewDao; import com.sipai.entity.process.DataVisualMpView; import com.sipai.service.process.DataVisualMpViewService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class DataVisualMpViewServiceImpl implements DataVisualMpViewService { diff --git a/src/main/java/com/sipai/service/process/impl/DataVisualPercentChartServiceImpl.java b/src/main/java/com/sipai/service/process/impl/DataVisualPercentChartServiceImpl.java index f8ce7249..df605c29 100644 --- a/src/main/java/com/sipai/service/process/impl/DataVisualPercentChartServiceImpl.java +++ b/src/main/java/com/sipai/service/process/impl/DataVisualPercentChartServiceImpl.java @@ -1,18 +1,12 @@ package com.sipai.service.process.impl; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import javax.annotation.Resource; - -import net.sf.json.JSONArray; - -import org.springframework.stereotype.Service; import com.sipai.dao.process.DataVisualPercentChartDao; import com.sipai.entity.process.DataVisualPercentChart; import com.sipai.service.process.DataVisualPercentChartService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class DataVisualPercentChartServiceImpl implements DataVisualPercentChartService { diff --git a/src/main/java/com/sipai/service/process/impl/DataVisualPersonnelPositioningServiceImpl.java b/src/main/java/com/sipai/service/process/impl/DataVisualPersonnelPositioningServiceImpl.java index aed53bcf..f3f69914 100644 --- a/src/main/java/com/sipai/service/process/impl/DataVisualPersonnelPositioningServiceImpl.java +++ b/src/main/java/com/sipai/service/process/impl/DataVisualPersonnelPositioningServiceImpl.java @@ -1,18 +1,12 @@ package com.sipai.service.process.impl; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import javax.annotation.Resource; - -import net.sf.json.JSONArray; - -import org.springframework.stereotype.Service; import com.sipai.dao.process.DataVisualPersonnelPositioningDao; import com.sipai.entity.process.DataVisualPersonnelPositioning; import com.sipai.service.process.DataVisualPersonnelPositioningService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class DataVisualPersonnelPositioningServiceImpl implements DataVisualPersonnelPositioningService { diff --git a/src/main/java/com/sipai/service/process/impl/DataVisualPieChartSeriesServiceImpl.java b/src/main/java/com/sipai/service/process/impl/DataVisualPieChartSeriesServiceImpl.java index 41c51be6..37e856c6 100644 --- a/src/main/java/com/sipai/service/process/impl/DataVisualPieChartSeriesServiceImpl.java +++ b/src/main/java/com/sipai/service/process/impl/DataVisualPieChartSeriesServiceImpl.java @@ -1,18 +1,12 @@ package com.sipai.service.process.impl; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import javax.annotation.Resource; - -import net.sf.json.JSONArray; - -import org.springframework.stereotype.Service; import com.sipai.dao.process.DataVisualPieChartSeriesDao; import com.sipai.entity.process.DataVisualPieChartSeries; import com.sipai.service.process.DataVisualPieChartSeriesService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class DataVisualPieChartSeriesServiceImpl implements DataVisualPieChartSeriesService { diff --git a/src/main/java/com/sipai/service/process/impl/DataVisualPieChartServiceImpl.java b/src/main/java/com/sipai/service/process/impl/DataVisualPieChartServiceImpl.java index 1de21546..1220e854 100644 --- a/src/main/java/com/sipai/service/process/impl/DataVisualPieChartServiceImpl.java +++ b/src/main/java/com/sipai/service/process/impl/DataVisualPieChartServiceImpl.java @@ -1,18 +1,12 @@ package com.sipai.service.process.impl; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import javax.annotation.Resource; - -import net.sf.json.JSONArray; - -import org.springframework.stereotype.Service; import com.sipai.dao.process.DataVisualPieChartDao; import com.sipai.entity.process.DataVisualPieChart; import com.sipai.service.process.DataVisualPieChartService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class DataVisualPieChartServiceImpl implements DataVisualPieChartService { diff --git a/src/main/java/com/sipai/service/process/impl/DataVisualPolarCoordinatesSeriesServiceImpl.java b/src/main/java/com/sipai/service/process/impl/DataVisualPolarCoordinatesSeriesServiceImpl.java index 588c82d5..a484587d 100644 --- a/src/main/java/com/sipai/service/process/impl/DataVisualPolarCoordinatesSeriesServiceImpl.java +++ b/src/main/java/com/sipai/service/process/impl/DataVisualPolarCoordinatesSeriesServiceImpl.java @@ -1,18 +1,12 @@ package com.sipai.service.process.impl; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import javax.annotation.Resource; - -import net.sf.json.JSONArray; - -import org.springframework.stereotype.Service; import com.sipai.dao.process.DataVisualPolarCoordinatesSeriesDao; import com.sipai.entity.process.DataVisualPolarCoordinatesSeries; import com.sipai.service.process.DataVisualPolarCoordinatesSeriesService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class DataVisualPolarCoordinatesSeriesServiceImpl implements DataVisualPolarCoordinatesSeriesService { diff --git a/src/main/java/com/sipai/service/process/impl/DataVisualPolarCoordinatesServiceImpl.java b/src/main/java/com/sipai/service/process/impl/DataVisualPolarCoordinatesServiceImpl.java index 975c8a9f..8190dd4b 100644 --- a/src/main/java/com/sipai/service/process/impl/DataVisualPolarCoordinatesServiceImpl.java +++ b/src/main/java/com/sipai/service/process/impl/DataVisualPolarCoordinatesServiceImpl.java @@ -1,18 +1,12 @@ package com.sipai.service.process.impl; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import javax.annotation.Resource; - -import net.sf.json.JSONArray; - -import org.springframework.stereotype.Service; import com.sipai.dao.process.DataVisualPolarCoordinatesDao; import com.sipai.entity.process.DataVisualPolarCoordinates; import com.sipai.service.process.DataVisualPolarCoordinatesService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class DataVisualPolarCoordinatesServiceImpl implements DataVisualPolarCoordinatesService { diff --git a/src/main/java/com/sipai/service/process/impl/DataVisualProgressBarChartServiceImpl.java b/src/main/java/com/sipai/service/process/impl/DataVisualProgressBarChartServiceImpl.java index f1993375..fb8cc7e2 100644 --- a/src/main/java/com/sipai/service/process/impl/DataVisualProgressBarChartServiceImpl.java +++ b/src/main/java/com/sipai/service/process/impl/DataVisualProgressBarChartServiceImpl.java @@ -1,18 +1,12 @@ package com.sipai.service.process.impl; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import javax.annotation.Resource; - -import net.sf.json.JSONArray; - -import org.springframework.stereotype.Service; import com.sipai.dao.process.DataVisualProgressBarChartDao; import com.sipai.entity.process.DataVisualProgressBarChart; import com.sipai.service.process.DataVisualProgressBarChartService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class DataVisualProgressBarChartServiceImpl implements DataVisualProgressBarChartService { diff --git a/src/main/java/com/sipai/service/process/impl/DataVisualRadarChartAxisServiceImpl.java b/src/main/java/com/sipai/service/process/impl/DataVisualRadarChartAxisServiceImpl.java index 6a18c621..85976238 100644 --- a/src/main/java/com/sipai/service/process/impl/DataVisualRadarChartAxisServiceImpl.java +++ b/src/main/java/com/sipai/service/process/impl/DataVisualRadarChartAxisServiceImpl.java @@ -1,18 +1,12 @@ package com.sipai.service.process.impl; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import javax.annotation.Resource; - -import net.sf.json.JSONArray; - -import org.springframework.stereotype.Service; import com.sipai.dao.process.DataVisualRadarChartAxisDao; import com.sipai.entity.process.DataVisualRadarChartAxis; import com.sipai.service.process.DataVisualRadarChartAxisService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class DataVisualRadarChartAxisServiceImpl implements DataVisualRadarChartAxisService { diff --git a/src/main/java/com/sipai/service/process/impl/DataVisualRadarChartSeriesServiceImpl.java b/src/main/java/com/sipai/service/process/impl/DataVisualRadarChartSeriesServiceImpl.java index 3ad4fdba..c8752e20 100644 --- a/src/main/java/com/sipai/service/process/impl/DataVisualRadarChartSeriesServiceImpl.java +++ b/src/main/java/com/sipai/service/process/impl/DataVisualRadarChartSeriesServiceImpl.java @@ -1,18 +1,12 @@ package com.sipai.service.process.impl; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import javax.annotation.Resource; - -import net.sf.json.JSONArray; - -import org.springframework.stereotype.Service; import com.sipai.dao.process.DataVisualRadarChartSeriesDao; import com.sipai.entity.process.DataVisualRadarChartSeries; import com.sipai.service.process.DataVisualRadarChartSeriesService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class DataVisualRadarChartSeriesServiceImpl implements DataVisualRadarChartSeriesService { diff --git a/src/main/java/com/sipai/service/process/impl/DataVisualRadarChartServiceImpl.java b/src/main/java/com/sipai/service/process/impl/DataVisualRadarChartServiceImpl.java index 5077c968..53d9e8d5 100644 --- a/src/main/java/com/sipai/service/process/impl/DataVisualRadarChartServiceImpl.java +++ b/src/main/java/com/sipai/service/process/impl/DataVisualRadarChartServiceImpl.java @@ -1,18 +1,12 @@ package com.sipai.service.process.impl; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import javax.annotation.Resource; - -import net.sf.json.JSONArray; - -import org.springframework.stereotype.Service; import com.sipai.dao.process.DataVisualRadarChartDao; import com.sipai.entity.process.DataVisualRadarChart; import com.sipai.service.process.DataVisualRadarChartService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class DataVisualRadarChartServiceImpl implements DataVisualRadarChartService { diff --git a/src/main/java/com/sipai/service/process/impl/DataVisualSelectServiceImpl.java b/src/main/java/com/sipai/service/process/impl/DataVisualSelectServiceImpl.java index d7612577..faa4b0ab 100644 --- a/src/main/java/com/sipai/service/process/impl/DataVisualSelectServiceImpl.java +++ b/src/main/java/com/sipai/service/process/impl/DataVisualSelectServiceImpl.java @@ -1,13 +1,12 @@ package com.sipai.service.process.impl; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; import com.sipai.dao.process.DataVisualSelectDao; import com.sipai.entity.process.DataVisualSelect; import com.sipai.service.process.DataVisualSelectService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class DataVisualSelectServiceImpl implements DataVisualSelectService { diff --git a/src/main/java/com/sipai/service/process/impl/DataVisualSuspensionFrameServiceImpl.java b/src/main/java/com/sipai/service/process/impl/DataVisualSuspensionFrameServiceImpl.java index 1f041da9..f9d7f175 100644 --- a/src/main/java/com/sipai/service/process/impl/DataVisualSuspensionFrameServiceImpl.java +++ b/src/main/java/com/sipai/service/process/impl/DataVisualSuspensionFrameServiceImpl.java @@ -1,18 +1,12 @@ package com.sipai.service.process.impl; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import javax.annotation.Resource; - -import net.sf.json.JSONArray; - -import org.springframework.stereotype.Service; import com.sipai.dao.process.DataVisualSuspensionFrameDao; import com.sipai.entity.process.DataVisualSuspensionFrame; import com.sipai.service.process.DataVisualSuspensionFrameService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class DataVisualSuspensionFrameServiceImpl implements DataVisualSuspensionFrameService { diff --git a/src/main/java/com/sipai/service/process/impl/DataVisualSvgAlarmServiceImpl.java b/src/main/java/com/sipai/service/process/impl/DataVisualSvgAlarmServiceImpl.java index cebb65f4..e4b34acf 100644 --- a/src/main/java/com/sipai/service/process/impl/DataVisualSvgAlarmServiceImpl.java +++ b/src/main/java/com/sipai/service/process/impl/DataVisualSvgAlarmServiceImpl.java @@ -1,13 +1,12 @@ package com.sipai.service.process.impl; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; import com.sipai.dao.process.DataVisualSvgAlarmDao; import com.sipai.entity.process.DataVisualSvgAlarm; import com.sipai.service.process.DataVisualSvgAlarmService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class DataVisualSvgAlarmServiceImpl implements DataVisualSvgAlarmService { diff --git a/src/main/java/com/sipai/service/process/impl/DataVisualSvgServiceImpl.java b/src/main/java/com/sipai/service/process/impl/DataVisualSvgServiceImpl.java index eb16e079..58c02f53 100644 --- a/src/main/java/com/sipai/service/process/impl/DataVisualSvgServiceImpl.java +++ b/src/main/java/com/sipai/service/process/impl/DataVisualSvgServiceImpl.java @@ -1,18 +1,12 @@ package com.sipai.service.process.impl; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import javax.annotation.Resource; - -import net.sf.json.JSONArray; - -import org.springframework.stereotype.Service; import com.sipai.dao.process.DataVisualSvgDao; import com.sipai.entity.process.DataVisualSvg; import com.sipai.service.process.DataVisualSvgService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class DataVisualSvgServiceImpl implements DataVisualSvgService { diff --git a/src/main/java/com/sipai/service/process/impl/DataVisualSwitchPointServiceImpl.java b/src/main/java/com/sipai/service/process/impl/DataVisualSwitchPointServiceImpl.java index 5bf9a6dc..5abe3bc3 100644 --- a/src/main/java/com/sipai/service/process/impl/DataVisualSwitchPointServiceImpl.java +++ b/src/main/java/com/sipai/service/process/impl/DataVisualSwitchPointServiceImpl.java @@ -1,18 +1,12 @@ package com.sipai.service.process.impl; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import javax.annotation.Resource; - -import net.sf.json.JSONArray; - -import org.springframework.stereotype.Service; import com.sipai.dao.process.DataVisualSwitchPointDao; import com.sipai.entity.process.DataVisualSwitchPoint; import com.sipai.service.process.DataVisualSwitchPointService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class DataVisualSwitchPointServiceImpl implements DataVisualSwitchPointService { diff --git a/src/main/java/com/sipai/service/process/impl/DataVisualSwitchServiceImpl.java b/src/main/java/com/sipai/service/process/impl/DataVisualSwitchServiceImpl.java index d73d9ee3..274fa5d1 100644 --- a/src/main/java/com/sipai/service/process/impl/DataVisualSwitchServiceImpl.java +++ b/src/main/java/com/sipai/service/process/impl/DataVisualSwitchServiceImpl.java @@ -1,18 +1,12 @@ package com.sipai.service.process.impl; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import javax.annotation.Resource; - -import net.sf.json.JSONArray; - -import org.springframework.stereotype.Service; import com.sipai.dao.process.DataVisualSwitchDao; import com.sipai.entity.process.DataVisualSwitch; import com.sipai.service.process.DataVisualSwitchService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class DataVisualSwitchServiceImpl implements DataVisualSwitchService { diff --git a/src/main/java/com/sipai/service/process/impl/DataVisualTabServiceImpl.java b/src/main/java/com/sipai/service/process/impl/DataVisualTabServiceImpl.java index 5d0ad517..cf4f94ba 100644 --- a/src/main/java/com/sipai/service/process/impl/DataVisualTabServiceImpl.java +++ b/src/main/java/com/sipai/service/process/impl/DataVisualTabServiceImpl.java @@ -1,19 +1,12 @@ package com.sipai.service.process.impl; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import javax.annotation.Resource; - -import net.sf.json.JSONArray; - -import org.springframework.stereotype.Service; import com.sipai.dao.process.DataVisualTabDao; -import com.sipai.entity.process.DataVisualFrame; import com.sipai.entity.process.DataVisualTab; import com.sipai.service.process.DataVisualTabService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class DataVisualTabServiceImpl implements DataVisualTabService { diff --git a/src/main/java/com/sipai/service/process/impl/DataVisualTaskPointsServiceImpl.java b/src/main/java/com/sipai/service/process/impl/DataVisualTaskPointsServiceImpl.java index ebacb6ca..763bc2f3 100644 --- a/src/main/java/com/sipai/service/process/impl/DataVisualTaskPointsServiceImpl.java +++ b/src/main/java/com/sipai/service/process/impl/DataVisualTaskPointsServiceImpl.java @@ -1,15 +1,14 @@ package com.sipai.service.process.impl; -import java.util.List; - -import javax.annotation.Resource; - -import com.sipai.entity.timeefficiency.PatrolPoint; -import com.sipai.service.timeefficiency.PatrolPointService; -import org.springframework.stereotype.Service; import com.sipai.dao.process.DataVisualTaskPointsDao; import com.sipai.entity.process.DataVisualTaskPoints; +import com.sipai.entity.timeefficiency.PatrolPoint; import com.sipai.service.process.DataVisualTaskPointsService; +import com.sipai.service.timeefficiency.PatrolPointService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class DataVisualTaskPointsServiceImpl implements DataVisualTaskPointsService { diff --git a/src/main/java/com/sipai/service/process/impl/DataVisualTextServiceImpl.java b/src/main/java/com/sipai/service/process/impl/DataVisualTextServiceImpl.java index 7f907eac..f99d58a9 100644 --- a/src/main/java/com/sipai/service/process/impl/DataVisualTextServiceImpl.java +++ b/src/main/java/com/sipai/service/process/impl/DataVisualTextServiceImpl.java @@ -1,18 +1,12 @@ package com.sipai.service.process.impl; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import javax.annotation.Resource; - -import net.sf.json.JSONArray; - -import org.springframework.stereotype.Service; import com.sipai.dao.process.DataVisualTextDao; import com.sipai.entity.process.DataVisualText; import com.sipai.service.process.DataVisualTextService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service("dataVisualTextService") public class DataVisualTextServiceImpl implements DataVisualTextService { diff --git a/src/main/java/com/sipai/service/process/impl/DataVisualTextWarehouseServiceImpl.java b/src/main/java/com/sipai/service/process/impl/DataVisualTextWarehouseServiceImpl.java index 09f34765..d16eff5b 100644 --- a/src/main/java/com/sipai/service/process/impl/DataVisualTextWarehouseServiceImpl.java +++ b/src/main/java/com/sipai/service/process/impl/DataVisualTextWarehouseServiceImpl.java @@ -1,18 +1,12 @@ package com.sipai.service.process.impl; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import javax.annotation.Resource; - -import net.sf.json.JSONArray; - -import org.springframework.stereotype.Service; import com.sipai.dao.process.DataVisualTextWarehouseDao; import com.sipai.entity.process.DataVisualTextWarehouse; import com.sipai.service.process.DataVisualTextWarehouseService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class DataVisualTextWarehouseServiceImpl implements DataVisualTextWarehouseService { diff --git a/src/main/java/com/sipai/service/process/impl/DataVisualWeatherServiceImpl.java b/src/main/java/com/sipai/service/process/impl/DataVisualWeatherServiceImpl.java index 75533922..5ec4e2a6 100644 --- a/src/main/java/com/sipai/service/process/impl/DataVisualWeatherServiceImpl.java +++ b/src/main/java/com/sipai/service/process/impl/DataVisualWeatherServiceImpl.java @@ -1,18 +1,12 @@ package com.sipai.service.process.impl; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import javax.annotation.Resource; - -import net.sf.json.JSONArray; - -import org.springframework.stereotype.Service; import com.sipai.dao.process.DataVisualWeatherDao; import com.sipai.entity.process.DataVisualWeather; import com.sipai.service.process.DataVisualWeatherService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class DataVisualWeatherServiceImpl implements DataVisualWeatherService { diff --git a/src/main/java/com/sipai/service/process/impl/DecisionExpertBaseServiceImpl.java b/src/main/java/com/sipai/service/process/impl/DecisionExpertBaseServiceImpl.java index 975b79c3..e7f63abb 100644 --- a/src/main/java/com/sipai/service/process/impl/DecisionExpertBaseServiceImpl.java +++ b/src/main/java/com/sipai/service/process/impl/DecisionExpertBaseServiceImpl.java @@ -1,19 +1,17 @@ package com.sipai.service.process.impl; +import com.sipai.dao.process.DecisionExpertBaseDao; +import com.sipai.entity.process.DecisionExpertBase; +import com.sipai.service.process.DecisionExpertBaseService; +import net.sf.json.JSONArray; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.annotation.Resource; - -import net.sf.json.JSONArray; - -import org.springframework.stereotype.Service; -import com.sipai.dao.process.DecisionExpertBaseDao; -import com.sipai.entity.process.DecisionExpertBase; -import com.sipai.service.process.DecisionExpertBaseService; - @Service public class DecisionExpertBaseServiceImpl implements DecisionExpertBaseService { @Resource diff --git a/src/main/java/com/sipai/service/process/impl/DecisionExpertBaseTextServiceImpl.java b/src/main/java/com/sipai/service/process/impl/DecisionExpertBaseTextServiceImpl.java index 4942c5cf..87cd4f8c 100644 --- a/src/main/java/com/sipai/service/process/impl/DecisionExpertBaseTextServiceImpl.java +++ b/src/main/java/com/sipai/service/process/impl/DecisionExpertBaseTextServiceImpl.java @@ -1,20 +1,16 @@ package com.sipai.service.process.impl; -import java.util.*; +import com.sipai.dao.process.DecisionExpertBaseTextDao; +import com.sipai.entity.process.DecisionExpertBase; +import com.sipai.entity.process.DecisionExpertBaseText; +import com.sipai.service.process.DecisionExpertBaseService; +import com.sipai.service.process.DecisionExpertBaseTextService; +import org.springframework.stereotype.Service; import javax.annotation.Resource; - -import com.sipai.entity.process.DecisionExpertBase; -import com.sipai.entity.sparepart.GoodsClass; -import com.sipai.entity.user.Unit; -import com.sipai.service.process.DecisionExpertBaseService; -import com.sipai.tools.CommString; -import net.sf.json.JSONArray; - -import org.springframework.stereotype.Service; -import com.sipai.dao.process.DecisionExpertBaseTextDao; -import com.sipai.entity.process.DecisionExpertBaseText; -import com.sipai.service.process.DecisionExpertBaseTextService; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; @Service public class DecisionExpertBaseTextServiceImpl implements DecisionExpertBaseTextService { diff --git a/src/main/java/com/sipai/service/process/impl/LibraryProcessAdjustmentServiceImpl.java b/src/main/java/com/sipai/service/process/impl/LibraryProcessAdjustmentServiceImpl.java index 4e2e87f0..df3263dc 100644 --- a/src/main/java/com/sipai/service/process/impl/LibraryProcessAdjustmentServiceImpl.java +++ b/src/main/java/com/sipai/service/process/impl/LibraryProcessAdjustmentServiceImpl.java @@ -1,5 +1,21 @@ package com.sipai.service.process.impl; +import com.sipai.dao.process.LibraryProcessAdjustmentDao; +import com.sipai.entity.process.LibraryProcessAbnormal; +import com.sipai.entity.process.LibraryProcessAdjustment; +import com.sipai.entity.process.ProcessAdjustmentType; +import com.sipai.service.process.LibraryProcessAbnormalService; +import com.sipai.service.process.LibraryProcessAdjustmentService; +import com.sipai.service.process.ProcessAdjustmentTypeService; +import com.sipai.tools.CommUtil; +import org.apache.poi.hssf.usermodel.*; +import org.apache.poi.ss.usermodel.*; +import org.apache.poi.ss.util.CellRangeAddress; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; @@ -7,36 +23,8 @@ import java.net.URLEncoder; import java.text.SimpleDateFormat; import java.util.Date; import java.util.List; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletResponse; -import com.sipai.entity.process.ProcessAdjustmentType; -import com.sipai.service.process.ProcessAdjustmentTypeService; -import com.sipai.tools.CommUtil; - -import org.apache.poi.hssf.usermodel.HSSFCell; -import org.apache.poi.hssf.usermodel.HSSFCellStyle; -import org.apache.poi.hssf.usermodel.HSSFFont; -import org.apache.poi.hssf.usermodel.HSSFPatriarch; -import org.apache.poi.hssf.usermodel.HSSFRichTextString; -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.ss.util.CellRangeAddress; -import org.apache.poi.hssf.util.HSSFColor; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.sipai.dao.process.LibraryProcessAdjustmentDao; -import com.sipai.entity.process.LibraryProcessAbnormal; -import com.sipai.entity.process.LibraryProcessAdjustment; -import com.sipai.entity.process.LibraryWaterTest; -import com.sipai.entity.process.LibraryProcessAdjustment; -import com.sipai.service.process.LibraryProcessAbnormalService; -import com.sipai.service.process.LibraryProcessAdjustmentService; - -import static org.apache.poi.ss.usermodel.CellType.*; +import static org.apache.poi.ss.usermodel.CellType.STRING; @Service public class LibraryProcessAdjustmentServiceImpl implements LibraryProcessAdjustmentService { diff --git a/src/main/java/com/sipai/service/process/impl/LibraryProcessManageDetailServiceImpl.java b/src/main/java/com/sipai/service/process/impl/LibraryProcessManageDetailServiceImpl.java index efe504a2..02a9b2c8 100644 --- a/src/main/java/com/sipai/service/process/impl/LibraryProcessManageDetailServiceImpl.java +++ b/src/main/java/com/sipai/service/process/impl/LibraryProcessManageDetailServiceImpl.java @@ -5,6 +5,7 @@ import com.sipai.entity.process.LibraryProcessManageDetail; import com.sipai.service.process.LibraryProcessManageDetailService; import com.sipai.service.scada.MPointService; import org.springframework.stereotype.Service; + import javax.annotation.Resource; import java.util.List; diff --git a/src/main/java/com/sipai/service/process/impl/LibraryProcessManageServiceImpl.java b/src/main/java/com/sipai/service/process/impl/LibraryProcessManageServiceImpl.java index d6224bfb..20d74623 100644 --- a/src/main/java/com/sipai/service/process/impl/LibraryProcessManageServiceImpl.java +++ b/src/main/java/com/sipai/service/process/impl/LibraryProcessManageServiceImpl.java @@ -4,6 +4,7 @@ import com.sipai.dao.process.LibraryProcessManageDao; import com.sipai.entity.process.LibraryProcessManage; import com.sipai.service.process.LibraryProcessManageService; import org.springframework.stereotype.Service; + import javax.annotation.Resource; import java.util.List; diff --git a/src/main/java/com/sipai/service/process/impl/LibraryProcessManageTypeServiceImpl.java b/src/main/java/com/sipai/service/process/impl/LibraryProcessManageTypeServiceImpl.java index 246fcc40..b49d2b8a 100644 --- a/src/main/java/com/sipai/service/process/impl/LibraryProcessManageTypeServiceImpl.java +++ b/src/main/java/com/sipai/service/process/impl/LibraryProcessManageTypeServiceImpl.java @@ -1,19 +1,16 @@ package com.sipai.service.process.impl; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import javax.annotation.Resource; - -import net.sf.json.JSONArray; - -import org.springframework.stereotype.Service; - import com.sipai.dao.process.LibraryProcessManageTypeDao; import com.sipai.entity.process.LibraryProcessManageType; import com.sipai.service.process.LibraryProcessManageTypeService; +import net.sf.json.JSONArray; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; @Service("LibraryProcessManageTypeService") public class LibraryProcessManageTypeServiceImpl implements LibraryProcessManageTypeService{ diff --git a/src/main/java/com/sipai/service/process/impl/LibraryProcessManageWorkOrderServiceImpl.java b/src/main/java/com/sipai/service/process/impl/LibraryProcessManageWorkOrderServiceImpl.java index 6a5fb649..748f8891 100644 --- a/src/main/java/com/sipai/service/process/impl/LibraryProcessManageWorkOrderServiceImpl.java +++ b/src/main/java/com/sipai/service/process/impl/LibraryProcessManageWorkOrderServiceImpl.java @@ -1,16 +1,5 @@ package com.sipai.service.process.impl; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import javax.annotation.Resource; - -import net.sf.json.JSONArray; - -import org.springframework.stereotype.Service; - import com.sipai.dao.process.LibraryProcessManageWorkOrderDao; import com.sipai.entity.process.LibraryProcessManage; import com.sipai.entity.process.LibraryProcessManageWorkOrder; @@ -18,6 +7,10 @@ import com.sipai.entity.user.User; import com.sipai.service.process.LibraryProcessManageService; import com.sipai.service.process.LibraryProcessManageWorkOrderService; import com.sipai.service.user.UserService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service("LibraryProcessManageWorkOrderService") public class LibraryProcessManageWorkOrderServiceImpl implements LibraryProcessManageWorkOrderService{ diff --git a/src/main/java/com/sipai/service/process/impl/LibraryRoutineWorkServiceImpl.java b/src/main/java/com/sipai/service/process/impl/LibraryRoutineWorkServiceImpl.java index 0370c05a..ba5a8a0a 100644 --- a/src/main/java/com/sipai/service/process/impl/LibraryRoutineWorkServiceImpl.java +++ b/src/main/java/com/sipai/service/process/impl/LibraryRoutineWorkServiceImpl.java @@ -3,33 +3,18 @@ package com.sipai.service.process.impl; import com.sipai.dao.process.LibraryRoutineWorkDao; import com.sipai.entity.administration.OrganizationClass; import com.sipai.entity.process.LibraryRoutineWork; -import com.sipai.entity.work.ProductionIndexPlanNameConfigure; -import com.sipai.entity.work.ProductionIndexPlanNameData; import com.sipai.service.administration.OrganizationClassService; import com.sipai.service.process.LibraryRoutineWorkService; import com.sipai.tools.CommUtil; - -import org.apache.poi.hssf.usermodel.DVConstraint; -import org.apache.poi.hssf.usermodel.HSSFCell; -import org.apache.poi.hssf.usermodel.HSSFCellStyle; -import org.apache.poi.hssf.usermodel.HSSFDataValidation; -import org.apache.poi.hssf.usermodel.HSSFFont; -import org.apache.poi.hssf.usermodel.HSSFPatriarch; -import org.apache.poi.hssf.usermodel.HSSFRichTextString; -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.hssf.usermodel.*; import org.apache.poi.ss.usermodel.*; import org.apache.poi.ss.util.CellRangeAddress; import org.apache.poi.ss.util.CellRangeAddressList; -import org.apache.poi.hssf.util.HSSFColor; -import org.apache.poi.xssf.usermodel.XSSFCell; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; - import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; @@ -38,7 +23,7 @@ import java.text.SimpleDateFormat; import java.util.Date; import java.util.List; -import static org.apache.poi.ss.usermodel.CellType.*; +import static org.apache.poi.ss.usermodel.CellType.STRING; @Service public class LibraryRoutineWorkServiceImpl implements LibraryRoutineWorkService { diff --git a/src/main/java/com/sipai/service/process/impl/LibraryWaterTestServiceImpl.java b/src/main/java/com/sipai/service/process/impl/LibraryWaterTestServiceImpl.java index 89fda758..75135367 100644 --- a/src/main/java/com/sipai/service/process/impl/LibraryWaterTestServiceImpl.java +++ b/src/main/java/com/sipai/service/process/impl/LibraryWaterTestServiceImpl.java @@ -2,28 +2,17 @@ package com.sipai.service.process.impl; import com.sipai.dao.process.LibraryWaterTestDao; import com.sipai.entity.process.LibraryWaterTest; -import com.sipai.entity.process.LibraryWaterTest; import com.sipai.service.process.LibraryWaterTestService; import com.sipai.service.scada.MPointService; import com.sipai.tools.CommUtil; - -import org.apache.poi.hssf.usermodel.HSSFCell; -import org.apache.poi.hssf.usermodel.HSSFCellStyle; -import org.apache.poi.hssf.usermodel.HSSFFont; -import org.apache.poi.hssf.usermodel.HSSFPatriarch; -import org.apache.poi.hssf.usermodel.HSSFRichTextString; -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.hssf.usermodel.*; import org.apache.poi.ss.usermodel.*; import org.apache.poi.ss.util.CellRangeAddress; -import org.apache.poi.hssf.util.HSSFColor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; - import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; @@ -32,7 +21,7 @@ import java.text.SimpleDateFormat; import java.util.Date; import java.util.List; -import static org.apache.poi.ss.usermodel.CellType.*; +import static org.apache.poi.ss.usermodel.CellType.STRING; @Service public class LibraryWaterTestServiceImpl implements LibraryWaterTestService { diff --git a/src/main/java/com/sipai/service/process/impl/MeterCheckLibraryServiceImpl.java b/src/main/java/com/sipai/service/process/impl/MeterCheckLibraryServiceImpl.java index 0c7e77c3..e5ef049d 100644 --- a/src/main/java/com/sipai/service/process/impl/MeterCheckLibraryServiceImpl.java +++ b/src/main/java/com/sipai/service/process/impl/MeterCheckLibraryServiceImpl.java @@ -1,19 +1,12 @@ package com.sipai.service.process.impl; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import javax.annotation.Resource; - -import net.sf.json.JSONArray; - -import org.springframework.stereotype.Service; import com.sipai.dao.process.MeterCheckLibraryDao; -import com.sipai.entity.process.DataVisualFrame; import com.sipai.entity.process.MeterCheckLibrary; import com.sipai.service.process.MeterCheckLibraryService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class MeterCheckLibraryServiceImpl implements MeterCheckLibraryService { diff --git a/src/main/java/com/sipai/service/process/impl/MeterCheckServiceImpl.java b/src/main/java/com/sipai/service/process/impl/MeterCheckServiceImpl.java index 93abedc5..a8f85548 100644 --- a/src/main/java/com/sipai/service/process/impl/MeterCheckServiceImpl.java +++ b/src/main/java/com/sipai/service/process/impl/MeterCheckServiceImpl.java @@ -1,24 +1,17 @@ package com.sipai.service.process.impl; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import javax.annotation.Resource; - -import com.sipai.entity.process.MeterCheckLibrary; +import com.sipai.dao.process.MeterCheckDao; +import com.sipai.entity.process.MeterCheck; import com.sipai.entity.timeefficiency.PatrolRecord; import com.sipai.entity.user.User; import com.sipai.service.process.MeterCheckLibraryService; +import com.sipai.service.process.MeterCheckService; import com.sipai.service.timeefficiency.PatrolRecordService; import com.sipai.service.user.UserService; -import net.sf.json.JSONArray; - import org.springframework.stereotype.Service; -import com.sipai.dao.process.MeterCheckDao; -import com.sipai.entity.process.MeterCheck; -import com.sipai.service.process.MeterCheckService; + +import javax.annotation.Resource; +import java.util.List; @Service public class MeterCheckServiceImpl implements MeterCheckService { diff --git a/src/main/java/com/sipai/service/process/impl/ProcessAdjustmentContentServiceImpl.java b/src/main/java/com/sipai/service/process/impl/ProcessAdjustmentContentServiceImpl.java index 1a67a2cf..db13a758 100644 --- a/src/main/java/com/sipai/service/process/impl/ProcessAdjustmentContentServiceImpl.java +++ b/src/main/java/com/sipai/service/process/impl/ProcessAdjustmentContentServiceImpl.java @@ -4,21 +4,17 @@ import com.sipai.dao.process.ProcessAdjustmentContentDao; import com.sipai.entity.document.DocFileRelation; import com.sipai.entity.process.LibraryProcessAbnormal; import com.sipai.entity.process.LibraryProcessAdjustment; -import com.sipai.entity.process.ProcessAdjustment; import com.sipai.entity.process.ProcessAdjustmentContent; -import com.sipai.entity.user.User; import com.sipai.service.document.DocFileRelationService; import com.sipai.service.process.LibraryProcessAbnormalService; import com.sipai.service.process.LibraryProcessAdjustmentService; import com.sipai.service.process.ProcessAdjustmentContentService; import com.sipai.service.user.UserService; import com.sipai.tools.CommUtil; - import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; - import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/com/sipai/service/process/impl/ProcessAdjustmentServiceImpl.java b/src/main/java/com/sipai/service/process/impl/ProcessAdjustmentServiceImpl.java index 3198bebe..5239c51f 100644 --- a/src/main/java/com/sipai/service/process/impl/ProcessAdjustmentServiceImpl.java +++ b/src/main/java/com/sipai/service/process/impl/ProcessAdjustmentServiceImpl.java @@ -8,8 +8,6 @@ import com.sipai.entity.business.BusinessUnitRecord; import com.sipai.entity.maintenance.MaintenanceCommString; import com.sipai.entity.process.ProcessAdjustment; import com.sipai.entity.process.ProcessAdjustmentType; -import com.sipai.entity.sparepart.InStockRecord; -import com.sipai.entity.sparepart.SparePartCommString; import com.sipai.entity.user.Company; import com.sipai.entity.user.User; import com.sipai.service.activiti.WorkflowProcessDefinitionService; diff --git a/src/main/java/com/sipai/service/process/impl/RoutineWorkServiceImpl.java b/src/main/java/com/sipai/service/process/impl/RoutineWorkServiceImpl.java index 671da727..11e88f58 100644 --- a/src/main/java/com/sipai/service/process/impl/RoutineWorkServiceImpl.java +++ b/src/main/java/com/sipai/service/process/impl/RoutineWorkServiceImpl.java @@ -3,14 +3,11 @@ package com.sipai.service.process.impl; import com.sipai.dao.process.RoutineWorkDao; import com.sipai.entity.activiti.ProcessType; import com.sipai.entity.base.BusinessUnitAdapter; -import com.sipai.entity.base.Result; import com.sipai.entity.business.BusinessUnitAudit; import com.sipai.entity.business.BusinessUnitRecord; import com.sipai.entity.maintenance.MaintenanceCommString; import com.sipai.entity.process.LibraryRoutineWork; -import com.sipai.entity.process.ProcessAdjustment; import com.sipai.entity.process.RoutineWork; -import com.sipai.entity.scada.MPoint4APP; import com.sipai.entity.user.Company; import com.sipai.entity.user.User; import com.sipai.service.activiti.WorkflowProcessDefinitionService; @@ -22,7 +19,6 @@ import com.sipai.service.user.UnitService; import com.sipai.service.user.UserService; import com.sipai.tools.CommString; import com.sipai.tools.CommUtil; - import org.activiti.engine.repository.ProcessDefinition; import org.activiti.engine.runtime.ProcessInstance; import org.activiti.engine.task.Task; diff --git a/src/main/java/com/sipai/service/process/impl/TestIndexManageServiceImpl.java b/src/main/java/com/sipai/service/process/impl/TestIndexManageServiceImpl.java index 1361d380..51f65245 100644 --- a/src/main/java/com/sipai/service/process/impl/TestIndexManageServiceImpl.java +++ b/src/main/java/com/sipai/service/process/impl/TestIndexManageServiceImpl.java @@ -1,21 +1,15 @@ package com.sipai.service.process.impl; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import javax.annotation.Resource; - -import net.sf.json.JSONArray; - -import org.springframework.stereotype.Service; import com.sipai.dao.process.TestIndexManageDao; import com.sipai.entity.process.TestIndexManage; import com.sipai.entity.process.TestMethods; import com.sipai.service.process.TestIndexManageService; import com.sipai.service.process.TestMethodsService; -import com.sipai.service.work.CameraService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; @Service public class TestIndexManageServiceImpl implements TestIndexManageService { diff --git a/src/main/java/com/sipai/service/process/impl/TestMethodsServiceImpl.java b/src/main/java/com/sipai/service/process/impl/TestMethodsServiceImpl.java index 61b93c18..30114313 100644 --- a/src/main/java/com/sipai/service/process/impl/TestMethodsServiceImpl.java +++ b/src/main/java/com/sipai/service/process/impl/TestMethodsServiceImpl.java @@ -1,19 +1,12 @@ package com.sipai.service.process.impl; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import javax.annotation.Resource; - -import net.sf.json.JSONArray; - -import org.springframework.stereotype.Service; import com.sipai.dao.process.TestMethodsDao; import com.sipai.entity.process.TestMethods; import com.sipai.service.process.TestMethodsService; -import com.sipai.service.work.CameraService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class TestMethodsServiceImpl implements TestMethodsService { @Resource diff --git a/src/main/java/com/sipai/service/process/impl/TestTaskServiceImpl.java b/src/main/java/com/sipai/service/process/impl/TestTaskServiceImpl.java index 4516c18b..7fe3b9a6 100644 --- a/src/main/java/com/sipai/service/process/impl/TestTaskServiceImpl.java +++ b/src/main/java/com/sipai/service/process/impl/TestTaskServiceImpl.java @@ -1,22 +1,15 @@ package com.sipai.service.process.impl; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import javax.annotation.Resource; - -import net.sf.json.JSONArray; - -import org.springframework.stereotype.Service; import com.sipai.dao.process.TestTaskDao; import com.sipai.entity.process.TestIndexManage; -import com.sipai.entity.process.TestMethods; import com.sipai.entity.process.TestTask; import com.sipai.service.process.TestIndexManageService; import com.sipai.service.process.TestTaskService; import com.sipai.service.user.UserService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class TestTaskServiceImpl implements TestTaskService { @Resource diff --git a/src/main/java/com/sipai/service/process/impl/WaterTestDetailServiceImpl.java b/src/main/java/com/sipai/service/process/impl/WaterTestDetailServiceImpl.java index 76e3a429..ec85c4aa 100644 --- a/src/main/java/com/sipai/service/process/impl/WaterTestDetailServiceImpl.java +++ b/src/main/java/com/sipai/service/process/impl/WaterTestDetailServiceImpl.java @@ -1,6 +1,5 @@ package com.sipai.service.process.impl; -import com.sipai.dao.process.LibraryWaterTestDao; import com.sipai.dao.process.WaterTestDetailDao; import com.sipai.entity.document.DocFileRelation; import com.sipai.entity.process.LibraryWaterTest; @@ -13,7 +12,6 @@ import com.sipai.service.user.UserService; import org.springframework.stereotype.Service; import javax.annotation.Resource; - import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/com/sipai/service/process/impl/WaterTestServiceImpl.java b/src/main/java/com/sipai/service/process/impl/WaterTestServiceImpl.java index 4e6a0e84..bfad32c8 100644 --- a/src/main/java/com/sipai/service/process/impl/WaterTestServiceImpl.java +++ b/src/main/java/com/sipai/service/process/impl/WaterTestServiceImpl.java @@ -8,7 +8,6 @@ import com.sipai.entity.business.BusinessUnitRecord; import com.sipai.entity.maintenance.MaintenanceCommString; import com.sipai.entity.process.ProcessAdjustment; import com.sipai.entity.process.WaterTest; -import com.sipai.entity.process.WaterTest; import com.sipai.entity.user.User; import com.sipai.service.activiti.WorkflowProcessDefinitionService; import com.sipai.service.activiti.WorkflowService; diff --git a/src/main/java/com/sipai/service/question/QuesTitleService.java b/src/main/java/com/sipai/service/question/QuesTitleService.java index 7521ad50..b2ac5b53 100644 --- a/src/main/java/com/sipai/service/question/QuesTitleService.java +++ b/src/main/java/com/sipai/service/question/QuesTitleService.java @@ -13,7 +13,6 @@ import org.apache.poi.hssf.usermodel.HSSFCell; 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.Cell; import org.apache.poi.ss.usermodel.CellType; import org.apache.poi.ss.usermodel.DateUtil; import org.apache.poi.xssf.usermodel.XSSFCell; diff --git a/src/main/java/com/sipai/service/report/CustomReportMPointService.java b/src/main/java/com/sipai/service/report/CustomReportMPointService.java index aee0b47c..063e7b27 100644 --- a/src/main/java/com/sipai/service/report/CustomReportMPointService.java +++ b/src/main/java/com/sipai/service/report/CustomReportMPointService.java @@ -1,17 +1,16 @@ package com.sipai.service.report; -import java.util.List; - -import javax.annotation.Resource; - -import com.sipai.entity.base.Result; -import org.springframework.stereotype.Service; import com.sipai.dao.equipment.EquipmentCardPropDao; import com.sipai.dao.report.CustomReportMPointDao; +import com.sipai.entity.base.Result; import com.sipai.entity.report.CustomReportMPoint; import com.sipai.entity.scada.MPoint; import com.sipai.service.scada.MPointService; import com.sipai.tools.CommService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class CustomReportMPointService implements CommService{ diff --git a/src/main/java/com/sipai/service/report/CustomReportService.java b/src/main/java/com/sipai/service/report/CustomReportService.java index 913f4646..8041869d 100644 --- a/src/main/java/com/sipai/service/report/CustomReportService.java +++ b/src/main/java/com/sipai/service/report/CustomReportService.java @@ -1,31 +1,25 @@ package com.sipai.service.report; -import java.io.IOException; -import java.io.OutputStream; -import java.net.URLEncoder; -import java.sql.ResultSet; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletResponse; - +import com.sipai.dao.report.CustomReportDao; +import com.sipai.entity.report.CustomReport; +import com.sipai.tools.CommService; import com.sipai.tools.CommUtil; import net.sf.json.JSONArray; - import net.sf.json.JSONObject; import org.apache.poi.hssf.usermodel.*; -import org.apache.poi.hssf.util.HSSFColor; import org.apache.poi.ss.usermodel.*; import org.apache.poi.ss.util.CellRangeAddress; import org.springframework.stereotype.Service; -import com.sipai.dao.equipment.EquipmentCardPropDao; -import com.sipai.dao.report.CustomReportDao; -import com.sipai.entity.report.CustomReport; -import com.sipai.tools.CommService; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.io.OutputStream; +import java.net.URLEncoder; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; @Service("customReportService") public class CustomReportService implements CommService { diff --git a/src/main/java/com/sipai/service/report/DrainageDataomprehensiveTableConfigureService.java b/src/main/java/com/sipai/service/report/DrainageDataomprehensiveTableConfigureService.java index bb6ed44d..dd2cc7fb 100644 --- a/src/main/java/com/sipai/service/report/DrainageDataomprehensiveTableConfigureService.java +++ b/src/main/java/com/sipai/service/report/DrainageDataomprehensiveTableConfigureService.java @@ -1,20 +1,17 @@ package com.sipai.service.report; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import javax.annotation.Resource; - -import net.sf.json.JSONArray; - -import org.springframework.stereotype.Service; - import com.sipai.dao.report.DrainageDataomprehensiveTableConfigureDao; import com.sipai.dao.timeefficiency.PatrolAreaDao; import com.sipai.entity.report.DrainageDataomprehensiveTableConfigure; import com.sipai.tools.CommService; +import net.sf.json.JSONArray; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; @Service public class DrainageDataomprehensiveTableConfigureService implements CommService{ diff --git a/src/main/java/com/sipai/service/report/DrainageDataomprehensiveTableMainconfigureDetailService.java b/src/main/java/com/sipai/service/report/DrainageDataomprehensiveTableMainconfigureDetailService.java index 4daf8636..96083cef 100644 --- a/src/main/java/com/sipai/service/report/DrainageDataomprehensiveTableMainconfigureDetailService.java +++ b/src/main/java/com/sipai/service/report/DrainageDataomprehensiveTableMainconfigureDetailService.java @@ -1,18 +1,12 @@ package com.sipai.service.report; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.sipai.dao.report.DrainageDataomprehensiveTableMainconfigureDetailDao; -import com.sipai.entity.report.DrainageDataomprehensiveTableMainconfigure; import com.sipai.entity.report.DrainageDataomprehensiveTableMainconfigureDetail; import com.sipai.tools.CommService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class DrainageDataomprehensiveTableMainconfigureDetailService implements CommService{ diff --git a/src/main/java/com/sipai/service/report/DrainageDataomprehensiveTableMainconfigureService.java b/src/main/java/com/sipai/service/report/DrainageDataomprehensiveTableMainconfigureService.java index 9212c12d..e69a5581 100644 --- a/src/main/java/com/sipai/service/report/DrainageDataomprehensiveTableMainconfigureService.java +++ b/src/main/java/com/sipai/service/report/DrainageDataomprehensiveTableMainconfigureService.java @@ -1,21 +1,17 @@ package com.sipai.service.report; +import com.sipai.dao.report.DrainageDataomprehensiveTableMainconfigureDao; +import com.sipai.entity.report.DrainageDataomprehensiveTableMainconfigure; +import com.sipai.tools.CommService; +import net.sf.json.JSONArray; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.annotation.Resource; - -import net.sf.json.JSONArray; - -import org.springframework.stereotype.Service; - -import com.sipai.dao.report.DrainageDataomprehensiveTableMainconfigureDao; -import com.sipai.entity.report.DrainageDataomprehensiveTableConfigure; -import com.sipai.entity.report.DrainageDataomprehensiveTableMainconfigure; -import com.sipai.tools.CommService; - @Service public class DrainageDataomprehensiveTableMainconfigureService implements CommService{ @Resource diff --git a/src/main/java/com/sipai/service/report/DrainageDataomprehensiveTableService.java b/src/main/java/com/sipai/service/report/DrainageDataomprehensiveTableService.java index 37552804..68689198 100644 --- a/src/main/java/com/sipai/service/report/DrainageDataomprehensiveTableService.java +++ b/src/main/java/com/sipai/service/report/DrainageDataomprehensiveTableService.java @@ -1,15 +1,13 @@ package com.sipai.service.report; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.sipai.dao.report.DrainageDataomprehensiveTableDao; import com.sipai.dao.timeefficiency.PatrolAreaDao; import com.sipai.entity.report.DrainageDataomprehensiveTable; import com.sipai.tools.CommService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class DrainageDataomprehensiveTableService implements CommService{ diff --git a/src/main/java/com/sipai/service/report/ReportEnergyPumpService.java b/src/main/java/com/sipai/service/report/ReportEnergyPumpService.java index 54fb7462..5b095f3d 100644 --- a/src/main/java/com/sipai/service/report/ReportEnergyPumpService.java +++ b/src/main/java/com/sipai/service/report/ReportEnergyPumpService.java @@ -1,21 +1,13 @@ package com.sipai.service.report; -import java.util.ArrayList; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - -import com.sipai.dao.report.ReportTemplateDao; import com.sipai.entity.report.ReportEnergyPump; import com.sipai.entity.report.ReportEnergyPumpParam; -import com.sipai.entity.report.ReportTemplate; -import com.sipai.entity.report.TemplateType; -import com.sipai.entity.scada.MPointHistory; import com.sipai.service.scada.MPointHistoryService; -import com.sipai.service.scada.MPointService; -import com.sipai.tools.CommService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; /**二级水泵运行记录能耗报表 * @author 12235 * diff --git a/src/main/java/com/sipai/service/report/ReportTemplateService.java b/src/main/java/com/sipai/service/report/ReportTemplateService.java index 2a5982ef..1f893217 100644 --- a/src/main/java/com/sipai/service/report/ReportTemplateService.java +++ b/src/main/java/com/sipai/service/report/ReportTemplateService.java @@ -1,23 +1,19 @@ package com.sipai.service.report; -import java.io.IOException; -import java.io.InputStream; -import java.util.List; -import java.util.Properties; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.alibaba.fastjson.JSONObject; import com.sipai.dao.report.ReportTemplateDao; import com.sipai.entity.base.CommonFile; import com.sipai.entity.report.ReportTemplate; import com.sipai.entity.report.TemplateType; import com.sipai.service.base.CommonFileService; import com.sipai.service.msg.MsgServiceImpl; -import com.sipai.tools.FileUtil; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; +import java.io.IOException; +import java.io.InputStream; +import java.util.List; +import java.util.Properties; @Service public class ReportTemplateService{ diff --git a/src/main/java/com/sipai/service/report/ReportWaterBackWashEquipmentService.java b/src/main/java/com/sipai/service/report/ReportWaterBackWashEquipmentService.java index d81a2e01..c64fde3a 100644 --- a/src/main/java/com/sipai/service/report/ReportWaterBackWashEquipmentService.java +++ b/src/main/java/com/sipai/service/report/ReportWaterBackWashEquipmentService.java @@ -1,38 +1,19 @@ package com.sipai.service.report; -import java.io.IOException; -import java.io.InputStream; +import com.sipai.entity.report.ReportWaterBackWashEquipment; +import com.sipai.entity.report.TemplateType; +import com.sipai.entity.scada.MPointHistory; +import com.sipai.service.scada.MPointHistoryService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; import java.math.BigDecimal; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Calendar; import java.util.Date; -import java.util.HashMap; import java.util.List; -import java.util.Properties; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; -import com.google.gson.Gson; -import com.sipai.dao.report.ReportTemplateDao; -import com.sipai.entity.report.ReportEnergyPump; -import com.sipai.entity.report.ReportEnergyPumpParam; -import com.sipai.entity.report.ReportTemplate; -import com.sipai.entity.report.ReportWaterBackWashEquipment; -import com.sipai.entity.report.ReportWaterOutletPump; -import com.sipai.entity.report.TemplateType; -import com.sipai.entity.scada.MPointHistory; -import com.sipai.service.msg.MsgServiceImpl; -import com.sipai.service.scada.MPointHistoryService; -import com.sipai.service.scada.MPointService; -import com.sipai.tools.CommService; -import com.sipai.tools.CommUtil; -import com.sun.xml.xsom.impl.scd.Iterators.Map; @Service public class ReportWaterBackWashEquipmentService implements BaseService{ diff --git a/src/main/java/com/sipai/service/report/ReportWaterInAndOutFlowService.java b/src/main/java/com/sipai/service/report/ReportWaterInAndOutFlowService.java index 5910fa1c..d8e3025b 100644 --- a/src/main/java/com/sipai/service/report/ReportWaterInAndOutFlowService.java +++ b/src/main/java/com/sipai/service/report/ReportWaterInAndOutFlowService.java @@ -1,42 +1,19 @@ package com.sipai.service.report; -import groovy.sql.OutParameter; +import com.sipai.entity.report.ReportWaterInAndOutFlow; +import com.sipai.entity.report.TemplateType; +import com.sipai.entity.scada.MPointHistory; +import com.sipai.service.scada.MPointHistoryService; +import org.springframework.stereotype.Service; -import java.io.IOException; -import java.io.InputStream; +import javax.annotation.Resource; import java.math.BigDecimal; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Calendar; import java.util.Date; -import java.util.HashMap; import java.util.List; -import java.util.Properties; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; -import com.google.gson.Gson; -import com.sipai.dao.report.ReportTemplateDao; -import com.sipai.entity.report.ReportEnergyPump; -import com.sipai.entity.report.ReportEnergyPumpParam; -import com.sipai.entity.report.ReportTemplate; -import com.sipai.entity.report.ReportWaterBackWashEquipment; -import com.sipai.entity.report.ReportWaterInAndOutFlow; -import com.sipai.entity.report.ReportWaterOutletPump; -import com.sipai.entity.report.ReportWaterTlc; -import com.sipai.entity.report.TemplateType; -import com.sipai.entity.scada.MPointHistory; -import com.sipai.service.msg.MsgServiceImpl; -import com.sipai.service.scada.MPointHistoryService; -import com.sipai.service.scada.MPointService; -import com.sipai.tools.CommService; -import com.sipai.tools.CommUtil; -import com.sun.xml.xsom.impl.scd.Iterators.Map; @Service public class ReportWaterInAndOutFlowService implements BaseService{ diff --git a/src/main/java/com/sipai/service/report/ReportWaterInAndOutParamService.java b/src/main/java/com/sipai/service/report/ReportWaterInAndOutParamService.java index ed6387f8..515a9101 100644 --- a/src/main/java/com/sipai/service/report/ReportWaterInAndOutParamService.java +++ b/src/main/java/com/sipai/service/report/ReportWaterInAndOutParamService.java @@ -1,5 +1,12 @@ package com.sipai.service.report; +import com.sipai.entity.report.ReportWaterTlc; +import com.sipai.entity.report.TemplateType; +import com.sipai.entity.scada.MPointHistory; +import com.sipai.service.scada.MPointHistoryService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; import java.math.BigDecimal; import java.text.ParseException; import java.text.SimpleDateFormat; @@ -7,22 +14,6 @@ import java.util.ArrayList; import java.util.Calendar; import java.util.Date; import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - -import com.sipai.dao.report.ReportTemplateDao; -import com.sipai.entity.report.ReportEnergyPump; -import com.sipai.entity.report.ReportEnergyPumpParam; -import com.sipai.entity.report.ReportTemplate; -import com.sipai.entity.report.ReportWaterTlc; -import com.sipai.entity.report.TemplateType; -import com.sipai.entity.scada.MPointHistory; -import com.sipai.service.scada.MPointHistoryService; -import com.sipai.service.scada.MPointService; -import com.sipai.tools.CommService; -import com.sipai.tools.CommUtil; /**进出水参数报表 * @author 12235 * diff --git a/src/main/java/com/sipai/service/report/ReportWaterMlcService.java b/src/main/java/com/sipai/service/report/ReportWaterMlcService.java index 11e2d0d3..2d462ee2 100644 --- a/src/main/java/com/sipai/service/report/ReportWaterMlcService.java +++ b/src/main/java/com/sipai/service/report/ReportWaterMlcService.java @@ -1,5 +1,12 @@ package com.sipai.service.report; +import com.sipai.entity.report.ReportWaterTlc; +import com.sipai.entity.report.TemplateType; +import com.sipai.entity.scada.MPointHistory; +import com.sipai.service.scada.MPointHistoryService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; import java.math.BigDecimal; import java.text.ParseException; import java.text.SimpleDateFormat; @@ -7,22 +14,6 @@ import java.util.ArrayList; import java.util.Calendar; import java.util.Date; import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - -import com.sipai.dao.report.ReportTemplateDao; -import com.sipai.entity.report.ReportEnergyPump; -import com.sipai.entity.report.ReportEnergyPumpParam; -import com.sipai.entity.report.ReportTemplate; -import com.sipai.entity.report.ReportWaterTlc; -import com.sipai.entity.report.TemplateType; -import com.sipai.entity.scada.MPointHistory; -import com.sipai.service.scada.MPointHistoryService; -import com.sipai.service.scada.MPointService; -import com.sipai.tools.CommService; -import com.sipai.tools.CommUtil; /**膜滤池、中和池、清水池工艺参数报表 * @author 12235 * diff --git a/src/main/java/com/sipai/service/report/ReportWaterOutletPumpService.java b/src/main/java/com/sipai/service/report/ReportWaterOutletPumpService.java index f9cdf1a4..88dd8d8b 100644 --- a/src/main/java/com/sipai/service/report/ReportWaterOutletPumpService.java +++ b/src/main/java/com/sipai/service/report/ReportWaterOutletPumpService.java @@ -1,41 +1,19 @@ package com.sipai.service.report; -import groovy.sql.OutParameter; +import com.sipai.entity.report.ReportWaterOutletPump; +import com.sipai.entity.report.TemplateType; +import com.sipai.entity.scada.MPointHistory; +import com.sipai.service.scada.MPointHistoryService; +import org.springframework.stereotype.Service; -import java.io.IOException; -import java.io.InputStream; +import javax.annotation.Resource; import java.math.BigDecimal; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Calendar; import java.util.Date; -import java.util.HashMap; import java.util.List; -import java.util.Properties; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; -import com.google.gson.Gson; -import com.sipai.dao.report.ReportTemplateDao; -import com.sipai.entity.report.ReportEnergyPump; -import com.sipai.entity.report.ReportEnergyPumpParam; -import com.sipai.entity.report.ReportTemplate; -import com.sipai.entity.report.ReportWaterBackWashEquipment; -import com.sipai.entity.report.ReportWaterOutletPump; -import com.sipai.entity.report.ReportWaterTlc; -import com.sipai.entity.report.TemplateType; -import com.sipai.entity.scada.MPointHistory; -import com.sipai.service.msg.MsgServiceImpl; -import com.sipai.service.scada.MPointHistoryService; -import com.sipai.service.scada.MPointService; -import com.sipai.tools.CommService; -import com.sipai.tools.CommUtil; -import com.sun.xml.xsom.impl.scd.Iterators.Map; @Service public class ReportWaterOutletPumpService implements BaseService{ diff --git a/src/main/java/com/sipai/service/report/ReportWaterTlcService.java b/src/main/java/com/sipai/service/report/ReportWaterTlcService.java index dc31d3e9..db233109 100644 --- a/src/main/java/com/sipai/service/report/ReportWaterTlcService.java +++ b/src/main/java/com/sipai/service/report/ReportWaterTlcService.java @@ -1,5 +1,12 @@ package com.sipai.service.report; +import com.sipai.entity.report.ReportWaterTlc; +import com.sipai.entity.report.TemplateType; +import com.sipai.entity.scada.MPointHistory; +import com.sipai.service.scada.MPointHistoryService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; import java.math.BigDecimal; import java.text.ParseException; import java.text.SimpleDateFormat; @@ -7,22 +14,6 @@ import java.util.ArrayList; import java.util.Calendar; import java.util.Date; import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - -import com.sipai.dao.report.ReportTemplateDao; -import com.sipai.entity.report.ReportEnergyPump; -import com.sipai.entity.report.ReportEnergyPumpParam; -import com.sipai.entity.report.ReportTemplate; -import com.sipai.entity.report.ReportWaterTlc; -import com.sipai.entity.report.TemplateType; -import com.sipai.entity.scada.MPointHistory; -import com.sipai.service.scada.MPointHistoryService; -import com.sipai.service.scada.MPointService; -import com.sipai.tools.CommService; -import com.sipai.tools.CommUtil; /**炭滤池工艺参数报表 * @author 12235 * diff --git a/src/main/java/com/sipai/service/report/ReportWaterTsjfService.java b/src/main/java/com/sipai/service/report/ReportWaterTsjfService.java index 38e2d0c9..1bad36fe 100644 --- a/src/main/java/com/sipai/service/report/ReportWaterTsjfService.java +++ b/src/main/java/com/sipai/service/report/ReportWaterTsjfService.java @@ -1,5 +1,12 @@ package com.sipai.service.report; +import com.sipai.entity.report.ReportWaterTlc; +import com.sipai.entity.report.TemplateType; +import com.sipai.entity.scada.MPointHistory; +import com.sipai.service.scada.MPointHistoryService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; import java.math.BigDecimal; import java.text.ParseException; import java.text.SimpleDateFormat; @@ -7,22 +14,6 @@ import java.util.ArrayList; import java.util.Calendar; import java.util.Date; import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - -import com.sipai.dao.report.ReportTemplateDao; -import com.sipai.entity.report.ReportEnergyPump; -import com.sipai.entity.report.ReportEnergyPumpParam; -import com.sipai.entity.report.ReportTemplate; -import com.sipai.entity.report.ReportWaterTlc; -import com.sipai.entity.report.TemplateType; -import com.sipai.entity.scada.MPointHistory; -import com.sipai.service.scada.MPointHistoryService; -import com.sipai.service.scada.MPointService; -import com.sipai.tools.CommService; -import com.sipai.tools.CommUtil; /**脱水机房、污泥浓缩池工艺参数报表 * @author 12235 * diff --git a/src/main/java/com/sipai/service/report/RptCollectModeService.java b/src/main/java/com/sipai/service/report/RptCollectModeService.java index e0e2c543..063d756d 100644 --- a/src/main/java/com/sipai/service/report/RptCollectModeService.java +++ b/src/main/java/com/sipai/service/report/RptCollectModeService.java @@ -1,8 +1,10 @@ package com.sipai.service.report; +import com.sipai.entity.report.RptCollectMode; + import java.util.List; -import com.sipai.entity.report.RptCollectMode;; +; public interface RptCollectModeService { diff --git a/src/main/java/com/sipai/service/report/RptCollectModeServiceImpl.java b/src/main/java/com/sipai/service/report/RptCollectModeServiceImpl.java index 84aaf166..06e41da6 100644 --- a/src/main/java/com/sipai/service/report/RptCollectModeServiceImpl.java +++ b/src/main/java/com/sipai/service/report/RptCollectModeServiceImpl.java @@ -1,13 +1,11 @@ package com.sipai.service.report; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.sipai.dao.report.RptCollectModeDao; import com.sipai.entity.report.RptCollectMode; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class RptCollectModeServiceImpl implements RptCollectModeService{ diff --git a/src/main/java/com/sipai/service/report/RptCreateService.java b/src/main/java/com/sipai/service/report/RptCreateService.java index b7f706ab..3abb569c 100644 --- a/src/main/java/com/sipai/service/report/RptCreateService.java +++ b/src/main/java/com/sipai/service/report/RptCreateService.java @@ -1,21 +1,17 @@ package com.sipai.service.report; +import com.sipai.entity.business.BusinessUnitAudit; +import com.sipai.entity.report.RptCreate; +import org.xmlpull.v1.XmlPullParserException; + +import javax.xml.parsers.ParserConfigurationException; +import javax.xml.transform.TransformerException; +import javax.xml.transform.TransformerFactoryConfigurationError; import java.io.IOException; import java.security.InvalidKeyException; import java.security.NoSuchAlgorithmException; import java.util.List; -import javax.servlet.http.HttpServletRequest; -import javax.xml.parsers.ParserConfigurationException; -import javax.xml.transform.TransformerException; -import javax.xml.transform.TransformerFactoryConfigurationError; - -import com.sipai.entity.business.BusinessUnitAudit; -import com.sipai.entity.process.ProcessAdjustment; -import com.sipai.entity.report.RptCreate; -import com.sipai.entity.report.RptInfoSet; -import org.xmlpull.v1.XmlPullParserException; - public interface RptCreateService { public abstract RptCreate selectById(String id); diff --git a/src/main/java/com/sipai/service/report/RptDayValSetService.java b/src/main/java/com/sipai/service/report/RptDayValSetService.java index dfaed9cc..fa6f4c4a 100644 --- a/src/main/java/com/sipai/service/report/RptDayValSetService.java +++ b/src/main/java/com/sipai/service/report/RptDayValSetService.java @@ -1,6 +1,7 @@ package com.sipai.service.report; import com.sipai.entity.report.RptDayValSet; + import java.util.List; public interface RptDayValSetService { diff --git a/src/main/java/com/sipai/service/report/RptDeptSetService.java b/src/main/java/com/sipai/service/report/RptDeptSetService.java index d229c20e..c3222058 100644 --- a/src/main/java/com/sipai/service/report/RptDeptSetService.java +++ b/src/main/java/com/sipai/service/report/RptDeptSetService.java @@ -1,10 +1,10 @@ package com.sipai.service.report; +import com.sipai.entity.report.RptDeptSet; + import java.util.List; import java.util.Map; -import com.sipai.entity.report.RptDeptSet; - public interface RptDeptSetService { public abstract RptDeptSet selectById(String id); diff --git a/src/main/java/com/sipai/service/report/RptDeptSetUserService.java b/src/main/java/com/sipai/service/report/RptDeptSetUserService.java index 7e94813d..7fb2ed01 100644 --- a/src/main/java/com/sipai/service/report/RptDeptSetUserService.java +++ b/src/main/java/com/sipai/service/report/RptDeptSetUserService.java @@ -1,9 +1,8 @@ package com.sipai.service.report; -import java.util.List; - import com.sipai.entity.report.RptDeptSetUser; -import com.sipai.entity.user.Unit; + +import java.util.List; public interface RptDeptSetUserService { diff --git a/src/main/java/com/sipai/service/report/RptInfoSetFileService.java b/src/main/java/com/sipai/service/report/RptInfoSetFileService.java index e629d762..a322570e 100644 --- a/src/main/java/com/sipai/service/report/RptInfoSetFileService.java +++ b/src/main/java/com/sipai/service/report/RptInfoSetFileService.java @@ -1,8 +1,9 @@ package com.sipai.service.report; -import java.util.List; import com.sipai.entity.report.RptInfoSetFile; +import java.util.List; + public interface RptInfoSetFileService { public abstract RptInfoSetFile selectById(String id); diff --git a/src/main/java/com/sipai/service/report/RptInfoSetService.java b/src/main/java/com/sipai/service/report/RptInfoSetService.java index 3154212c..2363adf7 100644 --- a/src/main/java/com/sipai/service/report/RptInfoSetService.java +++ b/src/main/java/com/sipai/service/report/RptInfoSetService.java @@ -1,11 +1,10 @@ package com.sipai.service.report; +import com.sipai.entity.report.RptInfoSet; + import java.util.List; import java.util.Map; -import com.sipai.entity.report.RptInfoSet; -import com.sipai.entity.report.RptTypeSet; - public interface RptInfoSetService { /* (non-Javadoc) diff --git a/src/main/java/com/sipai/service/report/RptInfoSetSheetService.java b/src/main/java/com/sipai/service/report/RptInfoSetSheetService.java index 46e12339..c08b61b2 100644 --- a/src/main/java/com/sipai/service/report/RptInfoSetSheetService.java +++ b/src/main/java/com/sipai/service/report/RptInfoSetSheetService.java @@ -1,6 +1,7 @@ package com.sipai.service.report; import com.sipai.entity.report.RptInfoSetSheet; + import java.util.List; /** diff --git a/src/main/java/com/sipai/service/report/RptLogService.java b/src/main/java/com/sipai/service/report/RptLogService.java index bfbdd661..69541d62 100644 --- a/src/main/java/com/sipai/service/report/RptLogService.java +++ b/src/main/java/com/sipai/service/report/RptLogService.java @@ -1,13 +1,11 @@ package com.sipai.service.report; -import java.io.IOException; -import java.util.List; - import com.sipai.entity.report.RptLog; -import net.sf.json.JSONObject; import javax.xml.parsers.ParserConfigurationException; import javax.xml.transform.TransformerException; +import java.io.IOException; +import java.util.List; public interface RptLogService { diff --git a/src/main/java/com/sipai/service/report/RptMpSetService.java b/src/main/java/com/sipai/service/report/RptMpSetService.java index 18bd64c0..d1084fa8 100644 --- a/src/main/java/com/sipai/service/report/RptMpSetService.java +++ b/src/main/java/com/sipai/service/report/RptMpSetService.java @@ -1,9 +1,9 @@ package com.sipai.service.report; -import java.util.List; - import com.sipai.entity.report.RptMpSet; +import java.util.List; + public interface RptMpSetService { public abstract RptMpSet selectById(String id); diff --git a/src/main/java/com/sipai/service/report/RptSpSetService.java b/src/main/java/com/sipai/service/report/RptSpSetService.java index d7190015..0fb0a619 100644 --- a/src/main/java/com/sipai/service/report/RptSpSetService.java +++ b/src/main/java/com/sipai/service/report/RptSpSetService.java @@ -1,9 +1,9 @@ package com.sipai.service.report; -import java.util.List; - import com.sipai.entity.report.RptSpSet; +import java.util.List; + public interface RptSpSetService { /* (non-Javadoc) diff --git a/src/main/java/com/sipai/service/report/RptTypeSetService.java b/src/main/java/com/sipai/service/report/RptTypeSetService.java index af3a49b0..7a4e40c6 100644 --- a/src/main/java/com/sipai/service/report/RptTypeSetService.java +++ b/src/main/java/com/sipai/service/report/RptTypeSetService.java @@ -1,8 +1,9 @@ package com.sipai.service.report; -import java.util.List; import com.sipai.entity.report.RptTypeSet; +import java.util.List; + public interface RptTypeSetService { public abstract RptTypeSet selectById(String id); diff --git a/src/main/java/com/sipai/service/report/TemplateTypeService.java b/src/main/java/com/sipai/service/report/TemplateTypeService.java index 2fa75818..a48ed0b8 100644 --- a/src/main/java/com/sipai/service/report/TemplateTypeService.java +++ b/src/main/java/com/sipai/service/report/TemplateTypeService.java @@ -1,14 +1,12 @@ package com.sipai.service.report; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.sipai.dao.report.TemplateTypeDao; import com.sipai.entity.report.TemplateType; import com.sipai.tools.CommService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class TemplateTypeService implements CommService{ diff --git a/src/main/java/com/sipai/service/report/impl/RptCreateServiceImpl.java b/src/main/java/com/sipai/service/report/impl/RptCreateServiceImpl.java index 4673fa84..2109e705 100644 --- a/src/main/java/com/sipai/service/report/impl/RptCreateServiceImpl.java +++ b/src/main/java/com/sipai/service/report/impl/RptCreateServiceImpl.java @@ -1,63 +1,34 @@ package com.sipai.service.report.impl; -import java.io.*; -import java.math.BigDecimal; -import java.security.InvalidKeyException; -import java.security.NoSuchAlgorithmException; -import java.text.*; -import java.util.*; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -import javax.annotation.Resource; -import javax.servlet.ServletContext; -import javax.servlet.ServletContextEvent; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.xml.parsers.DocumentBuilderFactory; -import javax.xml.parsers.ParserConfigurationException; -import javax.xml.transform.OutputKeys; -import javax.xml.transform.Transformer; -import javax.xml.transform.TransformerException; -import javax.xml.transform.TransformerFactory; -import javax.xml.transform.TransformerFactoryConfigurationError; -import javax.xml.transform.dom.DOMSource; -import javax.xml.transform.stream.StreamResult; - - import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; +import com.sipai.dao.report.RptCreateDao; import com.sipai.entity.activiti.ProcessType; import com.sipai.entity.base.BusinessUnitAdapter; -import com.sipai.entity.base.CommonFile; import com.sipai.entity.business.BusinessUnitAudit; -import com.sipai.entity.business.BusinessUnitRecord; -import com.sipai.entity.maintenance.Abnormity; +import com.sipai.entity.enums.FileNameSpaceEnum; import com.sipai.entity.maintenance.MaintenanceCommString; -import com.sipai.entity.process.ProcessAdjustment; import com.sipai.entity.report.*; import com.sipai.entity.scada.MPoint; import com.sipai.entity.scada.TempReport; +import com.sipai.entity.user.User; import com.sipai.entity.work.GroupDetail; import com.sipai.entity.work.Scheduling; -import com.sipai.entity.workorder.WorkorderDetail; import com.sipai.service.activiti.WorkflowProcessDefinitionService; import com.sipai.service.activiti.WorkflowService; +import com.sipai.service.base.CommonFileService; import com.sipai.service.business.BusinessUnitAuditService; import com.sipai.service.business.BusinessUnitHandleDetailService; import com.sipai.service.report.*; import com.sipai.service.scada.MPointService; import com.sipai.service.scada.TempReportService; +import com.sipai.service.user.UserService; import com.sipai.service.work.GroupDetailService; import com.sipai.service.work.SchedulingService; import com.sipai.tools.*; -import com.sun.scenario.effect.impl.sw.sse.SSEBlend_SRC_OUTPeer; import io.minio.MinioClient; -import io.minio.errors.InvalidEndpointException; -import io.minio.errors.InvalidPortException; import io.minio.errors.MinioException; -import net.sf.json.JsonConfig; import org.activiti.engine.repository.ProcessDefinition; import org.activiti.engine.runtime.ProcessInstance; import org.activiti.engine.task.Task; @@ -65,30 +36,35 @@ import org.apache.commons.lang3.StringUtils; import org.apache.poi.hssf.converter.ExcelToHtmlConverter; import org.apache.poi.hssf.usermodel.*; import org.apache.poi.hssf.util.HSSFColor; -import org.apache.poi.ss.formula.ConditionalFormattingEvaluator; -import org.apache.poi.ss.formula.EvaluationConditionalFormatRule; -import org.apache.poi.ss.formula.WorkbookEvaluatorProvider; import org.apache.poi.ss.usermodel.*; import org.apache.poi.ss.usermodel.DateUtil; import org.apache.poi.ss.util.CellRangeAddress; -import org.apache.poi.util.StringUtil; -import org.apache.poi.xssf.usermodel.*; -import org.dom4j.Document; +import org.apache.poi.xssf.usermodel.XSSFColor; +import org.apache.poi.xssf.usermodel.XSSFSheet; +import org.apache.poi.xssf.usermodel.XSSFWorkbook; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; - -import com.sipai.dao.report.RptCreateDao; -import com.sipai.entity.enums.FileNameSpaceEnum; -import com.sipai.entity.user.User; -import com.sipai.service.base.CommonFileService; -import com.sipai.service.user.UserService; import org.springframework.transaction.annotation.Transactional; -import org.springframework.web.multipart.MultipartFile; import org.xmlpull.v1.XmlPullParserException; -import static com.microsoft.schemas.office.visio.x2012.main.CellType.*; -import static org.apache.poi.ss.usermodel.CellType.*; +import javax.annotation.Resource; +import javax.xml.parsers.DocumentBuilderFactory; +import javax.xml.parsers.ParserConfigurationException; +import javax.xml.transform.*; +import javax.xml.transform.dom.DOMSource; +import javax.xml.transform.stream.StreamResult; +import java.io.*; +import java.math.BigDecimal; +import java.security.InvalidKeyException; +import java.security.NoSuchAlgorithmException; +import java.text.DateFormat; +import java.text.DecimalFormat; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.*; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + import static org.apache.poi.ss.usermodel.CellType.FORMULA; @Service("rptCreateService") diff --git a/src/main/java/com/sipai/service/report/impl/RptDeptSetServiceImpl.java b/src/main/java/com/sipai/service/report/impl/RptDeptSetServiceImpl.java index 844d8e69..ffc48fc1 100644 --- a/src/main/java/com/sipai/service/report/impl/RptDeptSetServiceImpl.java +++ b/src/main/java/com/sipai/service/report/impl/RptDeptSetServiceImpl.java @@ -1,24 +1,19 @@ package com.sipai.service.report.impl; +import com.sipai.dao.report.RptDeptSetDao; +import com.sipai.entity.report.RptDeptSet; +import com.sipai.entity.report.RptInfoSet; +import com.sipai.service.report.RptDeptSetService; +import com.sipai.service.user.UnitService; +import net.sf.json.JSONArray; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - -import com.alibaba.fastjson.JSONObject; -import com.sipai.dao.report.RptDeptSetDao; -import com.sipai.entity.report.RptDeptSet; -import com.sipai.entity.report.RptInfoSet; -import com.sipai.entity.user.Unit; -import com.sipai.service.report.RptDeptSetService; -import com.sipai.service.user.UnitService; - -import net.sf.json.JSONArray; - @Service public class RptDeptSetServiceImpl implements RptDeptSetService { @Resource diff --git a/src/main/java/com/sipai/service/report/impl/RptDeptSetUserServiceImpl.java b/src/main/java/com/sipai/service/report/impl/RptDeptSetUserServiceImpl.java index ba58ade0..d883dfab 100644 --- a/src/main/java/com/sipai/service/report/impl/RptDeptSetUserServiceImpl.java +++ b/src/main/java/com/sipai/service/report/impl/RptDeptSetUserServiceImpl.java @@ -1,14 +1,12 @@ package com.sipai.service.report.impl; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.sipai.dao.report.RptDeptSetUserDao; import com.sipai.entity.report.RptDeptSetUser; import com.sipai.service.report.RptDeptSetUserService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class RptDeptSetUserServiceImpl implements RptDeptSetUserService { diff --git a/src/main/java/com/sipai/service/report/impl/RptInfoSetFileServiceImpl.java b/src/main/java/com/sipai/service/report/impl/RptInfoSetFileServiceImpl.java index 4c245307..8e815c50 100644 --- a/src/main/java/com/sipai/service/report/impl/RptInfoSetFileServiceImpl.java +++ b/src/main/java/com/sipai/service/report/impl/RptInfoSetFileServiceImpl.java @@ -1,14 +1,12 @@ package com.sipai.service.report.impl; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.sipai.dao.report.RptInfoSetFileDao; import com.sipai.entity.report.RptInfoSetFile; import com.sipai.service.report.RptInfoSetFileService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class RptInfoSetFileServiceImpl implements RptInfoSetFileService{ diff --git a/src/main/java/com/sipai/service/report/impl/RptInfoSetServiceImpl.java b/src/main/java/com/sipai/service/report/impl/RptInfoSetServiceImpl.java index f2ea834e..3beaf548 100644 --- a/src/main/java/com/sipai/service/report/impl/RptInfoSetServiceImpl.java +++ b/src/main/java/com/sipai/service/report/impl/RptInfoSetServiceImpl.java @@ -1,25 +1,21 @@ package com.sipai.service.report.impl; -import java.util.*; - -import javax.annotation.Resource; - -import com.alibaba.fastjson.JSON; +import com.sipai.dao.report.RptInfoSetDao; +import com.sipai.entity.report.RptInfoSet; import com.sipai.entity.user.Job; import com.sipai.entity.user.Unit; import com.sipai.entity.user.User; import com.sipai.entity.user.UserJob; +import com.sipai.service.report.RptInfoSetService; import com.sipai.service.user.JobService; import com.sipai.service.user.UnitService; import com.sipai.service.user.UserJobService; import com.sipai.service.user.UserService; import net.sf.json.JSONArray; - import org.springframework.stereotype.Service; -import com.sipai.dao.report.RptInfoSetDao; -import com.sipai.entity.report.RptInfoSet; -import com.sipai.service.report.RptInfoSetService; +import javax.annotation.Resource; +import java.util.*; @Service public class RptInfoSetServiceImpl implements RptInfoSetService { diff --git a/src/main/java/com/sipai/service/report/impl/RptMpSetServiceImpl.java b/src/main/java/com/sipai/service/report/impl/RptMpSetServiceImpl.java index b46347eb..834efca0 100644 --- a/src/main/java/com/sipai/service/report/impl/RptMpSetServiceImpl.java +++ b/src/main/java/com/sipai/service/report/impl/RptMpSetServiceImpl.java @@ -1,24 +1,20 @@ package com.sipai.service.report.impl; -import java.util.List; - -import javax.annotation.Resource; - +import com.sipai.dao.report.RptMpSetDao; import com.sipai.entity.report.RptCollectMode; +import com.sipai.entity.report.RptMpSet; import com.sipai.entity.report.RptSpSet; import com.sipai.service.report.RptCollectModeService; +import com.sipai.service.report.RptMpSetService; import com.sipai.service.report.RptSpSetService; import com.sipai.service.scada.MPointService; import com.sipai.tools.CommUtil; - import org.springframework.stereotype.Service; - -import com.sipai.dao.report.RptMpSetDao; -import com.sipai.entity.report.RptMpSet; -import com.sipai.service.report.RptMpSetService; - import org.springframework.transaction.annotation.Transactional; +import javax.annotation.Resource; +import java.util.List; + @Service public class RptMpSetServiceImpl implements RptMpSetService { @Resource diff --git a/src/main/java/com/sipai/service/report/impl/RptSpSetServiceImpl.java b/src/main/java/com/sipai/service/report/impl/RptSpSetServiceImpl.java index 54bc68ec..24eab5f4 100644 --- a/src/main/java/com/sipai/service/report/impl/RptSpSetServiceImpl.java +++ b/src/main/java/com/sipai/service/report/impl/RptSpSetServiceImpl.java @@ -1,16 +1,16 @@ package com.sipai.service.report.impl; -import java.util.List; -import javax.annotation.Resource; - +import com.sipai.dao.report.RptSpSetDao; +import com.sipai.entity.report.RptSpSet; import com.sipai.entity.work.GroupTime; import com.sipai.entity.work.GroupType; +import com.sipai.service.report.RptSpSetService; import com.sipai.service.work.GroupTimeService; import com.sipai.service.work.GroupTypeService; import org.springframework.stereotype.Service; -import com.sipai.dao.report.RptSpSetDao; -import com.sipai.entity.report.RptSpSet; -import com.sipai.service.report.RptSpSetService; + +import javax.annotation.Resource; +import java.util.List; @Service public class RptSpSetServiceImpl implements RptSpSetService { diff --git a/src/main/java/com/sipai/service/report/impl/RptTypeSetServiceImpl.java b/src/main/java/com/sipai/service/report/impl/RptTypeSetServiceImpl.java index 5295edb0..21a94461 100644 --- a/src/main/java/com/sipai/service/report/impl/RptTypeSetServiceImpl.java +++ b/src/main/java/com/sipai/service/report/impl/RptTypeSetServiceImpl.java @@ -1,11 +1,12 @@ package com.sipai.service.report.impl; -import java.util.List; -import javax.annotation.Resource; -import org.springframework.stereotype.Service; import com.sipai.dao.report.RptTypeSetDao; import com.sipai.entity.report.RptTypeSet; import com.sipai.service.report.RptTypeSetService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class RptTypeSetServiceImpl implements RptTypeSetService{ diff --git a/src/main/java/com/sipai/service/safety/SafetyCheckActivityService.java b/src/main/java/com/sipai/service/safety/SafetyCheckActivityService.java index b01da02c..7f5ce535 100644 --- a/src/main/java/com/sipai/service/safety/SafetyCheckActivityService.java +++ b/src/main/java/com/sipai/service/safety/SafetyCheckActivityService.java @@ -13,7 +13,6 @@ import org.activiti.engine.task.Task; import org.springframework.stereotype.Service; import javax.annotation.Resource; -import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/com/sipai/service/safety/SafetyEducationBuilderService.java b/src/main/java/com/sipai/service/safety/SafetyEducationBuilderService.java index f9e9e8f9..cd7f8558 100644 --- a/src/main/java/com/sipai/service/safety/SafetyEducationBuilderService.java +++ b/src/main/java/com/sipai/service/safety/SafetyEducationBuilderService.java @@ -2,7 +2,9 @@ package com.sipai.service.safety; import com.sipai.dao.safety.SafetyEducationBuilderDao; import com.sipai.entity.enums.EnumJsonObject; -import com.sipai.entity.safety.*; +import com.sipai.entity.safety.SafetyCommonQuery; +import com.sipai.entity.safety.SafetyEducationBuilder; +import com.sipai.entity.safety.SafetyEducationBuilderQuery; import com.sipai.tools.CommService; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/sipai/service/safety/SafetyEducationTraineeService.java b/src/main/java/com/sipai/service/safety/SafetyEducationTraineeService.java index c873ec07..7b31d94d 100644 --- a/src/main/java/com/sipai/service/safety/SafetyEducationTraineeService.java +++ b/src/main/java/com/sipai/service/safety/SafetyEducationTraineeService.java @@ -2,7 +2,6 @@ package com.sipai.service.safety; import com.sipai.dao.safety.SafetyEducationTraineeDao; import com.sipai.entity.safety.SafetyCommonQuery; -import com.sipai.entity.safety.SafetyEducationBuilder; import com.sipai.entity.safety.SafetyEducationTrainee; import com.sipai.tools.CommService; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/sipai/service/safety/SafetyEducationVisitorService.java b/src/main/java/com/sipai/service/safety/SafetyEducationVisitorService.java index 6ca12e7c..68cce363 100644 --- a/src/main/java/com/sipai/service/safety/SafetyEducationVisitorService.java +++ b/src/main/java/com/sipai/service/safety/SafetyEducationVisitorService.java @@ -1,21 +1,17 @@ package com.sipai.service.safety; import com.sipai.dao.safety.SafetyEducationVisitorDao; -import com.sipai.entity.base.Result; import com.sipai.entity.safety.SafetyCommonQuery; import com.sipai.entity.safety.SafetyEducationVisitor; import com.sipai.tools.CommService; import org.springframework.stereotype.Service; import javax.annotation.Resource; - import java.sql.Timestamp; import java.text.DateFormat; import java.text.ParseException; import java.text.SimpleDateFormat; -import java.util.Date; import java.util.List; -import java.util.UUID; /** * 访客教育 diff --git a/src/main/java/com/sipai/service/safety/SafetyExternalStaffService.java b/src/main/java/com/sipai/service/safety/SafetyExternalStaffService.java index c8c63d94..a7a1e8a7 100644 --- a/src/main/java/com/sipai/service/safety/SafetyExternalStaffService.java +++ b/src/main/java/com/sipai/service/safety/SafetyExternalStaffService.java @@ -7,7 +7,6 @@ import com.sipai.tools.CommService; import org.springframework.stereotype.Service; import javax.annotation.Resource; -import java.io.IOException; import java.util.List; import java.util.Map; diff --git a/src/main/java/com/sipai/service/safety/SafetyJobInsideService.java b/src/main/java/com/sipai/service/safety/SafetyJobInsideService.java index 7bfe0423..9940f310 100644 --- a/src/main/java/com/sipai/service/safety/SafetyJobInsideService.java +++ b/src/main/java/com/sipai/service/safety/SafetyJobInsideService.java @@ -3,8 +3,10 @@ package com.sipai.service.safety; import com.alibaba.fastjson.JSON; import com.sipai.dao.safety.SafetyJobInsideDao; import com.sipai.entity.enums.EnumJsonObject; -import com.sipai.entity.safety.*; +import com.sipai.entity.safety.SafetyJobCommonQuery; import com.sipai.entity.safety.SafetyJobInside; +import com.sipai.entity.safety.SafetyJobInsideSignInfo; +import com.sipai.entity.safety.SafetyJobInsideVo; import com.sipai.entity.user.User; import com.sipai.service.user.UserService; import com.sipai.tools.CommService; diff --git a/src/main/java/com/sipai/service/safety/SafetyJobOutsideService.java b/src/main/java/com/sipai/service/safety/SafetyJobOutsideService.java index 0270f7f8..9aab0c79 100644 --- a/src/main/java/com/sipai/service/safety/SafetyJobOutsideService.java +++ b/src/main/java/com/sipai/service/safety/SafetyJobOutsideService.java @@ -2,7 +2,9 @@ package com.sipai.service.safety; import com.sipai.dao.safety.SafetyJobOutsideDao; import com.sipai.entity.enums.EnumJsonObject; -import com.sipai.entity.safety.*; +import com.sipai.entity.safety.SafetyJobCommonQuery; +import com.sipai.entity.safety.SafetyJobOutside; +import com.sipai.entity.safety.SafetyJobOutsideVo; import com.sipai.tools.CommService; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/sipai/service/safety/SafetySeqService.java b/src/main/java/com/sipai/service/safety/SafetySeqService.java index 57b5d58f..538c4afe 100644 --- a/src/main/java/com/sipai/service/safety/SafetySeqService.java +++ b/src/main/java/com/sipai/service/safety/SafetySeqService.java @@ -3,7 +3,6 @@ package com.sipai.service.safety; import com.sipai.entity.enums.safety.SafetyFunctionEnum; import com.sipai.entity.user.Company; import com.sipai.entity.user.User; -import com.sipai.redis.RedisUtil; import com.sipai.service.user.UnitService; import org.redisson.api.RBucket; import org.redisson.api.RedissonClient; diff --git a/src/main/java/com/sipai/service/scada/DataSummaryService.java b/src/main/java/com/sipai/service/scada/DataSummaryService.java index da1cd335..9061d5c1 100644 --- a/src/main/java/com/sipai/service/scada/DataSummaryService.java +++ b/src/main/java/com/sipai/service/scada/DataSummaryService.java @@ -1,9 +1,9 @@ package com.sipai.service.scada; -import java.util.List; - import com.sipai.entity.scada.DataSummary; +import java.util.List; + public interface DataSummaryService { public abstract DataSummary selectById(String bizId, String id); diff --git a/src/main/java/com/sipai/service/scada/MPointFormulaAutoHourService.java b/src/main/java/com/sipai/service/scada/MPointFormulaAutoHourService.java index f534df90..08e09c9d 100644 --- a/src/main/java/com/sipai/service/scada/MPointFormulaAutoHourService.java +++ b/src/main/java/com/sipai/service/scada/MPointFormulaAutoHourService.java @@ -1,9 +1,9 @@ package com.sipai.service.scada; -import java.util.List; - import com.sipai.entity.scada.MPointFormulaAutoHour; +import java.util.List; + public interface MPointFormulaAutoHourService { public abstract MPointFormulaAutoHour selectById(String bizId, String id); diff --git a/src/main/java/com/sipai/service/scada/MPointFormulaDenominatorService.java b/src/main/java/com/sipai/service/scada/MPointFormulaDenominatorService.java index 8ab9bdfc..8de43d78 100644 --- a/src/main/java/com/sipai/service/scada/MPointFormulaDenominatorService.java +++ b/src/main/java/com/sipai/service/scada/MPointFormulaDenominatorService.java @@ -1,9 +1,9 @@ package com.sipai.service.scada; -import java.util.List; - import com.sipai.entity.scada.MPointFormulaDenominator; +import java.util.List; + public interface MPointFormulaDenominatorService { public abstract MPointFormulaDenominator selectById(String bizId, String mpointid); diff --git a/src/main/java/com/sipai/service/scada/MPointFormulaService.java b/src/main/java/com/sipai/service/scada/MPointFormulaService.java index 34d8777a..90cdcc2c 100644 --- a/src/main/java/com/sipai/service/scada/MPointFormulaService.java +++ b/src/main/java/com/sipai/service/scada/MPointFormulaService.java @@ -1,13 +1,11 @@ package com.sipai.service.scada; +import com.sipai.entity.scada.MPointFormula; +import com.sipai.entity.scada.MPointHistory; + import java.util.HashMap; import java.util.List; -import com.sipai.entity.scada.MPointHistory; -import org.springframework.transaction.annotation.Transactional; - -import com.sipai.entity.scada.MPointFormula; - public interface MPointFormulaService { public abstract MPointFormula selectById(String bizId, String mpointid); diff --git a/src/main/java/com/sipai/service/scada/MPointProgrammeDetailService.java b/src/main/java/com/sipai/service/scada/MPointProgrammeDetailService.java index 7f3f2d01..73963588 100644 --- a/src/main/java/com/sipai/service/scada/MPointProgrammeDetailService.java +++ b/src/main/java/com/sipai/service/scada/MPointProgrammeDetailService.java @@ -1,9 +1,9 @@ package com.sipai.service.scada; -import org.springframework.transaction.annotation.Transactional; -import java.util.List; import com.sipai.entity.scada.MPointProgrammeDetail; +import java.util.List; + public interface MPointProgrammeDetailService { public abstract List selectListByWhere(String bizId, String wherestr); diff --git a/src/main/java/com/sipai/service/scada/MPointProgrammeService.java b/src/main/java/com/sipai/service/scada/MPointProgrammeService.java index c48fccb7..3b92e7b2 100644 --- a/src/main/java/com/sipai/service/scada/MPointProgrammeService.java +++ b/src/main/java/com/sipai/service/scada/MPointProgrammeService.java @@ -1,11 +1,9 @@ package com.sipai.service.scada; -import java.util.List; - -import org.springframework.transaction.annotation.Transactional; - import com.sipai.entity.scada.MPointProgramme; +import java.util.List; + public interface MPointProgrammeService { public abstract MPointProgramme selectById(String bizId, String mpointid); diff --git a/src/main/java/com/sipai/service/scada/MPointPropService.java b/src/main/java/com/sipai/service/scada/MPointPropService.java index c3e515e3..a773afec 100644 --- a/src/main/java/com/sipai/service/scada/MPointPropService.java +++ b/src/main/java/com/sipai/service/scada/MPointPropService.java @@ -1,6 +1,5 @@ package com.sipai.service.scada; -import com.alibaba.fastjson.JSONObject; import com.sipai.entity.scada.MPoint; import com.sipai.entity.scada.MPointProp; import com.sipai.entity.scada.MPointPropSource; diff --git a/src/main/java/com/sipai/service/scada/OEProcessService.java b/src/main/java/com/sipai/service/scada/OEProcessService.java index 815079c6..a2697844 100644 --- a/src/main/java/com/sipai/service/scada/OEProcessService.java +++ b/src/main/java/com/sipai/service/scada/OEProcessService.java @@ -1,14 +1,12 @@ package com.sipai.service.scada; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.sipai.dao.activiti.OEProcessDao; import com.sipai.entity.activiti.OEProcess; import com.sipai.tools.CommService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service diff --git a/src/main/java/com/sipai/service/scada/PersonalMpCollectionService.java b/src/main/java/com/sipai/service/scada/PersonalMpCollectionService.java index e4a85077..63a098ee 100644 --- a/src/main/java/com/sipai/service/scada/PersonalMpCollectionService.java +++ b/src/main/java/com/sipai/service/scada/PersonalMpCollectionService.java @@ -1,13 +1,11 @@ package com.sipai.service.scada; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; import com.sipai.dao.scada.PersonalMpCollectionDao; import com.sipai.entity.scada.PersonalMpCollection; -import com.sipai.tools.CommService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class PersonalMpCollectionService{ diff --git a/src/main/java/com/sipai/service/scada/ProAlarmService.java b/src/main/java/com/sipai/service/scada/ProAlarmService.java index ab6a4418..2d010dae 100644 --- a/src/main/java/com/sipai/service/scada/ProAlarmService.java +++ b/src/main/java/com/sipai/service/scada/ProAlarmService.java @@ -1,8 +1,6 @@ package com.sipai.service.scada; -import com.sipai.entity.scada.MPoint; import com.sipai.entity.scada.ProAlarm; -import com.sipai.entity.user.ProcessSection; import javax.servlet.http.HttpServletRequest; import java.util.List; diff --git a/src/main/java/com/sipai/service/scada/ScadaAlarmService.java b/src/main/java/com/sipai/service/scada/ScadaAlarmService.java index ec83e5fe..3885b466 100644 --- a/src/main/java/com/sipai/service/scada/ScadaAlarmService.java +++ b/src/main/java/com/sipai/service/scada/ScadaAlarmService.java @@ -1,25 +1,16 @@ package com.sipai.service.scada; -import java.math.BigDecimal; -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Date; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; import com.sipai.dao.scada.ScadaAlarmDao; import com.sipai.entity.scada.MPoint; import com.sipai.entity.scada.ScadaAlarm; -import com.sipai.entity.user.ProcessSection; -import com.sipai.service.user.ProcessSectionService; import com.sipai.tools.DateSpan; import com.sipai.tools.DateUtil; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; +import java.text.SimpleDateFormat; +import java.util.*; @Service public class ScadaAlarmService { diff --git a/src/main/java/com/sipai/service/scada/TempReportService.java b/src/main/java/com/sipai/service/scada/TempReportService.java index a029513c..371cde5c 100644 --- a/src/main/java/com/sipai/service/scada/TempReportService.java +++ b/src/main/java/com/sipai/service/scada/TempReportService.java @@ -1,13 +1,11 @@ package com.sipai.service.scada; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.sipai.dao.scada.TempReportDao; import com.sipai.entity.scada.TempReport; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class TempReportService { diff --git a/src/main/java/com/sipai/service/scada/WeatherService.java b/src/main/java/com/sipai/service/scada/WeatherService.java index a482e7d9..a62dad18 100644 --- a/src/main/java/com/sipai/service/scada/WeatherService.java +++ b/src/main/java/com/sipai/service/scada/WeatherService.java @@ -1,17 +1,11 @@ package com.sipai.service.scada; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.sipai.dao.work.WeatherDao; import com.sipai.entity.work.Weather; -import com.sipai.tools.CommService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class WeatherService { diff --git a/src/main/java/com/sipai/service/scada/impl/DataSummaryServiceImpl.java b/src/main/java/com/sipai/service/scada/impl/DataSummaryServiceImpl.java index d9a54edf..bab693dd 100644 --- a/src/main/java/com/sipai/service/scada/impl/DataSummaryServiceImpl.java +++ b/src/main/java/com/sipai/service/scada/impl/DataSummaryServiceImpl.java @@ -1,14 +1,13 @@ package com.sipai.service.scada.impl; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; import com.sipai.dao.scada.DataSummaryDao; import com.sipai.entity.scada.DataSummary; import com.sipai.service.scada.DataSummaryService; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; +import java.util.List; @Service public class DataSummaryServiceImpl implements DataSummaryService { diff --git a/src/main/java/com/sipai/service/scada/impl/MPointFormulaAutoHourServiceImpl.java b/src/main/java/com/sipai/service/scada/impl/MPointFormulaAutoHourServiceImpl.java index 885c1162..8c8f1d40 100644 --- a/src/main/java/com/sipai/service/scada/impl/MPointFormulaAutoHourServiceImpl.java +++ b/src/main/java/com/sipai/service/scada/impl/MPointFormulaAutoHourServiceImpl.java @@ -1,14 +1,13 @@ package com.sipai.service.scada.impl; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; import com.sipai.dao.scada.MPointFormulaAutoHourDao; import com.sipai.entity.scada.MPointFormulaAutoHour; import com.sipai.service.scada.MPointFormulaAutoHourService; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; +import java.util.List; @Service public class MPointFormulaAutoHourServiceImpl implements MPointFormulaAutoHourService { diff --git a/src/main/java/com/sipai/service/scada/impl/MPointFormulaDenominatorServiceImpl.java b/src/main/java/com/sipai/service/scada/impl/MPointFormulaDenominatorServiceImpl.java index d950e9b6..a72f384c 100644 --- a/src/main/java/com/sipai/service/scada/impl/MPointFormulaDenominatorServiceImpl.java +++ b/src/main/java/com/sipai/service/scada/impl/MPointFormulaDenominatorServiceImpl.java @@ -1,14 +1,13 @@ package com.sipai.service.scada.impl; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; import com.sipai.dao.scada.MPointFormulaDenominatorDao; import com.sipai.entity.scada.MPointFormulaDenominator; import com.sipai.service.scada.MPointFormulaDenominatorService; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; +import java.util.List; @Service public class MPointFormulaDenominatorServiceImpl implements MPointFormulaDenominatorService { diff --git a/src/main/java/com/sipai/service/scada/impl/MPointFormulaServiceImpl.java b/src/main/java/com/sipai/service/scada/impl/MPointFormulaServiceImpl.java index 1947b30e..551939b2 100644 --- a/src/main/java/com/sipai/service/scada/impl/MPointFormulaServiceImpl.java +++ b/src/main/java/com/sipai/service/scada/impl/MPointFormulaServiceImpl.java @@ -1,20 +1,18 @@ package com.sipai.service.scada.impl; -import java.util.List; -import java.util.HashMap; - -import javax.annotation.Resource; - +import com.sipai.dao.scada.MPointFormulaDao; import com.sipai.dao.scada.MPointHistoryDao; import com.sipai.entity.scada.MPoint; +import com.sipai.entity.scada.MPointFormula; import com.sipai.entity.scada.MPointHistory; +import com.sipai.service.scada.MPointFormulaService; import com.sipai.service.scada.MPointService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import com.sipai.dao.scada.MPointFormulaDao; -import com.sipai.entity.scada.MPointFormula; -import com.sipai.service.scada.MPointFormulaService; +import javax.annotation.Resource; +import java.util.HashMap; +import java.util.List; @Service("mPointFormulaService") public class MPointFormulaServiceImpl implements MPointFormulaService { diff --git a/src/main/java/com/sipai/service/scada/impl/MPointProgrammeDetailServiceImpl.java b/src/main/java/com/sipai/service/scada/impl/MPointProgrammeDetailServiceImpl.java index 3e73fbf3..54bd9394 100644 --- a/src/main/java/com/sipai/service/scada/impl/MPointProgrammeDetailServiceImpl.java +++ b/src/main/java/com/sipai/service/scada/impl/MPointProgrammeDetailServiceImpl.java @@ -1,14 +1,12 @@ package com.sipai.service.scada.impl; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.sipai.dao.scada.MPointProgrammeDetailDao; import com.sipai.entity.scada.MPointProgrammeDetail; import com.sipai.service.scada.MPointProgrammeDetailService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class MPointProgrammeDetailServiceImpl implements MPointProgrammeDetailService{ @Resource diff --git a/src/main/java/com/sipai/service/scada/impl/MPointPropServiceImpl.java b/src/main/java/com/sipai/service/scada/impl/MPointPropServiceImpl.java index 05fae5bb..efbf0cc9 100644 --- a/src/main/java/com/sipai/service/scada/impl/MPointPropServiceImpl.java +++ b/src/main/java/com/sipai/service/scada/impl/MPointPropServiceImpl.java @@ -1,26 +1,16 @@ package com.sipai.service.scada.impl; -import java.math.BigDecimal; -import java.util.*; -import java.util.concurrent.ExecutionException; -import java.util.concurrent.Future; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.TimeoutException; - -import javax.annotation.Resource; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.singularsys.jep.Jep; import com.sipai.dao.repository.MPointPropSourceRepo; +import com.sipai.dao.scada.MPointPropDao; import com.sipai.entity.enums.TimeUnitEnum; import com.sipai.entity.scada.*; -import com.sipai.entity.score.LibraryMPointProp; -import com.sipai.entity.score.LibraryMPointPropSource; import com.sipai.service.scada.MPointPropService; import com.sipai.service.scada.MPointPropSourceService; import com.sipai.service.scada.MPointService; import com.sipai.tools.CommUtil; -import com.sipai.tools.DataSourceHolder; import com.sipai.tools.jep.Max; import com.sipai.tools.jep.Min; import org.apache.log4j.Logger; @@ -32,11 +22,16 @@ import org.springframework.data.elasticsearch.core.query.SearchQuery; import org.springframework.scheduling.annotation.Async; import org.springframework.scheduling.annotation.AsyncResult; import org.springframework.stereotype.Service; - -import com.sipai.dao.scada.MPointPropDao; -import com.sipai.service.user.UnitService; import org.springframework.transaction.annotation.Transactional; +import javax.annotation.Resource; +import java.math.BigDecimal; +import java.util.*; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.Future; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.TimeoutException; + @Service public class MPointPropServiceImpl implements MPointPropService { private static final Logger logger = Logger.getLogger(MPointPropServiceImpl.class); diff --git a/src/main/java/com/sipai/service/scada/impl/MPointPropTargetServiceImpl.java b/src/main/java/com/sipai/service/scada/impl/MPointPropTargetServiceImpl.java index 644ce960..2092ae72 100644 --- a/src/main/java/com/sipai/service/scada/impl/MPointPropTargetServiceImpl.java +++ b/src/main/java/com/sipai/service/scada/impl/MPointPropTargetServiceImpl.java @@ -1,14 +1,12 @@ package com.sipai.service.scada.impl; -import java.util.List; - -import javax.annotation.Resource; - -import com.sipai.service.scada.MPointPropTargetService; -import org.springframework.stereotype.Service; import com.sipai.dao.scada.MPointPropTargetDao; import com.sipai.entity.scada.MPointPropTarget; -import com.sipai.tools.CommService; +import com.sipai.service.scada.MPointPropTargetService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class MPointPropTargetServiceImpl implements MPointPropTargetService { diff --git a/src/main/java/com/sipai/service/scada/impl/ProAlarmBaseTextServiceImpl.java b/src/main/java/com/sipai/service/scada/impl/ProAlarmBaseTextServiceImpl.java index f37a6571..fe3a0a1a 100644 --- a/src/main/java/com/sipai/service/scada/impl/ProAlarmBaseTextServiceImpl.java +++ b/src/main/java/com/sipai/service/scada/impl/ProAlarmBaseTextServiceImpl.java @@ -1,19 +1,17 @@ package com.sipai.service.scada.impl; -import java.util.List; - -import javax.annotation.Resource; - +import com.sipai.dao.scada.ProAlarmBaseTextDao; import com.sipai.entity.process.DecisionExpertBase; import com.sipai.entity.scada.ProAlarm; +import com.sipai.entity.scada.ProAlarmBaseText; import com.sipai.service.process.DecisionExpertBaseService; +import com.sipai.service.scada.ProAlarmBaseTextService; import com.sipai.service.scada.ProAlarmService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import com.sipai.dao.scada.ProAlarmBaseTextDao; -import com.sipai.entity.scada.ProAlarmBaseText; -import com.sipai.service.scada.ProAlarmBaseTextService; +import javax.annotation.Resource; +import java.util.List; @Service public class ProAlarmBaseTextServiceImpl implements ProAlarmBaseTextService { diff --git a/src/main/java/com/sipai/service/scada/impl/ProAlarmDataStopHisPointServiceImpl.java b/src/main/java/com/sipai/service/scada/impl/ProAlarmDataStopHisPointServiceImpl.java index a3664bae..d2327c75 100644 --- a/src/main/java/com/sipai/service/scada/impl/ProAlarmDataStopHisPointServiceImpl.java +++ b/src/main/java/com/sipai/service/scada/impl/ProAlarmDataStopHisPointServiceImpl.java @@ -1,14 +1,13 @@ package com.sipai.service.scada.impl; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; import com.sipai.dao.scada.ProAlarmDataStopHisPointDao; import com.sipai.entity.scada.ProAlarmDataStopHisPoint; import com.sipai.service.scada.ProAlarmDataStopHisPointService; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; +import java.util.List; @Service public class ProAlarmDataStopHisPointServiceImpl implements ProAlarmDataStopHisPointService { diff --git a/src/main/java/com/sipai/service/scada/impl/ProAlarmServiceImpl.java b/src/main/java/com/sipai/service/scada/impl/ProAlarmServiceImpl.java index 8b0be10b..94966e51 100644 --- a/src/main/java/com/sipai/service/scada/impl/ProAlarmServiceImpl.java +++ b/src/main/java/com/sipai/service/scada/impl/ProAlarmServiceImpl.java @@ -6,9 +6,7 @@ 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.ProAlarm; -import com.sipai.entity.user.ProcessSection; import com.sipai.entity.user.User; import com.sipai.service.alarm.AlarmInformationService; import com.sipai.service.alarm.AlarmPointService; @@ -16,7 +14,6 @@ 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 com.sipai.tools.Mqtt; import com.sipai.tools.MqttUtil; import org.springframework.stereotype.Service; @@ -25,7 +22,6 @@ import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpSession; -import java.math.BigDecimal; import java.util.HashMap; import java.util.List; diff --git a/src/main/java/com/sipai/service/schedule/ScheduleJobDetailService.java b/src/main/java/com/sipai/service/schedule/ScheduleJobDetailService.java index 970d36a6..fd92afe8 100644 --- a/src/main/java/com/sipai/service/schedule/ScheduleJobDetailService.java +++ b/src/main/java/com/sipai/service/schedule/ScheduleJobDetailService.java @@ -1,9 +1,9 @@ package com.sipai.service.schedule; -import java.util.List; - import com.sipai.entity.schedule.ScheduleJobDetail; +import java.util.List; + public interface ScheduleJobDetailService { public ScheduleJobDetail selectById(String t); diff --git a/src/main/java/com/sipai/service/schedule/ScheduleJobService.java b/src/main/java/com/sipai/service/schedule/ScheduleJobService.java index f0e40b33..2b4e1b87 100644 --- a/src/main/java/com/sipai/service/schedule/ScheduleJobService.java +++ b/src/main/java/com/sipai/service/schedule/ScheduleJobService.java @@ -1,11 +1,9 @@ package com.sipai.service.schedule; -import java.util.List; - -import org.springframework.stereotype.Service; - import com.sipai.entity.schedule.ScheduleJob; +import java.util.List; + diff --git a/src/main/java/com/sipai/service/schedule/ScheduleJobTypeService.java b/src/main/java/com/sipai/service/schedule/ScheduleJobTypeService.java index a6d82f97..3917a605 100644 --- a/src/main/java/com/sipai/service/schedule/ScheduleJobTypeService.java +++ b/src/main/java/com/sipai/service/schedule/ScheduleJobTypeService.java @@ -1,9 +1,9 @@ package com.sipai.service.schedule; -import java.util.List; - import com.sipai.entity.schedule.ScheduleJobType; +import java.util.List; + public interface ScheduleJobTypeService { public ScheduleJobType selectById(String t); diff --git a/src/main/java/com/sipai/service/schedule/impl/ScheduleJobDetailServiceImpl.java b/src/main/java/com/sipai/service/schedule/impl/ScheduleJobDetailServiceImpl.java index 443c62f0..da4f6299 100644 --- a/src/main/java/com/sipai/service/schedule/impl/ScheduleJobDetailServiceImpl.java +++ b/src/main/java/com/sipai/service/schedule/impl/ScheduleJobDetailServiceImpl.java @@ -1,15 +1,13 @@ package com.sipai.service.schedule.impl; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - import com.sipai.dao.schedule.ScheduleJobDetailDao; import com.sipai.entity.schedule.ScheduleJobDetail; import com.sipai.service.schedule.ScheduleJobDetailService; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; +import java.util.List; @Service("scheduleJobDetailService") public class ScheduleJobDetailServiceImpl implements ScheduleJobDetailService{ diff --git a/src/main/java/com/sipai/service/schedule/impl/ScheduleJobServiceImpl.java b/src/main/java/com/sipai/service/schedule/impl/ScheduleJobServiceImpl.java index 129749c4..bafb439e 100644 --- a/src/main/java/com/sipai/service/schedule/impl/ScheduleJobServiceImpl.java +++ b/src/main/java/com/sipai/service/schedule/impl/ScheduleJobServiceImpl.java @@ -1,22 +1,5 @@ package com.sipai.service.schedule.impl; -import java.util.List; - -import javax.annotation.PostConstruct; -import javax.annotation.Resource; - -import org.quartz.CronScheduleBuilder; -import org.quartz.CronTrigger; -import org.quartz.JobBuilder; -import org.quartz.JobDetail; -import org.quartz.JobKey; -import org.quartz.Scheduler; -import org.quartz.TriggerBuilder; -import org.quartz.TriggerKey; -//import org.slf4j.Logger; -//import org.slf4j.LoggerFactory; -import org.springframework.stereotype.Service; - import com.sipai.dao.schedule.ScheduleJobDao; import com.sipai.entity.schedule.ScheduleJob; import com.sipai.entity.schedule.ScheduleJobType; @@ -24,6 +7,12 @@ import com.sipai.quartz.job.QuartzJobFactory; import com.sipai.service.schedule.ScheduleJobService; import com.sipai.service.schedule.ScheduleJobTypeService; import com.sipai.tools.CommString; +import org.quartz.*; +import org.springframework.stereotype.Service; + +import javax.annotation.PostConstruct; +import javax.annotation.Resource; +import java.util.List; @Service("scheduleJobService") public class ScheduleJobServiceImpl implements ScheduleJobService { diff --git a/src/main/java/com/sipai/service/schedule/impl/ScheduleJobTypeServiceImpl.java b/src/main/java/com/sipai/service/schedule/impl/ScheduleJobTypeServiceImpl.java index 398ef67d..5a025060 100644 --- a/src/main/java/com/sipai/service/schedule/impl/ScheduleJobTypeServiceImpl.java +++ b/src/main/java/com/sipai/service/schedule/impl/ScheduleJobTypeServiceImpl.java @@ -1,18 +1,12 @@ package com.sipai.service.schedule.impl; -import java.util.List; - -import javax.annotation.Resource; - -import org.quartz.CronScheduleBuilder; -import org.quartz.CronTrigger; -import org.quartz.JobKey; -import org.quartz.TriggerKey; -import org.springframework.stereotype.Service; - import com.sipai.dao.schedule.ScheduleJobTypeDao; import com.sipai.entity.schedule.ScheduleJobType; import com.sipai.service.schedule.ScheduleJobTypeService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service("scheduleJobTypeService") public class ScheduleJobTypeServiceImpl implements ScheduleJobTypeService{ diff --git a/src/main/java/com/sipai/service/score/LibraryMPointPropService.java b/src/main/java/com/sipai/service/score/LibraryMPointPropService.java index 46b230af..44855cba 100644 --- a/src/main/java/com/sipai/service/score/LibraryMPointPropService.java +++ b/src/main/java/com/sipai/service/score/LibraryMPointPropService.java @@ -1,8 +1,6 @@ package com.sipai.service.score; import com.alibaba.fastjson.JSONObject; -import com.sipai.entity.base.Result; -import com.sipai.entity.scada.MPointProp; import com.sipai.entity.score.LibraryMPoint; import com.sipai.entity.score.LibraryMPointProp; import com.sipai.entity.score.LibraryMPointPropSource; diff --git a/src/main/java/com/sipai/service/score/impl/LibraryMPointPropServiceImpl.java b/src/main/java/com/sipai/service/score/impl/LibraryMPointPropServiceImpl.java index 8113e3d9..d02a9fdc 100644 --- a/src/main/java/com/sipai/service/score/impl/LibraryMPointPropServiceImpl.java +++ b/src/main/java/com/sipai/service/score/impl/LibraryMPointPropServiceImpl.java @@ -3,9 +3,7 @@ package com.sipai.service.score.impl; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.sipai.dao.score.LibraryMPointPropDao; -import com.sipai.entity.base.Result; import com.sipai.entity.scada.MPoint; -import com.sipai.entity.scada.MPointProp; import com.sipai.entity.scada.MPointPropSource; import com.sipai.entity.score.LibraryMPoint; import com.sipai.entity.score.LibraryMPointProp; @@ -15,11 +13,8 @@ import com.sipai.service.scada.MPointPropSourceService; import com.sipai.service.scada.MPointService; import com.sipai.service.score.LibraryMPointPropService; import com.sipai.service.score.LibraryMPointPropSourceService; -import com.sipai.tools.CommUtil; -import com.sipai.tools.DataSourceHolder; import org.elasticsearch.index.query.BoolQueryBuilder; import org.elasticsearch.index.query.QueryBuilders; -import org.springframework.beans.BeanUtils; import org.springframework.data.elasticsearch.core.query.NativeSearchQueryBuilder; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/sipai/service/sparepart/ApplyPurchasePlanService.java b/src/main/java/com/sipai/service/sparepart/ApplyPurchasePlanService.java index 9498a21e..f3754bcf 100644 --- a/src/main/java/com/sipai/service/sparepart/ApplyPurchasePlanService.java +++ b/src/main/java/com/sipai/service/sparepart/ApplyPurchasePlanService.java @@ -1,19 +1,18 @@ package com.sipai.service.sparepart; -import java.util.ArrayList; -import java.util.List; -import javax.annotation.Resource; -import org.springframework.stereotype.Service; import com.sipai.dao.sparepart.ApplyPurchasePlanDao; import com.sipai.entity.sparepart.ApplyPurchasePlan; -import com.sipai.entity.sparepart.PurchasePlan; -import com.sipai.entity.user.Dept; import com.sipai.entity.user.Unit; import com.sipai.entity.user.User; import com.sipai.service.user.UnitService; import com.sipai.service.user.UserService; import com.sipai.tools.CommService; import com.sipai.tools.CommUtil; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; @Service public class ApplyPurchasePlanService implements CommService{ diff --git a/src/main/java/com/sipai/service/sparepart/ChannelsService.java b/src/main/java/com/sipai/service/sparepart/ChannelsService.java index b522b2ea..ca658a34 100644 --- a/src/main/java/com/sipai/service/sparepart/ChannelsService.java +++ b/src/main/java/com/sipai/service/sparepart/ChannelsService.java @@ -1,27 +1,18 @@ package com.sipai.service.sparepart; +import com.sipai.dao.sparepart.ChannelsDao; +import com.sipai.entity.sparepart.Channels; +import com.sipai.entity.sparepart.Contract; +import com.sipai.tools.CommService; +import net.sf.json.JSONArray; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.annotation.Resource; - -import net.sf.json.JSONArray; - -import org.springframework.stereotype.Service; - -import com.sipai.dao.sparepart.ChannelsDao; -import com.sipai.entity.equipment.EquipmentStatusManagement; -import com.sipai.entity.sparepart.Channels; -import com.sipai.entity.sparepart.Contract; -import com.sipai.entity.sparepart.Channels; -import com.sipai.entity.sparepart.Channels; -import com.sipai.entity.sparepart.ContractClass; -import com.sipai.entity.user.ProcessSection; -import com.sipai.entity.user.Unit; -import com.sipai.tools.CommService; - @Service public class ChannelsService implements CommService{ @Resource diff --git a/src/main/java/com/sipai/service/sparepart/ConsumeDetailService.java b/src/main/java/com/sipai/service/sparepart/ConsumeDetailService.java index 8635f7d7..3cb470af 100644 --- a/src/main/java/com/sipai/service/sparepart/ConsumeDetailService.java +++ b/src/main/java/com/sipai/service/sparepart/ConsumeDetailService.java @@ -1,18 +1,15 @@ package com.sipai.service.sparepart; -import java.math.BigDecimal; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.sipai.dao.sparepart.ConsumeDetailDao; import com.sipai.entity.sparepart.ConsumeDetail; import com.sipai.entity.sparepart.Goods; -import com.sipai.entity.sparepart.Stock; import com.sipai.tools.CommService; import com.sipai.tools.CommUtil; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.math.BigDecimal; +import java.util.List; @Service public class ConsumeDetailService implements CommService{ diff --git a/src/main/java/com/sipai/service/sparepart/ContractChangeFileService.java b/src/main/java/com/sipai/service/sparepart/ContractChangeFileService.java index cc45573a..b83058e4 100644 --- a/src/main/java/com/sipai/service/sparepart/ContractChangeFileService.java +++ b/src/main/java/com/sipai/service/sparepart/ContractChangeFileService.java @@ -1,14 +1,12 @@ package com.sipai.service.sparepart; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.sipai.dao.sparepart.ContractChangeFileDao; import com.sipai.entity.sparepart.ContractChangeFile; import com.sipai.tools.CommService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class ContractChangeFileService implements CommService{ diff --git a/src/main/java/com/sipai/service/sparepart/ContractClassService.java b/src/main/java/com/sipai/service/sparepart/ContractClassService.java index e4a350d7..504e691c 100644 --- a/src/main/java/com/sipai/service/sparepart/ContractClassService.java +++ b/src/main/java/com/sipai/service/sparepart/ContractClassService.java @@ -1,22 +1,17 @@ package com.sipai.service.sparepart; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import javax.annotation.Resource; - -import net.sf.json.JSONArray; - -import org.springframework.stereotype.Service; - import com.sipai.dao.sparepart.ContractClassDao; import com.sipai.entity.sparepart.Contract; import com.sipai.entity.sparepart.ContractClass; -import com.sipai.entity.sparepart.ContractClass; -import com.sipai.entity.sparepart.ContractClass; import com.sipai.tools.CommService; +import net.sf.json.JSONArray; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; @Service public class ContractClassService implements CommService{ diff --git a/src/main/java/com/sipai/service/sparepart/ContractDetailInvoiceFileService.java b/src/main/java/com/sipai/service/sparepart/ContractDetailInvoiceFileService.java index 81ff62e4..e3222fa0 100644 --- a/src/main/java/com/sipai/service/sparepart/ContractDetailInvoiceFileService.java +++ b/src/main/java/com/sipai/service/sparepart/ContractDetailInvoiceFileService.java @@ -1,14 +1,12 @@ package com.sipai.service.sparepart; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.sipai.dao.sparepart.ContractDetailInvoiceFileDao; import com.sipai.entity.sparepart.ContractDetailInvoiceFile; import com.sipai.tools.CommService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class ContractDetailInvoiceFileService implements CommService{ diff --git a/src/main/java/com/sipai/service/sparepart/ContractDetailInvoiceService.java b/src/main/java/com/sipai/service/sparepart/ContractDetailInvoiceService.java index 10a95bf2..22f98948 100644 --- a/src/main/java/com/sipai/service/sparepart/ContractDetailInvoiceService.java +++ b/src/main/java/com/sipai/service/sparepart/ContractDetailInvoiceService.java @@ -1,15 +1,12 @@ package com.sipai.service.sparepart; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.sipai.dao.sparepart.ContractDetailInvoiceDao; import com.sipai.entity.sparepart.ContractDetailInvoice; -import com.sipai.entity.sparepart.ContractDetailInvoice; import com.sipai.tools.CommService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class ContractDetailInvoiceService implements CommService{ diff --git a/src/main/java/com/sipai/service/sparepart/ContractDetailPaymentService.java b/src/main/java/com/sipai/service/sparepart/ContractDetailPaymentService.java index a6bce21a..d9b68224 100644 --- a/src/main/java/com/sipai/service/sparepart/ContractDetailPaymentService.java +++ b/src/main/java/com/sipai/service/sparepart/ContractDetailPaymentService.java @@ -1,14 +1,12 @@ package com.sipai.service.sparepart; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.sipai.dao.sparepart.ContractDetailPaymentDao; import com.sipai.entity.sparepart.ContractDetailPayment; import com.sipai.tools.CommService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class ContractDetailPaymentService implements CommService{ diff --git a/src/main/java/com/sipai/service/sparepart/ContractDetailService.java b/src/main/java/com/sipai/service/sparepart/ContractDetailService.java index f4298a33..2fa02d39 100644 --- a/src/main/java/com/sipai/service/sparepart/ContractDetailService.java +++ b/src/main/java/com/sipai/service/sparepart/ContractDetailService.java @@ -1,20 +1,18 @@ package com.sipai.service.sparepart; -import java.math.BigDecimal; -import java.util.Arrays; -import java.util.List; - -import javax.annotation.Resource; - +import com.sipai.dao.sparepart.ContractDetailDao; +import com.sipai.entity.sparepart.Contract; +import com.sipai.entity.sparepart.ContractDetail; +import com.sipai.entity.sparepart.Goods; +import com.sipai.entity.sparepart.PurchaseRecordDetail; +import com.sipai.tools.CommService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import com.sipai.dao.sparepart.ContractDetailDao; -import com.sipai.entity.sparepart.Goods; -import com.sipai.entity.sparepart.PurchaseRecordDetail; -import com.sipai.entity.sparepart.Contract; -import com.sipai.entity.sparepart.ContractDetail; -import com.sipai.tools.CommService; +import javax.annotation.Resource; +import java.math.BigDecimal; +import java.util.Arrays; +import java.util.List; @Service public class ContractDetailService implements CommService{ diff --git a/src/main/java/com/sipai/service/sparepart/ContractFileService.java b/src/main/java/com/sipai/service/sparepart/ContractFileService.java index 78c74ae5..0cd15017 100644 --- a/src/main/java/com/sipai/service/sparepart/ContractFileService.java +++ b/src/main/java/com/sipai/service/sparepart/ContractFileService.java @@ -1,14 +1,12 @@ package com.sipai.service.sparepart; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.sipai.dao.sparepart.ContractFileDao; import com.sipai.entity.sparepart.ContractFile; import com.sipai.tools.CommService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class ContractFileService implements CommService{ diff --git a/src/main/java/com/sipai/service/sparepart/ContractService.java b/src/main/java/com/sipai/service/sparepart/ContractService.java index 77c63e62..442a3361 100644 --- a/src/main/java/com/sipai/service/sparepart/ContractService.java +++ b/src/main/java/com/sipai/service/sparepart/ContractService.java @@ -1,48 +1,12 @@ package com.sipai.service.sparepart; -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 org.activiti.engine.repository.ProcessDefinition; -import org.activiti.engine.runtime.ProcessInstance; -import org.activiti.engine.task.Task; -import org.activiti.workflow.simple.definition.WorkflowDefinition; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.github.pagehelper.PageHelper; -import com.itextpdf.text.pdf.PdfStructTreeController.returnType; -import com.sipai.dao.sparepart.PurchasePlanDao; import com.sipai.dao.sparepart.ContractDao; import com.sipai.entity.activiti.ProcessType; import com.sipai.entity.base.BusinessUnitAdapter; import com.sipai.entity.business.BusinessUnitAudit; import com.sipai.entity.business.BusinessUnitRecord; -import com.sipai.entity.maintenance.Abnormity; import com.sipai.entity.maintenance.MaintenanceCommString; -import com.sipai.entity.maintenance.MaintenanceDetail; -import com.sipai.entity.sparepart.Channels; -import com.sipai.entity.sparepart.ContractClass; -import com.sipai.entity.sparepart.ContractDetailInvoice; -import com.sipai.entity.sparepart.ContractDetailPayment; -import com.sipai.entity.sparepart.ContractTaxRate; -import com.sipai.entity.sparepart.PurchaseDetail; -import com.sipai.entity.sparepart.PurchaseMethods; -import com.sipai.entity.sparepart.PurchasePlan; -import com.sipai.entity.sparepart.PurchaseRecord; -import com.sipai.entity.sparepart.SparePartCommString; -import com.sipai.entity.sparepart.Contract; -import com.sipai.entity.sparepart.ContractDetail; -import com.sipai.entity.sparepart.Contract; -import com.sipai.entity.sparepart.Subscribe; -import com.sipai.entity.sparepart.SubscribeDetail; -import com.sipai.entity.sparepart.Supplier; -import com.sipai.entity.sparepart.WarrantyPeriod; +import com.sipai.entity.sparepart.*; import com.sipai.entity.user.Company; import com.sipai.entity.user.Dept; import com.sipai.entity.user.User; @@ -55,7 +19,18 @@ import com.sipai.service.user.UnitService; import com.sipai.service.user.UserService; import com.sipai.service.work.AutoAlertService; import com.sipai.tools.CommService; -import com.sipai.webservice.server.user.UserServer; +import org.activiti.engine.repository.ProcessDefinition; +import org.activiti.engine.runtime.ProcessInstance; +import org.activiti.engine.task.Task; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; @Service public class ContractService implements CommService{ diff --git a/src/main/java/com/sipai/service/sparepart/ContractTaxRateService.java b/src/main/java/com/sipai/service/sparepart/ContractTaxRateService.java index e396756a..60e481f6 100644 --- a/src/main/java/com/sipai/service/sparepart/ContractTaxRateService.java +++ b/src/main/java/com/sipai/service/sparepart/ContractTaxRateService.java @@ -1,14 +1,12 @@ package com.sipai.service.sparepart; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.sipai.dao.sparepart.ContractTaxRateDao; import com.sipai.entity.sparepart.ContractTaxRate; import com.sipai.tools.CommService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class ContractTaxRateService implements CommService{ diff --git a/src/main/java/com/sipai/service/sparepart/GoodsAcceptanceApplyDetailService.java b/src/main/java/com/sipai/service/sparepart/GoodsAcceptanceApplyDetailService.java index c5d2fb32..3c60040a 100644 --- a/src/main/java/com/sipai/service/sparepart/GoodsAcceptanceApplyDetailService.java +++ b/src/main/java/com/sipai/service/sparepart/GoodsAcceptanceApplyDetailService.java @@ -1,14 +1,12 @@ package com.sipai.service.sparepart; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.sipai.dao.sparepart.GoodsAcceptanceApplyDetailDao; import com.sipai.entity.sparepart.GoodsAcceptanceApplyDetail; import com.sipai.tools.CommService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class GoodsAcceptanceApplyDetailService implements CommService{ diff --git a/src/main/java/com/sipai/service/sparepart/GoodsApplyService.java b/src/main/java/com/sipai/service/sparepart/GoodsApplyService.java index 416ff0f3..9e685db4 100644 --- a/src/main/java/com/sipai/service/sparepart/GoodsApplyService.java +++ b/src/main/java/com/sipai/service/sparepart/GoodsApplyService.java @@ -1,17 +1,14 @@ package com.sipai.service.sparepart; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.sipai.dao.sparepart.GoodsApplyDao; import com.sipai.entity.sparepart.GoodsApply; import com.sipai.entity.sparepart.GoodsClass; - import com.sipai.service.equipment.EquipmentCardService; import com.sipai.tools.CommService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class GoodsApplyService implements CommService{ diff --git a/src/main/java/com/sipai/service/sparepart/GoodsClassService.java b/src/main/java/com/sipai/service/sparepart/GoodsClassService.java index fe297392..dbf46594 100644 --- a/src/main/java/com/sipai/service/sparepart/GoodsClassService.java +++ b/src/main/java/com/sipai/service/sparepart/GoodsClassService.java @@ -1,19 +1,16 @@ package com.sipai.service.sparepart; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import javax.annotation.Resource; - -import net.sf.json.JSONArray; - -import org.springframework.stereotype.Service; - import com.sipai.dao.sparepart.GoodsClassDao; import com.sipai.entity.sparepart.GoodsClass; import com.sipai.tools.CommService; +import net.sf.json.JSONArray; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; @Service public class GoodsClassService implements CommService{ diff --git a/src/main/java/com/sipai/service/sparepart/GoodsService.java b/src/main/java/com/sipai/service/sparepart/GoodsService.java index 8f48fb75..9f732342 100644 --- a/src/main/java/com/sipai/service/sparepart/GoodsService.java +++ b/src/main/java/com/sipai/service/sparepart/GoodsService.java @@ -1,20 +1,15 @@ package com.sipai.service.sparepart; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.sipai.dao.sparepart.GoodsDao; import com.sipai.entity.equipment.EquipmentCard; -import com.sipai.entity.scada.MPointHistory; import com.sipai.entity.sparepart.Goods; import com.sipai.entity.sparepart.GoodsClass; - -import com.sipai.entity.user.User; import com.sipai.service.equipment.EquipmentCardService; import com.sipai.tools.CommService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class GoodsService implements CommService{ diff --git a/src/main/java/com/sipai/service/sparepart/InOutDeatilService.java b/src/main/java/com/sipai/service/sparepart/InOutDeatilService.java index 698c0371..9a556f85 100644 --- a/src/main/java/com/sipai/service/sparepart/InOutDeatilService.java +++ b/src/main/java/com/sipai/service/sparepart/InOutDeatilService.java @@ -1,9 +1,7 @@ package com.sipai.service.sparepart; import com.sipai.dao.sparepart.InOutDeatilDao; -import com.sipai.dao.sparepart.ScoreDao; import com.sipai.entity.sparepart.InOutDeatil; -import com.sipai.entity.sparepart.Score; import com.sipai.tools.CommService; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/sipai/service/sparepart/InStockRecordDetailService.java b/src/main/java/com/sipai/service/sparepart/InStockRecordDetailService.java index 253af492..381ebab9 100644 --- a/src/main/java/com/sipai/service/sparepart/InStockRecordDetailService.java +++ b/src/main/java/com/sipai/service/sparepart/InStockRecordDetailService.java @@ -1,23 +1,21 @@ package com.sipai.service.sparepart; -import java.math.BigDecimal; -import java.math.RoundingMode; -import java.util.List; - -import javax.annotation.Resource; - -import com.sipai.entity.sparepart.*; -import org.apache.commons.lang3.StringUtils; -import org.springframework.scheduling.annotation.Async; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - import com.sipai.dao.sparepart.InStockRecordDetailDao; -import com.sipai.dao.sparepart.WarehouseDao; -import com.sipai.entity.user.Company; +import com.sipai.entity.sparepart.Goods; +import com.sipai.entity.sparepart.InStockRecord; +import com.sipai.entity.sparepart.InStockRecordDetail; +import com.sipai.entity.sparepart.SparePartCommString; import com.sipai.entity.user.Dept; import com.sipai.service.user.UnitService; import com.sipai.tools.CommService; +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; +import java.math.BigDecimal; +import java.math.RoundingMode; +import java.util.List; @Service public class InStockRecordDetailService implements CommService{ diff --git a/src/main/java/com/sipai/service/sparepart/InStockRecordService.java b/src/main/java/com/sipai/service/sparepart/InStockRecordService.java index 2ef3dcfa..a00ab6d3 100644 --- a/src/main/java/com/sipai/service/sparepart/InStockRecordService.java +++ b/src/main/java/com/sipai/service/sparepart/InStockRecordService.java @@ -17,23 +17,22 @@ import com.sipai.service.user.UserService; import com.sipai.tools.CommService; import com.sipai.tools.CommUtil; import com.sipai.tools.ThreadPoolUpdateMoney; -import net.sf.json.JSONArray; -import net.sf.json.JSONObject; import org.activiti.engine.TaskService; import org.activiti.engine.repository.ProcessDefinition; import org.activiti.engine.runtime.ProcessInstance; import org.activiti.engine.task.Task; import org.apache.commons.lang3.StringUtils; -import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.math.BigDecimal; import java.math.RoundingMode; -import java.util.*; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.UUID; import java.util.concurrent.ExecutorService; -import java.util.concurrent.ThreadPoolExecutor; @Service @Transactional diff --git a/src/main/java/com/sipai/service/sparepart/OutStockRecordDetailService.java b/src/main/java/com/sipai/service/sparepart/OutStockRecordDetailService.java index 7989b63d..72236206 100644 --- a/src/main/java/com/sipai/service/sparepart/OutStockRecordDetailService.java +++ b/src/main/java/com/sipai/service/sparepart/OutStockRecordDetailService.java @@ -1,32 +1,19 @@ package com.sipai.service.sparepart; -import java.math.BigDecimal; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.scheduling.annotation.Async; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.sipai.dao.sparepart.InStockRecordDetailDao; import com.sipai.dao.sparepart.OutStockRecordDetailDao; -import com.sipai.dao.sparepart.WarehouseDao; import com.sipai.entity.sparepart.Goods; -import com.sipai.entity.sparepart.InStockRecord; -import com.sipai.entity.sparepart.InStockRecordDetail; import com.sipai.entity.sparepart.OutStockRecord; import com.sipai.entity.sparepart.OutStockRecordDetail; -import com.sipai.entity.sparepart.PurchaseRecord; -import com.sipai.entity.sparepart.PurchaseRecordDetail; import com.sipai.entity.sparepart.Stock; -import com.sipai.entity.sparepart.Subscribe; -import com.sipai.entity.sparepart.SubscribeDetail; -import com.sipai.entity.sparepart.Warehouse; -import com.sipai.entity.user.Company; import com.sipai.entity.user.Dept; import com.sipai.service.user.UnitService; import com.sipai.tools.CommService; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; +import java.math.BigDecimal; +import java.util.List; @Service public class OutStockRecordDetailService implements CommService{ diff --git a/src/main/java/com/sipai/service/sparepart/OutStockRecordService.java b/src/main/java/com/sipai/service/sparepart/OutStockRecordService.java index cf183235..a60ca569 100644 --- a/src/main/java/com/sipai/service/sparepart/OutStockRecordService.java +++ b/src/main/java/com/sipai/service/sparepart/OutStockRecordService.java @@ -1,18 +1,22 @@ package com.sipai.service.sparepart; -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 com.sipai.dao.sparepart.OutStockRecordDao; +import com.sipai.entity.activiti.ProcessType; +import com.sipai.entity.base.BusinessUnitAdapter; +import com.sipai.entity.business.BusinessUnitAudit; +import com.sipai.entity.business.BusinessUnitRecord; +import com.sipai.entity.maintenance.MaintenanceCommString; import com.sipai.entity.sparepart.*; +import com.sipai.entity.user.Company; +import com.sipai.entity.user.Dept; +import com.sipai.entity.user.User; +import com.sipai.service.activiti.WorkflowProcessDefinitionService; +import com.sipai.service.activiti.WorkflowService; +import com.sipai.service.business.BusinessUnitAuditService; +import com.sipai.service.user.UnitService; import com.sipai.service.user.UserService; -import net.sf.json.JSONArray; -import net.sf.json.JSONObject; +import com.sipai.tools.CommService; +import com.sipai.tools.CommUtil; import org.activiti.engine.TaskService; import org.activiti.engine.repository.ProcessDefinition; import org.activiti.engine.runtime.ProcessInstance; @@ -20,29 +24,12 @@ import org.activiti.engine.task.Task; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import org.springframework.ui.Model; -import org.springframework.web.bind.annotation.ModelAttribute; -import org.springframework.web.bind.annotation.RequestMapping; -import com.sipai.dao.sparepart.InStockRecordDao; -import com.sipai.dao.sparepart.OutStockRecordDao; -import com.sipai.dao.sparepart.WarehouseDao; -import com.sipai.entity.activiti.ProcessType; -import com.sipai.entity.base.BusinessUnitAdapter; -import com.sipai.entity.business.BusinessUnitAudit; -import com.sipai.entity.business.BusinessUnitRecord; -import com.sipai.entity.maintenance.MaintenanceCommString; -import com.sipai.entity.user.Company; -import com.sipai.entity.user.Dept; -import com.sipai.entity.user.Unit; -import com.sipai.entity.user.User; -import com.sipai.service.activiti.WorkflowProcessDefinitionService; -import com.sipai.service.activiti.WorkflowService; -import com.sipai.service.business.BusinessUnitAuditService; -import com.sipai.service.user.UnitService; -import com.sipai.tools.CommService; -import com.sipai.tools.CommString; -import com.sipai.tools.CommUtil; +import javax.annotation.Resource; +import java.math.BigDecimal; +import java.util.HashMap; +import java.util.List; +import java.util.Map; @Service public class OutStockRecordService implements CommService{ diff --git a/src/main/java/com/sipai/service/sparepart/PerformanceService.java b/src/main/java/com/sipai/service/sparepart/PerformanceService.java index d4905487..631aacee 100644 --- a/src/main/java/com/sipai/service/sparepart/PerformanceService.java +++ b/src/main/java/com/sipai/service/sparepart/PerformanceService.java @@ -1,14 +1,12 @@ package com.sipai.service.sparepart; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.sipai.dao.sparepart.PerformanceDao; import com.sipai.entity.sparepart.Performance; import com.sipai.tools.CommService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class PerformanceService implements CommService{ diff --git a/src/main/java/com/sipai/service/sparepart/PurchaseDetailService.java b/src/main/java/com/sipai/service/sparepart/PurchaseDetailService.java index b93c893c..3309a3a5 100644 --- a/src/main/java/com/sipai/service/sparepart/PurchaseDetailService.java +++ b/src/main/java/com/sipai/service/sparepart/PurchaseDetailService.java @@ -1,17 +1,13 @@ package com.sipai.service.sparepart; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - -import com.sipai.dao.sparepart.GoodsDao; import com.sipai.dao.sparepart.PurchaseDetailDao; import com.sipai.entity.sparepart.Goods; -import com.sipai.entity.sparepart.GoodsClass; import com.sipai.entity.sparepart.PurchaseDetail; import com.sipai.tools.CommService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class PurchaseDetailService implements CommService{ diff --git a/src/main/java/com/sipai/service/sparepart/PurchaseMethodsService.java b/src/main/java/com/sipai/service/sparepart/PurchaseMethodsService.java index 9a24dd01..c27250ac 100644 --- a/src/main/java/com/sipai/service/sparepart/PurchaseMethodsService.java +++ b/src/main/java/com/sipai/service/sparepart/PurchaseMethodsService.java @@ -1,14 +1,12 @@ package com.sipai.service.sparepart; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.sipai.dao.sparepart.PurchaseMethodsDao; import com.sipai.entity.sparepart.PurchaseMethods; import com.sipai.tools.CommService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class PurchaseMethodsService implements CommService{ diff --git a/src/main/java/com/sipai/service/sparepart/PurchasePlanService.java b/src/main/java/com/sipai/service/sparepart/PurchasePlanService.java index d99e9a61..d1cd028c 100644 --- a/src/main/java/com/sipai/service/sparepart/PurchasePlanService.java +++ b/src/main/java/com/sipai/service/sparepart/PurchasePlanService.java @@ -1,12 +1,5 @@ package com.sipai.service.sparepart; -import java.math.BigDecimal; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.sipai.dao.sparepart.PurchasePlanDao; import com.sipai.entity.sparepart.PurchaseDetail; import com.sipai.entity.sparepart.PurchasePlan; @@ -16,7 +9,11 @@ import com.sipai.entity.user.User; import com.sipai.service.user.UnitService; import com.sipai.service.user.UserService; import com.sipai.tools.CommService; -import com.sipai.webservice.server.user.UserServer; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.math.BigDecimal; +import java.util.List; @Service public class PurchasePlanService implements CommService{ diff --git a/src/main/java/com/sipai/service/sparepart/PurchaseRecordDetailService.java b/src/main/java/com/sipai/service/sparepart/PurchaseRecordDetailService.java index fed51a1b..9f2f7156 100644 --- a/src/main/java/com/sipai/service/sparepart/PurchaseRecordDetailService.java +++ b/src/main/java/com/sipai/service/sparepart/PurchaseRecordDetailService.java @@ -1,26 +1,21 @@ package com.sipai.service.sparepart; -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - -import javax.annotation.Resource; - -import org.apache.commons.lang3.StringUtils; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - import com.sipai.dao.sparepart.PurchaseRecordDetailDao; -import com.sipai.dao.sparepart.SubscribeDetailDao; import com.sipai.entity.sparepart.Goods; import com.sipai.entity.sparepart.PurchaseRecord; import com.sipai.entity.sparepart.PurchaseRecordDetail; -import com.sipai.entity.sparepart.Subscribe; import com.sipai.entity.sparepart.SubscribeDetail; import com.sipai.entity.user.Dept; import com.sipai.service.user.UnitService; import com.sipai.tools.CommService; +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.List; @Service public class PurchaseRecordDetailService implements CommService{ diff --git a/src/main/java/com/sipai/service/sparepart/PurchaseRecordService.java b/src/main/java/com/sipai/service/sparepart/PurchaseRecordService.java index 13f81dea..af61b136 100644 --- a/src/main/java/com/sipai/service/sparepart/PurchaseRecordService.java +++ b/src/main/java/com/sipai/service/sparepart/PurchaseRecordService.java @@ -1,35 +1,21 @@ package com.sipai.service.sparepart; -import java.math.BigDecimal; -import java.util.List; - -import javax.annotation.Resource; - -import com.alibaba.fastjson.JSONObject; +import com.sipai.dao.sparepart.PurchaseRecordDao; import com.sipai.entity.business.BusinessUnitRecord; -import com.sipai.tools.Mqtt; -import com.sipai.tools.MqttUtil; -import com.sipai.tools.SpringContextUtil; +import com.sipai.entity.sparepart.PurchaseRecord; +import com.sipai.entity.sparepart.PurchaseRecordDetail; +import com.sipai.entity.sparepart.SparePartCommString; +import com.sipai.entity.user.Company; +import com.sipai.service.user.UnitService; +import com.sipai.service.user.UserService; +import com.sipai.tools.CommService; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import com.sipai.dao.sparepart.PurchasePlanDao; -import com.sipai.dao.sparepart.PurchaseRecordDao; -import com.sipai.entity.sparepart.PurchaseDetail; -import com.sipai.entity.sparepart.PurchasePlan; -import com.sipai.entity.sparepart.PurchaseRecord; -import com.sipai.entity.sparepart.PurchaseRecordDetail; -import com.sipai.entity.sparepart.SparePartCommString; -import com.sipai.entity.sparepart.Subscribe; -import com.sipai.entity.sparepart.SubscribeDetail; -import com.sipai.entity.user.Company; -import com.sipai.entity.user.Dept; -import com.sipai.entity.user.User; -import com.sipai.service.user.UnitService; -import com.sipai.service.user.UserService; -import com.sipai.tools.CommService; -import com.sipai.webservice.server.user.UserServer; +import javax.annotation.Resource; +import java.math.BigDecimal; +import java.util.List; @Service public class PurchaseRecordService implements CommService{ diff --git a/src/main/java/com/sipai/service/sparepart/PurposeService.java b/src/main/java/com/sipai/service/sparepart/PurposeService.java index 0890fb46..0fa0bb18 100644 --- a/src/main/java/com/sipai/service/sparepart/PurposeService.java +++ b/src/main/java/com/sipai/service/sparepart/PurposeService.java @@ -1,14 +1,12 @@ package com.sipai.service.sparepart; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.sipai.dao.sparepart.PurposeDao; import com.sipai.entity.sparepart.Purpose; import com.sipai.tools.CommService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class PurposeService implements CommService{ diff --git a/src/main/java/com/sipai/service/sparepart/QualificationTypeService.java b/src/main/java/com/sipai/service/sparepart/QualificationTypeService.java index 5869ff8d..3fba032c 100644 --- a/src/main/java/com/sipai/service/sparepart/QualificationTypeService.java +++ b/src/main/java/com/sipai/service/sparepart/QualificationTypeService.java @@ -1,16 +1,12 @@ package com.sipai.service.sparepart; -import java.util.List; - -import javax.annotation.Resource; - +import com.sipai.dao.sparepart.QualificationTypeDao; +import com.sipai.entity.sparepart.QualificationType; +import com.sipai.tools.CommService; import org.springframework.stereotype.Service; -import com.sipai.dao.sparepart.QualificationTypeDao; - -import com.sipai.entity.sparepart.QualificationType; - -import com.sipai.tools.CommService; +import javax.annotation.Resource; +import java.util.List; @Service public class QualificationTypeService implements CommService{ diff --git a/src/main/java/com/sipai/service/sparepart/QualificationType_copyService.java b/src/main/java/com/sipai/service/sparepart/QualificationType_copyService.java index d7b5beb7..76026c6a 100644 --- a/src/main/java/com/sipai/service/sparepart/QualificationType_copyService.java +++ b/src/main/java/com/sipai/service/sparepart/QualificationType_copyService.java @@ -1,16 +1,12 @@ package com.sipai.service.sparepart; -import java.util.List; - -import javax.annotation.Resource; - +import com.sipai.dao.sparepart.QualificationType_copyDao; +import com.sipai.entity.sparepart.QualificationType_copy; +import com.sipai.tools.CommService; import org.springframework.stereotype.Service; -import com.sipai.dao.sparepart.QualificationType_copyDao; - -import com.sipai.entity.sparepart.QualificationType_copy; - -import com.sipai.tools.CommService; +import javax.annotation.Resource; +import java.util.List; @Service public class QualificationType_copyService implements CommService{ diff --git a/src/main/java/com/sipai/service/sparepart/RawMaterialDetailService.java b/src/main/java/com/sipai/service/sparepart/RawMaterialDetailService.java index b140def5..dda38fb5 100644 --- a/src/main/java/com/sipai/service/sparepart/RawMaterialDetailService.java +++ b/src/main/java/com/sipai/service/sparepart/RawMaterialDetailService.java @@ -1,13 +1,5 @@ package com.sipai.service.sparepart; -import java.math.BigDecimal; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - import com.sipai.dao.sparepart.RawMaterialDetailDao; import com.sipai.entity.sparepart.Goods; import com.sipai.entity.sparepart.RawMaterial; @@ -15,6 +7,12 @@ import com.sipai.entity.sparepart.RawMaterialDetail; import com.sipai.entity.user.Dept; import com.sipai.service.user.UnitService; import com.sipai.tools.CommService; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; +import java.math.BigDecimal; +import java.util.List; @Service public class RawMaterialDetailService implements CommService{ diff --git a/src/main/java/com/sipai/service/sparepart/RawMaterialService.java b/src/main/java/com/sipai/service/sparepart/RawMaterialService.java index ea7d8340..d5539ed2 100644 --- a/src/main/java/com/sipai/service/sparepart/RawMaterialService.java +++ b/src/main/java/com/sipai/service/sparepart/RawMaterialService.java @@ -1,31 +1,12 @@ package com.sipai.service.sparepart; -import java.math.BigDecimal; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import javax.annotation.Resource; - -import org.activiti.engine.TaskService; -import org.activiti.engine.repository.ProcessDefinition; -import org.activiti.engine.runtime.ProcessInstance; -import org.activiti.engine.task.Task; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - import com.sipai.dao.sparepart.RawMaterialDao; import com.sipai.entity.activiti.ProcessType; import com.sipai.entity.base.BusinessUnitAdapter; import com.sipai.entity.business.BusinessUnitAudit; import com.sipai.entity.business.BusinessUnitRecord; import com.sipai.entity.maintenance.MaintenanceCommString; -import com.sipai.entity.sparepart.GoodsClass; -import com.sipai.entity.sparepart.InStockRecord; -import com.sipai.entity.sparepart.InStockRecordDetail; -import com.sipai.entity.sparepart.RawMaterial; -import com.sipai.entity.sparepart.RawMaterialDetail; -import com.sipai.entity.sparepart.SparePartCommString; +import com.sipai.entity.sparepart.*; import com.sipai.entity.user.Company; import com.sipai.service.activiti.WorkflowProcessDefinitionService; import com.sipai.service.activiti.WorkflowService; @@ -33,6 +14,17 @@ import com.sipai.service.business.BusinessUnitAuditService; import com.sipai.service.user.UnitService; import com.sipai.tools.CommService; import com.sipai.tools.CommUtil; +import org.activiti.engine.TaskService; +import org.activiti.engine.repository.ProcessDefinition; +import org.activiti.engine.runtime.ProcessInstance; +import org.activiti.engine.task.Task; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; +import java.util.HashMap; +import java.util.List; +import java.util.Map; @Service public class RawMaterialService implements CommService{ diff --git a/src/main/java/com/sipai/service/sparepart/ReturnStockRecordDetailService.java b/src/main/java/com/sipai/service/sparepart/ReturnStockRecordDetailService.java index 56e73cde..8ac5f36c 100644 --- a/src/main/java/com/sipai/service/sparepart/ReturnStockRecordDetailService.java +++ b/src/main/java/com/sipai/service/sparepart/ReturnStockRecordDetailService.java @@ -1,27 +1,18 @@ package com.sipai.service.sparepart; -import java.math.BigDecimal; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - import com.sipai.dao.sparepart.ReturnStockRecordDetailDao; -import com.sipai.dao.sparepart.WarehouseDao; import com.sipai.entity.sparepart.Goods; import com.sipai.entity.sparepart.ReturnStockRecord; import com.sipai.entity.sparepart.ReturnStockRecordDetail; -import com.sipai.entity.sparepart.PurchaseRecord; -import com.sipai.entity.sparepart.PurchaseRecordDetail; -import com.sipai.entity.sparepart.Subscribe; -import com.sipai.entity.sparepart.SubscribeDetail; -import com.sipai.entity.sparepart.Warehouse; -import com.sipai.entity.user.Company; import com.sipai.entity.user.Dept; import com.sipai.service.user.UnitService; import com.sipai.tools.CommService; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; +import java.math.BigDecimal; +import java.util.List; @Service public class ReturnStockRecordDetailService implements CommService{ diff --git a/src/main/java/com/sipai/service/sparepart/ReturnStockRecordService.java b/src/main/java/com/sipai/service/sparepart/ReturnStockRecordService.java index 3ee5dde1..3078a032 100644 --- a/src/main/java/com/sipai/service/sparepart/ReturnStockRecordService.java +++ b/src/main/java/com/sipai/service/sparepart/ReturnStockRecordService.java @@ -1,22 +1,7 @@ package com.sipai.service.sparepart; -import java.math.BigDecimal; -import java.util.List; - -import javax.annotation.Resource; - -import org.activiti.engine.TaskService; -import org.activiti.engine.task.Task; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - import com.sipai.dao.sparepart.ReturnStockRecordDao; -import com.sipai.entity.sparepart.GoodsClass; -import com.sipai.entity.sparepart.ReturnStockRecord; -import com.sipai.entity.sparepart.ReturnStockRecordDetail; -import com.sipai.entity.sparepart.SparePartCommString; -import com.sipai.entity.sparepart.Stock; -import com.sipai.entity.sparepart.Warehouse; +import com.sipai.entity.sparepart.*; import com.sipai.entity.user.Company; import com.sipai.service.activiti.WorkflowProcessDefinitionService; import com.sipai.service.activiti.WorkflowService; @@ -24,6 +9,14 @@ import com.sipai.service.business.BusinessUnitAuditService; import com.sipai.service.user.UnitService; import com.sipai.tools.CommService; import com.sipai.tools.CommUtil; +import org.activiti.engine.TaskService; +import org.activiti.engine.task.Task; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; +import java.math.BigDecimal; +import java.util.List; @Service public class ReturnStockRecordService implements CommService{ diff --git a/src/main/java/com/sipai/service/sparepart/ScoreService.java b/src/main/java/com/sipai/service/sparepart/ScoreService.java index 0d4d11ad..7ab0a711 100644 --- a/src/main/java/com/sipai/service/sparepart/ScoreService.java +++ b/src/main/java/com/sipai/service/sparepart/ScoreService.java @@ -1,16 +1,12 @@ package com.sipai.service.sparepart; -import java.util.List; - -import javax.annotation.Resource; - +import com.sipai.dao.sparepart.ScoreDao; +import com.sipai.entity.sparepart.Score; +import com.sipai.tools.CommService; import org.springframework.stereotype.Service; -import com.sipai.dao.sparepart.ScoreDao; - -import com.sipai.entity.sparepart.Score; - -import com.sipai.tools.CommService; +import javax.annotation.Resource; +import java.util.List; @Service public class ScoreService implements CommService{ diff --git a/src/main/java/com/sipai/service/sparepart/Score_copyService.java b/src/main/java/com/sipai/service/sparepart/Score_copyService.java index 84a94be3..f692fabb 100644 --- a/src/main/java/com/sipai/service/sparepart/Score_copyService.java +++ b/src/main/java/com/sipai/service/sparepart/Score_copyService.java @@ -1,16 +1,12 @@ package com.sipai.service.sparepart; -import java.util.List; - -import javax.annotation.Resource; - +import com.sipai.dao.sparepart.Score_copyDao; +import com.sipai.entity.sparepart.Score_copy; +import com.sipai.tools.CommService; import org.springframework.stereotype.Service; -import com.sipai.dao.sparepart.Score_copyDao; - -import com.sipai.entity.sparepart.Score_copy; - -import com.sipai.tools.CommService; +import javax.annotation.Resource; +import java.util.List; @Service public class Score_copyService implements CommService{ diff --git a/src/main/java/com/sipai/service/sparepart/SewageInputService.java b/src/main/java/com/sipai/service/sparepart/SewageInputService.java index 4e235086..0f0fa494 100644 --- a/src/main/java/com/sipai/service/sparepart/SewageInputService.java +++ b/src/main/java/com/sipai/service/sparepart/SewageInputService.java @@ -1,32 +1,22 @@ package com.sipai.service.sparepart; -import java.io.IOException; -import java.io.OutputStream; -import java.net.URLEncoder; -import java.util.List; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletResponse; - -import org.apache.poi.hssf.usermodel.HSSFCell; -import org.apache.poi.hssf.usermodel.HSSFCellStyle; -import org.apache.poi.hssf.usermodel.HSSFFont; -import org.apache.poi.hssf.usermodel.HSSFPatriarch; -import org.apache.poi.hssf.usermodel.HSSFRichTextString; -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.hssf.util.HSSFColor; -import org.apache.poi.ss.usermodel.*; -import org.apache.poi.ss.util.CellRangeAddress; -import org.springframework.stereotype.Service; - import com.sipai.dao.sparepart.SewageInputDao; import com.sipai.entity.sparepart.Sewage; import com.sipai.entity.sparepart.SewageInput; import com.sipai.entity.user.User; import com.sipai.service.user.UserService; import com.sipai.tools.CommService; +import org.apache.poi.hssf.usermodel.*; +import org.apache.poi.ss.usermodel.*; +import org.apache.poi.ss.util.CellRangeAddress; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.io.OutputStream; +import java.net.URLEncoder; +import java.util.List; @Service public class SewageInputService implements CommService{ diff --git a/src/main/java/com/sipai/service/sparepart/SewageService.java b/src/main/java/com/sipai/service/sparepart/SewageService.java index da6f7b25..d8d97c25 100644 --- a/src/main/java/com/sipai/service/sparepart/SewageService.java +++ b/src/main/java/com/sipai/service/sparepart/SewageService.java @@ -1,5 +1,26 @@ package com.sipai.service.sparepart; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import com.sipai.dao.sparepart.SewageDao; +import com.sipai.entity.jsyw.JsywPoint; +import com.sipai.entity.sparepart.Sewage; +import com.sipai.entity.sparepart.SewageInput; +import com.sipai.entity.user.Company; +import com.sipai.entity.user.ProcessSection; +import com.sipai.service.company.CompanyService; +import com.sipai.service.jsyw.JsywPointService; +import com.sipai.service.user.ProcessSectionService; +import com.sipai.service.user.UnitService; +import com.sipai.tools.CommService; +import com.sipai.tools.CommUtil; +import org.apache.poi.hssf.usermodel.*; +import org.apache.poi.ss.usermodel.*; +import org.apache.poi.ss.util.CellRangeAddress; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; @@ -8,47 +29,7 @@ import java.text.SimpleDateFormat; import java.util.Date; import java.util.List; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletResponse; - -import org.apache.poi.hssf.usermodel.HSSFCell; -import org.apache.poi.hssf.usermodel.HSSFCellStyle; -import org.apache.poi.hssf.usermodel.HSSFFont; -import org.apache.poi.hssf.usermodel.HSSFPatriarch; -import org.apache.poi.hssf.usermodel.HSSFRichTextString; -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.hssf.util.HSSFColor; -import org.apache.poi.ss.usermodel.*; -import org.apache.poi.ss.util.CellRangeAddress; -import org.springframework.stereotype.Service; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Map; -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; -import com.sipai.dao.sparepart.SewageDao; -import com.sipai.entity.equipment.EquipmentSpecification; -import com.sipai.entity.jsyw.JsywPoint; -import com.sipai.entity.sparepart.Sewage; -import com.sipai.entity.sparepart.SewageInput; -import com.sipai.entity.timeefficiency.PatrolModel; -import com.sipai.entity.user.Company; -import com.sipai.entity.user.ProcessSection; -import com.sipai.entity.work.GroupDetail; -import com.sipai.entity.work.GroupTime; -import com.sipai.entity.work.GroupType; -import com.sipai.entity.work.Scheduling; -import com.sipai.service.company.CompanyService; -import com.sipai.service.jsyw.JsywPointService; -import com.sipai.service.user.ProcessSectionService; -import com.sipai.service.user.UnitService; -import com.sipai.tools.CommService; -import com.sipai.tools.CommUtil; - -import static org.apache.poi.ss.usermodel.CellType.*; +import static org.apache.poi.ss.usermodel.CellType.STRING; @Service public class SewageService implements CommService{ diff --git a/src/main/java/com/sipai/service/sparepart/StockCheckDetailService.java b/src/main/java/com/sipai/service/sparepart/StockCheckDetailService.java index b8fe8dea..981ec3de 100644 --- a/src/main/java/com/sipai/service/sparepart/StockCheckDetailService.java +++ b/src/main/java/com/sipai/service/sparepart/StockCheckDetailService.java @@ -1,15 +1,13 @@ package com.sipai.service.sparepart; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.sipai.dao.sparepart.StockCheckDetailDao; import com.sipai.entity.sparepart.Goods; import com.sipai.entity.sparepart.StockCheckDetail; import com.sipai.tools.CommService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class StockCheckDetailService implements CommService{ diff --git a/src/main/java/com/sipai/service/sparepart/StockCheckService.java b/src/main/java/com/sipai/service/sparepart/StockCheckService.java index 3a1d95c5..96e48cc5 100644 --- a/src/main/java/com/sipai/service/sparepart/StockCheckService.java +++ b/src/main/java/com/sipai/service/sparepart/StockCheckService.java @@ -5,15 +5,9 @@ import com.sipai.entity.activiti.ProcessType; import com.sipai.entity.base.BusinessUnitAdapter; import com.sipai.entity.business.BusinessUnitAudit; import com.sipai.entity.business.BusinessUnitRecord; -import com.sipai.entity.equipment.EquipmentCard; -import com.sipai.entity.equipment.EquipmentCardProp; -import com.sipai.entity.equipment.EquipmentClass; -import com.sipai.entity.equipment.EquipmentCodeRule; import com.sipai.entity.maintenance.MaintenanceCommString; import com.sipai.entity.sparepart.*; import com.sipai.entity.user.Company; -import com.sipai.entity.work.WeatherNew; -import com.sipai.entity.work.WeatherSaveName; import com.sipai.service.activiti.WorkflowProcessDefinitionService; import com.sipai.service.activiti.WorkflowService; import com.sipai.service.business.BusinessUnitAuditService; @@ -45,10 +39,12 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; import java.math.BigDecimal; -import java.math.RoundingMode; import java.net.URLEncoder; import java.text.SimpleDateFormat; -import java.util.*; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import static org.apache.poi.ss.usermodel.CellType.STRING; diff --git a/src/main/java/com/sipai/service/sparepart/StockService.java b/src/main/java/com/sipai/service/sparepart/StockService.java index 9b4ae26d..594fa294 100644 --- a/src/main/java/com/sipai/service/sparepart/StockService.java +++ b/src/main/java/com/sipai/service/sparepart/StockService.java @@ -1,15 +1,7 @@ package com.sipai.service.sparepart; -import java.math.BigDecimal; -import java.util.List; - -import javax.annotation.Resource; - -import com.sipai.entity.sparepart.*; -import org.springframework.scheduling.annotation.Async; -import org.springframework.stereotype.Service; - import com.sipai.dao.sparepart.StockDao; +import com.sipai.entity.sparepart.*; import com.sipai.entity.timeefficiency.PatrolType; import com.sipai.entity.user.Company; import com.sipai.entity.user.User; @@ -18,6 +10,11 @@ import com.sipai.service.user.RoleService; import com.sipai.service.user.UnitService; import com.sipai.tools.CommService; import com.sipai.tools.CommUtil; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.math.BigDecimal; +import java.util.List; @Service public class StockService implements CommService{ diff --git a/src/main/java/com/sipai/service/sparepart/StockTransfersApplyDetailService.java b/src/main/java/com/sipai/service/sparepart/StockTransfersApplyDetailService.java index 7395e5d3..daf1bb53 100644 --- a/src/main/java/com/sipai/service/sparepart/StockTransfersApplyDetailService.java +++ b/src/main/java/com/sipai/service/sparepart/StockTransfersApplyDetailService.java @@ -1,14 +1,12 @@ package com.sipai.service.sparepart; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.sipai.dao.sparepart.StockTransfersApplyDetailDao; import com.sipai.entity.sparepart.StockTransfersApplyDetail; import com.sipai.tools.CommService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class StockTransfersApplyDetailService implements CommService{ diff --git a/src/main/java/com/sipai/service/sparepart/SubscribeDetailService.java b/src/main/java/com/sipai/service/sparepart/SubscribeDetailService.java index 76d3f88c..489b19c7 100644 --- a/src/main/java/com/sipai/service/sparepart/SubscribeDetailService.java +++ b/src/main/java/com/sipai/service/sparepart/SubscribeDetailService.java @@ -1,66 +1,10 @@ package com.sipai.service.sparepart; -import java.io.BufferedReader; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.io.OutputStream; -import java.math.BigDecimal; -import java.net.URLEncoder; -import java.text.SimpleDateFormat; -import java.util.Arrays; -import java.util.Date; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Properties; -import java.util.Set; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletResponse; - -import org.apache.commons.lang3.StringUtils; -import org.apache.poi.hssf.usermodel.DVConstraint; -import org.apache.poi.hssf.usermodel.HSSFCell; -import org.apache.poi.hssf.usermodel.HSSFCellStyle; -import org.apache.poi.hssf.usermodel.HSSFClientAnchor; -import org.apache.poi.hssf.usermodel.HSSFComment; -import org.apache.poi.hssf.usermodel.HSSFDataValidation; -import org.apache.poi.hssf.usermodel.HSSFFont; -import org.apache.poi.hssf.usermodel.HSSFName; -import org.apache.poi.hssf.usermodel.HSSFPatriarch; -import org.apache.poi.hssf.usermodel.HSSFRichTextString; -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.ss.util.CellRangeAddress; -import org.apache.poi.hssf.util.HSSFColor; -import org.apache.poi.ss.util.CellRangeAddressList; -import org.apache.poi.xssf.usermodel.XSSFCell; -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.Service; -import org.springframework.transaction.annotation.Transactional; - import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.sipai.dao.sparepart.SubscribeDetailDao; -import com.sipai.entity.equipment.AssetClass; -import com.sipai.entity.equipment.EquipmentCard; -import com.sipai.entity.equipment.EquipmentCardProp; import com.sipai.entity.equipment.EquipmentClass; -import com.sipai.entity.equipment.EquipmentCodeRule; -import com.sipai.entity.equipment.EquipmentTypeNumber; -import com.sipai.entity.sparepart.Channels; -import com.sipai.entity.sparepart.Goods; -import com.sipai.entity.sparepart.PurchaseRecordDetail; -import com.sipai.entity.sparepart.SparePartCommString; -import com.sipai.entity.sparepart.Subscribe; -import com.sipai.entity.sparepart.SubscribeDetail; -import com.sipai.entity.user.Company; +import com.sipai.entity.sparepart.*; import com.sipai.entity.user.ProcessSection; import com.sipai.entity.user.User; import com.sipai.service.equipment.EquipmentCardService; @@ -70,8 +14,30 @@ import com.sipai.service.user.ProcessSectionService; import com.sipai.tools.CommService; import com.sipai.tools.CommString; import com.sipai.tools.CommUtil; +import org.apache.commons.lang3.StringUtils; +import org.apache.poi.hssf.usermodel.*; +import org.apache.poi.ss.usermodel.*; +import org.apache.poi.ss.util.CellRangeAddress; +import org.apache.poi.ss.util.CellRangeAddressList; +import org.apache.poi.xssf.usermodel.XSSFCell; +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.Service; +import org.springframework.transaction.annotation.Transactional; -import static org.apache.poi.ss.usermodel.CellType.*; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import java.io.*; +import java.math.BigDecimal; +import java.net.URLEncoder; +import java.text.SimpleDateFormat; +import java.util.Arrays; +import java.util.Date; +import java.util.List; +import java.util.Properties; + +import static org.apache.poi.ss.usermodel.CellType.STRING; @Service public class SubscribeDetailService implements CommService{ diff --git a/src/main/java/com/sipai/service/sparepart/SubscribeService.java b/src/main/java/com/sipai/service/sparepart/SubscribeService.java index 1a5a39dc..80747714 100644 --- a/src/main/java/com/sipai/service/sparepart/SubscribeService.java +++ b/src/main/java/com/sipai/service/sparepart/SubscribeService.java @@ -1,36 +1,12 @@ package com.sipai.service.sparepart; -import java.math.BigDecimal; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import javax.annotation.Resource; - -import org.activiti.engine.repository.ProcessDefinition; -import org.activiti.engine.runtime.ProcessInstance; -import org.activiti.engine.task.Task; -import org.activiti.workflow.simple.definition.WorkflowDefinition; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.itextpdf.text.pdf.PdfStructTreeController.returnType; -import com.sipai.dao.sparepart.PurchasePlanDao; import com.sipai.dao.sparepart.SubscribeDao; import com.sipai.entity.activiti.ProcessType; import com.sipai.entity.base.BusinessUnitAdapter; import com.sipai.entity.business.BusinessUnitAudit; import com.sipai.entity.business.BusinessUnitRecord; -import com.sipai.entity.maintenance.Abnormity; import com.sipai.entity.maintenance.MaintenanceCommString; -import com.sipai.entity.maintenance.MaintenanceDetail; -import com.sipai.entity.sparepart.Channels; -import com.sipai.entity.sparepart.PurchaseDetail; -import com.sipai.entity.sparepart.PurchaseMethods; -import com.sipai.entity.sparepart.PurchasePlan; -import com.sipai.entity.sparepart.SparePartCommString; -import com.sipai.entity.sparepart.Subscribe; -import com.sipai.entity.sparepart.SubscribeDetail; +import com.sipai.entity.sparepart.*; import com.sipai.entity.user.Company; import com.sipai.entity.user.Dept; import com.sipai.entity.user.User; @@ -40,7 +16,17 @@ import com.sipai.service.business.BusinessUnitAuditService; import com.sipai.service.user.UnitService; import com.sipai.service.user.UserService; import com.sipai.tools.CommService; -import com.sipai.webservice.server.user.UserServer; +import org.activiti.engine.repository.ProcessDefinition; +import org.activiti.engine.runtime.ProcessInstance; +import org.activiti.engine.task.Task; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; +import java.math.BigDecimal; +import java.util.HashMap; +import java.util.List; +import java.util.Map; @Service public class SubscribeService implements CommService{ diff --git a/src/main/java/com/sipai/service/sparepart/SupplierClassService.java b/src/main/java/com/sipai/service/sparepart/SupplierClassService.java index 32d3fcb8..04e644f4 100644 --- a/src/main/java/com/sipai/service/sparepart/SupplierClassService.java +++ b/src/main/java/com/sipai/service/sparepart/SupplierClassService.java @@ -1,14 +1,12 @@ package com.sipai.service.sparepart; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.sipai.dao.sparepart.SupplierClassDao; import com.sipai.entity.sparepart.SupplierClass; import com.sipai.tools.CommService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class SupplierClassService implements CommService{ diff --git a/src/main/java/com/sipai/service/sparepart/SupplierClass_copyService.java b/src/main/java/com/sipai/service/sparepart/SupplierClass_copyService.java index 1563e4b1..e33eed21 100644 --- a/src/main/java/com/sipai/service/sparepart/SupplierClass_copyService.java +++ b/src/main/java/com/sipai/service/sparepart/SupplierClass_copyService.java @@ -1,14 +1,12 @@ package com.sipai.service.sparepart; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.sipai.dao.sparepart.SupplierClass_copyDao; import com.sipai.entity.sparepart.SupplierClass_copy; import com.sipai.tools.CommService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class SupplierClass_copyService implements CommService{ diff --git a/src/main/java/com/sipai/service/sparepart/SupplierQualificationService.java b/src/main/java/com/sipai/service/sparepart/SupplierQualificationService.java index d2e8637a..d2e0c97c 100644 --- a/src/main/java/com/sipai/service/sparepart/SupplierQualificationService.java +++ b/src/main/java/com/sipai/service/sparepart/SupplierQualificationService.java @@ -1,16 +1,12 @@ package com.sipai.service.sparepart; -import java.util.List; - -import javax.annotation.Resource; - +import com.sipai.dao.sparepart.SupplierQualificationDao; +import com.sipai.entity.sparepart.SupplierQualification; +import com.sipai.tools.CommService; import org.springframework.stereotype.Service; -import com.sipai.dao.sparepart.SupplierQualificationDao; - -import com.sipai.entity.sparepart.SupplierQualification; - -import com.sipai.tools.CommService; +import javax.annotation.Resource; +import java.util.List; @Service public class SupplierQualificationService implements CommService{ diff --git a/src/main/java/com/sipai/service/sparepart/SupplierQualification_copyService.java b/src/main/java/com/sipai/service/sparepart/SupplierQualification_copyService.java index d029088e..1674515b 100644 --- a/src/main/java/com/sipai/service/sparepart/SupplierQualification_copyService.java +++ b/src/main/java/com/sipai/service/sparepart/SupplierQualification_copyService.java @@ -1,16 +1,12 @@ package com.sipai.service.sparepart; -import java.util.List; - -import javax.annotation.Resource; - +import com.sipai.dao.sparepart.SupplierQualification_copyDao; +import com.sipai.entity.sparepart.SupplierQualification_copy; +import com.sipai.tools.CommService; import org.springframework.stereotype.Service; -import com.sipai.dao.sparepart.SupplierQualification_copyDao; - -import com.sipai.entity.sparepart.SupplierQualification_copy; - -import com.sipai.tools.CommService; +import javax.annotation.Resource; +import java.util.List; @Service public class SupplierQualification_copyService implements CommService{ diff --git a/src/main/java/com/sipai/service/sparepart/SupplierQualification_fileService.java b/src/main/java/com/sipai/service/sparepart/SupplierQualification_fileService.java index 1c50f2b1..476131bc 100644 --- a/src/main/java/com/sipai/service/sparepart/SupplierQualification_fileService.java +++ b/src/main/java/com/sipai/service/sparepart/SupplierQualification_fileService.java @@ -1,16 +1,12 @@ package com.sipai.service.sparepart; -import java.util.List; - -import javax.annotation.Resource; - +import com.sipai.dao.sparepart.SupplierQualification_fileDao; +import com.sipai.entity.sparepart.SupplierQualification_file; +import com.sipai.tools.CommService; import org.springframework.stereotype.Service; -import com.sipai.dao.sparepart.SupplierQualification_fileDao; - -import com.sipai.entity.sparepart.SupplierQualification_file; - -import com.sipai.tools.CommService; +import javax.annotation.Resource; +import java.util.List; @Service public class SupplierQualification_fileService implements CommService{ diff --git a/src/main/java/com/sipai/service/sparepart/SupplierService.java b/src/main/java/com/sipai/service/sparepart/SupplierService.java index 575404ce..785a06b2 100644 --- a/src/main/java/com/sipai/service/sparepart/SupplierService.java +++ b/src/main/java/com/sipai/service/sparepart/SupplierService.java @@ -1,15 +1,13 @@ package com.sipai.service.sparepart; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.sipai.dao.sparepart.SupplierDao; import com.sipai.entity.sparepart.Supplier; import com.sipai.entity.sparepart.SupplierClass; import com.sipai.tools.CommService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class SupplierService implements CommService{ diff --git a/src/main/java/com/sipai/service/sparepart/Supplier_copyService.java b/src/main/java/com/sipai/service/sparepart/Supplier_copyService.java index 03b7aa95..fb27c330 100644 --- a/src/main/java/com/sipai/service/sparepart/Supplier_copyService.java +++ b/src/main/java/com/sipai/service/sparepart/Supplier_copyService.java @@ -1,27 +1,19 @@ package com.sipai.service.sparepart; -import java.util.List; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; - -import org.apache.cxf.binding.soap.interceptor.TibcoSoapActionInterceptor; -import org.springframework.stereotype.Service; -import org.springframework.ui.Model; -import org.springframework.web.bind.annotation.ModelAttribute; -import org.springframework.web.servlet.ModelAndView; - import com.sipai.dao.sparepart.Supplier_copyDao; import com.sipai.dao.user.DeptDao; import com.sipai.dao.user.UnitDao; -import com.sipai.entity.sparepart.Supplier_copy; import com.sipai.entity.sparepart.SupplierClass_copy; +import com.sipai.entity.sparepart.Supplier_copy; import com.sipai.entity.user.Company; import com.sipai.entity.user.Dept; import com.sipai.service.user.UnitService; import com.sipai.tools.CommService; import com.sipai.tools.CommString; -import com.sipai.tools.CommUtil; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class Supplier_copyService implements CommService{ diff --git a/src/main/java/com/sipai/service/sparepart/WarehouseService.java b/src/main/java/com/sipai/service/sparepart/WarehouseService.java index cc415b55..653ff77b 100644 --- a/src/main/java/com/sipai/service/sparepart/WarehouseService.java +++ b/src/main/java/com/sipai/service/sparepart/WarehouseService.java @@ -1,16 +1,14 @@ package com.sipai.service.sparepart; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.sipai.dao.sparepart.WarehouseDao; import com.sipai.entity.sparepart.Warehouse; import com.sipai.entity.user.Company; import com.sipai.service.user.UnitService; import com.sipai.tools.CommService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class WarehouseService implements CommService{ diff --git a/src/main/java/com/sipai/service/sparepart/WarrantyPeriodService.java b/src/main/java/com/sipai/service/sparepart/WarrantyPeriodService.java index e9a0d1ce..98b57ff3 100644 --- a/src/main/java/com/sipai/service/sparepart/WarrantyPeriodService.java +++ b/src/main/java/com/sipai/service/sparepart/WarrantyPeriodService.java @@ -1,14 +1,12 @@ package com.sipai.service.sparepart; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.sipai.dao.sparepart.WarrantyPeriodDao; import com.sipai.entity.sparepart.WarrantyPeriod; import com.sipai.tools.CommService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class WarrantyPeriodService implements CommService{ diff --git a/src/main/java/com/sipai/service/sparepart/impl/HazardousChemicalsServiceImpl.java b/src/main/java/com/sipai/service/sparepart/impl/HazardousChemicalsServiceImpl.java index 18f30a4b..8c870ce7 100644 --- a/src/main/java/com/sipai/service/sparepart/impl/HazardousChemicalsServiceImpl.java +++ b/src/main/java/com/sipai/service/sparepart/impl/HazardousChemicalsServiceImpl.java @@ -1,9 +1,7 @@ package com.sipai.service.sparepart.impl; import com.sipai.dao.sparepart.HazardousChemicalsDao; -import com.sipai.dao.workorder.WorkorderDetailDao; import com.sipai.entity.sparepart.HazardousChemicals; -import com.sipai.entity.workorder.WorkorderDetail; import com.sipai.service.sparepart.HazardousChemicalsService; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/sipai/service/structure/StructureCardPictureRoutePointdetailService.java b/src/main/java/com/sipai/service/structure/StructureCardPictureRoutePointdetailService.java index fdcb05ad..56077f93 100644 --- a/src/main/java/com/sipai/service/structure/StructureCardPictureRoutePointdetailService.java +++ b/src/main/java/com/sipai/service/structure/StructureCardPictureRoutePointdetailService.java @@ -1,9 +1,9 @@ package com.sipai.service.structure; -import java.util.List; - import com.sipai.entity.structure.StructureCardPictureRoutePointdetail; +import java.util.List; + public interface StructureCardPictureRoutePointdetailService { public abstract StructureCardPictureRoutePointdetail selectById(String id); diff --git a/src/main/java/com/sipai/service/structure/StructureCardPictureRoutePointdetailServiceImpl.java b/src/main/java/com/sipai/service/structure/StructureCardPictureRoutePointdetailServiceImpl.java index 075d6b2e..c43cc4fa 100644 --- a/src/main/java/com/sipai/service/structure/StructureCardPictureRoutePointdetailServiceImpl.java +++ b/src/main/java/com/sipai/service/structure/StructureCardPictureRoutePointdetailServiceImpl.java @@ -1,13 +1,11 @@ package com.sipai.service.structure; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.sipai.dao.structure.StructureCardPictureRoutePointdetailDao; import com.sipai.entity.structure.StructureCardPictureRoutePointdetail; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service diff --git a/src/main/java/com/sipai/service/structure/StructureCardPictureRouteService.java b/src/main/java/com/sipai/service/structure/StructureCardPictureRouteService.java index 22ddabf6..65e6d716 100644 --- a/src/main/java/com/sipai/service/structure/StructureCardPictureRouteService.java +++ b/src/main/java/com/sipai/service/structure/StructureCardPictureRouteService.java @@ -1,9 +1,9 @@ package com.sipai.service.structure; -import java.util.List; - import com.sipai.entity.structure.StructureCardPictureRoute; +import java.util.List; + public interface StructureCardPictureRouteService { diff --git a/src/main/java/com/sipai/service/structure/StructureCardPictureRouteServiceImpl.java b/src/main/java/com/sipai/service/structure/StructureCardPictureRouteServiceImpl.java index 87ebd233..ec13c37a 100644 --- a/src/main/java/com/sipai/service/structure/StructureCardPictureRouteServiceImpl.java +++ b/src/main/java/com/sipai/service/structure/StructureCardPictureRouteServiceImpl.java @@ -1,23 +1,17 @@ package com.sipai.service.structure; -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.HashSet; -import java.util.Iterator; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - import com.sipai.dao.structure.StructureCardPictureRouteDao; -import com.sipai.entity.structure.StructureCardPicture; import com.sipai.entity.structure.StructureCardPictureRoute; import com.sipai.entity.timeefficiency.PatrolPoint; import com.sipai.entity.timeefficiency.TimeEfficiencyCommStr; import com.sipai.service.timeefficiency.PatrolPointService; -import com.sipai.tools.CommUtil; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; @Service public class StructureCardPictureRouteServiceImpl implements StructureCardPictureRouteService{ diff --git a/src/main/java/com/sipai/service/structure/StructureCardPictureService.java b/src/main/java/com/sipai/service/structure/StructureCardPictureService.java index 409bca95..8cc0d47e 100644 --- a/src/main/java/com/sipai/service/structure/StructureCardPictureService.java +++ b/src/main/java/com/sipai/service/structure/StructureCardPictureService.java @@ -1,16 +1,14 @@ package com.sipai.service.structure; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.sipai.dao.structure.StructureCardPictureDao; import com.sipai.entity.structure.StructureCardPicture; import com.sipai.entity.user.Company; import com.sipai.service.user.UnitService; import com.sipai.tools.CommService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class StructureCardPictureService implements CommService{ diff --git a/src/main/java/com/sipai/service/structure/StructureCardService.java b/src/main/java/com/sipai/service/structure/StructureCardService.java index 5e949e7f..977b5357 100644 --- a/src/main/java/com/sipai/service/structure/StructureCardService.java +++ b/src/main/java/com/sipai/service/structure/StructureCardService.java @@ -1,41 +1,11 @@ package com.sipai.service.structure; -import java.io.FileInputStream; -import java.io.IOException; -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Comparator; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import javax.annotation.Resource; - -import net.sf.json.JSONArray; - -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.poifs.filesystem.POIFSFileSystem; -import org.springframework.stereotype.Service; -import org.springframework.web.multipart.MultipartFile; - import com.sipai.dao.structure.StructureCardDao; -import com.sipai.entity.equipment.AssetClass; import com.sipai.entity.equipment.EquipmentCard; +import com.sipai.entity.scada.MPoint; import com.sipai.entity.structure.Structure; import com.sipai.entity.structure.StructureCard; -import com.sipai.entity.structure.StructureClass; import com.sipai.entity.structure.StructureCommStr; -import com.sipai.entity.scada.MPoint; -import com.sipai.entity.scada.MPoint4APP; -import com.sipai.entity.timeefficiency.TimeEfficiencyCommStr; -import com.sipai.entity.user.Company; -import com.sipai.entity.user.ExtSystem; -import com.sipai.entity.user.ProcessSection; -import com.sipai.entity.user.Unit; -import com.sipai.entity.user.User; import com.sipai.service.equipment.EquipmentCardService; import com.sipai.service.scada.MPointService; import com.sipai.service.user.ExtSystemService; @@ -43,8 +13,11 @@ import com.sipai.service.user.ProcessSectionService; import com.sipai.service.user.UnitService; import com.sipai.tools.CommService; import com.sipai.tools.CommString; -import com.sipai.tools.CommUtil; -import com.sipai.tools.FileUtil; +import net.sf.json.JSONArray; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.*; @Service diff --git a/src/main/java/com/sipai/service/structure/StructureClassService.java b/src/main/java/com/sipai/service/structure/StructureClassService.java index 217ac57a..b8c9b4a9 100644 --- a/src/main/java/com/sipai/service/structure/StructureClassService.java +++ b/src/main/java/com/sipai/service/structure/StructureClassService.java @@ -1,16 +1,12 @@ package com.sipai.service.structure; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.sipai.dao.structure.StructureClassDao; -import com.sipai.entity.structure.StructureCard; import com.sipai.entity.structure.StructureClass; import com.sipai.tools.CommService; -import com.sipai.tools.CommUtil; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class StructureClassService implements CommService{ @Resource diff --git a/src/main/java/com/sipai/service/teacher/TeacherFileService.java b/src/main/java/com/sipai/service/teacher/TeacherFileService.java index 36acfc3e..ceaf8adc 100644 --- a/src/main/java/com/sipai/service/teacher/TeacherFileService.java +++ b/src/main/java/com/sipai/service/teacher/TeacherFileService.java @@ -1,14 +1,12 @@ package com.sipai.service.teacher; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.sipai.dao.teacher.TeacherFileDao; import com.sipai.entity.teacher.TeacherFile; import com.sipai.tools.CommService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class TeacherFileService implements CommService{ @Resource diff --git a/src/main/java/com/sipai/service/teacher/TeachertypeService.java b/src/main/java/com/sipai/service/teacher/TeachertypeService.java index 63565280..20760953 100644 --- a/src/main/java/com/sipai/service/teacher/TeachertypeService.java +++ b/src/main/java/com/sipai/service/teacher/TeachertypeService.java @@ -1,20 +1,13 @@ package com.sipai.service.teacher; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.sipai.dao.teacher.TeachertypeDao; import com.sipai.entity.teacher.Teachertype; import com.sipai.tools.CommService; - import net.sf.json.JSONArray; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.*; @Service public class TeachertypeService implements CommService{ diff --git a/src/main/java/com/sipai/service/timeefficiency/ClockinRecordService.java b/src/main/java/com/sipai/service/timeefficiency/ClockinRecordService.java index 2710f806..9b49b6cd 100644 --- a/src/main/java/com/sipai/service/timeefficiency/ClockinRecordService.java +++ b/src/main/java/com/sipai/service/timeefficiency/ClockinRecordService.java @@ -1,13 +1,9 @@ package com.sipai.service.timeefficiency; -import java.io.IOException; -import java.io.OutputStream; -import java.net.URLEncoder; -import java.util.List; - -import javax.annotation.Resource; -import javax.servlet.ServletOutputStream; -import javax.servlet.http.HttpServletResponse; +import com.sipai.dao.timeefficiency.ClockinRecordDao; +import com.sipai.entity.timeefficiency.ClockinRecord; +import com.sipai.tools.CommService; +import com.sipai.tools.CommUtil; import org.apache.poi.ss.usermodel.HorizontalAlignment; import org.apache.poi.ss.util.CellRangeAddress; import org.apache.poi.xssf.usermodel.XSSFCellStyle; @@ -16,10 +12,12 @@ import org.apache.poi.xssf.usermodel.XSSFSheet; import org.apache.poi.xssf.usermodel.XSSFWorkbook; import org.springframework.stereotype.Service; -import com.sipai.dao.timeefficiency.ClockinRecordDao; -import com.sipai.entity.timeefficiency.ClockinRecord; -import com.sipai.tools.CommService; -import com.sipai.tools.CommUtil; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.io.OutputStream; +import java.net.URLEncoder; +import java.util.List; @Service public class ClockinRecordService implements CommService{ diff --git a/src/main/java/com/sipai/service/timeefficiency/EfficiencyProcessService.java b/src/main/java/com/sipai/service/timeefficiency/EfficiencyProcessService.java index 6095dc49..b113e352 100644 --- a/src/main/java/com/sipai/service/timeefficiency/EfficiencyProcessService.java +++ b/src/main/java/com/sipai/service/timeefficiency/EfficiencyProcessService.java @@ -1,16 +1,13 @@ package com.sipai.service.timeefficiency; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - -import com.itextpdf.text.pdf.PdfStructTreeController.returnType; import com.sipai.dao.timeefficiency.EfficiencyProcessDao; import com.sipai.entity.timeefficiency.EfficiencyProcess; import com.sipai.service.work.CameraService; import com.sipai.tools.CommService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class EfficiencyProcessService implements CommService{ @Resource diff --git a/src/main/java/com/sipai/service/timeefficiency/ElectricityPriceDetailService.java b/src/main/java/com/sipai/service/timeefficiency/ElectricityPriceDetailService.java index f2ac3fd9..c6175b17 100644 --- a/src/main/java/com/sipai/service/timeefficiency/ElectricityPriceDetailService.java +++ b/src/main/java/com/sipai/service/timeefficiency/ElectricityPriceDetailService.java @@ -1,16 +1,13 @@ package com.sipai.service.timeefficiency; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - -import com.itextpdf.text.pdf.PdfStructTreeController.returnType; import com.sipai.dao.timeefficiency.ElectricityPriceDetailDao; import com.sipai.entity.timeefficiency.ElectricityPriceDetail; import com.sipai.service.work.CameraService; import com.sipai.tools.CommService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class ElectricityPriceDetailService implements CommService{ @Resource diff --git a/src/main/java/com/sipai/service/timeefficiency/ElectricityPriceService.java b/src/main/java/com/sipai/service/timeefficiency/ElectricityPriceService.java index 4eac093d..32381bbe 100644 --- a/src/main/java/com/sipai/service/timeefficiency/ElectricityPriceService.java +++ b/src/main/java/com/sipai/service/timeefficiency/ElectricityPriceService.java @@ -1,35 +1,21 @@ package com.sipai.service.timeefficiency; -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Calendar; -import java.util.Date; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; - -import net.sf.json.JSONObject; - -import org.springframework.stereotype.Service; -import org.springframework.ui.Model; -import org.springframework.web.bind.annotation.RequestMapping; - -import com.itextpdf.text.pdf.PdfStructTreeController.returnType; import com.sipai.dao.timeefficiency.ElectricityPriceDao; import com.sipai.entity.scada.MPointHistory; import com.sipai.entity.timeefficiency.EfficiencyProcess; import com.sipai.entity.timeefficiency.ElectricityPrice; import com.sipai.entity.timeefficiency.ElectricityPriceDetail; -import com.sipai.entity.timeefficiency.PatrolRecord; -import com.sipai.entity.user.User; -import com.sipai.entity.workorder.WorkorderAchievement; import com.sipai.service.scada.MPointHistoryService; import com.sipai.service.work.CameraService; import com.sipai.tools.CommService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; +import java.util.List; @Service public class ElectricityPriceService implements CommService { diff --git a/src/main/java/com/sipai/service/timeefficiency/PatrolAreaFloorService.java b/src/main/java/com/sipai/service/timeefficiency/PatrolAreaFloorService.java index 4c40b099..1d57ce86 100644 --- a/src/main/java/com/sipai/service/timeefficiency/PatrolAreaFloorService.java +++ b/src/main/java/com/sipai/service/timeefficiency/PatrolAreaFloorService.java @@ -1,9 +1,9 @@ package com.sipai.service.timeefficiency; -import java.util.List; - import com.sipai.entity.timeefficiency.PatrolAreaFloor; +import java.util.List; + public interface PatrolAreaFloorService { public abstract PatrolAreaFloor selectById(String id); diff --git a/src/main/java/com/sipai/service/timeefficiency/PatrolAreaProcessSectionService.java b/src/main/java/com/sipai/service/timeefficiency/PatrolAreaProcessSectionService.java index ee7e88c3..1cd1003d 100644 --- a/src/main/java/com/sipai/service/timeefficiency/PatrolAreaProcessSectionService.java +++ b/src/main/java/com/sipai/service/timeefficiency/PatrolAreaProcessSectionService.java @@ -1,9 +1,9 @@ package com.sipai.service.timeefficiency; -import java.util.List; - import com.sipai.entity.timeefficiency.PatrolAreaProcessSection; +import java.util.List; + public interface PatrolAreaProcessSectionService { public abstract PatrolAreaProcessSection selectById(String id); diff --git a/src/main/java/com/sipai/service/timeefficiency/PatrolAreaService.java b/src/main/java/com/sipai/service/timeefficiency/PatrolAreaService.java index c3632a05..50d56f1d 100644 --- a/src/main/java/com/sipai/service/timeefficiency/PatrolAreaService.java +++ b/src/main/java/com/sipai/service/timeefficiency/PatrolAreaService.java @@ -1,11 +1,11 @@ package com.sipai.service.timeefficiency; -import java.util.List; - import com.sipai.entity.timeefficiency.PatrolArea; import com.sipai.entity.timeefficiency.PatrolPoint; import com.sipai.entity.user.ProcessSection; +import java.util.List; + public interface PatrolAreaService { public abstract PatrolArea selectById(String id); diff --git a/src/main/java/com/sipai/service/timeefficiency/PatrolAreaUserService.java b/src/main/java/com/sipai/service/timeefficiency/PatrolAreaUserService.java index f24d8f2c..d5a2c77d 100644 --- a/src/main/java/com/sipai/service/timeefficiency/PatrolAreaUserService.java +++ b/src/main/java/com/sipai/service/timeefficiency/PatrolAreaUserService.java @@ -2,6 +2,7 @@ package com.sipai.service.timeefficiency; import com.sipai.entity.timeefficiency.PatrolAreaUser; + import java.util.List; public interface PatrolAreaUserService { diff --git a/src/main/java/com/sipai/service/timeefficiency/PatrolContentsPlanService.java b/src/main/java/com/sipai/service/timeefficiency/PatrolContentsPlanService.java index fd004995..842bb5cf 100644 --- a/src/main/java/com/sipai/service/timeefficiency/PatrolContentsPlanService.java +++ b/src/main/java/com/sipai/service/timeefficiency/PatrolContentsPlanService.java @@ -1,9 +1,9 @@ package com.sipai.service.timeefficiency; -import java.util.List; - import com.sipai.entity.timeefficiency.PatrolContentsPlan; +import java.util.List; + public interface PatrolContentsPlanService { public abstract PatrolContentsPlan selectById(String id); diff --git a/src/main/java/com/sipai/service/timeefficiency/PatrolContentsRecordService.java b/src/main/java/com/sipai/service/timeefficiency/PatrolContentsRecordService.java index b0220865..5932f720 100644 --- a/src/main/java/com/sipai/service/timeefficiency/PatrolContentsRecordService.java +++ b/src/main/java/com/sipai/service/timeefficiency/PatrolContentsRecordService.java @@ -1,10 +1,9 @@ package com.sipai.service.timeefficiency; -import java.util.List; - +import com.sipai.entity.timeefficiency.PatrolContentsRecord; import net.sf.json.JSONArray; -import com.sipai.entity.timeefficiency.PatrolContentsRecord; +import java.util.List; public interface PatrolContentsRecordService { diff --git a/src/main/java/com/sipai/service/timeefficiency/PatrolContentsService.java b/src/main/java/com/sipai/service/timeefficiency/PatrolContentsService.java index aa12416c..bbdcb557 100644 --- a/src/main/java/com/sipai/service/timeefficiency/PatrolContentsService.java +++ b/src/main/java/com/sipai/service/timeefficiency/PatrolContentsService.java @@ -1,9 +1,9 @@ package com.sipai.service.timeefficiency; -import java.util.List; - import com.sipai.entity.timeefficiency.PatrolContents; +import java.util.List; + public interface PatrolContentsService { public abstract PatrolContents selectById(String id); diff --git a/src/main/java/com/sipai/service/timeefficiency/PatrolContentsStandardService.java b/src/main/java/com/sipai/service/timeefficiency/PatrolContentsStandardService.java index b2832cbf..927280c2 100644 --- a/src/main/java/com/sipai/service/timeefficiency/PatrolContentsStandardService.java +++ b/src/main/java/com/sipai/service/timeefficiency/PatrolContentsStandardService.java @@ -1,11 +1,12 @@ package com.sipai.service.timeefficiency; +import com.sipai.entity.equipment.EquipmentClass; +import com.sipai.entity.timeefficiency.PatrolContentsStandard; + +import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.InputStream; import java.util.List; -import javax.servlet.http.HttpServletResponse; -import com.sipai.entity.equipment.EquipmentClass; -import com.sipai.entity.timeefficiency.PatrolContentsStandard; public interface PatrolContentsStandardService { diff --git a/src/main/java/com/sipai/service/timeefficiency/PatrolMeasurePointPlanService.java b/src/main/java/com/sipai/service/timeefficiency/PatrolMeasurePointPlanService.java index 89293092..dc123d3c 100644 --- a/src/main/java/com/sipai/service/timeefficiency/PatrolMeasurePointPlanService.java +++ b/src/main/java/com/sipai/service/timeefficiency/PatrolMeasurePointPlanService.java @@ -1,9 +1,9 @@ package com.sipai.service.timeefficiency; -import java.util.List; - import com.sipai.entity.timeefficiency.PatrolMeasurePointPlan; +import java.util.List; + public interface PatrolMeasurePointPlanService { public abstract PatrolMeasurePointPlan selectById(String id); diff --git a/src/main/java/com/sipai/service/timeefficiency/PatrolMeasurePointRecordService.java b/src/main/java/com/sipai/service/timeefficiency/PatrolMeasurePointRecordService.java index da90efdd..73b50b1f 100644 --- a/src/main/java/com/sipai/service/timeefficiency/PatrolMeasurePointRecordService.java +++ b/src/main/java/com/sipai/service/timeefficiency/PatrolMeasurePointRecordService.java @@ -1,10 +1,9 @@ package com.sipai.service.timeefficiency; -import java.util.List; - +import com.sipai.entity.timeefficiency.PatrolMeasurePointRecord; import net.sf.json.JSONArray; -import com.sipai.entity.timeefficiency.PatrolMeasurePointRecord; +import java.util.List; public interface PatrolMeasurePointRecordService { public abstract PatrolMeasurePointRecord selectById(String id); diff --git a/src/main/java/com/sipai/service/timeefficiency/PatrolModelService.java b/src/main/java/com/sipai/service/timeefficiency/PatrolModelService.java index eb0d7c4a..9a8f7e3d 100644 --- a/src/main/java/com/sipai/service/timeefficiency/PatrolModelService.java +++ b/src/main/java/com/sipai/service/timeefficiency/PatrolModelService.java @@ -1,11 +1,9 @@ package com.sipai.service.timeefficiency; -import java.util.List; - -import org.springframework.transaction.annotation.Transactional; - import com.sipai.entity.timeefficiency.PatrolModel; +import java.util.List; + public interface PatrolModelService { public abstract PatrolModel selectById(String id); diff --git a/src/main/java/com/sipai/service/timeefficiency/PatrolPlanDeptService.java b/src/main/java/com/sipai/service/timeefficiency/PatrolPlanDeptService.java index 42cf31f1..865130cb 100644 --- a/src/main/java/com/sipai/service/timeefficiency/PatrolPlanDeptService.java +++ b/src/main/java/com/sipai/service/timeefficiency/PatrolPlanDeptService.java @@ -1,10 +1,10 @@ package com.sipai.service.timeefficiency; -import java.util.List; - import com.sipai.entity.timeefficiency.PatrolPlanDept; import com.sipai.entity.user.Dept; +import java.util.List; + public interface PatrolPlanDeptService { public abstract PatrolPlanDept selectById(String id); diff --git a/src/main/java/com/sipai/service/timeefficiency/PatrolPlanPatrolCameraService.java b/src/main/java/com/sipai/service/timeefficiency/PatrolPlanPatrolCameraService.java index 5b75b145..7864d430 100644 --- a/src/main/java/com/sipai/service/timeefficiency/PatrolPlanPatrolCameraService.java +++ b/src/main/java/com/sipai/service/timeefficiency/PatrolPlanPatrolCameraService.java @@ -1,15 +1,13 @@ package com.sipai.service.timeefficiency; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.sipai.dao.timeefficiency.PatrolPlanPatrolCameraDao; import com.sipai.entity.timeefficiency.PatrolPlanPatrolCamera; import com.sipai.service.work.CameraService; import com.sipai.tools.CommService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class PatrolPlanPatrolCameraService implements CommService{ @Resource diff --git a/src/main/java/com/sipai/service/timeefficiency/PatrolPlanPatrolEquipmentService.java b/src/main/java/com/sipai/service/timeefficiency/PatrolPlanPatrolEquipmentService.java index 087cca5f..6b228207 100644 --- a/src/main/java/com/sipai/service/timeefficiency/PatrolPlanPatrolEquipmentService.java +++ b/src/main/java/com/sipai/service/timeefficiency/PatrolPlanPatrolEquipmentService.java @@ -1,10 +1,10 @@ package com.sipai.service.timeefficiency; -import java.util.List; - import com.sipai.entity.equipment.EquipmentCard; import com.sipai.entity.timeefficiency.PatrolPlanPatrolEquipment; +import java.util.List; + public interface PatrolPlanPatrolEquipmentService { public abstract PatrolPlanPatrolEquipment selectById(String id); diff --git a/src/main/java/com/sipai/service/timeefficiency/PatrolPlanPatrolPointService.java b/src/main/java/com/sipai/service/timeefficiency/PatrolPlanPatrolPointService.java index a7725412..bce20d70 100644 --- a/src/main/java/com/sipai/service/timeefficiency/PatrolPlanPatrolPointService.java +++ b/src/main/java/com/sipai/service/timeefficiency/PatrolPlanPatrolPointService.java @@ -1,10 +1,10 @@ package com.sipai.service.timeefficiency; -import java.util.List; - import com.sipai.entity.timeefficiency.PatrolPlanPatrolPoint; import com.sipai.entity.timeefficiency.PatrolPoint; +import java.util.List; + public interface PatrolPlanPatrolPointService { public abstract PatrolPlanPatrolPoint selectById(String id); diff --git a/src/main/java/com/sipai/service/timeefficiency/PatrolPlanService.java b/src/main/java/com/sipai/service/timeefficiency/PatrolPlanService.java index a7c7a1ba..14714396 100644 --- a/src/main/java/com/sipai/service/timeefficiency/PatrolPlanService.java +++ b/src/main/java/com/sipai/service/timeefficiency/PatrolPlanService.java @@ -1,11 +1,9 @@ package com.sipai.service.timeefficiency; -import java.util.List; - -import org.springframework.transaction.annotation.Transactional; - import com.sipai.entity.timeefficiency.PatrolPlan; +import java.util.List; + public interface PatrolPlanService { /* (non-Javadoc) diff --git a/src/main/java/com/sipai/service/timeefficiency/PatrolPointCameraService.java b/src/main/java/com/sipai/service/timeefficiency/PatrolPointCameraService.java index 137ebff5..56c73d55 100644 --- a/src/main/java/com/sipai/service/timeefficiency/PatrolPointCameraService.java +++ b/src/main/java/com/sipai/service/timeefficiency/PatrolPointCameraService.java @@ -1,9 +1,9 @@ package com.sipai.service.timeefficiency; -import java.util.List; - import com.sipai.entity.timeefficiency.PatrolPointCamera; +import java.util.List; + public interface PatrolPointCameraService { public PatrolPointCamera selectById(String id); diff --git a/src/main/java/com/sipai/service/timeefficiency/PatrolPointEquipmentCardService.java b/src/main/java/com/sipai/service/timeefficiency/PatrolPointEquipmentCardService.java index 8c454aca..bd300405 100644 --- a/src/main/java/com/sipai/service/timeefficiency/PatrolPointEquipmentCardService.java +++ b/src/main/java/com/sipai/service/timeefficiency/PatrolPointEquipmentCardService.java @@ -1,10 +1,9 @@ package com.sipai.service.timeefficiency; -import java.util.List; - -import com.sipai.entity.equipment.EquipmentCard; import com.sipai.entity.timeefficiency.PatrolPointEquipmentCard; +import java.util.List; + public interface PatrolPointEquipmentCardService { public abstract PatrolPointEquipmentCard selectById(String id); diff --git a/src/main/java/com/sipai/service/timeefficiency/PatrolPointFileService.java b/src/main/java/com/sipai/service/timeefficiency/PatrolPointFileService.java index 0bc7c6bb..bbe72222 100644 --- a/src/main/java/com/sipai/service/timeefficiency/PatrolPointFileService.java +++ b/src/main/java/com/sipai/service/timeefficiency/PatrolPointFileService.java @@ -1,10 +1,10 @@ package com.sipai.service.timeefficiency; -import java.util.List; - import com.sipai.entity.base.CommonFile; import com.sipai.entity.timeefficiency.PatrolPointFile; +import java.util.List; + public interface PatrolPointFileService { public abstract PatrolPointFile selectById(String id); diff --git a/src/main/java/com/sipai/service/timeefficiency/PatrolPointMeasurePointService.java b/src/main/java/com/sipai/service/timeefficiency/PatrolPointMeasurePointService.java index 64e2bfeb..1cc1bbf6 100644 --- a/src/main/java/com/sipai/service/timeefficiency/PatrolPointMeasurePointService.java +++ b/src/main/java/com/sipai/service/timeefficiency/PatrolPointMeasurePointService.java @@ -1,11 +1,10 @@ package com.sipai.service.timeefficiency; -import java.util.List; - -import net.sf.json.JSONArray; - import com.sipai.entity.scada.MPoint4APP; import com.sipai.entity.timeefficiency.PatrolPointMeasurePoint; +import net.sf.json.JSONArray; + +import java.util.List; public interface PatrolPointMeasurePointService { diff --git a/src/main/java/com/sipai/service/timeefficiency/PatrolPointService.java b/src/main/java/com/sipai/service/timeefficiency/PatrolPointService.java index 17379571..77877404 100644 --- a/src/main/java/com/sipai/service/timeefficiency/PatrolPointService.java +++ b/src/main/java/com/sipai/service/timeefficiency/PatrolPointService.java @@ -1,14 +1,10 @@ package com.sipai.service.timeefficiency; -import java.util.List; - import com.alibaba.fastjson.JSONArray; -import com.sipai.entity.timeefficiency.PatrolContents; - -import org.springframework.transaction.annotation.Transactional; - import com.sipai.entity.timeefficiency.PatrolPoint; +import java.util.List; + public interface PatrolPointService { public abstract PatrolPoint selectById(String id); diff --git a/src/main/java/com/sipai/service/timeefficiency/PatrolRecordPatrolCameraService.java b/src/main/java/com/sipai/service/timeefficiency/PatrolRecordPatrolCameraService.java index 580dc31b..926b1b0f 100644 --- a/src/main/java/com/sipai/service/timeefficiency/PatrolRecordPatrolCameraService.java +++ b/src/main/java/com/sipai/service/timeefficiency/PatrolRecordPatrolCameraService.java @@ -1,18 +1,15 @@ package com.sipai.service.timeefficiency; -import java.util.List; - -import javax.annotation.Resource; - -import com.sipai.entity.user.User; -import com.sipai.service.user.UserService; -import org.springframework.stereotype.Service; - -import com.itextpdf.text.pdf.PdfStructTreeController.returnType; import com.sipai.dao.timeefficiency.PatrolRecordPatrolCameraDao; import com.sipai.entity.timeefficiency.PatrolRecordPatrolCamera; +import com.sipai.entity.user.User; +import com.sipai.service.user.UserService; import com.sipai.service.work.CameraService; import com.sipai.tools.CommService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class PatrolRecordPatrolCameraService implements CommService { diff --git a/src/main/java/com/sipai/service/timeefficiency/PatrolRecordPatrolEquipmentService.java b/src/main/java/com/sipai/service/timeefficiency/PatrolRecordPatrolEquipmentService.java index 8e0432a2..5ee35118 100644 --- a/src/main/java/com/sipai/service/timeefficiency/PatrolRecordPatrolEquipmentService.java +++ b/src/main/java/com/sipai/service/timeefficiency/PatrolRecordPatrolEquipmentService.java @@ -1,12 +1,10 @@ package com.sipai.service.timeefficiency; -import java.util.List; - -import com.sipai.entity.timeefficiency.PatrolRecordPatrolRoute; -import net.sf.json.JSONArray; - import com.sipai.entity.equipment.EquipmentCard; import com.sipai.entity.timeefficiency.PatrolRecordPatrolEquipment; +import net.sf.json.JSONArray; + +import java.util.List; public interface PatrolRecordPatrolEquipmentService { diff --git a/src/main/java/com/sipai/service/timeefficiency/PatrolRecordPatrolPointService.java b/src/main/java/com/sipai/service/timeefficiency/PatrolRecordPatrolPointService.java index 4250670d..4210b3ab 100644 --- a/src/main/java/com/sipai/service/timeefficiency/PatrolRecordPatrolPointService.java +++ b/src/main/java/com/sipai/service/timeefficiency/PatrolRecordPatrolPointService.java @@ -1,9 +1,9 @@ package com.sipai.service.timeefficiency; -import java.util.List; - import com.sipai.entity.timeefficiency.PatrolRecordPatrolPoint; +import java.util.List; + public interface PatrolRecordPatrolPointService { public abstract PatrolRecordPatrolPoint selectById(String id); diff --git a/src/main/java/com/sipai/service/timeefficiency/PatrolRecordPatrolRouteService.java b/src/main/java/com/sipai/service/timeefficiency/PatrolRecordPatrolRouteService.java index 2e4e57c1..d2b6b18e 100644 --- a/src/main/java/com/sipai/service/timeefficiency/PatrolRecordPatrolRouteService.java +++ b/src/main/java/com/sipai/service/timeefficiency/PatrolRecordPatrolRouteService.java @@ -1,9 +1,9 @@ package com.sipai.service.timeefficiency; -import java.util.List; - import com.sipai.entity.timeefficiency.PatrolRecordPatrolRoute; +import java.util.List; + public interface PatrolRecordPatrolRouteService { public abstract PatrolRecordPatrolRoute selectById(String id); diff --git a/src/main/java/com/sipai/service/timeefficiency/PatrolRecordService.java b/src/main/java/com/sipai/service/timeefficiency/PatrolRecordService.java index 1afc0c3e..6b1779a5 100644 --- a/src/main/java/com/sipai/service/timeefficiency/PatrolRecordService.java +++ b/src/main/java/com/sipai/service/timeefficiency/PatrolRecordService.java @@ -1,19 +1,14 @@ package com.sipai.service.timeefficiency; -import java.io.IOException; -import java.util.List; -import java.util.Set; - -import javax.servlet.http.HttpServletResponse; - -import com.sipai.entity.business.BusinessUnitAudit; -import net.sf.json.JSONArray; - -import net.sf.json.JSONObject; -import org.springframework.transaction.annotation.Transactional; - import com.sipai.entity.timeefficiency.PatrolRecord; import com.sipai.entity.timeefficiency.PatrolRecordDetailStatistics; +import net.sf.json.JSONArray; +import net.sf.json.JSONObject; + +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.List; +import java.util.Set; public interface PatrolRecordService { diff --git a/src/main/java/com/sipai/service/timeefficiency/PatrolRouteService.java b/src/main/java/com/sipai/service/timeefficiency/PatrolRouteService.java index 615493fe..fc97ccf7 100644 --- a/src/main/java/com/sipai/service/timeefficiency/PatrolRouteService.java +++ b/src/main/java/com/sipai/service/timeefficiency/PatrolRouteService.java @@ -1,13 +1,10 @@ package com.sipai.service.timeefficiency; -import java.util.List; - -import com.sipai.entity.business.BusinessUnitAudit; -import org.springframework.transaction.annotation.Transactional; - import com.sipai.entity.timeefficiency.PatrolRecordPatrolRoute; import com.sipai.entity.timeefficiency.PatrolRoute; +import java.util.List; + public interface PatrolRouteService { public abstract PatrolRoute selectById(String id); diff --git a/src/main/java/com/sipai/service/timeefficiency/ViolationRecordCountService.java b/src/main/java/com/sipai/service/timeefficiency/ViolationRecordCountService.java index c81aacc7..c6c53f52 100644 --- a/src/main/java/com/sipai/service/timeefficiency/ViolationRecordCountService.java +++ b/src/main/java/com/sipai/service/timeefficiency/ViolationRecordCountService.java @@ -1,15 +1,11 @@ package com.sipai.service.timeefficiency; -import java.util.List; - -import javax.annotation.Resource; - +import com.sipai.dao.timeefficiency.ViolationRecordCountDao; +import com.sipai.entity.timeefficiency.ViolationRecordCount; import org.springframework.stereotype.Service; -import com.sipai.dao.timeefficiency.ViolationRecordCountDao; -import com.sipai.entity.timeefficiency.PatrolRecordViolationRecord; -import com.sipai.entity.timeefficiency.ViolationRecordCount; -import com.sipai.tools.CommService; +import javax.annotation.Resource; +import java.util.List; @Service diff --git a/src/main/java/com/sipai/service/timeefficiency/WorkRecordService.java b/src/main/java/com/sipai/service/timeefficiency/WorkRecordService.java index 614f400b..cfef7a65 100644 --- a/src/main/java/com/sipai/service/timeefficiency/WorkRecordService.java +++ b/src/main/java/com/sipai/service/timeefficiency/WorkRecordService.java @@ -1,9 +1,9 @@ package com.sipai.service.timeefficiency; -import java.util.List; - import com.sipai.entity.timeefficiency.WorkRecord; +import java.util.List; + public interface WorkRecordService { public abstract WorkRecord selectById(String id); diff --git a/src/main/java/com/sipai/service/timeefficiency/WorkerPositionService.java b/src/main/java/com/sipai/service/timeefficiency/WorkerPositionService.java index 8ac5b111..a6c004ce 100644 --- a/src/main/java/com/sipai/service/timeefficiency/WorkerPositionService.java +++ b/src/main/java/com/sipai/service/timeefficiency/WorkerPositionService.java @@ -1,8 +1,7 @@ package com.sipai.service.timeefficiency; -import net.sf.json.JSONArray; - import com.sipai.entity.timeefficiency.WorkerPosition; +import net.sf.json.JSONArray; public interface WorkerPositionService { diff --git a/src/main/java/com/sipai/service/timeefficiency/impl/PatrolAreaFloorServiceImpl.java b/src/main/java/com/sipai/service/timeefficiency/impl/PatrolAreaFloorServiceImpl.java index a5a31346..e053de10 100644 --- a/src/main/java/com/sipai/service/timeefficiency/impl/PatrolAreaFloorServiceImpl.java +++ b/src/main/java/com/sipai/service/timeefficiency/impl/PatrolAreaFloorServiceImpl.java @@ -1,15 +1,14 @@ package com.sipai.service.timeefficiency.impl; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; import com.sipai.dao.timeefficiency.PatrolAreaFloorDao; import com.sipai.entity.timeefficiency.PatrolAreaFloor; import com.sipai.entity.user.Unit; import com.sipai.service.timeefficiency.PatrolAreaFloorService; import com.sipai.service.user.UnitService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; //@Service(version=CommString.DUBBO_VERSION_PATROL) @Service public class PatrolAreaFloorServiceImpl implements PatrolAreaFloorService { diff --git a/src/main/java/com/sipai/service/timeefficiency/impl/PatrolAreaProcessSectionServiceImpl.java b/src/main/java/com/sipai/service/timeefficiency/impl/PatrolAreaProcessSectionServiceImpl.java index 330b1fa6..5cbce70f 100644 --- a/src/main/java/com/sipai/service/timeefficiency/impl/PatrolAreaProcessSectionServiceImpl.java +++ b/src/main/java/com/sipai/service/timeefficiency/impl/PatrolAreaProcessSectionServiceImpl.java @@ -1,14 +1,12 @@ package com.sipai.service.timeefficiency.impl; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.sipai.dao.timeefficiency.PatrolAreaProcessSectionDao; import com.sipai.entity.timeefficiency.PatrolAreaProcessSection; import com.sipai.service.timeefficiency.PatrolAreaProcessSectionService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; //@Service(version=CommString.DUBBO_VERSION_PATROL) @Service diff --git a/src/main/java/com/sipai/service/timeefficiency/impl/PatrolAreaServiceImpl.java b/src/main/java/com/sipai/service/timeefficiency/impl/PatrolAreaServiceImpl.java index 64692500..64579aae 100644 --- a/src/main/java/com/sipai/service/timeefficiency/impl/PatrolAreaServiceImpl.java +++ b/src/main/java/com/sipai/service/timeefficiency/impl/PatrolAreaServiceImpl.java @@ -1,13 +1,4 @@ package com.sipai.service.timeefficiency.impl; -import java.util.List; - -import javax.annotation.Resource; - - - - - -import org.springframework.stereotype.Service; import com.sipai.dao.timeefficiency.PatrolAreaDao; import com.sipai.entity.timeefficiency.PatrolArea; @@ -20,6 +11,10 @@ import com.sipai.service.timeefficiency.PatrolAreaService; import com.sipai.service.timeefficiency.PatrolPointService; import com.sipai.service.user.ProcessSectionService; import com.sipai.service.user.UnitService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; //@Service(version=CommString.DUBBO_VERSION_PATROL) @Service public class PatrolAreaServiceImpl implements PatrolAreaService{ diff --git a/src/main/java/com/sipai/service/timeefficiency/impl/PatrolContentsPlanServiceImpl.java b/src/main/java/com/sipai/service/timeefficiency/impl/PatrolContentsPlanServiceImpl.java index f4cdfe15..286efc50 100644 --- a/src/main/java/com/sipai/service/timeefficiency/impl/PatrolContentsPlanServiceImpl.java +++ b/src/main/java/com/sipai/service/timeefficiency/impl/PatrolContentsPlanServiceImpl.java @@ -1,27 +1,21 @@ package com.sipai.service.timeefficiency.impl; -import java.util.ArrayList; -import java.util.List; - -import javax.annotation.Resource; - -import org.json.JSONArray; -import org.json.JSONObject; -import org.springframework.stereotype.Service; - import com.sipai.dao.timeefficiency.PatrolContentsPlanDao; import com.sipai.dao.timeefficiency.PatrolPlanPatrolEquipmentDao; import com.sipai.dao.timeefficiency.PatrolPointEquipmentCardDao; import com.sipai.entity.equipment.EquipmentCard; -import com.sipai.entity.timeefficiency.PatrolContents; -import com.sipai.entity.timeefficiency.PatrolContentsPlan; -import com.sipai.entity.timeefficiency.PatrolPlanPatrolEquipment; -import com.sipai.entity.timeefficiency.PatrolPointEquipmentCard; -import com.sipai.entity.timeefficiency.TimeEfficiencyCommStr; +import com.sipai.entity.timeefficiency.*; import com.sipai.service.equipment.EquipmentCardService; import com.sipai.service.timeefficiency.PatrolContentsPlanService; import com.sipai.service.timeefficiency.PatrolContentsService; import com.sipai.tools.CommUtil; +import org.json.JSONArray; +import org.json.JSONObject; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; //@Service(version=CommString.DUBBO_VERSION_PATROL) @Service diff --git a/src/main/java/com/sipai/service/timeefficiency/impl/PatrolContentsRecordServiceImpl.java b/src/main/java/com/sipai/service/timeefficiency/impl/PatrolContentsRecordServiceImpl.java index c193d6bc..91757ceb 100644 --- a/src/main/java/com/sipai/service/timeefficiency/impl/PatrolContentsRecordServiceImpl.java +++ b/src/main/java/com/sipai/service/timeefficiency/impl/PatrolContentsRecordServiceImpl.java @@ -1,13 +1,5 @@ package com.sipai.service.timeefficiency.impl; -import java.util.HashSet; -import java.util.Iterator; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.sipai.dao.timeefficiency.PatrolContentsRecordDao; import com.sipai.dao.timeefficiency.PatrolPointDao; import com.sipai.entity.equipment.EquipmentCard; @@ -19,9 +11,14 @@ import com.sipai.entity.user.User; import com.sipai.service.equipment.EquipmentCardService; import com.sipai.service.timeefficiency.PatrolContentsRecordService; import com.sipai.service.user.UserService; - import net.sf.json.JSONArray; import net.sf.json.JSONObject; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; //@Service(version=CommString.DUBBO_VERSION_PATROL) @Service diff --git a/src/main/java/com/sipai/service/timeefficiency/impl/PatrolContentsServiceImpl.java b/src/main/java/com/sipai/service/timeefficiency/impl/PatrolContentsServiceImpl.java index 0a3f41d9..c39f97e3 100644 --- a/src/main/java/com/sipai/service/timeefficiency/impl/PatrolContentsServiceImpl.java +++ b/src/main/java/com/sipai/service/timeefficiency/impl/PatrolContentsServiceImpl.java @@ -1,25 +1,25 @@ package com.sipai.service.timeefficiency.impl; -import java.util.List; - -import javax.annotation.Resource; - -import com.sipai.entity.timeefficiency.*; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import net.sf.json.JSONArray; -import net.sf.json.JSONObject; - import com.sipai.dao.timeefficiency.PatrolContentsDao; import com.sipai.dao.timeefficiency.PatrolPointDao; import com.sipai.dao.timeefficiency.PatrolPointEquipmentCardDao; import com.sipai.entity.equipment.EquipmentCard; +import com.sipai.entity.timeefficiency.PatrolContents; +import com.sipai.entity.timeefficiency.PatrolPoint; +import com.sipai.entity.timeefficiency.PatrolPointEquipmentCard; +import com.sipai.entity.timeefficiency.TimeEfficiencyCommStr; import com.sipai.service.equipment.EquipmentCardService; import com.sipai.service.scada.MPointService; import com.sipai.service.timeefficiency.PatrolContentsService; import com.sipai.service.timeefficiency.PatrolPointService; import com.sipai.tools.CommUtil; +import net.sf.json.JSONArray; +import net.sf.json.JSONObject; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; +import java.util.List; @Service //@Service(version=CommString.DUBBO_VERSION_PATROL) diff --git a/src/main/java/com/sipai/service/timeefficiency/impl/PatrolContentsStandardServiceImpl.java b/src/main/java/com/sipai/service/timeefficiency/impl/PatrolContentsStandardServiceImpl.java index b55a7529..59401bcc 100644 --- a/src/main/java/com/sipai/service/timeefficiency/impl/PatrolContentsStandardServiceImpl.java +++ b/src/main/java/com/sipai/service/timeefficiency/impl/PatrolContentsStandardServiceImpl.java @@ -1,5 +1,22 @@ package com.sipai.service.timeefficiency.impl; +import com.sipai.dao.timeefficiency.PatrolContentsStandardDao; +import com.sipai.entity.equipment.EquipmentClass; +import com.sipai.entity.timeefficiency.PatrolContentsStandard; +import com.sipai.service.company.CompanyService; +import com.sipai.service.timeefficiency.PatrolContentsStandardService; +import com.sipai.tools.CommUtil; +import net.sf.json.JSONArray; +import net.sf.json.JSONObject; +import org.apache.poi.hssf.usermodel.*; +import org.apache.poi.ss.usermodel.*; +import org.apache.poi.ss.util.CellRangeAddress; +import org.apache.poi.xssf.usermodel.XSSFCell; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; @@ -9,37 +26,7 @@ import java.util.Date; import java.util.Iterator; import java.util.List; -import javax.annotation.Resource; -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.HSSFClientAnchor; -import org.apache.poi.hssf.usermodel.HSSFComment; -import org.apache.poi.hssf.usermodel.HSSFDataFormat; -import org.apache.poi.hssf.usermodel.HSSFFont; -import org.apache.poi.hssf.usermodel.HSSFPatriarch; -import org.apache.poi.hssf.usermodel.HSSFRichTextString; -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.ss.util.CellRangeAddress; -import org.apache.poi.hssf.util.HSSFColor; -import org.apache.poi.xssf.usermodel.XSSFCell; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import com.sipai.dao.timeefficiency.PatrolContentsStandardDao; -import com.sipai.entity.equipment.EquipmentClass; -import com.sipai.entity.timeefficiency.PatrolContentsStandard; -import com.sipai.service.company.CompanyService; -import com.sipai.service.timeefficiency.PatrolContentsStandardService; -import com.sipai.tools.CommUtil; - -import static org.apache.poi.ss.usermodel.CellType.*; +import static org.apache.poi.ss.usermodel.CellType.STRING; @Service public class PatrolContentsStandardServiceImpl implements PatrolContentsStandardService{ diff --git a/src/main/java/com/sipai/service/timeefficiency/impl/PatrolMeasurePointPlanServiceImpl.java b/src/main/java/com/sipai/service/timeefficiency/impl/PatrolMeasurePointPlanServiceImpl.java index 21db21ac..682ac62c 100644 --- a/src/main/java/com/sipai/service/timeefficiency/impl/PatrolMeasurePointPlanServiceImpl.java +++ b/src/main/java/com/sipai/service/timeefficiency/impl/PatrolMeasurePointPlanServiceImpl.java @@ -1,26 +1,23 @@ package com.sipai.service.timeefficiency.impl; -import java.util.ArrayList; -import java.util.List; - -import javax.annotation.Resource; - -import org.json.JSONArray; -import org.json.JSONObject; -import org.springframework.stereotype.Service; - import com.sipai.dao.timeefficiency.PatrolMeasurePointPlanDao; import com.sipai.dao.timeefficiency.PatrolPlanPatrolEquipmentDao; import com.sipai.dao.timeefficiency.PatrolPointMeasurePointDao; import com.sipai.entity.scada.MPoint; import com.sipai.entity.timeefficiency.PatrolMeasurePointPlan; import com.sipai.entity.timeefficiency.PatrolPlanPatrolEquipment; -import com.sipai.entity.timeefficiency.PatrolPointMeasurePoint; import com.sipai.entity.timeefficiency.TimeEfficiencyCommStr; import com.sipai.service.equipment.EquipmentCardService; import com.sipai.service.scada.MPointService; import com.sipai.service.timeefficiency.PatrolMeasurePointPlanService; import com.sipai.tools.CommUtil; +import org.json.JSONArray; +import org.json.JSONObject; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; //@Service(version=CommString.DUBBO_VERSION_PATROL) @Service diff --git a/src/main/java/com/sipai/service/timeefficiency/impl/PatrolMeasurePointRecordServiceImpl.java b/src/main/java/com/sipai/service/timeefficiency/impl/PatrolMeasurePointRecordServiceImpl.java index 83d0ed40..c515ab9c 100644 --- a/src/main/java/com/sipai/service/timeefficiency/impl/PatrolMeasurePointRecordServiceImpl.java +++ b/src/main/java/com/sipai/service/timeefficiency/impl/PatrolMeasurePointRecordServiceImpl.java @@ -1,40 +1,32 @@ package com.sipai.service.timeefficiency.impl; +import com.sipai.dao.timeefficiency.*; +import com.sipai.entity.enums.MeterLibraryTypeEnum; +import com.sipai.entity.equipment.EquipmentCard; +import com.sipai.entity.process.MeterCheck; +import com.sipai.entity.scada.MPoint; +import com.sipai.entity.scada.MPointHistory; +import com.sipai.entity.timeefficiency.PatrolMeasurePointRecord; +import com.sipai.entity.timeefficiency.PatrolPoint; +import com.sipai.entity.timeefficiency.TimeEfficiencyCommStr; +import com.sipai.service.equipment.EquipmentCardService; +import com.sipai.service.process.MeterCheckService; +import com.sipai.service.scada.MPointHistoryService; +import com.sipai.service.scada.MPointService; +import com.sipai.service.timeefficiency.PatrolMeasurePointRecordService; +import com.sipai.tools.CommUtil; +import net.sf.json.JSONArray; +import net.sf.json.JSONObject; +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; import java.math.BigDecimal; import java.math.RoundingMode; import java.util.HashSet; import java.util.Iterator; import java.util.List; -import javax.annotation.Resource; - -import com.sipai.entity.enums.MeterLibraryTypeEnum; -import com.sipai.entity.process.MeterCheck; -import com.sipai.entity.process.MeterCheckLibrary; -import com.sipai.entity.scada.MPointHistory; -import com.sipai.service.process.MeterCheckService; -import com.sipai.service.scada.MPointHistoryService; -import com.sipai.tools.CommUtil; -import org.apache.commons.lang3.StringUtils; -import org.springframework.stereotype.Service; - -import net.sf.json.JSONArray; -import net.sf.json.JSONObject; - -import com.sipai.dao.timeefficiency.PatrolContentsRecordDao; -import com.sipai.dao.timeefficiency.PatrolMeasurePointRecordDao; -import com.sipai.dao.timeefficiency.PatrolPointDao; -import com.sipai.dao.timeefficiency.PatrolPointMeasurePointDao; -import com.sipai.dao.timeefficiency.PatrolRecordPatrolRouteDao; -import com.sipai.entity.equipment.EquipmentCard; -import com.sipai.entity.scada.MPoint; -import com.sipai.entity.timeefficiency.PatrolMeasurePointRecord; -import com.sipai.entity.timeefficiency.PatrolPoint; -import com.sipai.entity.timeefficiency.TimeEfficiencyCommStr; -import com.sipai.service.equipment.EquipmentCardService; -import com.sipai.service.scada.MPointService; -import com.sipai.service.timeefficiency.PatrolMeasurePointRecordService; - //@Service(version=CommString.DUBBO_VERSION_PATROL) @Service public class PatrolMeasurePointRecordServiceImpl implements PatrolMeasurePointRecordService { diff --git a/src/main/java/com/sipai/service/timeefficiency/impl/PatrolModelServiceImpl.java b/src/main/java/com/sipai/service/timeefficiency/impl/PatrolModelServiceImpl.java index e64b84da..86920c0f 100644 --- a/src/main/java/com/sipai/service/timeefficiency/impl/PatrolModelServiceImpl.java +++ b/src/main/java/com/sipai/service/timeefficiency/impl/PatrolModelServiceImpl.java @@ -1,31 +1,20 @@ package com.sipai.service.timeefficiency.impl; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - import com.sipai.dao.timeefficiency.PatrolModelDao; import com.sipai.entity.base.CommonFile; -import com.sipai.entity.timeefficiency.PatrolArea; -import com.sipai.entity.timeefficiency.PatrolAreaFloor; -import com.sipai.entity.timeefficiency.PatrolAreaProcessSection; -import com.sipai.entity.timeefficiency.PatrolModel; -import com.sipai.entity.timeefficiency.PatrolPoint; +import com.sipai.entity.timeefficiency.*; import com.sipai.entity.user.ProcessSection; import com.sipai.entity.user.Unit; import com.sipai.service.base.CommonFileService; -import com.sipai.service.timeefficiency.PatrolAreaFloorService; -import com.sipai.service.timeefficiency.PatrolAreaProcessSectionService; -import com.sipai.service.timeefficiency.PatrolAreaService; -import com.sipai.service.timeefficiency.PatrolModelService; -import com.sipai.service.timeefficiency.PatrolPointService; +import com.sipai.service.timeefficiency.*; import com.sipai.service.user.ProcessSectionService; import com.sipai.service.user.UnitService; -import com.sipai.tools.CommString; import com.sipai.tools.CommUtil; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; +import java.util.List; //@Service(version=CommString.DUBBO_VERSION_PATROL) @Service("patrolModelService") public class PatrolModelServiceImpl implements PatrolModelService{ diff --git a/src/main/java/com/sipai/service/timeefficiency/impl/PatrolPlanDeptServiceImpl.java b/src/main/java/com/sipai/service/timeefficiency/impl/PatrolPlanDeptServiceImpl.java index 80db4ba3..c6ffe68e 100644 --- a/src/main/java/com/sipai/service/timeefficiency/impl/PatrolPlanDeptServiceImpl.java +++ b/src/main/java/com/sipai/service/timeefficiency/impl/PatrolPlanDeptServiceImpl.java @@ -1,16 +1,15 @@ package com.sipai.service.timeefficiency.impl; -import java.util.ArrayList; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; import com.sipai.dao.timeefficiency.PatrolPlanDeptDao; import com.sipai.entity.timeefficiency.PatrolPlanDept; import com.sipai.entity.user.Dept; import com.sipai.service.timeefficiency.PatrolPlanDeptService; import com.sipai.service.user.UnitService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; //@Service(version=CommString.DUBBO_VERSION_PATROL) @Service diff --git a/src/main/java/com/sipai/service/timeefficiency/impl/PatrolPlanPatrolEquipmentServiceImpl.java b/src/main/java/com/sipai/service/timeefficiency/impl/PatrolPlanPatrolEquipmentServiceImpl.java index 4777697f..8a58643f 100644 --- a/src/main/java/com/sipai/service/timeefficiency/impl/PatrolPlanPatrolEquipmentServiceImpl.java +++ b/src/main/java/com/sipai/service/timeefficiency/impl/PatrolPlanPatrolEquipmentServiceImpl.java @@ -1,17 +1,15 @@ package com.sipai.service.timeefficiency.impl; -import java.util.ArrayList; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.sipai.dao.timeefficiency.PatrolPlanPatrolEquipmentDao; import com.sipai.entity.equipment.EquipmentCard; import com.sipai.entity.timeefficiency.PatrolPlanPatrolEquipment; import com.sipai.service.equipment.EquipmentCardService; import com.sipai.service.timeefficiency.PatrolPlanPatrolEquipmentService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; //@Service(version=CommString.DUBBO_VERSION_PATROL) @Service diff --git a/src/main/java/com/sipai/service/timeefficiency/impl/PatrolPlanPatrolPointServiceImpl.java b/src/main/java/com/sipai/service/timeefficiency/impl/PatrolPlanPatrolPointServiceImpl.java index a6a3f6fa..f3922c4b 100644 --- a/src/main/java/com/sipai/service/timeefficiency/impl/PatrolPlanPatrolPointServiceImpl.java +++ b/src/main/java/com/sipai/service/timeefficiency/impl/PatrolPlanPatrolPointServiceImpl.java @@ -1,16 +1,15 @@ package com.sipai.service.timeefficiency.impl; -import java.util.ArrayList; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; import com.sipai.dao.timeefficiency.PatrolPlanPatrolPointDao; import com.sipai.entity.timeefficiency.PatrolPlanPatrolPoint; import com.sipai.entity.timeefficiency.PatrolPoint; import com.sipai.service.timeefficiency.PatrolPlanPatrolPointService; import com.sipai.service.timeefficiency.PatrolPointService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; //@Service(version=CommString.DUBBO_VERSION_PATROL) @Service("patrolPlanPatrolPointService") public class PatrolPlanPatrolPointServiceImpl implements PatrolPlanPatrolPointService{ diff --git a/src/main/java/com/sipai/service/timeefficiency/impl/PatrolPlanServiceImpl.java b/src/main/java/com/sipai/service/timeefficiency/impl/PatrolPlanServiceImpl.java index c1e2c3ae..312dff7a 100644 --- a/src/main/java/com/sipai/service/timeefficiency/impl/PatrolPlanServiceImpl.java +++ b/src/main/java/com/sipai/service/timeefficiency/impl/PatrolPlanServiceImpl.java @@ -1,25 +1,22 @@ package com.sipai.service.timeefficiency.impl; +import com.sipai.dao.timeefficiency.PatrolPlanDao; +import com.sipai.entity.equipment.EquipmentCard; +import com.sipai.entity.timeefficiency.*; +import com.sipai.entity.user.Dept; +import com.sipai.service.equipment.EquipmentCardService; +import com.sipai.service.timeefficiency.*; +import com.sipai.service.user.ProcessSectionService; +import com.sipai.tools.CommUtil; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; import java.math.BigDecimal; import java.util.HashSet; import java.util.Iterator; import java.util.List; -import javax.annotation.Resource; - -import com.sipai.entity.equipment.EquipmentCard; -import com.sipai.entity.timeefficiency.*; -import com.sipai.service.equipment.EquipmentCardService; -import com.sipai.service.timeefficiency.*; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.sipai.dao.timeefficiency.PatrolPlanDao; -import com.sipai.entity.user.Dept; -import com.sipai.service.user.ProcessSectionService; -import com.sipai.tools.CommString; -import com.sipai.tools.CommUtil; - //@Service(version=CommString.DUBBO_VERSION_PATROL) @Service("patrolPlanService") public class PatrolPlanServiceImpl implements PatrolPlanService { diff --git a/src/main/java/com/sipai/service/timeefficiency/impl/PatrolPointCameraServiceImpl.java b/src/main/java/com/sipai/service/timeefficiency/impl/PatrolPointCameraServiceImpl.java index 9829e51c..42b50256 100644 --- a/src/main/java/com/sipai/service/timeefficiency/impl/PatrolPointCameraServiceImpl.java +++ b/src/main/java/com/sipai/service/timeefficiency/impl/PatrolPointCameraServiceImpl.java @@ -1,15 +1,13 @@ package com.sipai.service.timeefficiency.impl; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.sipai.dao.timeefficiency.PatrolPointCameraDao; import com.sipai.entity.timeefficiency.PatrolPointCamera; import com.sipai.service.timeefficiency.PatrolPointCameraService; import com.sipai.service.work.CameraService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class PatrolPointCameraServiceImpl implements PatrolPointCameraService { diff --git a/src/main/java/com/sipai/service/timeefficiency/impl/PatrolPointEquipmentCardServiceImpl.java b/src/main/java/com/sipai/service/timeefficiency/impl/PatrolPointEquipmentCardServiceImpl.java index 134904f5..38a7dd49 100644 --- a/src/main/java/com/sipai/service/timeefficiency/impl/PatrolPointEquipmentCardServiceImpl.java +++ b/src/main/java/com/sipai/service/timeefficiency/impl/PatrolPointEquipmentCardServiceImpl.java @@ -1,17 +1,14 @@ package com.sipai.service.timeefficiency.impl; -import java.util.ArrayList; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.sipai.dao.timeefficiency.PatrolPointEquipmentCardDao; import com.sipai.entity.equipment.EquipmentCard; import com.sipai.entity.timeefficiency.PatrolPointEquipmentCard; import com.sipai.service.equipment.EquipmentCardService; import com.sipai.service.timeefficiency.PatrolPointEquipmentCardService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; //@Service(version=CommString.DUBBO_VERSION_PATROL) @Service public class PatrolPointEquipmentCardServiceImpl implements PatrolPointEquipmentCardService{ diff --git a/src/main/java/com/sipai/service/timeefficiency/impl/PatrolPointFileServiceImpl.java b/src/main/java/com/sipai/service/timeefficiency/impl/PatrolPointFileServiceImpl.java index 514b3b78..95bb498d 100644 --- a/src/main/java/com/sipai/service/timeefficiency/impl/PatrolPointFileServiceImpl.java +++ b/src/main/java/com/sipai/service/timeefficiency/impl/PatrolPointFileServiceImpl.java @@ -1,18 +1,15 @@ package com.sipai.service.timeefficiency.impl; -import java.util.ArrayList; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.sipai.dao.timeefficiency.PatrolPointFileDao; import com.sipai.entity.base.CommonFile; import com.sipai.entity.timeefficiency.PatrolPointFile; import com.sipai.service.base.CommonFileService; import com.sipai.service.timeefficiency.PatrolPointFileService; -import com.sipai.tools.CommString; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; //@Service(version=CommString.DUBBO_VERSION_PATROL) @Service public class PatrolPointFileServiceImpl implements PatrolPointFileService{ diff --git a/src/main/java/com/sipai/service/timeefficiency/impl/PatrolPointMeasurePointServiceImpl.java b/src/main/java/com/sipai/service/timeefficiency/impl/PatrolPointMeasurePointServiceImpl.java index 10eca0b5..aa2e9fd9 100644 --- a/src/main/java/com/sipai/service/timeefficiency/impl/PatrolPointMeasurePointServiceImpl.java +++ b/src/main/java/com/sipai/service/timeefficiency/impl/PatrolPointMeasurePointServiceImpl.java @@ -1,16 +1,5 @@ package com.sipai.service.timeefficiency.impl; -import java.util.ArrayList; -import java.util.List; - -import javax.annotation.Resource; - -import org.h2.util.New; -import org.springframework.stereotype.Service; - -import net.sf.json.JSONArray; -import net.sf.json.JSONObject; - import com.sipai.dao.timeefficiency.PatrolPointDao; import com.sipai.dao.timeefficiency.PatrolPointEquipmentCardDao; import com.sipai.dao.timeefficiency.PatrolPointMeasurePointDao; @@ -24,7 +13,12 @@ import com.sipai.entity.timeefficiency.TimeEfficiencyCommStr; import com.sipai.service.equipment.EquipmentCardService; import com.sipai.service.scada.MPointService; import com.sipai.service.timeefficiency.PatrolPointMeasurePointService; -import com.sipai.tools.CommString; +import net.sf.json.JSONArray; +import net.sf.json.JSONObject; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; //@Service(version=CommString.DUBBO_VERSION_PATROL) @Service diff --git a/src/main/java/com/sipai/service/timeefficiency/impl/PatrolPointServiceImpl.java b/src/main/java/com/sipai/service/timeefficiency/impl/PatrolPointServiceImpl.java index 2d509b95..e9ff05e7 100644 --- a/src/main/java/com/sipai/service/timeefficiency/impl/PatrolPointServiceImpl.java +++ b/src/main/java/com/sipai/service/timeefficiency/impl/PatrolPointServiceImpl.java @@ -1,32 +1,29 @@ package com.sipai.service.timeefficiency.impl; -import java.util.ArrayList; -import java.util.List; - -import javax.annotation.Resource; - import com.alibaba.fastjson.JSONObject; -import com.sipai.entity.equipment.EquipmentCard; -import com.sipai.entity.timeefficiency.*; -import com.sipai.entity.work.AreaManage; -import com.sipai.service.equipment.EquipmentCardService; -import com.sipai.service.work.AreaManageService; -import net.sf.json.JSONArray; - -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - import com.sipai.dao.timeefficiency.PatrolPointDao; import com.sipai.entity.base.CommonFile; -import com.sipai.entity.scada.MPoint; +import com.sipai.entity.equipment.EquipmentCard; +import com.sipai.entity.timeefficiency.PatrolPoint; +import com.sipai.entity.timeefficiency.PatrolPointFile; +import com.sipai.entity.timeefficiency.PatrolType; +import com.sipai.entity.timeefficiency.TimeEfficiencyCommStr; import com.sipai.entity.user.ProcessSection; import com.sipai.entity.user.Unit; +import com.sipai.entity.work.AreaManage; +import com.sipai.service.equipment.EquipmentCardService; import com.sipai.service.timeefficiency.PatrolPointFileService; import com.sipai.service.timeefficiency.PatrolPointService; import com.sipai.service.user.ProcessSectionService; import com.sipai.service.user.UnitService; -import com.sipai.tools.CommString; +import com.sipai.service.work.AreaManageService; import com.sipai.tools.CommUtil; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; //@Service(version=CommString.DUBBO_VERSION_PATROL) @Service("patrolPointService") diff --git a/src/main/java/com/sipai/service/timeefficiency/impl/PatrolRecordPatrolEquipmentServiceImpl.java b/src/main/java/com/sipai/service/timeefficiency/impl/PatrolRecordPatrolEquipmentServiceImpl.java index 2fdc428a..4f192004 100644 --- a/src/main/java/com/sipai/service/timeefficiency/impl/PatrolRecordPatrolEquipmentServiceImpl.java +++ b/src/main/java/com/sipai/service/timeefficiency/impl/PatrolRecordPatrolEquipmentServiceImpl.java @@ -1,23 +1,14 @@ package com.sipai.service.timeefficiency.impl; -import java.util.*; - -import javax.annotation.Resource; - -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONException; -import com.sipai.entity.timeefficiency.*; -import com.sipai.tools.CommUtil; -import org.springframework.stereotype.Service; - -import net.sf.json.JSONArray; -import net.sf.json.JSONObject; - import com.sipai.dao.timeefficiency.PatrolContentsRecordDao; import com.sipai.dao.timeefficiency.PatrolMeasurePointRecordDao; import com.sipai.dao.timeefficiency.PatrolRecordPatrolEquipmentDao; import com.sipai.entity.equipment.EquipmentCard; import com.sipai.entity.scada.MPoint; +import com.sipai.entity.timeefficiency.PatrolContentsRecord; +import com.sipai.entity.timeefficiency.PatrolMeasurePointRecord; +import com.sipai.entity.timeefficiency.PatrolRecord; +import com.sipai.entity.timeefficiency.PatrolRecordPatrolEquipment; import com.sipai.entity.user.User; import com.sipai.service.equipment.EquipmentCardService; import com.sipai.service.scada.MPointService; @@ -26,7 +17,14 @@ import com.sipai.service.timeefficiency.PatrolMeasurePointRecordService; import com.sipai.service.timeefficiency.PatrolRecordPatrolEquipmentService; import com.sipai.service.timeefficiency.PatrolRecordService; 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.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; //@Service(version=CommString.DUBBO_VERSION_PATROL) @Service diff --git a/src/main/java/com/sipai/service/timeefficiency/impl/PatrolRecordPatrolPointServiceImpl.java b/src/main/java/com/sipai/service/timeefficiency/impl/PatrolRecordPatrolPointServiceImpl.java index a2ae585e..73070d56 100644 --- a/src/main/java/com/sipai/service/timeefficiency/impl/PatrolRecordPatrolPointServiceImpl.java +++ b/src/main/java/com/sipai/service/timeefficiency/impl/PatrolRecordPatrolPointServiceImpl.java @@ -1,14 +1,13 @@ package com.sipai.service.timeefficiency.impl; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; import com.sipai.dao.timeefficiency.PatrolRecordPatrolPointDao; import com.sipai.entity.timeefficiency.PatrolRecordPatrolPoint; import com.sipai.service.timeefficiency.PatrolPointService; import com.sipai.service.timeefficiency.PatrolRecordPatrolPointService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; //@Service(version=CommString.DUBBO_VERSION_PATROL) @Service diff --git a/src/main/java/com/sipai/service/timeefficiency/impl/PatrolRecordPatrolRouteServiceImpl.java b/src/main/java/com/sipai/service/timeefficiency/impl/PatrolRecordPatrolRouteServiceImpl.java index 8727a7ab..6b228b97 100644 --- a/src/main/java/com/sipai/service/timeefficiency/impl/PatrolRecordPatrolRouteServiceImpl.java +++ b/src/main/java/com/sipai/service/timeefficiency/impl/PatrolRecordPatrolRouteServiceImpl.java @@ -1,25 +1,23 @@ package com.sipai.service.timeefficiency.impl; +import com.sipai.dao.timeefficiency.PatrolRecordPatrolRouteDao; +import com.sipai.entity.base.CommonFile; +import com.sipai.entity.maintenance.Abnormity; +import com.sipai.entity.timeefficiency.*; +import com.sipai.entity.user.User; +import com.sipai.service.base.CommonFileService; +import com.sipai.service.maintenance.AbnormityService; +import com.sipai.service.timeefficiency.*; +import com.sipai.service.user.UserService; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; import java.util.ArrayList; import java.util.HashSet; import java.util.Iterator; import java.util.List; -import javax.annotation.Resource; - -import com.sipai.entity.base.CommonFile; -import com.sipai.entity.timeefficiency.*; -import com.sipai.entity.user.User; -import com.sipai.service.base.CommonFileService; -import com.sipai.service.timeefficiency.*; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.sipai.dao.timeefficiency.PatrolRecordPatrolRouteDao; -import com.sipai.entity.maintenance.Abnormity; -import com.sipai.service.maintenance.AbnormityService; -import com.sipai.service.user.UserService; - //@Service(version=CommString.DUBBO_VERSION_PATROL) @Service("patrolRecordPatrolRouteService") public class PatrolRecordPatrolRouteServiceImpl implements PatrolRecordPatrolRouteService { diff --git a/src/main/java/com/sipai/service/timeefficiency/impl/PatrolRecordServiceImpl.java b/src/main/java/com/sipai/service/timeefficiency/impl/PatrolRecordServiceImpl.java index 06c88c93..139344ff 100644 --- a/src/main/java/com/sipai/service/timeefficiency/impl/PatrolRecordServiceImpl.java +++ b/src/main/java/com/sipai/service/timeefficiency/impl/PatrolRecordServiceImpl.java @@ -1,31 +1,15 @@ package com.sipai.service.timeefficiency.impl; -import java.io.BufferedReader; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.io.OutputStream; -import java.math.BigDecimal; -import java.net.URLEncoder; -import java.text.DecimalFormat; -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.*; - -import javax.annotation.Resource; -import javax.servlet.ServletOutputStream; -import javax.servlet.http.HttpServletResponse; - +import com.sipai.dao.timeefficiency.PatrolRecordDao; import com.sipai.entity.activiti.ProcessType; -import com.sipai.entity.base.BusinessUnitAdapter; -import com.sipai.entity.business.BusinessUnitAudit; import com.sipai.entity.business.BusinessUnitRecord; import com.sipai.entity.maintenance.Abnormity; import com.sipai.entity.maintenance.MaintenanceCommString; import com.sipai.entity.maintenance.MaintenanceDetail; -import com.sipai.entity.report.RptCreate; +import com.sipai.entity.scada.MPoint; import com.sipai.entity.timeefficiency.*; -import com.sipai.entity.user.Dept; +import com.sipai.entity.user.Unit; +import com.sipai.entity.user.User; import com.sipai.entity.work.GroupDetail; import com.sipai.entity.work.GroupType; import com.sipai.entity.work.Scheduling; @@ -36,46 +20,38 @@ import com.sipai.service.activiti.WorkflowService; import com.sipai.service.business.BusinessUnitAuditService; import com.sipai.service.maintenance.AbnormityService; import com.sipai.service.maintenance.MaintenanceDetailService; -import com.sipai.service.timeefficiency.*; -import com.sipai.service.work.*; -import com.sipai.service.workorder.WorkorderAchievementService; -import com.sipai.service.workorder.WorkorderDetailService; -import net.sf.json.JSONArray; -import net.sf.json.JSONObject; - -import org.activiti.engine.repository.ProcessDefinition; -import org.activiti.engine.runtime.ProcessInstance; -import org.activiti.engine.task.Task; -import org.apache.commons.lang3.ObjectUtils; -import org.apache.commons.lang3.StringUtils; -import org.apache.poi.hssf.usermodel.HSSFCell; -import org.apache.poi.hssf.usermodel.HSSFCellStyle; -import org.apache.poi.hssf.usermodel.HSSFClientAnchor; -import org.apache.poi.hssf.usermodel.HSSFComment; -import org.apache.poi.hssf.usermodel.HSSFFont; -import org.apache.poi.hssf.usermodel.HSSFPatriarch; -import org.apache.poi.hssf.usermodel.HSSFRichTextString; -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.springframework.security.access.method.P; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.sipai.dao.timeefficiency.PatrolRecordDao; -import com.sipai.entity.scada.MPoint; -import com.sipai.entity.user.Unit; -import com.sipai.entity.user.User; import com.sipai.service.msg.MsgService; import com.sipai.service.scada.MPointHistoryService; import com.sipai.service.scada.MPointService; +import com.sipai.service.timeefficiency.*; import com.sipai.service.user.ProcessSectionService; import com.sipai.service.user.UnitService; import com.sipai.service.user.UserService; +import com.sipai.service.work.*; +import com.sipai.service.workorder.WorkorderAchievementService; +import com.sipai.service.workorder.WorkorderDetailService; import com.sipai.tools.CommString; import com.sipai.tools.CommUtil; import com.sipai.tools.DateUtil; +import net.sf.json.JSONArray; +import net.sf.json.JSONObject; +import org.activiti.engine.repository.ProcessDefinition; +import org.activiti.engine.runtime.ProcessInstance; +import org.apache.commons.lang3.StringUtils; +import org.apache.poi.hssf.usermodel.*; +import org.apache.poi.ss.usermodel.*; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import java.io.*; +import java.math.BigDecimal; +import java.net.URLEncoder; +import java.text.DecimalFormat; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.*; //@Service(version=CommString.DUBBO_VERSION_PATROL) @Service("patrolRecordService") diff --git a/src/main/java/com/sipai/service/timeefficiency/impl/PatrolRouteServiceImpl.java b/src/main/java/com/sipai/service/timeefficiency/impl/PatrolRouteServiceImpl.java index 3003a985..2bbecbe7 100644 --- a/src/main/java/com/sipai/service/timeefficiency/impl/PatrolRouteServiceImpl.java +++ b/src/main/java/com/sipai/service/timeefficiency/impl/PatrolRouteServiceImpl.java @@ -1,23 +1,20 @@ package com.sipai.service.timeefficiency.impl; +import com.sipai.dao.timeefficiency.PatrolRouteDao; +import com.sipai.entity.timeefficiency.*; +import com.sipai.service.timeefficiency.*; +import com.sipai.service.user.ProcessSectionService; +import com.sipai.tools.CommUtil; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; import java.math.BigDecimal; import java.util.ArrayList; import java.util.HashSet; import java.util.Iterator; import java.util.List; -import javax.annotation.Resource; - -import com.sipai.entity.timeefficiency.*; -import com.sipai.entity.user.ProcessSection; -import com.sipai.service.timeefficiency.*; -import com.sipai.service.user.ProcessSectionService; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.sipai.dao.timeefficiency.PatrolRouteDao; -import com.sipai.tools.CommUtil; - //@Service(version=CommString.DUBBO_VERSION_PATROL) @Service("patrolRouteService") public class PatrolRouteServiceImpl implements PatrolRouteService { diff --git a/src/main/java/com/sipai/service/timeefficiency/impl/WorkRecordServiceImpl.java b/src/main/java/com/sipai/service/timeefficiency/impl/WorkRecordServiceImpl.java index e999bb33..fc145461 100644 --- a/src/main/java/com/sipai/service/timeefficiency/impl/WorkRecordServiceImpl.java +++ b/src/main/java/com/sipai/service/timeefficiency/impl/WorkRecordServiceImpl.java @@ -1,16 +1,14 @@ package com.sipai.service.timeefficiency.impl; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.sipai.dao.timeefficiency.WorkRecordDao; import com.sipai.entity.timeefficiency.WorkRecord; import com.sipai.entity.user.User; import com.sipai.service.timeefficiency.WorkRecordService; import com.sipai.service.user.UserService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; //@Service(version=CommString.DUBBO_VERSION_PATROL) @Service diff --git a/src/main/java/com/sipai/service/timeefficiency/impl/WorkerPositionServiceImpl.java b/src/main/java/com/sipai/service/timeefficiency/impl/WorkerPositionServiceImpl.java index 1f8d96cd..667ca5e1 100644 --- a/src/main/java/com/sipai/service/timeefficiency/impl/WorkerPositionServiceImpl.java +++ b/src/main/java/com/sipai/service/timeefficiency/impl/WorkerPositionServiceImpl.java @@ -1,36 +1,29 @@ package com.sipai.service.timeefficiency.impl; -import java.util.ArrayList; -import java.util.HashSet; -import java.util.List; -import java.util.Set; - -import javax.annotation.Resource; - +import com.sipai.dao.timeefficiency.PatrolRecordDao; +import com.sipai.dao.timeefficiency.PatrolRecordPatrolRouteDao; +import com.sipai.dao.timeefficiency.WorkerPositionDao; +import com.sipai.entity.timeefficiency.PatrolRecord; +import com.sipai.entity.timeefficiency.PatrolRecordPatrolRoute; +import com.sipai.entity.timeefficiency.WorkerPosition; +import com.sipai.entity.user.User; import com.sipai.entity.user.UserDetail; +import com.sipai.service.timeefficiency.WorkerPositionService; import com.sipai.service.user.UserDetailService; +import com.sipai.service.user.UserService; import com.sipai.tools.CommString; import com.sipai.tools.CommUtil; -import com.sipai.tools.SpringContextUtil; +import net.sf.json.JSONArray; +import net.sf.json.JSONObject; import org.redisson.api.RMap; import org.redisson.api.RedissonClient; import org.springframework.stereotype.Service; -import net.sf.json.JSONArray; -import net.sf.json.JSONObject; - -import com.sipai.dao.timeefficiency.PatrolRecordDao; -import com.sipai.dao.timeefficiency.PatrolRecordPatrolPointDao; -import com.sipai.dao.timeefficiency.PatrolRecordPatrolRouteDao; -import com.sipai.dao.timeefficiency.WorkerPositionDao; -import com.sipai.dao.user.UserDao; -import com.sipai.entity.timeefficiency.PatrolRecord; -import com.sipai.entity.timeefficiency.PatrolRecordPatrolPoint; -import com.sipai.entity.timeefficiency.PatrolRecordPatrolRoute; -import com.sipai.entity.timeefficiency.WorkerPosition; -import com.sipai.entity.user.User; -import com.sipai.service.timeefficiency.WorkerPositionService; -import com.sipai.service.user.UserService; +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.Set; //@Service(version=CommString.DUBBO_VERSION_PATROL) @Service diff --git a/src/main/java/com/sipai/service/user/BonusPointRecordService.java b/src/main/java/com/sipai/service/user/BonusPointRecordService.java index 4ad3b334..c7262e92 100644 --- a/src/main/java/com/sipai/service/user/BonusPointRecordService.java +++ b/src/main/java/com/sipai/service/user/BonusPointRecordService.java @@ -1,18 +1,12 @@ package com.sipai.service.user; -import java.util.List; -import javax.annotation.Resource; - - - - -import org.springframework.stereotype.Service; - -import com.sipai.dao.user.BonusPointDao; import com.sipai.dao.user.BonusPointRecordDao; -import com.sipai.entity.user.BonusPoint; import com.sipai.entity.user.BonusPointRecord; import com.sipai.tools.CommService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class BonusPointRecordService implements CommService{ diff --git a/src/main/java/com/sipai/service/user/BonusPointService.java b/src/main/java/com/sipai/service/user/BonusPointService.java index abd6e0b5..a79f77ef 100644 --- a/src/main/java/com/sipai/service/user/BonusPointService.java +++ b/src/main/java/com/sipai/service/user/BonusPointService.java @@ -1,34 +1,4 @@ package com.sipai.service.user; -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Calendar; -import java.util.Date; -import java.util.HashSet; -import java.util.List; -import java.util.Set; - -import javax.annotation.Resource; - - - - - - - - - - - - - - - - - - -import org.kohsuke.rngom.digested.DDataPattern; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; import com.sipai.dao.user.BonusPointDao; import com.sipai.entity.business.BusinessUnitHandleDetail; @@ -40,6 +10,12 @@ import com.sipai.service.business.BusinessUnitHandleDetailService; import com.sipai.service.maintenance.MaintenanceDetailService; import com.sipai.tools.CommService; import com.sipai.tools.CommUtil; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; +import java.text.SimpleDateFormat; +import java.util.*; @Service public class BonusPointService implements CommService{ diff --git a/src/main/java/com/sipai/service/user/DeptAreaService.java b/src/main/java/com/sipai/service/user/DeptAreaService.java index b68f6030..883c0874 100644 --- a/src/main/java/com/sipai/service/user/DeptAreaService.java +++ b/src/main/java/com/sipai/service/user/DeptAreaService.java @@ -1,19 +1,15 @@ package com.sipai.service.user; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.sipai.dao.timeefficiency.PatrolAreaDao; import com.sipai.dao.user.DeptAreaDao; import com.sipai.entity.timeefficiency.PatrolArea; import com.sipai.entity.user.DeptArea; -import com.sipai.entity.user.DeptRole; -import com.sipai.entity.user.Role; import com.sipai.tools.CommService; import com.sipai.tools.CommUtil; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service diff --git a/src/main/java/com/sipai/service/user/DeptProcessService.java b/src/main/java/com/sipai/service/user/DeptProcessService.java index b9f1a1c7..26806c12 100644 --- a/src/main/java/com/sipai/service/user/DeptProcessService.java +++ b/src/main/java/com/sipai/service/user/DeptProcessService.java @@ -1,19 +1,15 @@ package com.sipai.service.user; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.sipai.dao.user.DeptProcessDao; import com.sipai.dao.user.ProcessSectionDao; import com.sipai.entity.user.DeptProcess; -import com.sipai.entity.user.DeptRole; import com.sipai.entity.user.ProcessSection; -import com.sipai.entity.user.Role; import com.sipai.tools.CommService; import com.sipai.tools.CommUtil; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service diff --git a/src/main/java/com/sipai/service/user/DeptRoleService.java b/src/main/java/com/sipai/service/user/DeptRoleService.java index 0bb809ea..f6f42785 100644 --- a/src/main/java/com/sipai/service/user/DeptRoleService.java +++ b/src/main/java/com/sipai/service/user/DeptRoleService.java @@ -1,17 +1,14 @@ package com.sipai.service.user; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.sipai.dao.user.DeptRoleDao; import com.sipai.dao.user.RoleDao; -import com.sipai.entity.equipment.EquipmentClass; import com.sipai.entity.user.DeptRole; import com.sipai.entity.user.Role; import com.sipai.tools.CommService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service diff --git a/src/main/java/com/sipai/service/user/ExtSystemService.java b/src/main/java/com/sipai/service/user/ExtSystemService.java index 0d4ad1ae..30f500e2 100644 --- a/src/main/java/com/sipai/service/user/ExtSystemService.java +++ b/src/main/java/com/sipai/service/user/ExtSystemService.java @@ -1,19 +1,17 @@ package com.sipai.service.user; -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.List; - -import javax.annotation.Resource; - -import net.sf.json.JSONObject; - -import org.springframework.stereotype.Service; import com.sipai.dao.user.ExtSystemDao; import com.sipai.entity.user.ExtSystem; import com.sipai.tools.CommService; import com.sipai.tools.HttpUtil; +import net.sf.json.JSONObject; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.List; @Service public class ExtSystemService implements CommService{ diff --git a/src/main/java/com/sipai/service/user/JobService.java b/src/main/java/com/sipai/service/user/JobService.java index 33914723..fbf34e11 100644 --- a/src/main/java/com/sipai/service/user/JobService.java +++ b/src/main/java/com/sipai/service/user/JobService.java @@ -1,11 +1,11 @@ package com.sipai.service.user; -import java.util.List; - import com.sipai.entity.activiti.ModelNodeJob; import com.sipai.entity.base.Tree; import com.sipai.entity.user.Job; +import java.util.List; + public interface JobService { List selectListByWhere(String where); diff --git a/src/main/java/com/sipai/service/user/JobServiceImpl.java b/src/main/java/com/sipai/service/user/JobServiceImpl.java index b2614c9c..6ef6ddc4 100644 --- a/src/main/java/com/sipai/service/user/JobServiceImpl.java +++ b/src/main/java/com/sipai/service/user/JobServiceImpl.java @@ -1,27 +1,23 @@ package com.sipai.service.user; -import java.util.ArrayList; -import java.util.HashSet; -import java.util.List; - -import javax.annotation.Resource; - -import com.sipai.entity.base.Tree; -import com.sipai.entity.enums.PositionTypeEnum; -import org.activiti.engine.RepositoryService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - import com.sipai.dao.activiti.ModelNodeJobDao; import com.sipai.dao.user.JobDao; import com.sipai.dao.user.UserDao; import com.sipai.dao.user.UserJobDao; import com.sipai.entity.activiti.ModelNodeJob; +import com.sipai.entity.base.Tree; import com.sipai.entity.user.Job; import com.sipai.entity.user.User; import com.sipai.entity.user.UserJob; import com.sipai.tools.CommUtil; -import org.springframework.web.servlet.ModelAndView; +import org.activiti.engine.RepositoryService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; @Service public class JobServiceImpl implements JobService { diff --git a/src/main/java/com/sipai/service/user/MenuService.java b/src/main/java/com/sipai/service/user/MenuService.java index 87634824..e9015745 100644 --- a/src/main/java/com/sipai/service/user/MenuService.java +++ b/src/main/java/com/sipai/service/user/MenuService.java @@ -1,12 +1,12 @@ package com.sipai.service.user; -import java.util.List; -import java.util.Map; - import com.sipai.entity.user.Menu; import com.sipai.entity.user.RoleMenu; import com.sipai.entity.user.UserPower; +import java.util.List; +import java.util.Map; + public interface MenuService { public Menu getMenuById(String menuId); diff --git a/src/main/java/com/sipai/service/user/MenuServiceImpl.java b/src/main/java/com/sipai/service/user/MenuServiceImpl.java index 633bccaa..23e2f83f 100644 --- a/src/main/java/com/sipai/service/user/MenuServiceImpl.java +++ b/src/main/java/com/sipai/service/user/MenuServiceImpl.java @@ -1,5 +1,5 @@ package com.sipai.service.user; -import com.alibaba.fastjson.JSONObject; + import com.sipai.dao.user.MenuDao; import com.sipai.dao.user.UserPowerDao; import com.sipai.entity.user.Menu; diff --git a/src/main/java/com/sipai/service/user/MobileManagementService.java b/src/main/java/com/sipai/service/user/MobileManagementService.java index e66bc295..3005bf8a 100644 --- a/src/main/java/com/sipai/service/user/MobileManagementService.java +++ b/src/main/java/com/sipai/service/user/MobileManagementService.java @@ -1,9 +1,9 @@ package com.sipai.service.user; -import java.util.List; - import com.sipai.entity.user.MobileManagement; +import java.util.List; + public interface MobileManagementService { public abstract MobileManagement selectById(String id); diff --git a/src/main/java/com/sipai/service/user/MobileManagementServiceImpl.java b/src/main/java/com/sipai/service/user/MobileManagementServiceImpl.java index 385e4284..a9f9e354 100644 --- a/src/main/java/com/sipai/service/user/MobileManagementServiceImpl.java +++ b/src/main/java/com/sipai/service/user/MobileManagementServiceImpl.java @@ -1,14 +1,12 @@ package com.sipai.service.user; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.sipai.dao.user.MobileManagementDao; import com.sipai.entity.user.MobileManagement; import com.sipai.entity.user.User; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class MobileManagementServiceImpl implements MobileManagementService{ diff --git a/src/main/java/com/sipai/service/user/MobileValidationService.java b/src/main/java/com/sipai/service/user/MobileValidationService.java index 86f53496..1545d171 100644 --- a/src/main/java/com/sipai/service/user/MobileValidationService.java +++ b/src/main/java/com/sipai/service/user/MobileValidationService.java @@ -1,15 +1,12 @@ package com.sipai.service.user; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; import com.sipai.dao.user.MobileValidationDao; -import com.sipai.dao.user.UserDetailDao; import com.sipai.entity.user.MobileValidation; -import com.sipai.entity.user.UserDetail; import com.sipai.tools.CommService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class MobileValidationService implements CommService{ diff --git a/src/main/java/com/sipai/service/user/ProcessSectionScoreService.java b/src/main/java/com/sipai/service/user/ProcessSectionScoreService.java index 3f27af83..6ee5963e 100644 --- a/src/main/java/com/sipai/service/user/ProcessSectionScoreService.java +++ b/src/main/java/com/sipai/service/user/ProcessSectionScoreService.java @@ -1,9 +1,9 @@ package com.sipai.service.user; -import java.util.List; - import com.sipai.entity.user.ProcessSectionScore; +import java.util.List; + public interface ProcessSectionScoreService { diff --git a/src/main/java/com/sipai/service/user/ProcessSectionScoreServiceImpl.java b/src/main/java/com/sipai/service/user/ProcessSectionScoreServiceImpl.java index b9ed5760..4ba98f2a 100644 --- a/src/main/java/com/sipai/service/user/ProcessSectionScoreServiceImpl.java +++ b/src/main/java/com/sipai/service/user/ProcessSectionScoreServiceImpl.java @@ -1,17 +1,11 @@ package com.sipai.service.user; -import java.util.List; - -import javax.annotation.Resource; - -import org.quartz.CronScheduleBuilder; -import org.quartz.CronTrigger; -import org.quartz.JobKey; -import org.quartz.TriggerKey; -import org.springframework.stereotype.Service; - import com.sipai.dao.user.ProcessSectionScoreDao; import com.sipai.entity.user.ProcessSectionScore; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service("ProcessSectionScoreService") diff --git a/src/main/java/com/sipai/service/user/ProcessSectionService.java b/src/main/java/com/sipai/service/user/ProcessSectionService.java index 31abe389..9f36a4f4 100644 --- a/src/main/java/com/sipai/service/user/ProcessSectionService.java +++ b/src/main/java/com/sipai/service/user/ProcessSectionService.java @@ -1,26 +1,24 @@ package com.sipai.service.user; -import java.util.Collections; -import java.util.Comparator; -import java.util.List; - -import javax.annotation.Resource; - -import com.sipai.entity.user.*; -import com.sipai.service.company.CompanyService; -import com.sipai.tools.CommUtil; -import org.springframework.stereotype.Service; - import com.sipai.dao.user.ProcessSectionDao; import com.sipai.entity.equipment.EquipmentCard; import com.sipai.entity.equipment.EquipmentCardProp; import com.sipai.entity.process.ProcessSectionInformation; import com.sipai.entity.scada.MPoint; +import com.sipai.entity.user.*; +import com.sipai.service.company.CompanyService; import com.sipai.service.equipment.EquipmentCardPropService; import com.sipai.service.equipment.EquipmentCardService; import com.sipai.service.process.ProcessSectionInformationService; import com.sipai.service.scada.MPointService; import com.sipai.tools.CommService; +import com.sipai.tools.CommUtil; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.Comparator; +import java.util.List; @Service("processSectionService") public class ProcessSectionService implements CommService{ diff --git a/src/main/java/com/sipai/service/user/ProcessSectionTypeService.java b/src/main/java/com/sipai/service/user/ProcessSectionTypeService.java index 6099c3a1..607dec64 100644 --- a/src/main/java/com/sipai/service/user/ProcessSectionTypeService.java +++ b/src/main/java/com/sipai/service/user/ProcessSectionTypeService.java @@ -1,18 +1,12 @@ package com.sipai.service.user; -import java.util.List; -import javax.annotation.Resource; - - - - -import org.springframework.stereotype.Service; - -import com.sipai.dao.user.ProcessSectionDao; import com.sipai.dao.user.ProcessSectionTypeDao; -import com.sipai.entity.user.ProcessSection; import com.sipai.entity.user.ProcessSectionType; import com.sipai.tools.CommService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class ProcessSectionTypeService implements CommService{ diff --git a/src/main/java/com/sipai/service/user/UnitService.java b/src/main/java/com/sipai/service/user/UnitService.java index 1376c092..37438275 100644 --- a/src/main/java/com/sipai/service/user/UnitService.java +++ b/src/main/java/com/sipai/service/user/UnitService.java @@ -10,8 +10,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.springframework.stereotype.Service; - public interface UnitService { public int deleteCompanyById(String id); diff --git a/src/main/java/com/sipai/service/user/UserDetailService.java b/src/main/java/com/sipai/service/user/UserDetailService.java index a5b08d05..5c8a29ea 100644 --- a/src/main/java/com/sipai/service/user/UserDetailService.java +++ b/src/main/java/com/sipai/service/user/UserDetailService.java @@ -1,13 +1,12 @@ package com.sipai.service.user; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; import com.sipai.dao.user.UserDetailDao; import com.sipai.entity.user.UserDetail; import com.sipai.tools.CommService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class UserDetailService implements CommService{ diff --git a/src/main/java/com/sipai/service/user/UserJobService.java b/src/main/java/com/sipai/service/user/UserJobService.java index 70790de8..3e487ad4 100644 --- a/src/main/java/com/sipai/service/user/UserJobService.java +++ b/src/main/java/com/sipai/service/user/UserJobService.java @@ -1,14 +1,12 @@ package com.sipai.service.user; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.sipai.dao.user.UserJobDao; import com.sipai.entity.user.UserJob; import com.sipai.tools.CommService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class UserJobService implements CommService{ diff --git a/src/main/java/com/sipai/service/user/UserRoleService.java b/src/main/java/com/sipai/service/user/UserRoleService.java index e5bae143..d23bb0b5 100644 --- a/src/main/java/com/sipai/service/user/UserRoleService.java +++ b/src/main/java/com/sipai/service/user/UserRoleService.java @@ -1,15 +1,12 @@ package com.sipai.service.user; -import java.text.SimpleDateFormat; -import java.util.*; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.sipai.dao.user.UserRoleDao; import com.sipai.entity.user.UserRole; import com.sipai.tools.CommService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class UserRoleService implements CommService { diff --git a/src/main/java/com/sipai/service/valueEngineering/EquipmentDepreciationService.java b/src/main/java/com/sipai/service/valueEngineering/EquipmentDepreciationService.java index b36e13c4..55b26899 100644 --- a/src/main/java/com/sipai/service/valueEngineering/EquipmentDepreciationService.java +++ b/src/main/java/com/sipai/service/valueEngineering/EquipmentDepreciationService.java @@ -1,10 +1,4 @@ package com.sipai.service.valueEngineering; -import java.math.BigDecimal; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; import com.sipai.dao.valueEngineering.EquipmentDepreciationDao; import com.sipai.entity.equipment.EquipmentCard; @@ -17,6 +11,11 @@ import com.sipai.service.equipment.EquipmentCardService; import com.sipai.service.user.ProcessSectionService; import com.sipai.service.user.UnitService; import com.sipai.tools.CommService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.math.BigDecimal; +import java.util.List; @Service public class EquipmentDepreciationService implements CommService{ diff --git a/src/main/java/com/sipai/service/valueEngineering/EquipmentEvaluateService.java b/src/main/java/com/sipai/service/valueEngineering/EquipmentEvaluateService.java index 26207724..f46a56cd 100644 --- a/src/main/java/com/sipai/service/valueEngineering/EquipmentEvaluateService.java +++ b/src/main/java/com/sipai/service/valueEngineering/EquipmentEvaluateService.java @@ -1,35 +1,11 @@ package com.sipai.service.valueEngineering; -import java.math.BigDecimal; -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Calendar; -import java.util.Collections; -import java.util.Comparator; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.sipai.dao.valueEngineering.EquipmentEvaluateDao; -import com.sipai.dao.valueEngineering.EquipmentModelDao; -import com.sipai.dao.work.KPIPointDao; import com.sipai.entity.base.LineChart; -import com.sipai.entity.equipment.Characteristic; -import com.sipai.entity.equipment.EquipmentAge; -import com.sipai.entity.equipment.EquipmentCard; -import com.sipai.entity.equipment.EquipmentClass; -import com.sipai.entity.equipment.EquipmentClassProp; -import com.sipai.entity.equipment.EquipmentSpecification; -import com.sipai.entity.equipment.EquipmentTypeNumber; -import com.sipai.entity.equipment.EquipmentUseAge; +import com.sipai.entity.equipment.*; import com.sipai.entity.maintenance.MaintenanceCommString; import com.sipai.entity.maintenance.MaintenanceDetail; import com.sipai.entity.scada.MPoint; @@ -37,22 +13,20 @@ import com.sipai.entity.scada.MPointHistory; import com.sipai.entity.user.Unit; import com.sipai.entity.valueEngineering.EquipmentEvaluate; import com.sipai.entity.valueEngineering.EquipmentEvaluateCommStr; -import com.sipai.entity.valueEngineering.EquipmentModel; -import com.sipai.entity.work.KPIPoint; -import com.sipai.service.equipment.CharacteristicService; -import com.sipai.service.equipment.EquipmentCardPropService; -import com.sipai.service.equipment.EquipmentCardService; -import com.sipai.service.equipment.EquipmentClassPropService; -import com.sipai.service.equipment.EquipmentClassService; -import com.sipai.service.equipment.EquipmentSpecificationService; -import com.sipai.service.equipment.EquipmentTypeNumberService; -import com.sipai.service.equipment.EquipmentUseAgeService; +import com.sipai.service.equipment.*; import com.sipai.service.maintenance.MaintenanceDetailService; import com.sipai.service.scada.MPointHistoryService; import com.sipai.service.scada.MPointService; import com.sipai.service.user.UnitService; import com.sipai.tools.CommService; import com.sipai.tools.CommUtil; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.math.BigDecimal; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.*; @Service public class EquipmentEvaluateService implements CommService{ diff --git a/src/main/java/com/sipai/service/valueEngineering/EquipmentModelService.java b/src/main/java/com/sipai/service/valueEngineering/EquipmentModelService.java index 9ef3d976..651aa2b3 100644 --- a/src/main/java/com/sipai/service/valueEngineering/EquipmentModelService.java +++ b/src/main/java/com/sipai/service/valueEngineering/EquipmentModelService.java @@ -1,19 +1,14 @@ package com.sipai.service.valueEngineering; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; import com.sipai.dao.equipment.EquipmentCardPropDao; import com.sipai.dao.valueEngineering.EquipmentModelDao; -import com.sipai.dao.work.KPIPointDao; import com.sipai.entity.equipment.EquipmentCardProp; -import com.sipai.entity.maintenance.Maintenance; -import com.sipai.entity.user.Company; import com.sipai.entity.valueEngineering.EquipmentModel; -import com.sipai.entity.work.KPIPoint; import com.sipai.tools.CommService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class EquipmentModelService implements CommService{ diff --git a/src/main/java/com/sipai/service/visit/VisitApplyService.java b/src/main/java/com/sipai/service/visit/VisitApplyService.java index 59eb07c8..aa3b9a93 100644 --- a/src/main/java/com/sipai/service/visit/VisitApplyService.java +++ b/src/main/java/com/sipai/service/visit/VisitApplyService.java @@ -1,54 +1,11 @@ package com.sipai.service.visit; -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.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletResponse; - -import org.activiti.engine.repository.ProcessDefinition; -import org.activiti.engine.runtime.ProcessInstance; -import org.activiti.engine.task.Task; -import org.apache.poi.hssf.usermodel.HSSFCell; -import org.apache.poi.hssf.usermodel.HSSFCellStyle; -import org.apache.poi.hssf.usermodel.HSSFClientAnchor; -import org.apache.poi.hssf.usermodel.HSSFComment; -import org.apache.poi.hssf.usermodel.HSSFDataValidation; -import org.apache.poi.hssf.usermodel.HSSFFont; -import org.apache.poi.hssf.usermodel.HSSFPatriarch; -import org.apache.poi.hssf.usermodel.HSSFRichTextString; -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.hssf.util.HSSFColor; -import org.apache.poi.ss.usermodel.*; -import org.apache.poi.ss.util.CellRangeAddress; -import org.apache.poi.xssf.usermodel.XSSFCell; -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.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; import com.sipai.dao.visit.VisitApplyDao; import com.sipai.entity.activiti.ProcessType; import com.sipai.entity.base.BusinessUnitAdapter; import com.sipai.entity.business.BusinessUnitAudit; import com.sipai.entity.business.BusinessUnitRecord; import com.sipai.entity.maintenance.MaintenanceCommString; -import com.sipai.entity.sparepart.Goods; -import com.sipai.entity.sparepart.SparePartCommString; -import com.sipai.entity.sparepart.SubscribeDetail; import com.sipai.entity.user.User; import com.sipai.entity.visit.VisitApply; import com.sipai.entity.visit.VisitCommString; @@ -58,9 +15,35 @@ import com.sipai.service.business.BusinessUnitAuditService; import com.sipai.service.business.BusinessUnitService; import com.sipai.service.user.UserService; import com.sipai.tools.CommService; -import com.sipai.tools.CommUtil; +import org.activiti.engine.repository.ProcessDefinition; +import org.activiti.engine.runtime.ProcessInstance; +import org.activiti.engine.task.Task; +import org.apache.poi.hssf.usermodel.*; +import org.apache.poi.ss.usermodel.BorderStyle; +import org.apache.poi.ss.usermodel.DateUtil; +import org.apache.poi.ss.usermodel.HorizontalAlignment; +import org.apache.poi.ss.usermodel.VerticalAlignment; +import org.apache.poi.ss.util.CellRangeAddress; +import org.apache.poi.xssf.usermodel.XSSFCell; +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.Service; +import org.springframework.transaction.annotation.Transactional; -import static org.apache.poi.ss.usermodel.CellType.*; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.net.URLEncoder; +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import static org.apache.poi.ss.usermodel.CellType.STRING; @Service public class VisitApplyService implements CommService{ diff --git a/src/main/java/com/sipai/service/visit/VisitPositionService.java b/src/main/java/com/sipai/service/visit/VisitPositionService.java index 2576348c..83d9d32e 100644 --- a/src/main/java/com/sipai/service/visit/VisitPositionService.java +++ b/src/main/java/com/sipai/service/visit/VisitPositionService.java @@ -1,14 +1,12 @@ package com.sipai.service.visit; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.sipai.dao.visit.VisitPositionDao; import com.sipai.entity.visit.VisitPosition; import com.sipai.tools.CommService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class VisitPositionService implements CommService{ @Resource diff --git a/src/main/java/com/sipai/service/visit/VisitSafetyCommitmentRecordService.java b/src/main/java/com/sipai/service/visit/VisitSafetyCommitmentRecordService.java index 9b71c7aa..cadb3acd 100644 --- a/src/main/java/com/sipai/service/visit/VisitSafetyCommitmentRecordService.java +++ b/src/main/java/com/sipai/service/visit/VisitSafetyCommitmentRecordService.java @@ -1,14 +1,12 @@ package com.sipai.service.visit; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.sipai.dao.visit.VisitSafetyCommitmentRecordDao; import com.sipai.entity.visit.VisitSafetyCommitmentRecord; import com.sipai.tools.CommService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class VisitSafetyCommitmentRecordService implements CommService{ @Resource diff --git a/src/main/java/com/sipai/service/visit/VisitSafetyCommitmentService.java b/src/main/java/com/sipai/service/visit/VisitSafetyCommitmentService.java index 0ea1bc15..116d34a5 100644 --- a/src/main/java/com/sipai/service/visit/VisitSafetyCommitmentService.java +++ b/src/main/java/com/sipai/service/visit/VisitSafetyCommitmentService.java @@ -1,14 +1,12 @@ package com.sipai.service.visit; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.sipai.dao.visit.VisitSafetyCommitmentDao; import com.sipai.entity.visit.VisitSafetyCommitment; import com.sipai.tools.CommService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class VisitSafetyCommitmentService implements CommService{ @Resource diff --git a/src/main/java/com/sipai/service/visit/VisitVisitorsService.java b/src/main/java/com/sipai/service/visit/VisitVisitorsService.java index 20dfd851..125d107f 100644 --- a/src/main/java/com/sipai/service/visit/VisitVisitorsService.java +++ b/src/main/java/com/sipai/service/visit/VisitVisitorsService.java @@ -1,14 +1,12 @@ package com.sipai.service.visit; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.sipai.dao.visit.VisitVisitorsDao; import com.sipai.entity.visit.VisitVisitors; import com.sipai.tools.CommService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class VisitVisitorsService implements CommService{ @Resource diff --git a/src/main/java/com/sipai/service/visual/CacheDataService.java b/src/main/java/com/sipai/service/visual/CacheDataService.java index 668c7589..3f00ce07 100644 --- a/src/main/java/com/sipai/service/visual/CacheDataService.java +++ b/src/main/java/com/sipai/service/visual/CacheDataService.java @@ -1,24 +1,20 @@ package com.sipai.service.visual; -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 net.sf.json.JSONArray; - -import org.springframework.stereotype.Service; import com.sipai.dao.visual.CacheDataDao; import com.sipai.entity.app.AppDataConfigure; -import com.sipai.entity.scada.MPoint; import com.sipai.entity.user.Unit; import com.sipai.entity.visual.CacheData; import com.sipai.service.app.AppDataConfigureService; import com.sipai.service.scada.MPointService; import com.sipai.tools.CommService; +import net.sf.json.JSONArray; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; @Service public class CacheDataService implements CommService{ diff --git a/src/main/java/com/sipai/service/visual/DataTypeService.java b/src/main/java/com/sipai/service/visual/DataTypeService.java index f9900a37..aeba2dc9 100644 --- a/src/main/java/com/sipai/service/visual/DataTypeService.java +++ b/src/main/java/com/sipai/service/visual/DataTypeService.java @@ -1,14 +1,12 @@ package com.sipai.service.visual; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.sipai.dao.visual.DataTypeDao; import com.sipai.entity.visual.DataType; import com.sipai.tools.CommService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class DataTypeService implements CommService { diff --git a/src/main/java/com/sipai/service/visual/InteractionService.java b/src/main/java/com/sipai/service/visual/InteractionService.java index a0c871ef..12bc85a2 100644 --- a/src/main/java/com/sipai/service/visual/InteractionService.java +++ b/src/main/java/com/sipai/service/visual/InteractionService.java @@ -1,14 +1,12 @@ package com.sipai.service.visual; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.sipai.dao.visual.InteractionDao; import com.sipai.entity.visual.Interaction; import com.sipai.tools.CommService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class InteractionService implements CommService { diff --git a/src/main/java/com/sipai/service/visual/JspConfigureDetailService.java b/src/main/java/com/sipai/service/visual/JspConfigureDetailService.java index c6e3882c..0a0eedd7 100644 --- a/src/main/java/com/sipai/service/visual/JspConfigureDetailService.java +++ b/src/main/java/com/sipai/service/visual/JspConfigureDetailService.java @@ -1,12 +1,5 @@ package com.sipai.service.visual; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; import com.sipai.dao.visual.JspConfigureDetailDao; import com.sipai.entity.scada.MPoint; import com.sipai.entity.visual.JspConfigureDetail; @@ -15,8 +8,14 @@ import com.sipai.service.scada.MPointHistoryService; import com.sipai.service.scada.MPointService; import com.sipai.service.user.UnitService; import com.sipai.tools.CommService; - import net.sf.json.JSONArray; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; @Service public class JspConfigureDetailService implements CommService{ diff --git a/src/main/java/com/sipai/service/visual/JspConfigureService.java b/src/main/java/com/sipai/service/visual/JspConfigureService.java index ef1c295c..394d29ee 100644 --- a/src/main/java/com/sipai/service/visual/JspConfigureService.java +++ b/src/main/java/com/sipai/service/visual/JspConfigureService.java @@ -1,9 +1,5 @@ package com.sipai.service.visual; -import java.util.List; -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; import com.sipai.dao.visual.JspConfigureDao; import com.sipai.entity.process.DataVisualFrame; import com.sipai.entity.user.Unit; @@ -14,6 +10,10 @@ import com.sipai.service.process.DataVisualFrameService; import com.sipai.service.user.UnitService; import com.sipai.service.work.CameraService; import com.sipai.tools.CommService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class JspConfigureService implements CommService{ diff --git a/src/main/java/com/sipai/service/visual/LayoutDetailService.java b/src/main/java/com/sipai/service/visual/LayoutDetailService.java index f4d04790..560aa355 100644 --- a/src/main/java/com/sipai/service/visual/LayoutDetailService.java +++ b/src/main/java/com/sipai/service/visual/LayoutDetailService.java @@ -1,13 +1,12 @@ package com.sipai.service.visual; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; import com.sipai.dao.visual.LayoutDetailDao; import com.sipai.entity.visual.LayoutDetail; import com.sipai.tools.CommService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class LayoutDetailService implements CommService{ diff --git a/src/main/java/com/sipai/service/visual/LayoutService.java b/src/main/java/com/sipai/service/visual/LayoutService.java index eb33a7c5..a2f7c19f 100644 --- a/src/main/java/com/sipai/service/visual/LayoutService.java +++ b/src/main/java/com/sipai/service/visual/LayoutService.java @@ -1,16 +1,13 @@ package com.sipai.service.visual; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; import com.sipai.dao.visual.LayoutDao; -import com.sipai.dao.visual.PlanLayoutDao; import com.sipai.entity.visual.Layout; import com.sipai.entity.visual.LayoutDetail; -import com.sipai.entity.visual.PlanLayout; import com.sipai.tools.CommService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class LayoutService implements CommService{ diff --git a/src/main/java/com/sipai/service/visual/PlanInteractionService.java b/src/main/java/com/sipai/service/visual/PlanInteractionService.java index ed241be4..e6d6a2dc 100644 --- a/src/main/java/com/sipai/service/visual/PlanInteractionService.java +++ b/src/main/java/com/sipai/service/visual/PlanInteractionService.java @@ -1,14 +1,12 @@ package com.sipai.service.visual; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.sipai.dao.visual.PlanInteractionDao; import com.sipai.entity.visual.PlanInteraction; import com.sipai.tools.CommService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class PlanInteractionService implements CommService { diff --git a/src/main/java/com/sipai/service/visual/PlanLayoutService.java b/src/main/java/com/sipai/service/visual/PlanLayoutService.java index 785aa491..e20a0cd2 100644 --- a/src/main/java/com/sipai/service/visual/PlanLayoutService.java +++ b/src/main/java/com/sipai/service/visual/PlanLayoutService.java @@ -1,13 +1,12 @@ package com.sipai.service.visual; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; import com.sipai.dao.visual.PlanLayoutDao; import com.sipai.entity.visual.PlanLayout; import com.sipai.tools.CommService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class PlanLayoutService implements CommService{ diff --git a/src/main/java/com/sipai/service/visual/PlanService.java b/src/main/java/com/sipai/service/visual/PlanService.java index 59471f35..745893ac 100644 --- a/src/main/java/com/sipai/service/visual/PlanService.java +++ b/src/main/java/com/sipai/service/visual/PlanService.java @@ -1,13 +1,13 @@ package com.sipai.service.visual; -import java.math.BigDecimal; -import java.util.List; -import java.util.Map; - import com.sipai.entity.visual.JspElement; import com.sipai.entity.visual.Plan; import com.sipai.entity.work.Camera; +import java.math.BigDecimal; +import java.util.List; +import java.util.Map; + public interface PlanService { public Plan getPlanById(String planId); diff --git a/src/main/java/com/sipai/service/visual/PlanServiceImpl.java b/src/main/java/com/sipai/service/visual/PlanServiceImpl.java index ff26ee6c..39775480 100644 --- a/src/main/java/com/sipai/service/visual/PlanServiceImpl.java +++ b/src/main/java/com/sipai/service/visual/PlanServiceImpl.java @@ -1,38 +1,22 @@ package com.sipai.service.visual; +import com.sipai.dao.visual.PlanDao; +import com.sipai.entity.visual.*; +import com.sipai.entity.work.Camera; +import com.sipai.service.work.CameraService; +import com.sipai.tools.CommUtil; +import net.sf.json.JSONArray; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; import java.io.File; import java.math.BigDecimal; import java.util.ArrayList; import java.util.HashMap; -import java.util.Iterator; import java.util.List; import java.util.Map; -import javax.annotation.Resource; -import javax.swing.text.TabableView; - -import net.sf.json.JSONArray; -import net.sf.json.JSONObject; - -import org.aspectj.weaver.ast.Var; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.sipai.dao.user.UserPowerDao; -import com.sipai.dao.visual.PlanDao; -import com.sipai.entity.user.Unit; -import com.sipai.entity.user.UserPower; -import com.sipai.entity.visual.DataType; -import com.sipai.entity.visual.JspElement; -import com.sipai.entity.visual.LayoutDetail; -import com.sipai.entity.visual.Plan; -import com.sipai.entity.visual.PlanInteraction; -import com.sipai.entity.visual.PlanLayout; -import com.sipai.entity.visual.VisualJsp; -import com.sipai.entity.work.Camera; -import com.sipai.service.work.CameraService; -import com.sipai.tools.CommUtil; - @Service("planService") public class PlanServiceImpl implements PlanService { @Resource diff --git a/src/main/java/com/sipai/service/visual/ProcessOperationService.java b/src/main/java/com/sipai/service/visual/ProcessOperationService.java index 4dcbfb0d..271248eb 100644 --- a/src/main/java/com/sipai/service/visual/ProcessOperationService.java +++ b/src/main/java/com/sipai/service/visual/ProcessOperationService.java @@ -1,14 +1,12 @@ package com.sipai.service.visual; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.sipai.dao.visual.ProcessOperationDao; import com.sipai.entity.visual.ProcessOperation; import com.sipai.tools.CommService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class ProcessOperationService implements CommService { diff --git a/src/main/java/com/sipai/service/visual/VisualCacheConfigService.java b/src/main/java/com/sipai/service/visual/VisualCacheConfigService.java index 04bd8851..35860c48 100644 --- a/src/main/java/com/sipai/service/visual/VisualCacheConfigService.java +++ b/src/main/java/com/sipai/service/visual/VisualCacheConfigService.java @@ -1,14 +1,12 @@ package com.sipai.service.visual; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.sipai.dao.visual.VisualCacheConfigDao; import com.sipai.entity.visual.VisualCacheConfig; import com.sipai.tools.CommService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class VisualCacheConfigService implements CommService { diff --git a/src/main/java/com/sipai/service/visual/VisualJspService.java b/src/main/java/com/sipai/service/visual/VisualJspService.java index 1474a536..af119c6e 100644 --- a/src/main/java/com/sipai/service/visual/VisualJspService.java +++ b/src/main/java/com/sipai/service/visual/VisualJspService.java @@ -1,14 +1,13 @@ package com.sipai.service.visual; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; import com.sipai.dao.visual.VisualJspDao; import com.sipai.entity.visual.JspElement; import com.sipai.entity.visual.VisualJsp; import com.sipai.tools.CommService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class VisualJspService implements CommService{ diff --git a/src/main/java/com/sipai/service/whp/baseinfo/WhpEquipmentService.java b/src/main/java/com/sipai/service/whp/baseinfo/WhpEquipmentService.java index 30919d06..d509175e 100644 --- a/src/main/java/com/sipai/service/whp/baseinfo/WhpEquipmentService.java +++ b/src/main/java/com/sipai/service/whp/baseinfo/WhpEquipmentService.java @@ -5,7 +5,6 @@ import com.sipai.dao.whp.baseinfo.WhpEquipmentDao; import com.sipai.entity.enums.EnumJsonObject; import com.sipai.entity.whp.baseinfo.WhpEquipment; import com.sipai.entity.whp.baseinfo.WhpEquipmentQuery; -import com.sipai.entity.whp.baseinfo.WhpTestItemWorkingCurve; import com.sipai.tools.CommService; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/sipai/service/whp/baseinfo/WhpSampleCodeService.java b/src/main/java/com/sipai/service/whp/baseinfo/WhpSampleCodeService.java index 8afa9c3e..d5135436 100644 --- a/src/main/java/com/sipai/service/whp/baseinfo/WhpSampleCodeService.java +++ b/src/main/java/com/sipai/service/whp/baseinfo/WhpSampleCodeService.java @@ -2,7 +2,6 @@ package com.sipai.service.whp.baseinfo; import com.sipai.controller.exception.BizCheckException; import com.sipai.dao.whp.baseinfo.WhpSampleCodeDao; -import com.sipai.entity.base.Result; import com.sipai.entity.whp.baseinfo.WhpSampleCode; import com.sipai.entity.whp.baseinfo.WhpSampleCodeQuery; import com.sipai.tools.CommService; diff --git a/src/main/java/com/sipai/service/whp/baseinfo/WhpTestItemService.java b/src/main/java/com/sipai/service/whp/baseinfo/WhpTestItemService.java index 18fceae5..1bd73fae 100644 --- a/src/main/java/com/sipai/service/whp/baseinfo/WhpTestItemService.java +++ b/src/main/java/com/sipai/service/whp/baseinfo/WhpTestItemService.java @@ -4,7 +4,6 @@ import com.sipai.controller.exception.BizCheckException; import com.sipai.dao.whp.baseinfo.WhpTestItemDao; import com.sipai.entity.enums.EnumJsonObject; import com.sipai.entity.user.Company; -import com.sipai.entity.user.Dept; import com.sipai.entity.user.Unit; import com.sipai.entity.whp.baseinfo.WhpTestItem; import com.sipai.entity.whp.baseinfo.WhpTestItemQuery; diff --git a/src/main/java/com/sipai/service/whp/baseinfo/WhpTestItemWorkingCurveService.java b/src/main/java/com/sipai/service/whp/baseinfo/WhpTestItemWorkingCurveService.java index 27b8c0ef..ed66b68e 100644 --- a/src/main/java/com/sipai/service/whp/baseinfo/WhpTestItemWorkingCurveService.java +++ b/src/main/java/com/sipai/service/whp/baseinfo/WhpTestItemWorkingCurveService.java @@ -1 +1 @@ -package com.sipai.service.whp.baseinfo; import cn.hutool.core.util.NumberUtil; import com.sipai.controller.exception.BizCheckException; import com.sipai.dao.whp.baseinfo.WhpTestItemWorkingCurveDao; import com.sipai.entity.scada.MPoint; import com.sipai.entity.scada.MPointFormula; import com.sipai.entity.scada.MPointHistory; import com.sipai.entity.scada.MPointPropSource; import com.sipai.entity.whp.baseinfo.WhpTestItemWorkingCurve; import com.sipai.entity.whp.baseinfo.WhpTestItemWorkingCurveVo; import com.sipai.service.scada.MPointFormulaService; import com.sipai.service.scada.MPointHistoryService; import com.sipai.service.scada.MPointPropSourceService; import com.sipai.service.scada.MPointService; import com.sipai.tools.CommService; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import com.sipai.entity.whp.baseinfo.WhpTestItemWorkingCurveQuery; import javax.annotation.Resource; import java.io.IOException; import java.math.BigDecimal; import java.text.DecimalFormat; import java.util.*; /** * 方法依据Service类 * * @Author: zxq * @Date: 2023/05/15 **/ @Service public class WhpTestItemWorkingCurveService implements CommService { @Resource private WhpTestItemWorkingCurveDao dao; @Resource private MPointService mPointService; @Resource private MPointFormulaService mPointFormulaService; @Resource private MPointPropSourceService mPointPropSourceService; @Resource private MPointHistoryService mPointHistoryService; @Override public WhpTestItemWorkingCurve selectById(String t) { return dao.selectByPrimaryKey(t); } @Override public int deleteById(String t) { return dao.deleteByPrimaryKey(t); } @Override public int save(WhpTestItemWorkingCurve bean) { bean.setId(UUID.randomUUID().toString()); return dao.insert(bean); } @Override public int update(WhpTestItemWorkingCurve bean) { return dao.updateByPrimaryKeySelective(bean); } @Override public List selectListByWhere(String t) { WhpTestItemWorkingCurve bean = new WhpTestItemWorkingCurve(); bean.setWhere(t); return dao.selectListByWhere(bean); } @Override public int deleteByWhere(String t) { WhpTestItemWorkingCurve bean = new WhpTestItemWorkingCurve(); bean.setWhere(t); return dao.deleteByWhere(bean); } /** * 列表查询 * * @Author: zxq * @Date: 2023/05/15 **/ public List queryList(WhpTestItemWorkingCurveQuery query) { query.setformulatype(); return dao.queryList(query); } /** * * 业务校验 * * @Author: zxq * @Date: 2023/05/15 **/ public void bizCheck(WhpTestItemWorkingCurve bean) throws BizCheckException { } public List selectListByItem(String testItemId,String formulatype){ List List=selectListByTestItemId(testItemId,formulatype); List listvo=new ArrayList<>(); if(List!=null&&List.size()>0) { for( WhpTestItemWorkingCurve item : List) { WhpTestItemWorkingCurveVo vo = new WhpTestItemWorkingCurveVo(); BeanUtils.copyProperties(item, vo); if(item.getKpi_id()!=null&&!item.getKpi_id().equals("")) { // System.out.println("监测点id:" + item.getKpi_id()); MPoint mPoint=mPointService.selectById(item.getKpi_id()); vo.setMPoint( mPoint); vo.setDefaultValue(item.getDefault_value()); } listvo.add(vo); } } return listvo; } /** * 查询检测点 * @param testItemId * @param formulatype * @param bizid * @param gdid * @param contmap * @return */ public List selectCurveListByItemForm(String testItemId, String formulatype, String bizid, String gdid, Map contmap){ Map proMap=new HashMap<>(); DecimalFormat df = new DecimalFormat("#.00"); //System.out.println(df.format(f)); /** * 查询 项目 曲线配置 */ List List=selectListByTestItemId(testItemId,formulatype); // 若是过程公式 筛选 和过程公式重复的点位 再显示 if (formulatype.equals("2")){ for (int i=0;i< List.size();i++) { proMap.put(List.get(i).getKpi_id(),List.get(i).getKpi_id()); } } List listvo=new ArrayList<>(); if(List!=null&&List.size()>0) { for( WhpTestItemWorkingCurve item : List) { BigDecimal pval=BigDecimal.valueOf(0); WhpTestItemWorkingCurveVo vo = new WhpTestItemWorkingCurveVo(); BeanUtils.copyProperties(item, vo); if(item.getKpi_id()!=null&&!item.getKpi_id().equals("")) { //根据测点 查询 测点详细信息 MPoint mPoint=mPointService.selectById(item.getKpi_id()); if ("NULL".equals(mPoint.getRemark())) { mPoint.setRemark("0"); } String sql=" where pid='"+mPoint.getMpointcode()+"' order by index_details"; //根据测点 查询 计算点信息 List mPointFormulas = this.mPointPropSourceService.selectListByWhere(bizid,sql); List mPointFormulasVO=new ArrayList<>(); if (mPoint!=null) { //查询测点 检测值 List mPointHistoryList = this.mPointHistoryService.selectAggregateList(bizid, "tb_mp_" +mPoint.getMpointcode() , " where userid='" + gdid + "' ", "ItemID, MeasureDT, memotype, memo, userid, insdt"); if(mPointHistoryList!=null&&mPointHistoryList.size()>0) { if (mPoint.getNumtail()!=null&&mPoint.getNumtail()!="") { //mPoint.setParmvalue(mPointHistoryList.get(0).getParmvalue().setScale(Integer.valueOf(mPoint.getNumtail()),BigDecimal.ROUND_HALF_UP)); // mPoint.setParmvalue(NumberUtil.roundHalfEven(mPointHistoryList.get(0).getParmvalue(),Integer.valueOf(mPoint.getNumtail()))); if (mPointHistoryList.get(0).getMemo() != null) { mPoint.setParmvalue(mPointHistoryList.get(0).getParmvalue()); mPoint.setParmvalueStr(mPointHistoryList.get(0).getMemo()); } else { mPoint.setParmvalue(mPointHistoryList.get(0).getParmvalue()); mPoint.setParmvalueStr("0"); } }else{ if (mPointHistoryList.get(0).getMemo() != null) { mPoint.setParmvalue(mPointHistoryList.get(0).getParmvalue()); mPoint.setParmvalueStr(mPointHistoryList.get(0).getMemo()); } else { mPoint.setParmvalue(mPointHistoryList.get(0).getParmvalue()); mPoint.setParmvalueStr("0"); } } }else{ mPoint.setParmvalue(pval); mPoint.setParmvalueStr("0"); } //查询计算点值 Boolean morderIsNull = false; if(mPointFormulas!=null&&mPointFormulas.size()>0) { for (MPointPropSource mPointPropSource:mPointFormulas) { if (mPointPropSource.getMorder() == null) { morderIsNull = true; } List templist = this.mPointHistoryService.selectAggregateList(bizid, "tb_mp_" +mPointPropSource.getMpid() , " where userid='" + gdid + "' ", "ItemID, MeasureDT, memotype, memo, userid, insdt"); if (templist!=null&&templist.size()>0) { if (mPoint.getNumtail()!=null&&mPoint.getNumtail()!="") { mPointPropSource.getmPoint().setParmvalueStr(templist.get(0).getMemo()); mPointPropSource.getmPoint().setParmvalue(templist.get(0).getParmvalue()); // mPointPropSource.getmPoint().setParmvalue(NumberUtil.roundHalfEven(templist.get(0).getParmvalue(),Integer.valueOf(mPoint.getNumtail()))); // mPointPropSource.getmPoint().setParmvalue(templist.get(0).getParmvalue().setScale(Integer.valueOf(mPoint.getNumtail()), BigDecimal.ROUND_HALF_UP)); }else{ mPointPropSource.getmPoint().setParmvalueStr(templist.get(0).getMemo()); mPointPropSource.getmPoint().setParmvalue(templist.get(0).getParmvalue()); } } //去除常量中配置的重复计算点 if (contmap==null&&proMap==null) { mPointFormulasVO.add(mPointPropSource); }else { if((contmap!=null&&contmap.get(mPointPropSource.getmPoint().getMpointcode())!=null)||(proMap!=null&&proMap.get(mPointPropSource.getmPoint().getMpointcode())!=null)) { }else{ mPointFormulasVO.add(mPointPropSource); } } } } if (!morderIsNull) { mPointFormulasVO.sort(Comparator.comparing(MPointPropSource::getMorder)); } mPoint.setmPointPropSource( mPointFormulasVO); } vo.setMPoint( mPoint); } listvo.add(vo); } } return listvo; } /** * 列表查询 根据检测项目主键 * * @Author: zxq * @Date: 2022/12/16 **/ public List selectListByTestItemId(String testItemId,String formulatype) { String sql=" where test_item_id='" + testItemId + "'"; if(formulatype!=null&&!formulatype.equals("")) { sql=sql+" and formulatype in ( "; String[] arr=formulatype.split(","); { for(int i=0;i list= selectListByWhere(sql); if(list!=null&&list.size()>0) { curve=list.get(0); } return curve; } } \ No newline at end of file +package com.sipai.service.whp.baseinfo; import com.sipai.controller.exception.BizCheckException; import com.sipai.dao.whp.baseinfo.WhpTestItemWorkingCurveDao; import com.sipai.entity.scada.MPoint; import com.sipai.entity.scada.MPointHistory; import com.sipai.entity.scada.MPointPropSource; import com.sipai.entity.whp.baseinfo.WhpTestItemWorkingCurve; import com.sipai.entity.whp.baseinfo.WhpTestItemWorkingCurveQuery; import com.sipai.entity.whp.baseinfo.WhpTestItemWorkingCurveVo; import com.sipai.service.scada.MPointFormulaService; import com.sipai.service.scada.MPointHistoryService; import com.sipai.service.scada.MPointPropSourceService; import com.sipai.service.scada.MPointService; import com.sipai.tools.CommService; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.math.BigDecimal; import java.text.DecimalFormat; import java.util.*; /** * 方法依据Service类 * * @Author: zxq * @Date: 2023/05/15 **/ @Service public class WhpTestItemWorkingCurveService implements CommService { @Resource private WhpTestItemWorkingCurveDao dao; @Resource private MPointService mPointService; @Resource private MPointFormulaService mPointFormulaService; @Resource private MPointPropSourceService mPointPropSourceService; @Resource private MPointHistoryService mPointHistoryService; @Override public WhpTestItemWorkingCurve selectById(String t) { return dao.selectByPrimaryKey(t); } @Override public int deleteById(String t) { return dao.deleteByPrimaryKey(t); } @Override public int save(WhpTestItemWorkingCurve bean) { bean.setId(UUID.randomUUID().toString()); return dao.insert(bean); } @Override public int update(WhpTestItemWorkingCurve bean) { return dao.updateByPrimaryKeySelective(bean); } @Override public List selectListByWhere(String t) { WhpTestItemWorkingCurve bean = new WhpTestItemWorkingCurve(); bean.setWhere(t); return dao.selectListByWhere(bean); } @Override public int deleteByWhere(String t) { WhpTestItemWorkingCurve bean = new WhpTestItemWorkingCurve(); bean.setWhere(t); return dao.deleteByWhere(bean); } /** * 列表查询 * * @Author: zxq * @Date: 2023/05/15 **/ public List queryList(WhpTestItemWorkingCurveQuery query) { query.setformulatype(); return dao.queryList(query); } /** * * 业务校验 * * @Author: zxq * @Date: 2023/05/15 **/ public void bizCheck(WhpTestItemWorkingCurve bean) throws BizCheckException { } public List selectListByItem(String testItemId,String formulatype){ List List=selectListByTestItemId(testItemId,formulatype); List listvo=new ArrayList<>(); if(List!=null&&List.size()>0) { for( WhpTestItemWorkingCurve item : List) { WhpTestItemWorkingCurveVo vo = new WhpTestItemWorkingCurveVo(); BeanUtils.copyProperties(item, vo); if(item.getKpi_id()!=null&&!item.getKpi_id().equals("")) { // System.out.println("监测点id:" + item.getKpi_id()); MPoint mPoint=mPointService.selectById(item.getKpi_id()); vo.setMPoint( mPoint); vo.setDefaultValue(item.getDefault_value()); } listvo.add(vo); } } return listvo; } /** * 查询检测点 * @param testItemId * @param formulatype * @param bizid * @param gdid * @param contmap * @return */ public List selectCurveListByItemForm(String testItemId, String formulatype, String bizid, String gdid, Map contmap){ Map proMap=new HashMap<>(); DecimalFormat df = new DecimalFormat("#.00"); //System.out.println(df.format(f)); /** * 查询 项目 曲线配置 */ List List=selectListByTestItemId(testItemId,formulatype); // 若是过程公式 筛选 和过程公式重复的点位 再显示 if (formulatype.equals("2")){ for (int i=0;i< List.size();i++) { proMap.put(List.get(i).getKpi_id(),List.get(i).getKpi_id()); } } List listvo=new ArrayList<>(); if(List!=null&&List.size()>0) { for( WhpTestItemWorkingCurve item : List) { BigDecimal pval=BigDecimal.valueOf(0); WhpTestItemWorkingCurveVo vo = new WhpTestItemWorkingCurveVo(); BeanUtils.copyProperties(item, vo); if(item.getKpi_id()!=null&&!item.getKpi_id().equals("")) { //根据测点 查询 测点详细信息 MPoint mPoint=mPointService.selectById(item.getKpi_id()); if ("NULL".equals(mPoint.getRemark())) { mPoint.setRemark("0"); } String sql=" where pid='"+mPoint.getMpointcode()+"' order by index_details"; //根据测点 查询 计算点信息 List mPointFormulas = this.mPointPropSourceService.selectListByWhere(bizid,sql); List mPointFormulasVO=new ArrayList<>(); if (mPoint!=null) { //查询测点 检测值 List mPointHistoryList = this.mPointHistoryService.selectAggregateList(bizid, "tb_mp_" +mPoint.getMpointcode() , " where userid='" + gdid + "' ", "ItemID, MeasureDT, memotype, memo, userid, insdt"); if(mPointHistoryList!=null&&mPointHistoryList.size()>0) { if (mPoint.getNumtail()!=null&&mPoint.getNumtail()!="") { //mPoint.setParmvalue(mPointHistoryList.get(0).getParmvalue().setScale(Integer.valueOf(mPoint.getNumtail()),BigDecimal.ROUND_HALF_UP)); // mPoint.setParmvalue(NumberUtil.roundHalfEven(mPointHistoryList.get(0).getParmvalue(),Integer.valueOf(mPoint.getNumtail()))); if (mPointHistoryList.get(0).getMemo() != null) { mPoint.setParmvalue(mPointHistoryList.get(0).getParmvalue()); mPoint.setParmvalueStr(mPointHistoryList.get(0).getMemo()); } else { mPoint.setParmvalue(mPointHistoryList.get(0).getParmvalue()); mPoint.setParmvalueStr("0"); } }else{ if (mPointHistoryList.get(0).getMemo() != null) { mPoint.setParmvalue(mPointHistoryList.get(0).getParmvalue()); mPoint.setParmvalueStr(mPointHistoryList.get(0).getMemo()); } else { mPoint.setParmvalue(mPointHistoryList.get(0).getParmvalue()); mPoint.setParmvalueStr("0"); } } }else{ mPoint.setParmvalue(pval); mPoint.setParmvalueStr("0"); } //查询计算点值 Boolean morderIsNull = false; if(mPointFormulas!=null&&mPointFormulas.size()>0) { for (MPointPropSource mPointPropSource:mPointFormulas) { if (mPointPropSource.getMorder() == null) { morderIsNull = true; } List templist = this.mPointHistoryService.selectAggregateList(bizid, "tb_mp_" +mPointPropSource.getMpid() , " where userid='" + gdid + "' ", "ItemID, MeasureDT, memotype, memo, userid, insdt"); if (templist!=null&&templist.size()>0) { if (mPoint.getNumtail()!=null&&mPoint.getNumtail()!="") { mPointPropSource.getmPoint().setParmvalueStr(templist.get(0).getMemo()); mPointPropSource.getmPoint().setParmvalue(templist.get(0).getParmvalue()); // mPointPropSource.getmPoint().setParmvalue(NumberUtil.roundHalfEven(templist.get(0).getParmvalue(),Integer.valueOf(mPoint.getNumtail()))); // mPointPropSource.getmPoint().setParmvalue(templist.get(0).getParmvalue().setScale(Integer.valueOf(mPoint.getNumtail()), BigDecimal.ROUND_HALF_UP)); }else{ mPointPropSource.getmPoint().setParmvalueStr(templist.get(0).getMemo()); mPointPropSource.getmPoint().setParmvalue(templist.get(0).getParmvalue()); } } //去除常量中配置的重复计算点 if (contmap==null&&proMap==null) { mPointFormulasVO.add(mPointPropSource); }else { if((contmap!=null&&contmap.get(mPointPropSource.getmPoint().getMpointcode())!=null)||(proMap!=null&&proMap.get(mPointPropSource.getmPoint().getMpointcode())!=null)) { }else{ mPointFormulasVO.add(mPointPropSource); } } } } if (!morderIsNull) { mPointFormulasVO.sort(Comparator.comparing(MPointPropSource::getMorder)); } mPoint.setmPointPropSource( mPointFormulasVO); } vo.setMPoint( mPoint); } listvo.add(vo); } } return listvo; } /** * 列表查询 根据检测项目主键 * * @Author: zxq * @Date: 2022/12/16 **/ public List selectListByTestItemId(String testItemId,String formulatype) { String sql=" where test_item_id='" + testItemId + "'"; if(formulatype!=null&&!formulatype.equals("")) { sql=sql+" and formulatype in ( "; String[] arr=formulatype.split(","); { for(int i=0;i list= selectListByWhere(sql); if(list!=null&&list.size()>0) { curve=list.get(0); } return curve; } } \ No newline at end of file diff --git a/src/main/java/com/sipai/service/whp/baseinfo/WhpTestMethodService.java b/src/main/java/com/sipai/service/whp/baseinfo/WhpTestMethodService.java index be7f4870..cda33869 100644 --- a/src/main/java/com/sipai/service/whp/baseinfo/WhpTestMethodService.java +++ b/src/main/java/com/sipai/service/whp/baseinfo/WhpTestMethodService.java @@ -1 +1 @@ -package com.sipai.service.whp.baseinfo; import com.sipai.controller.exception.BizCheckException; import com.sipai.dao.whp.baseinfo.WhpTestMethodDao; import com.sipai.entity.enums.EnumJsonObject; import com.sipai.entity.whp.baseinfo.WhpTestMethod; import com.sipai.tools.CommService; import org.springframework.stereotype.Service; import com.sipai.entity.whp.baseinfo.WhpTestMethodQuery; import javax.annotation.Resource; import java.io.IOException; import java.util.List; import java.util.UUID; /** * 方法依据Service类 * * @Author: zxq * @Date: 2023/05/15 **/ @Service public class WhpTestMethodService implements CommService { @Resource private WhpTestMethodDao dao; @Override public WhpTestMethod selectById(String t) { return dao.selectByPrimaryKey(t); } @Override public int deleteById(String t) { return dao.deleteByPrimaryKey(t); } @Override public int save(WhpTestMethod bean) { bean.setId(UUID.randomUUID().toString()); return dao.insert(bean); } @Override public int update(WhpTestMethod bean) { return dao.updateByPrimaryKeySelective(bean); } @Override public List selectListByWhere(String t) { WhpTestMethod bean = new WhpTestMethod(); bean.setWhere(t); return dao.selectListByWhere(bean); } @Override public int deleteByWhere(String t) { WhpTestMethod bean = new WhpTestMethod(); bean.setWhere(t); return dao.deleteByWhere(bean); } /** * 列表查询 * * @Author: zxq * @Date: 2023/05/15 **/ public List queryList(WhpTestMethodQuery query) { return dao.queryList(query); } /** * 业务校验 * * @Author: zxq * @Date: 2023/05/15 **/ public void bizCheck(WhpTestMethod bean) throws BizCheckException { } public List testMethodDropDownList( String testItem_id) { WhpTestMethodQuery whpTestMethodQuery=new WhpTestMethodQuery(); whpTestMethodQuery.setTestItem_id(testItem_id); List enumJsonObjects = dao.testMethodDropDownList(whpTestMethodQuery); return enumJsonObjects; } } \ No newline at end of file +package com.sipai.service.whp.baseinfo; import com.sipai.controller.exception.BizCheckException; import com.sipai.dao.whp.baseinfo.WhpTestMethodDao; import com.sipai.entity.enums.EnumJsonObject; import com.sipai.entity.whp.baseinfo.WhpTestMethod; import com.sipai.entity.whp.baseinfo.WhpTestMethodQuery; import com.sipai.tools.CommService; import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.List; import java.util.UUID; /** * 方法依据Service类 * * @Author: zxq * @Date: 2023/05/15 **/ @Service public class WhpTestMethodService implements CommService { @Resource private WhpTestMethodDao dao; @Override public WhpTestMethod selectById(String t) { return dao.selectByPrimaryKey(t); } @Override public int deleteById(String t) { return dao.deleteByPrimaryKey(t); } @Override public int save(WhpTestMethod bean) { bean.setId(UUID.randomUUID().toString()); return dao.insert(bean); } @Override public int update(WhpTestMethod bean) { return dao.updateByPrimaryKeySelective(bean); } @Override public List selectListByWhere(String t) { WhpTestMethod bean = new WhpTestMethod(); bean.setWhere(t); return dao.selectListByWhere(bean); } @Override public int deleteByWhere(String t) { WhpTestMethod bean = new WhpTestMethod(); bean.setWhere(t); return dao.deleteByWhere(bean); } /** * 列表查询 * * @Author: zxq * @Date: 2023/05/15 **/ public List queryList(WhpTestMethodQuery query) { return dao.queryList(query); } /** * 业务校验 * * @Author: zxq * @Date: 2023/05/15 **/ public void bizCheck(WhpTestMethod bean) throws BizCheckException { } public List testMethodDropDownList( String testItem_id) { WhpTestMethodQuery whpTestMethodQuery=new WhpTestMethodQuery(); whpTestMethodQuery.setTestItem_id(testItem_id); List enumJsonObjects = dao.testMethodDropDownList(whpTestMethodQuery); return enumJsonObjects; } } \ No newline at end of file diff --git a/src/main/java/com/sipai/service/whp/liquidWasteDispose/WhpLiquidWasteDisposeLogService.java b/src/main/java/com/sipai/service/whp/liquidWasteDispose/WhpLiquidWasteDisposeLogService.java index 9b86781d..386fd748 100644 --- a/src/main/java/com/sipai/service/whp/liquidWasteDispose/WhpLiquidWasteDisposeLogService.java +++ b/src/main/java/com/sipai/service/whp/liquidWasteDispose/WhpLiquidWasteDisposeLogService.java @@ -1 +1 @@ -package com.sipai.service.whp.liquidWasteDispose; import com.sipai.controller.exception.BizCheckException; import com.sipai.dao.whp.liquidWasteDispose.WhpLiquidWasteDisposeLogDao; import com.sipai.entity.whp.liquidWasteDispose.WhpLiquidWasteDisposeLog; import com.sipai.tools.CommService; import org.springframework.stereotype.Service; import com.sipai.entity.whp.liquidWasteDispose.WhpLiquidWasteDisposeLogQuery; import javax.annotation.Resource; import java.io.IOException; import java.util.List; import java.util.UUID; /** * 方法依据Service类 * * @Author: zxq * @Date: 2023/05/15 **/ @Service public class WhpLiquidWasteDisposeLogService implements CommService { @Resource private WhpLiquidWasteDisposeLogDao dao; @Override public WhpLiquidWasteDisposeLog selectById(String t) { return dao.selectByPrimaryKey(t); } @Override public int deleteById(String t) { return dao.deleteByPrimaryKey(t); } @Override public int save(WhpLiquidWasteDisposeLog bean) { bean.setId(UUID.randomUUID().toString()); return dao.insert(bean); } @Override public int update(WhpLiquidWasteDisposeLog bean) { return dao.updateByPrimaryKeySelective(bean); } @Override public List selectListByWhere(String t) { WhpLiquidWasteDisposeLog bean = new WhpLiquidWasteDisposeLog(); bean.setWhere(t); return dao.selectListByWhere(bean); } @Override public int deleteByWhere(String t) { WhpLiquidWasteDisposeLog bean = new WhpLiquidWasteDisposeLog(); bean.setWhere(t); return dao.deleteByWhere(bean); } /** * 列表查询 * * @Author: zxq * @Date: 2023/05/15 **/ public List queryList(WhpLiquidWasteDisposeLogQuery query) { return dao.queryList(query); } /** * 业务校验 * * @Author: zxq * @Date: 2023/05/15 **/ public void bizCheck(WhpLiquidWasteDisposeLog bean) throws BizCheckException { } } \ No newline at end of file +package com.sipai.service.whp.liquidWasteDispose; import com.sipai.controller.exception.BizCheckException; import com.sipai.dao.whp.liquidWasteDispose.WhpLiquidWasteDisposeLogDao; import com.sipai.entity.whp.liquidWasteDispose.WhpLiquidWasteDisposeLog; import com.sipai.entity.whp.liquidWasteDispose.WhpLiquidWasteDisposeLogQuery; import com.sipai.tools.CommService; import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.List; import java.util.UUID; /** * 方法依据Service类 * * @Author: zxq * @Date: 2023/05/15 **/ @Service public class WhpLiquidWasteDisposeLogService implements CommService { @Resource private WhpLiquidWasteDisposeLogDao dao; @Override public WhpLiquidWasteDisposeLog selectById(String t) { return dao.selectByPrimaryKey(t); } @Override public int deleteById(String t) { return dao.deleteByPrimaryKey(t); } @Override public int save(WhpLiquidWasteDisposeLog bean) { bean.setId(UUID.randomUUID().toString()); return dao.insert(bean); } @Override public int update(WhpLiquidWasteDisposeLog bean) { return dao.updateByPrimaryKeySelective(bean); } @Override public List selectListByWhere(String t) { WhpLiquidWasteDisposeLog bean = new WhpLiquidWasteDisposeLog(); bean.setWhere(t); return dao.selectListByWhere(bean); } @Override public int deleteByWhere(String t) { WhpLiquidWasteDisposeLog bean = new WhpLiquidWasteDisposeLog(); bean.setWhere(t); return dao.deleteByWhere(bean); } /** * 列表查询 * * @Author: zxq * @Date: 2023/05/15 **/ public List queryList(WhpLiquidWasteDisposeLogQuery query) { return dao.queryList(query); } /** * 业务校验 * * @Author: zxq * @Date: 2023/05/15 **/ public void bizCheck(WhpLiquidWasteDisposeLog bean) throws BizCheckException { } } \ No newline at end of file diff --git a/src/main/java/com/sipai/service/whp/plan/WhpSamplingPlanService.java b/src/main/java/com/sipai/service/whp/plan/WhpSamplingPlanService.java index 01470bc2..da6dae9d 100644 --- a/src/main/java/com/sipai/service/whp/plan/WhpSamplingPlanService.java +++ b/src/main/java/com/sipai/service/whp/plan/WhpSamplingPlanService.java @@ -20,7 +20,6 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import javax.annotation.Resource; -import java.net.URLEncoder; import java.util.*; /** diff --git a/src/main/java/com/sipai/service/whp/plan/WhpSamplingPlanTaskService.java b/src/main/java/com/sipai/service/whp/plan/WhpSamplingPlanTaskService.java index b089a2be..c169d9ca 100644 --- a/src/main/java/com/sipai/service/whp/plan/WhpSamplingPlanTaskService.java +++ b/src/main/java/com/sipai/service/whp/plan/WhpSamplingPlanTaskService.java @@ -1 +1 @@ -package com.sipai.service.whp.plan; import com.alibaba.fastjson.JSON; import com.sipai.controller.exception.BizCheckException; import com.sipai.dao.whp.plan.WhpSamplingPlanTaskDao; import com.sipai.entity.enums.EnableTypeEnum; import com.sipai.entity.enums.EnumJsonObject; import com.sipai.entity.enums.whp.*; import com.sipai.entity.whp.baseinfo.WhpSampleCode; import com.sipai.entity.whp.baseinfo.WhpSampleType; import com.sipai.entity.whp.plan.WhpSamplingPlan; import com.sipai.entity.whp.plan.WhpSamplingPlanQuery; import com.sipai.entity.whp.plan.WhpSamplingPlanTask; import com.sipai.entity.whp.plan.WhpSamplingPlanTaskQuery; import com.sipai.entity.whp.test.WhpSamplingPlanTaskTestItem; import com.sipai.service.whp.baseinfo.WhpSampleCodeService; import com.sipai.service.whp.baseinfo.WhpTestItemService; import com.sipai.service.whp.test.WhpSamplingPlanTaskTestItemService; import com.sipai.tools.CommService; import com.sipai.tools.DateUtil; import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.Date; import java.util.List; import java.util.UUID; /** * 采样任务Service类 * * @Author: 李晨 * @Date: 2022/12/30 **/ @Service public class WhpSamplingPlanTaskService implements CommService { @Resource private WhpSampleCodeService sampleCodeService; @Resource private WhpTestItemService whpTestItemService; @Resource private WhpSamplingPlanTaskTestItemService whpSamplingPlanTaskTestItemService; @Resource private WhpSamplingPlanTaskDao dao; @Override public WhpSamplingPlanTask selectById(String t) { return dao.selectByPrimaryKey(t); } @Override public int deleteById(String t) { return dao.deleteByPrimaryKey(t); } @Override public int save(WhpSamplingPlanTask bean) { bean.setId(UUID.randomUUID().toString()); return dao.insert(bean); } public void save(WhpSamplingPlan bean) { List sampleCodeList = sampleCodeService.selectListByWhere(" where type_id='" + bean.getSampleTypeId() + "' and status='" + EnableTypeEnum.Enable.getId() + "' order by id desc"); for (WhpSampleCode source : sampleCodeList) { WhpSamplingPlanTask target = new WhpSamplingPlanTask(); target.setPlanId(bean.getId()); target.setPlanCode(bean.getCode()); target.setSampleAddress(source.getAddress()); // target.setIsTest(Boolean.TRUE); //2023.8.30 修改为根据编码的是否检测 target.setIsTest(source.getIsTest()); target.setTestItemIds(source.getTestItemIds()); target.setStatus(SamplingPlanTaskStatusEnum.TEMPLATE.getId()); target.setPlanDate(bean.getDate()); //命名要求：字母前缀+日期+_+顺序号 Date planDate = DateUtil.toDate(target.getPlanDate()); target.setSampleCode(source.getPrefix() + DateUtil.toStr("yyMMdd", planDate) + "-" + source.getAddressCode()); target.setTestItemJson(JSON.toJSONString(whpTestItemService.testItemDropDownList(source.getTestItemIds()))); target.setSampleTypeId(bean.getSampleTypeId()); target.setSampleTypeName(bean.getSampleTypeName()); target.setReportDate(bean.getReportDate()); target.setDisposeStatus(ResidualSampleDisposeStatusEnum.WAIT.getId()); target.setDeptIds(source.getDeptIds()); target.setDeptNames(source.getDeptNames()); this.save(target); } } /** * 车间采样 新增 接收人即为创建人 状态为采样中 * @param bean */ public void workSave(WhpSamplingPlan bean) { List sampleCodeList = sampleCodeService.selectListByWhere(" where type_id='" + bean.getSampleTypeId() + "' and status='" + EnableTypeEnum.Enable.getId() + "' and is_test='1' order by id desc"); for (WhpSampleCode source : sampleCodeList) { WhpSamplingPlanTask target = new WhpSamplingPlanTask(); target.setPlanId(bean.getId()); target.setReceiverUserId(bean.getCreateUserId()); target.setStatus(SamplingPlanTaskStatusEnum.ING.getId()); target.setPlanCode(bean.getCode()); target.setSampleAddress(source.getAddress()); //target.setIsTest(Boolean.TRUE); target.setIsTest(source.getIsTest()); target.setTestItemIds(source.getTestItemIds()); // target.setStatus(SamplingPlanTaskStatusEnum.TEMPLATE.getId()); target.setPlanDate(bean.getDate()); //命名要求：字母前缀+日期+_+顺序号 Date planDate = DateUtil.toDate(target.getPlanDate()); target.setSampleCode(source.getPrefix() + DateUtil.toStr("yyMMdd", planDate) + "-" + source.getAddressCode()); target.setTestItemJson(JSON.toJSONString(whpTestItemService.testItemDropDownList(source.getTestItemIds()))); target.setSampleTypeId(bean.getSampleTypeId()); target.setSampleTypeName(bean.getSampleTypeName()); target.setReportDate(bean.getReportDate()); target.setDisposeStatus(ResidualSampleDisposeStatusEnum.WAIT.getId()); this.save(target); } } @Override public int update(WhpSamplingPlanTask bean) { return dao.updateByPrimaryKeySelective(bean); } @Override public List selectListByWhere(String t) { WhpSamplingPlanTask bean = new WhpSamplingPlanTask(); bean.setWhere(t); return dao.selectListByWhere(bean); } @Override public int deleteByWhere(String t) { WhpSamplingPlanTask bean = new WhpSamplingPlanTask(); bean.setWhere(t); return dao.deleteByWhere(bean); } /** * 列表查询 * * @Author: 李晨 * @Date: 2022/12/30 **/ public List queryList(WhpSamplingPlanTaskQuery query) { return dao.queryList(query); } /** * 业务校验 * * @Author: 李晨 * @Date: 2022/12/30 **/ public void bizCheck(WhpSamplingPlanTask bean) throws BizCheckException { } /** * 采样人下拉 * * @Author: lichen * @Date: 2023/1/3 **/ public List sampleUserDropDown() { return dao.sampleUserDropDown(); } /** * 采样地点下拉 * * @Author: lichen * @Date: 2023/1/3 **/ public List addressDropDown() { return dao.addressDropDown(); } /** * 根据采样单计划查询采样任务 * * @Author: lichen * @Date: 2023/1/3 **/ public List selectListByPlanId(String planid) { return selectListByWhere("where plan_id='" + planid + "' and is_test=1 order by id desc"); } /** * 根据采样单计划删除不检测的采样计划 * * @Author: lichen * @Date: 2023/1/3 **/ public void delByPlanIdNotTest(String planid) { deleteByWhere("where plan_id='" + planid + "' and is_test=0 "); } /** * 下发计划后，采样任务的状态也要提交为执行中 * * @Author: lichen * @Date: 2023/1/3 **/ public void submit(List taskList) { for (WhpSamplingPlanTask item : taskList) { item.setStatus(SamplingPlanTaskStatusEnum.WAIT.getId()); update(item); } } /** * 车间 采样登记完成 采样提交 * * @Author: lichen * @Date: 2023/1/3 **/ public void workSubmit(List taskList) { for (WhpSamplingPlanTask item : taskList) { item.setStatus(SamplingPlanTaskStatusEnum.AUDIT.getId()); update(item); } } /** * 批量下发计划后，采样任务也要批量复制，状态也要提交为执行中 * * @Author: lichen * @Date: 2023/1/3 **/ public void submit(WhpSamplingPlan plan, List taskList) { for (WhpSamplingPlanTask item : taskList) { item.setPlanId(plan.getId()); item.setPlanCode(plan.getCode()); item.setStatus(SamplingPlanTaskStatusEnum.WAIT.getId()); String sampleCode = item.getSampleCode(); String firstPart = sampleCode.split("-")[0]; String planDate = firstPart.substring(firstPart.length() - 6); Date planDateNew = DateUtil.toDate(plan.getDate()); String newPlanDate = DateUtil.toStr("yyMMdd", planDateNew); item.setSampleCode(item.getSampleCode().replace(planDate, newPlanDate)); item.setPlanDate(plan.getDate()); item.setReportDate(plan.getReportDate()); item.setStatus(SamplingPlanTaskStatusEnum.WAIT.getId()); save(item); } } /** * 批量下发计划后，采样任务也要批量复制，状态也要提交为执行中 * * @Author: lichen * @Date: 2023/1/3 **/ public void submitTask(WhpSamplingPlan plan) { List sampleCodeList = sampleCodeService.selectListByWhere(" where type_id='" + plan.getSampleTypeId() + "' and status='" + EnableTypeEnum.Enable.getId() + "' and is_test='1' order by id desc"); for (WhpSampleCode source : sampleCodeList) { WhpSamplingPlanTask target = new WhpSamplingPlanTask(); target.setPlanId(plan.getId()); target.setPlanCode(plan.getCode()); target.setSampleAddress(source.getAddress()); target.setIsTest(source.getIsTest()); target.setTestItemIds(source.getTestItemIds()); // target.setReceiverUserId(plan.getCreateUserId()); target.setStatus(SamplingPlanTaskStatusEnum.WAIT.getId()); target.setPlanDate(plan.getDate()); //命名要求：字母前缀+日期+_+顺序号 Date planDate = DateUtil.toDate(target.getPlanDate()); target.setSampleCode(source.getPrefix() + DateUtil.toStr("yyMMdd", planDate) + "-" + source.getAddressCode()); target.setTestItemJson(JSON.toJSONString(whpTestItemService.testItemDropDownList(source.getTestItemIds()))); target.setSampleTypeId(plan.getSampleTypeId()); target.setSampleTypeName(plan.getSampleTypeName()); target.setReportDate(plan.getReportDate()); target.setDisposeStatus(ResidualSampleDisposeStatusEnum.WAIT.getId()); this.save(target); } } /** * 查询列表，不包含草稿 * * @Author: lichen * @Date: 2023/1/4 **/ public List queryListNoTemplate(WhpSamplingPlanTaskQuery query) { return dao.queryListNoTemplate(query); } /** * 根据采样计划id更新状态 * @Author: lichen * @Date: 2023/1/6 **/ public void updateStatusByPlanId(String planId,int status) { WhpSamplingPlanTask bean = new WhpSamplingPlanTask(); bean.setPlanId(planId); bean.setStatus(status); dao.updateStatusByPlanId(bean); } /** * 根据采样计划id更新状态 * @Author: lichen * @Date: 2023/1/6 **/ public void updateStatusByPlanId(WhpSamplingPlanTask whpSamplingPlanTask) { dao.updateStatusByPlanId(whpSamplingPlanTask); } public String writeStatusString(WhpSamplingPlanTask item) { if (SamplingPlanTaskStatusEnum.ING.getId().equals(item.getStatus())) { List all = whpSamplingPlanTaskTestItemService.selectListByWhere(" where sample_code='" + item.getSampleCode() + "' order by id desc "); List done = whpSamplingPlanTaskTestItemService.selectListByWhere(" where sample_code='" + item.getSampleCode() + "' and status in ('" + SamplingPlanTaskStatusEnum.AUDIT.getId() + "','"+SamplingPlanTaskStatusEnum.REJECTION.getId()+"') order by id desc "); return SamplingPlanTaskStatusEnum.ING.getName() + " " + done.size() + "/" + all.size(); } if (SamplingPlanTaskStatusEnum.TEST.getId().equals(item.getStatus())) { List all = whpSamplingPlanTaskTestItemService.selectListByWhere(" where sample_code='" + item.getSampleCode() + "' order by id desc "); List done = whpSamplingPlanTaskTestItemService.selectListByWhere(" where sample_code='" + item.getSampleCode() + "' and status='" + SamplingPlanTaskTestItemStatusEnum.TEST.getId() + "' order by id desc "); return SamplingPlanTaskStatusEnum.TEST.getName() + " " + done.size() + "/" + all.size(); } return SamplingPlanTaskStatusEnum.getNameByid(item.getStatus()); } /** * 查询 首页 根据时间 统计相关数据 * @param query * @return */ public List queryListPlanTj(WhpSamplingPlanQuery query){ return dao.queryListPlanTj(query); } /** * 查询 首页 项目检测完成 统计相关数据 * @param query * @return */ public List selectItemCount(WhpSamplingPlanQuery query){ return dao.selectItemCount(query); } /** * 根据日期 查询 检测类型 * @param query * @return */ public List selectTypeByDate(WhpSamplingPlanQuery query){ return dao.selectTypeByDate(query); } /** * 根据 月份 查询 时间分组查询 采样计划完成 和总数 * @param query * @return */ public List selectPlanByDate(WhpSamplingPlanQuery query){ return dao.selectPlanByDate(query); } } \ No newline at end of file +package com.sipai.service.whp.plan; import com.alibaba.fastjson.JSON; import com.sipai.controller.exception.BizCheckException; import com.sipai.dao.whp.plan.WhpSamplingPlanTaskDao; import com.sipai.entity.enums.EnableTypeEnum; import com.sipai.entity.enums.EnumJsonObject; import com.sipai.entity.enums.whp.PlanIndexJson; import com.sipai.entity.enums.whp.ResidualSampleDisposeStatusEnum; import com.sipai.entity.enums.whp.SamplingPlanTaskStatusEnum; import com.sipai.entity.enums.whp.SamplingPlanTaskTestItemStatusEnum; import com.sipai.entity.whp.baseinfo.WhpSampleCode; import com.sipai.entity.whp.plan.WhpSamplingPlan; import com.sipai.entity.whp.plan.WhpSamplingPlanQuery; import com.sipai.entity.whp.plan.WhpSamplingPlanTask; import com.sipai.entity.whp.plan.WhpSamplingPlanTaskQuery; import com.sipai.entity.whp.test.WhpSamplingPlanTaskTestItem; import com.sipai.service.whp.baseinfo.WhpSampleCodeService; import com.sipai.service.whp.baseinfo.WhpTestItemService; import com.sipai.service.whp.test.WhpSamplingPlanTaskTestItemService; import com.sipai.tools.CommService; import com.sipai.tools.DateUtil; import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.Date; import java.util.List; import java.util.UUID; /** * 采样任务Service类 * * @Author: 李晨 * @Date: 2022/12/30 **/ @Service public class WhpSamplingPlanTaskService implements CommService { @Resource private WhpSampleCodeService sampleCodeService; @Resource private WhpTestItemService whpTestItemService; @Resource private WhpSamplingPlanTaskTestItemService whpSamplingPlanTaskTestItemService; @Resource private WhpSamplingPlanTaskDao dao; @Override public WhpSamplingPlanTask selectById(String t) { return dao.selectByPrimaryKey(t); } @Override public int deleteById(String t) { return dao.deleteByPrimaryKey(t); } @Override public int save(WhpSamplingPlanTask bean) { bean.setId(UUID.randomUUID().toString()); return dao.insert(bean); } public void save(WhpSamplingPlan bean) { List sampleCodeList = sampleCodeService.selectListByWhere(" where type_id='" + bean.getSampleTypeId() + "' and status='" + EnableTypeEnum.Enable.getId() + "' order by id desc"); for (WhpSampleCode source : sampleCodeList) { WhpSamplingPlanTask target = new WhpSamplingPlanTask(); target.setPlanId(bean.getId()); target.setPlanCode(bean.getCode()); target.setSampleAddress(source.getAddress()); // target.setIsTest(Boolean.TRUE); //2023.8.30 修改为根据编码的是否检测 target.setIsTest(source.getIsTest()); target.setTestItemIds(source.getTestItemIds()); target.setStatus(SamplingPlanTaskStatusEnum.TEMPLATE.getId()); target.setPlanDate(bean.getDate()); //命名要求：字母前缀+日期+_+顺序号 Date planDate = DateUtil.toDate(target.getPlanDate()); target.setSampleCode(source.getPrefix() + DateUtil.toStr("yyMMdd", planDate) + "-" + source.getAddressCode()); target.setTestItemJson(JSON.toJSONString(whpTestItemService.testItemDropDownList(source.getTestItemIds()))); target.setSampleTypeId(bean.getSampleTypeId()); target.setSampleTypeName(bean.getSampleTypeName()); target.setReportDate(bean.getReportDate()); target.setDisposeStatus(ResidualSampleDisposeStatusEnum.WAIT.getId()); target.setDeptIds(source.getDeptIds()); target.setDeptNames(source.getDeptNames()); this.save(target); } } /** * 车间采样 新增 接收人即为创建人 状态为采样中 * @param bean */ public void workSave(WhpSamplingPlan bean) { List sampleCodeList = sampleCodeService.selectListByWhere(" where type_id='" + bean.getSampleTypeId() + "' and status='" + EnableTypeEnum.Enable.getId() + "' and is_test='1' order by id desc"); for (WhpSampleCode source : sampleCodeList) { WhpSamplingPlanTask target = new WhpSamplingPlanTask(); target.setPlanId(bean.getId()); target.setReceiverUserId(bean.getCreateUserId()); target.setStatus(SamplingPlanTaskStatusEnum.ING.getId()); target.setPlanCode(bean.getCode()); target.setSampleAddress(source.getAddress()); //target.setIsTest(Boolean.TRUE); target.setIsTest(source.getIsTest()); target.setTestItemIds(source.getTestItemIds()); // target.setStatus(SamplingPlanTaskStatusEnum.TEMPLATE.getId()); target.setPlanDate(bean.getDate()); //命名要求：字母前缀+日期+_+顺序号 Date planDate = DateUtil.toDate(target.getPlanDate()); target.setSampleCode(source.getPrefix() + DateUtil.toStr("yyMMdd", planDate) + "-" + source.getAddressCode()); target.setTestItemJson(JSON.toJSONString(whpTestItemService.testItemDropDownList(source.getTestItemIds()))); target.setSampleTypeId(bean.getSampleTypeId()); target.setSampleTypeName(bean.getSampleTypeName()); target.setReportDate(bean.getReportDate()); target.setDisposeStatus(ResidualSampleDisposeStatusEnum.WAIT.getId()); this.save(target); } } @Override public int update(WhpSamplingPlanTask bean) { return dao.updateByPrimaryKeySelective(bean); } @Override public List selectListByWhere(String t) { WhpSamplingPlanTask bean = new WhpSamplingPlanTask(); bean.setWhere(t); return dao.selectListByWhere(bean); } @Override public int deleteByWhere(String t) { WhpSamplingPlanTask bean = new WhpSamplingPlanTask(); bean.setWhere(t); return dao.deleteByWhere(bean); } /** * 列表查询 * * @Author: 李晨 * @Date: 2022/12/30 **/ public List queryList(WhpSamplingPlanTaskQuery query) { return dao.queryList(query); } /** * 业务校验 * * @Author: 李晨 * @Date: 2022/12/30 **/ public void bizCheck(WhpSamplingPlanTask bean) throws BizCheckException { } /** * 采样人下拉 * * @Author: lichen * @Date: 2023/1/3 **/ public List sampleUserDropDown() { return dao.sampleUserDropDown(); } /** * 采样地点下拉 * * @Author: lichen * @Date: 2023/1/3 **/ public List addressDropDown() { return dao.addressDropDown(); } /** * 根据采样单计划查询采样任务 * * @Author: lichen * @Date: 2023/1/3 **/ public List selectListByPlanId(String planid) { return selectListByWhere("where plan_id='" + planid + "' and is_test=1 order by id desc"); } /** * 根据采样单计划删除不检测的采样计划 * * @Author: lichen * @Date: 2023/1/3 **/ public void delByPlanIdNotTest(String planid) { deleteByWhere("where plan_id='" + planid + "' and is_test=0 "); } /** * 下发计划后，采样任务的状态也要提交为执行中 * * @Author: lichen * @Date: 2023/1/3 **/ public void submit(List taskList) { for (WhpSamplingPlanTask item : taskList) { item.setStatus(SamplingPlanTaskStatusEnum.WAIT.getId()); update(item); } } /** * 车间 采样登记完成 采样提交 * * @Author: lichen * @Date: 2023/1/3 **/ public void workSubmit(List taskList) { for (WhpSamplingPlanTask item : taskList) { item.setStatus(SamplingPlanTaskStatusEnum.AUDIT.getId()); update(item); } } /** * 批量下发计划后，采样任务也要批量复制，状态也要提交为执行中 * * @Author: lichen * @Date: 2023/1/3 **/ public void submit(WhpSamplingPlan plan, List taskList) { for (WhpSamplingPlanTask item : taskList) { item.setPlanId(plan.getId()); item.setPlanCode(plan.getCode()); item.setStatus(SamplingPlanTaskStatusEnum.WAIT.getId()); String sampleCode = item.getSampleCode(); String firstPart = sampleCode.split("-")[0]; String planDate = firstPart.substring(firstPart.length() - 6); Date planDateNew = DateUtil.toDate(plan.getDate()); String newPlanDate = DateUtil.toStr("yyMMdd", planDateNew); item.setSampleCode(item.getSampleCode().replace(planDate, newPlanDate)); item.setPlanDate(plan.getDate()); item.setReportDate(plan.getReportDate()); item.setStatus(SamplingPlanTaskStatusEnum.WAIT.getId()); save(item); } } /** * 批量下发计划后，采样任务也要批量复制，状态也要提交为执行中 * * @Author: lichen * @Date: 2023/1/3 **/ public void submitTask(WhpSamplingPlan plan) { List sampleCodeList = sampleCodeService.selectListByWhere(" where type_id='" + plan.getSampleTypeId() + "' and status='" + EnableTypeEnum.Enable.getId() + "' and is_test='1' order by id desc"); for (WhpSampleCode source : sampleCodeList) { WhpSamplingPlanTask target = new WhpSamplingPlanTask(); target.setPlanId(plan.getId()); target.setPlanCode(plan.getCode()); target.setSampleAddress(source.getAddress()); target.setIsTest(source.getIsTest()); target.setTestItemIds(source.getTestItemIds()); // target.setReceiverUserId(plan.getCreateUserId()); target.setStatus(SamplingPlanTaskStatusEnum.WAIT.getId()); target.setPlanDate(plan.getDate()); //命名要求：字母前缀+日期+_+顺序号 Date planDate = DateUtil.toDate(target.getPlanDate()); target.setSampleCode(source.getPrefix() + DateUtil.toStr("yyMMdd", planDate) + "-" + source.getAddressCode()); target.setTestItemJson(JSON.toJSONString(whpTestItemService.testItemDropDownList(source.getTestItemIds()))); target.setSampleTypeId(plan.getSampleTypeId()); target.setSampleTypeName(plan.getSampleTypeName()); target.setReportDate(plan.getReportDate()); target.setDisposeStatus(ResidualSampleDisposeStatusEnum.WAIT.getId()); this.save(target); } } /** * 查询列表，不包含草稿 * * @Author: lichen * @Date: 2023/1/4 **/ public List queryListNoTemplate(WhpSamplingPlanTaskQuery query) { return dao.queryListNoTemplate(query); } /** * 根据采样计划id更新状态 * @Author: lichen * @Date: 2023/1/6 **/ public void updateStatusByPlanId(String planId,int status) { WhpSamplingPlanTask bean = new WhpSamplingPlanTask(); bean.setPlanId(planId); bean.setStatus(status); dao.updateStatusByPlanId(bean); } /** * 根据采样计划id更新状态 * @Author: lichen * @Date: 2023/1/6 **/ public void updateStatusByPlanId(WhpSamplingPlanTask whpSamplingPlanTask) { dao.updateStatusByPlanId(whpSamplingPlanTask); } public String writeStatusString(WhpSamplingPlanTask item) { if (SamplingPlanTaskStatusEnum.ING.getId().equals(item.getStatus())) { List all = whpSamplingPlanTaskTestItemService.selectListByWhere(" where sample_code='" + item.getSampleCode() + "' order by id desc "); List done = whpSamplingPlanTaskTestItemService.selectListByWhere(" where sample_code='" + item.getSampleCode() + "' and status in ('" + SamplingPlanTaskStatusEnum.AUDIT.getId() + "','"+SamplingPlanTaskStatusEnum.REJECTION.getId()+"') order by id desc "); return SamplingPlanTaskStatusEnum.ING.getName() + " " + done.size() + "/" + all.size(); } if (SamplingPlanTaskStatusEnum.TEST.getId().equals(item.getStatus())) { List all = whpSamplingPlanTaskTestItemService.selectListByWhere(" where sample_code='" + item.getSampleCode() + "' order by id desc "); List done = whpSamplingPlanTaskTestItemService.selectListByWhere(" where sample_code='" + item.getSampleCode() + "' and status='" + SamplingPlanTaskTestItemStatusEnum.TEST.getId() + "' order by id desc "); return SamplingPlanTaskStatusEnum.TEST.getName() + " " + done.size() + "/" + all.size(); } return SamplingPlanTaskStatusEnum.getNameByid(item.getStatus()); } /** * 查询 首页 根据时间 统计相关数据 * @param query * @return */ public List queryListPlanTj(WhpSamplingPlanQuery query){ return dao.queryListPlanTj(query); } /** * 查询 首页 项目检测完成 统计相关数据 * @param query * @return */ public List selectItemCount(WhpSamplingPlanQuery query){ return dao.selectItemCount(query); } /** * 根据日期 查询 检测类型 * @param query * @return */ public List selectTypeByDate(WhpSamplingPlanQuery query){ return dao.selectTypeByDate(query); } /** * 根据 月份 查询 时间分组查询 采样计划完成 和总数 * @param query * @return */ public List selectPlanByDate(WhpSamplingPlanQuery query){ return dao.selectPlanByDate(query); } } \ No newline at end of file diff --git a/src/main/java/com/sipai/service/whp/test/WhpSamplingPlanTaskTestConfirmService.java b/src/main/java/com/sipai/service/whp/test/WhpSamplingPlanTaskTestConfirmService.java index d0bf1361..9053d7e5 100644 --- a/src/main/java/com/sipai/service/whp/test/WhpSamplingPlanTaskTestConfirmService.java +++ b/src/main/java/com/sipai/service/whp/test/WhpSamplingPlanTaskTestConfirmService.java @@ -1 +1 @@ -package com.sipai.service.whp.test; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.singularsys.jep.functions.Str; import com.sipai.controller.exception.BizCheckException; import com.sipai.dao.whp.test.WhpSamplingPlanTaskTestConfirmDao; import com.sipai.entity.enums.EnumJsonObject; import com.sipai.entity.enums.whp.*; import com.sipai.entity.scada.MPointHistory; import com.sipai.entity.whp.baseinfo.WhpTestItem; import com.sipai.entity.whp.baseinfo.WhpTestItemWorkingCurveVo; import com.sipai.entity.whp.baseinfo.WhpTestMethod; import com.sipai.entity.whp.plan.WhpSamplingPlanTask; import com.sipai.entity.whp.test.*; import com.sipai.service.scada.MPointHistoryService; import com.sipai.service.whp.baseinfo.WhpTestItemService; import com.sipai.service.whp.baseinfo.WhpTestItemWorkingCurveService; import com.sipai.service.whp.baseinfo.WhpTestMethodService; import com.sipai.service.whp.plan.WhpSamplingPlanTaskService; import com.sipai.tools.*; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.math.BigDecimal; import java.util.*; /** * 计划单检测项目分组信息Service类 * * @Author: 李晨 * @Date: 2023/1/5 **/ @Service public class WhpSamplingPlanTaskTestConfirmService implements CommService { @Resource private WhpSamplingPlanTaskTestItemService whpSamplingPlanTaskTestItemService; @Resource private WhpSamplingPlanTaskService whpSamplingPlanTaskService; @Resource private WhpTestItemService whpTestItemService; @Resource private WhpTestItemWorkingCurveService whpTestItemWorkingCurveService; @Resource private MPointHistoryService mPointHistoryService; @Resource private WhpSamplingPlanTaskTestConfirmDao dao; @Resource private WhpTaskItemCurveService whpTaskItemCurveService; @Resource private WhpTestMethodService whpTestMethodService; @Resource private WhpTestItemWorkingCurveService workingCurveService; @Override public WhpSamplingPlanTaskTestConfirm selectById(String t) { return dao.selectByPrimaryKey(t); } @Override public int deleteById(String t) { return dao.deleteByPrimaryKey(t); } @Override public int save(WhpSamplingPlanTaskTestConfirm bean) { bean.setId(UUID.randomUUID().toString()); return dao.insert(bean); } @Override public int update(WhpSamplingPlanTaskTestConfirm bean) { return dao.updateByPrimaryKeySelective(bean); } @Override public List selectListByWhere(String t) { WhpSamplingPlanTaskTestConfirm bean = new WhpSamplingPlanTaskTestConfirm(); bean.setWhere(t); return dao.selectListByWhere(bean); } @Override public int deleteByWhere(String t) { WhpSamplingPlanTaskTestConfirm bean = new WhpSamplingPlanTaskTestConfirm(); bean.setWhere(t); return dao.deleteByWhere(bean); } /** * 列表查询 * * @Author: 李晨 * @Date: 2023/1/5 **/ public List queryList(WhpSamplingPlanTaskTestConfirmQuery query) { return dao.queryList(query); } /** * 业务校验 * * @Author: 李晨 * @Date: 2023/1/5 **/ public void bizCheck(WhpSamplingPlanTaskTestConfirm bean) throws BizCheckException { } /** * 检测项目树 * * @Author: lichen * @Date: 2023/1/5 **/ public List testItemTree(WhpSamplingPlanTaskTestConfirmQuery query) { return dao.testItemTree(query); } /** * 采样计划详细状态拼写 * * @Author: lichen * @Date: 2023/1/10 **/ public String writeStatusString(WhpSamplingPlanTaskTestConfirm item) { if (SamplingPlanTaskTestConfirmStatusEnum.TEST.getId().equals(item.getStatus())) { String alert = ""; if (DateUtil.toDate(item.getReportDate()).before(DateUtil.getDayStartTime(new Date()))) { alert = "超时预警"; } return SamplingPlanTaskTestConfirmStatusEnum.TEST.getName() + " " + alert; } return SamplingPlanTaskTestConfirmStatusEnum.getNameByid(item.getStatus()); } /** * 采样计划详细状态拼写` * * @Author: lichen * @Date: 2023/1/10 **/ public String writeIndexStatusString(WhpSamplingPlanTaskTestConfirm item) { if (SamplingPlanTaskTestConfirmStatusEnum.TEST.getId().equals(item.getStatus())) { List all = whpSamplingPlanTaskTestItemService.selectListByWhere(" where test_confirm_id='" + item.getId() + "' "); int id = SamplingPlanTaskTestItemStatusEnum.CONFIRM.getId(); List done = whpSamplingPlanTaskTestItemService.selectListByWhere(" where test_confirm_id='" + item.getId() + "' and detected='" + "1" + "' order by id desc "); return SamplingPlanStatusEnum.TESTING.getName() + " " + done.size() + "/" + all.size() ; } return SamplingPlanTaskTestConfirmStatusEnum.getNameByid(item.getStatus()); } /** * 原始记录同步 */ public void syncSamplingPlanTask() { ThirdRequestProp thirdRequestProp = (ThirdRequestProp) SpringContextUtil.getBean("thirdRequestProp"); WhpSamplingPlanTaskTestConfirm whpSamplingPlanTaskTestConfirm = new WhpSamplingPlanTaskTestConfirm(); whpSamplingPlanTaskTestConfirm.setWhere("where (isSync = '' or isSync is null) and status = 5 and plan_code = 'BLGTN230110' "); // 获取主表数据根据采样单号分组 List whpSamplingPlanTaskTestConfirmListVos = dao.selectPlanCodeList(whpSamplingPlanTaskTestConfirm); // 白龙港老项目主表对象集合 ArrayList intorecords = new ArrayList<>(); for (WhpSamplingPlanTaskTestConfirmListVo item : whpSamplingPlanTaskTestConfirmListVos) { // 拿出此单号所有的检测项目 List whpSamplingPlanTaskTestConfirmList = item.getWhpSamplingPlanTaskTestConfirmList(); for (WhpSamplingPlanTaskTestConfirm whpItem : whpSamplingPlanTaskTestConfirmList) { Intorecord intorecord = new Intorecord(); intorecord.setPlace(whpItem.getTestAddress()); // 测定地点 intorecord.setTemperature(String.valueOf(whpItem.getTemperature())); // 室温 intorecord.setAssaydt(whpItem.getTestDate()); // 测定日期 intorecord.setFormula(whpItem.getWorkCurveName()); // 工作曲线 intorecord.setInstrument(whpItem.getEquipmentCode()); // 仪器编号 if (StringUtils.isNotBlank(whpItem.getMethod())) { WhpTestMethod whpTestMethod = whpTestMethodService.selectById(whpItem.getMethod()); if (whpTestMethod != null) { intorecord.setMethods(whpTestMethod.getMethodBasis()); }// 方法依据 } intorecord.setAssayuser(whpItem.getTestUserName()); // 测定人员 intorecord.setCheckuser(whpItem.getConfirmUserName()); // 复核人员 intorecord.setChargeuser(whpItem.getTestUserName()); // 负责人 intorecord.setInsdt(whpItem.getTestDate()); // 新增日期 intorecord.setSampdt(whpItem.getTestDate()); // 采样日期 WhpTestItem whpTestItem = whpTestItemService.selectById(whpItem.getTestItemId()); if (whpTestItem != null) { intorecord.setType(whpTestItem.getAssayItemId()); } //常量 List contantCurves = workingCurveService.selectListByItem(whpItem.getTestItemId(), "1"); if (contantCurves != null && contantCurves.size() > 0) { ArrayList rl = new ArrayList<>(); for (WhpTestItemWorkingCurveVo item1 : contantCurves) { List mPointHistoryList = this.mPointHistoryService.selectAggregateList(item1.getMPoint().getBizid(), "tb_mp_" + item1.getMPoint().getMpointcode(), " where userid='" + item1.getId() + "' ", "*"); if (mPointHistoryList != null && mPointHistoryList.size() > 0) { if (item1.getMPoint().getNumtail() != null) { Recorddet recorddet = new Recorddet(); recorddet.setMpointid(item1.getMPoint().getMpointid()); recorddet.setFieldname(item1.getMPoint().getParmname()); recorddet.setVariabletype("常量"); // recorddet.setParmvalue(String.valueOf(mPointHistoryList.get(0).getParmvalue())); recorddet.setParmvalue(mPointHistoryList.get(0).getMemo()); rl.add(recorddet); } } } intorecord.setRecorddetcl(rl); } // 拿到此检测项目所有的样品信息 List whpSamplingPlanTaskTestItems = whpSamplingPlanTaskTestItemService.selectListByWhere("where test_item_id = '" + whpItem.getTestItemId() + "'"); ArrayList intorecordchildren = new ArrayList<>(); for (WhpSamplingPlanTaskTestItem whpSamplingPlanTaskTestItem : whpSamplingPlanTaskTestItems) { Intorecordchild intorecordchild = new Intorecordchild(); String sampleCode = whpSamplingPlanTaskTestItem.getSampleCode(); intorecordchild.setSerial(sampleCode); // 样品编号 intorecordchild.setOrd(Float.parseFloat(sampleCode.substring(sampleCode.indexOf("-") + 1, sampleCode.length()).replaceAll("[a-zA-Z]", ""))); // 顺序号 Map contaneMap = new HashMap<>(); // 非常量 ArrayList r = new ArrayList<>(); //过程公式 List processCurves = workingCurveService.selectCurveListByItemForm(whpSamplingPlanTaskTestItem.getTestItemId(), "2", "021BLG", whpSamplingPlanTaskTestItem.getId(), contaneMap); if (processCurves != null && processCurves.size() > 0) { for (WhpTestItemWorkingCurveVo item1 : processCurves) { //若检测值不为空 则 替换为最新值 if (item1.getMPoint().getParmvalue() != null) { Recorddet recorddet = new Recorddet(); recorddet.setMpointid(item1.getMPoint().getMpointid()); recorddet.setFieldname(item1.getMPoint().getParmname()); recorddet.setVariabletype("变量"); recorddet.setParmvalue(item1.getMPoint().getParmvalueStr()); r.add(recorddet); } } } /** * 查询结果公式 */ List curve = workingCurveService.selectCurveListByItemForm(whpSamplingPlanTaskTestItem.getTestItemId(), "3", "021BLG", whpSamplingPlanTaskTestItem.getId(), contaneMap); if (curve != null && curve.size() > 0) { WhpTestItemWorkingCurveVo curveVo = curve.get(0); if (curveVo.getKpi_id() != null) // { Recorddet recorddet = new Recorddet(); recorddet.setMpointid(curveVo.getMPoint().getMpointid()); recorddet.setFieldname(curveVo.getMPoint().getParmname()); recorddet.setParmvalue(String.valueOf(curveVo.getMPoint().getParmvalueStr())); recorddet.setVariabletype("变量"); r.add(recorddet); } } // // //查询 基础描述 List basicCurves = workingCurveService.selectListByItem(whpSamplingPlanTaskTestItem.getTestItemId(), "0"); if (basicCurves != null && basicCurves.size() > 0) { for (WhpTestItemWorkingCurveVo item1 : basicCurves) { String sql = " where plan_code= '" + whpSamplingPlanTaskTestItem.getPlanCode() + "' and working_curve_id ='" + item1.getId() + "' AND sample_code ='" + whpSamplingPlanTaskTestItem.getSampleCode() + "'"; List taskItemCurveList = whpTaskItemCurveService.selectListByWhere(sql); //若检测值不为空 则 替换为最新值 if (taskItemCurveList != null && taskItemCurveList.size() > 0) { if (StringUtils.isNotBlank((taskItemCurveList.get(0).getName()))) { Recorddet recorddet = new Recorddet(); recorddet.setFieldname(taskItemCurveList.get(0).getName()); recorddet.setParmvalue(taskItemCurveList.get(0).getCalculated_value()); recorddet.setVariabletype("变量"); r.add(recorddet); } } } } intorecordchild.setRecorddet(r); intorecordchildren.add(intorecordchild); } intorecord.setIntorecordchild(intorecordchildren); HashMap map = new HashMap<>(); map.put("method", "recordinto"); ArrayList json = new ArrayList<>(); json.add(JSONObject.toJSONString(intorecord)); JSONObject jsonObject = new JSONObject(); jsonObject.put("intorecord", json); map.put("params", JSONObject.toJSONString(jsonObject)); String id = HttpUtil.sendPost(thirdRequestProp.getInterfaces(), map); System.out.println(id); if (StringUtils.isNotBlank(id)) { whpItem.setIsSync(id); // this.update(whpItem); } } } System.out.println(whpSamplingPlanTaskTestConfirmListVos.size()); } } \ No newline at end of file +package com.sipai.service.whp.test; import com.alibaba.fastjson.JSONObject; import com.sipai.controller.exception.BizCheckException; import com.sipai.dao.whp.test.WhpSamplingPlanTaskTestConfirmDao; import com.sipai.entity.enums.EnumJsonObject; import com.sipai.entity.enums.whp.SamplingPlanStatusEnum; import com.sipai.entity.enums.whp.SamplingPlanTaskTestConfirmStatusEnum; import com.sipai.entity.enums.whp.SamplingPlanTaskTestItemStatusEnum; import com.sipai.entity.scada.MPointHistory; import com.sipai.entity.whp.baseinfo.WhpTestItem; import com.sipai.entity.whp.baseinfo.WhpTestItemWorkingCurveVo; import com.sipai.entity.whp.baseinfo.WhpTestMethod; import com.sipai.entity.whp.test.*; import com.sipai.service.scada.MPointHistoryService; import com.sipai.service.whp.baseinfo.WhpTestItemService; import com.sipai.service.whp.baseinfo.WhpTestItemWorkingCurveService; import com.sipai.service.whp.baseinfo.WhpTestMethodService; import com.sipai.service.whp.plan.WhpSamplingPlanTaskService; import com.sipai.tools.*; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.*; /** * 计划单检测项目分组信息Service类 * * @Author: 李晨 * @Date: 2023/1/5 **/ @Service public class WhpSamplingPlanTaskTestConfirmService implements CommService { @Resource private WhpSamplingPlanTaskTestItemService whpSamplingPlanTaskTestItemService; @Resource private WhpSamplingPlanTaskService whpSamplingPlanTaskService; @Resource private WhpTestItemService whpTestItemService; @Resource private WhpTestItemWorkingCurveService whpTestItemWorkingCurveService; @Resource private MPointHistoryService mPointHistoryService; @Resource private WhpSamplingPlanTaskTestConfirmDao dao; @Resource private WhpTaskItemCurveService whpTaskItemCurveService; @Resource private WhpTestMethodService whpTestMethodService; @Resource private WhpTestItemWorkingCurveService workingCurveService; @Override public WhpSamplingPlanTaskTestConfirm selectById(String t) { return dao.selectByPrimaryKey(t); } @Override public int deleteById(String t) { return dao.deleteByPrimaryKey(t); } @Override public int save(WhpSamplingPlanTaskTestConfirm bean) { bean.setId(UUID.randomUUID().toString()); return dao.insert(bean); } @Override public int update(WhpSamplingPlanTaskTestConfirm bean) { return dao.updateByPrimaryKeySelective(bean); } @Override public List selectListByWhere(String t) { WhpSamplingPlanTaskTestConfirm bean = new WhpSamplingPlanTaskTestConfirm(); bean.setWhere(t); return dao.selectListByWhere(bean); } @Override public int deleteByWhere(String t) { WhpSamplingPlanTaskTestConfirm bean = new WhpSamplingPlanTaskTestConfirm(); bean.setWhere(t); return dao.deleteByWhere(bean); } /** * 列表查询 * * @Author: 李晨 * @Date: 2023/1/5 **/ public List queryList(WhpSamplingPlanTaskTestConfirmQuery query) { return dao.queryList(query); } /** * 业务校验 * * @Author: 李晨 * @Date: 2023/1/5 **/ public void bizCheck(WhpSamplingPlanTaskTestConfirm bean) throws BizCheckException { } /** * 检测项目树 * * @Author: lichen * @Date: 2023/1/5 **/ public List testItemTree(WhpSamplingPlanTaskTestConfirmQuery query) { return dao.testItemTree(query); } /** * 采样计划详细状态拼写 * * @Author: lichen * @Date: 2023/1/10 **/ public String writeStatusString(WhpSamplingPlanTaskTestConfirm item) { if (SamplingPlanTaskTestConfirmStatusEnum.TEST.getId().equals(item.getStatus())) { String alert = ""; if (DateUtil.toDate(item.getReportDate()).before(DateUtil.getDayStartTime(new Date()))) { alert = "超时预警"; } return SamplingPlanTaskTestConfirmStatusEnum.TEST.getName() + " " + alert; } return SamplingPlanTaskTestConfirmStatusEnum.getNameByid(item.getStatus()); } /** * 采样计划详细状态拼写` * * @Author: lichen * @Date: 2023/1/10 **/ public String writeIndexStatusString(WhpSamplingPlanTaskTestConfirm item) { if (SamplingPlanTaskTestConfirmStatusEnum.TEST.getId().equals(item.getStatus())) { List all = whpSamplingPlanTaskTestItemService.selectListByWhere(" where test_confirm_id='" + item.getId() + "' "); int id = SamplingPlanTaskTestItemStatusEnum.CONFIRM.getId(); List done = whpSamplingPlanTaskTestItemService.selectListByWhere(" where test_confirm_id='" + item.getId() + "' and detected='" + "1" + "' order by id desc "); return SamplingPlanStatusEnum.TESTING.getName() + " " + done.size() + "/" + all.size() ; } return SamplingPlanTaskTestConfirmStatusEnum.getNameByid(item.getStatus()); } /** * 原始记录同步 */ public void syncSamplingPlanTask() { ThirdRequestProp thirdRequestProp = (ThirdRequestProp) SpringContextUtil.getBean("thirdRequestProp"); WhpSamplingPlanTaskTestConfirm whpSamplingPlanTaskTestConfirm = new WhpSamplingPlanTaskTestConfirm(); whpSamplingPlanTaskTestConfirm.setWhere("where (isSync = '' or isSync is null) and status = 5 and plan_code = 'BLGTN230110' "); // 获取主表数据根据采样单号分组 List whpSamplingPlanTaskTestConfirmListVos = dao.selectPlanCodeList(whpSamplingPlanTaskTestConfirm); // 白龙港老项目主表对象集合 ArrayList intorecords = new ArrayList<>(); for (WhpSamplingPlanTaskTestConfirmListVo item : whpSamplingPlanTaskTestConfirmListVos) { // 拿出此单号所有的检测项目 List whpSamplingPlanTaskTestConfirmList = item.getWhpSamplingPlanTaskTestConfirmList(); for (WhpSamplingPlanTaskTestConfirm whpItem : whpSamplingPlanTaskTestConfirmList) { Intorecord intorecord = new Intorecord(); intorecord.setPlace(whpItem.getTestAddress()); // 测定地点 intorecord.setTemperature(String.valueOf(whpItem.getTemperature())); // 室温 intorecord.setAssaydt(whpItem.getTestDate()); // 测定日期 intorecord.setFormula(whpItem.getWorkCurveName()); // 工作曲线 intorecord.setInstrument(whpItem.getEquipmentCode()); // 仪器编号 if (StringUtils.isNotBlank(whpItem.getMethod())) { WhpTestMethod whpTestMethod = whpTestMethodService.selectById(whpItem.getMethod()); if (whpTestMethod != null) { intorecord.setMethods(whpTestMethod.getMethodBasis()); }// 方法依据 } intorecord.setAssayuser(whpItem.getTestUserName()); // 测定人员 intorecord.setCheckuser(whpItem.getConfirmUserName()); // 复核人员 intorecord.setChargeuser(whpItem.getTestUserName()); // 负责人 intorecord.setInsdt(whpItem.getTestDate()); // 新增日期 intorecord.setSampdt(whpItem.getTestDate()); // 采样日期 WhpTestItem whpTestItem = whpTestItemService.selectById(whpItem.getTestItemId()); if (whpTestItem != null) { intorecord.setType(whpTestItem.getAssayItemId()); } //常量 List contantCurves = workingCurveService.selectListByItem(whpItem.getTestItemId(), "1"); if (contantCurves != null && contantCurves.size() > 0) { ArrayList rl = new ArrayList<>(); for (WhpTestItemWorkingCurveVo item1 : contantCurves) { List mPointHistoryList = this.mPointHistoryService.selectAggregateList(item1.getMPoint().getBizid(), "tb_mp_" + item1.getMPoint().getMpointcode(), " where userid='" + item1.getId() + "' ", "*"); if (mPointHistoryList != null && mPointHistoryList.size() > 0) { if (item1.getMPoint().getNumtail() != null) { Recorddet recorddet = new Recorddet(); recorddet.setMpointid(item1.getMPoint().getMpointid()); recorddet.setFieldname(item1.getMPoint().getParmname()); recorddet.setVariabletype("常量"); // recorddet.setParmvalue(String.valueOf(mPointHistoryList.get(0).getParmvalue())); recorddet.setParmvalue(mPointHistoryList.get(0).getMemo()); rl.add(recorddet); } } } intorecord.setRecorddetcl(rl); } // 拿到此检测项目所有的样品信息 List whpSamplingPlanTaskTestItems = whpSamplingPlanTaskTestItemService.selectListByWhere("where test_item_id = '" + whpItem.getTestItemId() + "'"); ArrayList intorecordchildren = new ArrayList<>(); for (WhpSamplingPlanTaskTestItem whpSamplingPlanTaskTestItem : whpSamplingPlanTaskTestItems) { Intorecordchild intorecordchild = new Intorecordchild(); String sampleCode = whpSamplingPlanTaskTestItem.getSampleCode(); intorecordchild.setSerial(sampleCode); // 样品编号 intorecordchild.setOrd(Float.parseFloat(sampleCode.substring(sampleCode.indexOf("-") + 1, sampleCode.length()).replaceAll("[a-zA-Z]", ""))); // 顺序号 Map contaneMap = new HashMap<>(); // 非常量 ArrayList r = new ArrayList<>(); //过程公式 List processCurves = workingCurveService.selectCurveListByItemForm(whpSamplingPlanTaskTestItem.getTestItemId(), "2", "021BLG", whpSamplingPlanTaskTestItem.getId(), contaneMap); if (processCurves != null && processCurves.size() > 0) { for (WhpTestItemWorkingCurveVo item1 : processCurves) { //若检测值不为空 则 替换为最新值 if (item1.getMPoint().getParmvalue() != null) { Recorddet recorddet = new Recorddet(); recorddet.setMpointid(item1.getMPoint().getMpointid()); recorddet.setFieldname(item1.getMPoint().getParmname()); recorddet.setVariabletype("变量"); recorddet.setParmvalue(item1.getMPoint().getParmvalueStr()); r.add(recorddet); } } } /** * 查询结果公式 */ List curve = workingCurveService.selectCurveListByItemForm(whpSamplingPlanTaskTestItem.getTestItemId(), "3", "021BLG", whpSamplingPlanTaskTestItem.getId(), contaneMap); if (curve != null && curve.size() > 0) { WhpTestItemWorkingCurveVo curveVo = curve.get(0); if (curveVo.getKpi_id() != null) // { Recorddet recorddet = new Recorddet(); recorddet.setMpointid(curveVo.getMPoint().getMpointid()); recorddet.setFieldname(curveVo.getMPoint().getParmname()); recorddet.setParmvalue(String.valueOf(curveVo.getMPoint().getParmvalueStr())); recorddet.setVariabletype("变量"); r.add(recorddet); } } // // //查询 基础描述 List basicCurves = workingCurveService.selectListByItem(whpSamplingPlanTaskTestItem.getTestItemId(), "0"); if (basicCurves != null && basicCurves.size() > 0) { for (WhpTestItemWorkingCurveVo item1 : basicCurves) { String sql = " where plan_code= '" + whpSamplingPlanTaskTestItem.getPlanCode() + "' and working_curve_id ='" + item1.getId() + "' AND sample_code ='" + whpSamplingPlanTaskTestItem.getSampleCode() + "'"; List taskItemCurveList = whpTaskItemCurveService.selectListByWhere(sql); //若检测值不为空 则 替换为最新值 if (taskItemCurveList != null && taskItemCurveList.size() > 0) { if (StringUtils.isNotBlank((taskItemCurveList.get(0).getName()))) { Recorddet recorddet = new Recorddet(); recorddet.setFieldname(taskItemCurveList.get(0).getName()); recorddet.setParmvalue(taskItemCurveList.get(0).getCalculated_value()); recorddet.setVariabletype("变量"); r.add(recorddet); } } } } intorecordchild.setRecorddet(r); intorecordchildren.add(intorecordchild); } intorecord.setIntorecordchild(intorecordchildren); HashMap map = new HashMap<>(); map.put("method", "recordinto"); ArrayList json = new ArrayList<>(); json.add(JSONObject.toJSONString(intorecord)); JSONObject jsonObject = new JSONObject(); jsonObject.put("intorecord", json); map.put("params", JSONObject.toJSONString(jsonObject)); String id = HttpUtil.sendPost(thirdRequestProp.getInterfaces(), map); System.out.println(id); if (StringUtils.isNotBlank(id)) { whpItem.setIsSync(id); // this.update(whpItem); } } } System.out.println(whpSamplingPlanTaskTestConfirmListVos.size()); } } \ No newline at end of file diff --git a/src/main/java/com/sipai/service/whp/test/WhpTaskItemCurveService.java b/src/main/java/com/sipai/service/whp/test/WhpTaskItemCurveService.java index 8a9c171a..38bbc7d0 100644 --- a/src/main/java/com/sipai/service/whp/test/WhpTaskItemCurveService.java +++ b/src/main/java/com/sipai/service/whp/test/WhpTaskItemCurveService.java @@ -1 +1 @@ -package com.sipai.service.whp.test; import com.sipai.controller.exception.BizCheckException; import com.sipai.dao.whp.test.WhpTaskItemCurveDao; import com.sipai.entity.whp.test.WhpTaskItemCurve; import com.sipai.tools.CommService; import org.springframework.stereotype.Service; import com.sipai.entity.whp.test.WhpTaskItemCurveQuery; import javax.annotation.Resource; import java.io.IOException; import java.util.List; import java.util.UUID; /** * 方法依据Service类 * * @Author: zxq * @Date: 2023/05/15 **/ @Service public class WhpTaskItemCurveService implements CommService { @Resource private WhpTaskItemCurveDao dao; @Override public WhpTaskItemCurve selectById(String t) { return dao.selectByPrimaryKey(t); } @Override public int deleteById(String t) { return dao.deleteByPrimaryKey(t); } @Override public int save(WhpTaskItemCurve bean) { bean.setId(UUID.randomUUID().toString()); return dao.insert(bean); } @Override public int update(WhpTaskItemCurve bean) { return dao.updateByPrimaryKeySelective(bean); } @Override public List selectListByWhere(String t) { WhpTaskItemCurve bean = new WhpTaskItemCurve(); bean.setWhere(t); return dao.selectListByWhere(bean); } @Override public int deleteByWhere(String t) { WhpTaskItemCurve bean = new WhpTaskItemCurve(); bean.setWhere(t); return dao.deleteByWhere(bean); } /** * 列表查询 * * @Author: zxq * @Date: 2023/05/15 **/ public List queryList(WhpTaskItemCurveQuery query) { return dao.queryList(query); } /** * 业务校验 * * @Author: zxq * @Date: 2023/05/15 **/ public void bizCheck(WhpTaskItemCurve bean) throws BizCheckException { } } \ No newline at end of file +package com.sipai.service.whp.test; import com.sipai.controller.exception.BizCheckException; import com.sipai.dao.whp.test.WhpTaskItemCurveDao; import com.sipai.entity.whp.test.WhpTaskItemCurve; import com.sipai.entity.whp.test.WhpTaskItemCurveQuery; import com.sipai.tools.CommService; import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.List; import java.util.UUID; /** * 方法依据Service类 * * @Author: zxq * @Date: 2023/05/15 **/ @Service public class WhpTaskItemCurveService implements CommService { @Resource private WhpTaskItemCurveDao dao; @Override public WhpTaskItemCurve selectById(String t) { return dao.selectByPrimaryKey(t); } @Override public int deleteById(String t) { return dao.deleteByPrimaryKey(t); } @Override public int save(WhpTaskItemCurve bean) { bean.setId(UUID.randomUUID().toString()); return dao.insert(bean); } @Override public int update(WhpTaskItemCurve bean) { return dao.updateByPrimaryKeySelective(bean); } @Override public List selectListByWhere(String t) { WhpTaskItemCurve bean = new WhpTaskItemCurve(); bean.setWhere(t); return dao.selectListByWhere(bean); } @Override public int deleteByWhere(String t) { WhpTaskItemCurve bean = new WhpTaskItemCurve(); bean.setWhere(t); return dao.deleteByWhere(bean); } /** * 列表查询 * * @Author: zxq * @Date: 2023/05/15 **/ public List queryList(WhpTaskItemCurveQuery query) { return dao.queryList(query); } /** * 业务校验 * * @Author: zxq * @Date: 2023/05/15 **/ public void bizCheck(WhpTaskItemCurve bean) throws BizCheckException { } } \ No newline at end of file diff --git a/src/main/java/com/sipai/service/work/AutoAlertService.java b/src/main/java/com/sipai/service/work/AutoAlertService.java index 9aaec1d3..9f835359 100644 --- a/src/main/java/com/sipai/service/work/AutoAlertService.java +++ b/src/main/java/com/sipai/service/work/AutoAlertService.java @@ -1,13 +1,12 @@ package com.sipai.service.work; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; import com.sipai.dao.work.AutoAlertDao; import com.sipai.entity.work.AutoAlert; import com.sipai.tools.CommService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class AutoAlertService implements CommService{ diff --git a/src/main/java/com/sipai/service/work/CameraDetailService.java b/src/main/java/com/sipai/service/work/CameraDetailService.java index e1955962..810ed68e 100644 --- a/src/main/java/com/sipai/service/work/CameraDetailService.java +++ b/src/main/java/com/sipai/service/work/CameraDetailService.java @@ -1,6 +1,5 @@ package com.sipai.service.work; -import com.alibaba.fastjson.JSONObject; import com.sipai.dao.work.CameraDetailDao; import com.sipai.entity.hqconfig.WorkModel; import com.sipai.entity.work.Camera; @@ -8,7 +7,7 @@ import com.sipai.entity.work.CameraDetail; import com.sipai.entity.work.CameraNVR; import com.sipai.service.hqconfig.WorkModelService; import com.sipai.service.scada.MPointService; -import com.sipai.tools.*; +import com.sipai.tools.CommService; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; @@ -16,8 +15,6 @@ import javax.annotation.Resource; import java.util.ArrayList; import java.util.List; -import static org.apache.cxf.version.Version.getName; - @Service public class CameraDetailService implements CommService { diff --git a/src/main/java/com/sipai/service/work/CameraFileService.java b/src/main/java/com/sipai/service/work/CameraFileService.java index 97793a1f..9fe4e852 100644 --- a/src/main/java/com/sipai/service/work/CameraFileService.java +++ b/src/main/java/com/sipai/service/work/CameraFileService.java @@ -1,13 +1,12 @@ package com.sipai.service.work; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; import com.sipai.dao.work.CameraFileDao; import com.sipai.entity.work.CameraFile; import com.sipai.tools.CommService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class CameraFileService implements CommService{ diff --git a/src/main/java/com/sipai/service/work/CameraNVRService.java b/src/main/java/com/sipai/service/work/CameraNVRService.java index bea5339a..9994acd0 100644 --- a/src/main/java/com/sipai/service/work/CameraNVRService.java +++ b/src/main/java/com/sipai/service/work/CameraNVRService.java @@ -6,6 +6,7 @@ import com.sipai.entity.work.CameraNVR; import com.sipai.tools.CommService; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; + import javax.annotation.Resource; import java.util.List; diff --git a/src/main/java/com/sipai/service/work/CameraService.java b/src/main/java/com/sipai/service/work/CameraService.java index d64e5fbc..90b51fe6 100644 --- a/src/main/java/com/sipai/service/work/CameraService.java +++ b/src/main/java/com/sipai/service/work/CameraService.java @@ -1,5 +1,26 @@ package com.sipai.service.work; +import com.sipai.dao.work.CameraDao; +import com.sipai.entity.base.CommonFile; +import com.sipai.entity.user.Company; +import com.sipai.entity.user.ProcessSection; +import com.sipai.entity.work.Camera; +import com.sipai.service.base.CommonFileService; +import com.sipai.service.base.MinioTemplate; +import com.sipai.service.company.CompanyService; +import com.sipai.service.user.ProcessSectionService; +import com.sipai.tools.CameraCall; +import com.sipai.tools.CommService; +import com.sipai.tools.CommUtil; +import com.sipai.tools.InitHCNetSDK; +import net.sf.json.JSONArray; +import net.sf.json.JSONObject; +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; +import sun.misc.BASE64Decoder; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; @@ -8,32 +29,6 @@ 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.base.CommonFile; -import com.sipai.entity.work.CameraDetail; -import com.sipai.service.base.CommonFileService; -import com.sipai.service.base.MinioTemplate; -import com.sipai.tools.CommUtil; -import net.sf.json.JSONArray; -import net.sf.json.JSONObject; - -import org.apache.commons.lang3.StringUtils; -import org.springframework.stereotype.Service; -import org.springframework.web.client.RestTemplate; - -import com.sipai.dao.work.CameraDao; -import com.sipai.entity.user.Company; -import com.sipai.entity.user.ProcessSection; -import com.sipai.entity.work.Camera; -import com.sipai.service.company.CompanyService; -import com.sipai.service.user.ProcessSectionService; -import com.sipai.tools.CameraCall; -import com.sipai.tools.CommService; -import com.sipai.tools.InitHCNetSDK; -import sun.misc.BASE64Decoder; - @Service public class CameraService implements CommService { diff --git a/src/main/java/com/sipai/service/work/ElectricityMeterService.java b/src/main/java/com/sipai/service/work/ElectricityMeterService.java index 0d1d06f0..cccd8a8f 100644 --- a/src/main/java/com/sipai/service/work/ElectricityMeterService.java +++ b/src/main/java/com/sipai/service/work/ElectricityMeterService.java @@ -1,12 +1,12 @@ package com.sipai.service.work; -import java.util.List; - -import javax.annotation.Resource; -import org.springframework.stereotype.Service; import com.sipai.dao.work.ElectricityMeterDao; import com.sipai.entity.work.ElectricityMeter; import com.sipai.tools.CommService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class ElectricityMeterService implements CommService{ diff --git a/src/main/java/com/sipai/service/work/GroupContentFormDataService.java b/src/main/java/com/sipai/service/work/GroupContentFormDataService.java index 9f5dbb9a..b1757b4b 100644 --- a/src/main/java/com/sipai/service/work/GroupContentFormDataService.java +++ b/src/main/java/com/sipai/service/work/GroupContentFormDataService.java @@ -1,13 +1,12 @@ package com.sipai.service.work; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; import com.sipai.dao.work.GroupContentFormDataDao; import com.sipai.entity.work.GroupContentFormData; import com.sipai.tools.CommService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class GroupContentFormDataService implements CommService{ diff --git a/src/main/java/com/sipai/service/work/GroupContentFormService.java b/src/main/java/com/sipai/service/work/GroupContentFormService.java index 05eb76d2..61e9b172 100644 --- a/src/main/java/com/sipai/service/work/GroupContentFormService.java +++ b/src/main/java/com/sipai/service/work/GroupContentFormService.java @@ -1,17 +1,12 @@ package com.sipai.service.work; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import javax.annotation.Resource; - -import net.sf.json.JSONArray; -import org.springframework.stereotype.Service; import com.sipai.dao.work.GroupContentFormDao; import com.sipai.entity.work.GroupContentForm; import com.sipai.tools.CommService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class GroupContentFormService implements CommService{ diff --git a/src/main/java/com/sipai/service/work/GroupContentService.java b/src/main/java/com/sipai/service/work/GroupContentService.java index dc58ec95..39a0492f 100644 --- a/src/main/java/com/sipai/service/work/GroupContentService.java +++ b/src/main/java/com/sipai/service/work/GroupContentService.java @@ -1,17 +1,16 @@ package com.sipai.service.work; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import javax.annotation.Resource; - -import net.sf.json.JSONArray; -import org.springframework.stereotype.Service; import com.sipai.dao.work.GroupContentDao; import com.sipai.entity.work.GroupContent; import com.sipai.tools.CommService; +import net.sf.json.JSONArray; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; @Service public class GroupContentService implements CommService{ diff --git a/src/main/java/com/sipai/service/work/GroupDetailService.java b/src/main/java/com/sipai/service/work/GroupDetailService.java index f49de80f..3dab363a 100644 --- a/src/main/java/com/sipai/service/work/GroupDetailService.java +++ b/src/main/java/com/sipai/service/work/GroupDetailService.java @@ -1,17 +1,15 @@ package com.sipai.service.work; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.sipai.dao.work.GroupDetailDao; import com.sipai.entity.user.User; import com.sipai.entity.work.GroupDetail; import com.sipai.service.user.UnitService; import com.sipai.service.user.UserService; import com.sipai.tools.CommService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class GroupDetailService implements CommService{ diff --git a/src/main/java/com/sipai/service/work/GroupManageService.java b/src/main/java/com/sipai/service/work/GroupManageService.java index 665ba062..c81205d5 100644 --- a/src/main/java/com/sipai/service/work/GroupManageService.java +++ b/src/main/java/com/sipai/service/work/GroupManageService.java @@ -1,26 +1,16 @@ package com.sipai.service.work; -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.Calendar; -import java.util.Collections; -import java.util.Comparator; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - import com.sipai.dao.work.GroupManageDao; -import com.sipai.entity.work.Group; import com.sipai.entity.work.GroupManage; import com.sipai.tools.CommService; import com.sipai.tools.CommUtil; -import com.sun.org.apache.bcel.internal.generic.NEW; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.*; @Service public class GroupManageService implements CommService{ diff --git a/src/main/java/com/sipai/service/work/GroupMemberService.java b/src/main/java/com/sipai/service/work/GroupMemberService.java index 58429cc7..00229735 100644 --- a/src/main/java/com/sipai/service/work/GroupMemberService.java +++ b/src/main/java/com/sipai/service/work/GroupMemberService.java @@ -1,14 +1,13 @@ package com.sipai.service.work; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; import com.sipai.dao.work.GroupMemberDao; import com.sipai.entity.work.GroupMember; import com.sipai.tools.CommService; import com.sipai.tools.CommUtil; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class GroupMemberService implements CommService{ diff --git a/src/main/java/com/sipai/service/work/GroupService.java b/src/main/java/com/sipai/service/work/GroupService.java index 504a6274..08baba31 100644 --- a/src/main/java/com/sipai/service/work/GroupService.java +++ b/src/main/java/com/sipai/service/work/GroupService.java @@ -1,15 +1,14 @@ package com.sipai.service.work; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; import com.sipai.dao.work.GroupDao; import com.sipai.dao.work.GroupMemberDao; import com.sipai.entity.work.Group; import com.sipai.entity.work.GroupMember; import com.sipai.tools.CommService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class GroupService implements CommService{ diff --git a/src/main/java/com/sipai/service/work/GroupTimeService.java b/src/main/java/com/sipai/service/work/GroupTimeService.java index e64d5b48..b5e0b219 100644 --- a/src/main/java/com/sipai/service/work/GroupTimeService.java +++ b/src/main/java/com/sipai/service/work/GroupTimeService.java @@ -1,19 +1,16 @@ package com.sipai.service.work; -import java.text.SimpleDateFormat; -import java.util.*; - -import javax.annotation.Resource; - -import com.sipai.entity.work.GroupManage; -import com.sipai.tools.CommUtil; -import org.springframework.stereotype.Service; - import com.sipai.dao.work.GroupTimeDao; import com.sipai.entity.work.GroupTime; import com.sipai.service.user.UnitService; import com.sipai.service.user.UserService; import com.sipai.tools.CommService; +import com.sipai.tools.CommUtil; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.text.SimpleDateFormat; +import java.util.*; @Service public class GroupTimeService implements CommService { diff --git a/src/main/java/com/sipai/service/work/GroupTypeService.java b/src/main/java/com/sipai/service/work/GroupTypeService.java index fa3e0053..15d52447 100644 --- a/src/main/java/com/sipai/service/work/GroupTypeService.java +++ b/src/main/java/com/sipai/service/work/GroupTypeService.java @@ -1,16 +1,14 @@ package com.sipai.service.work; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.sipai.dao.work.GroupTypeDao; import com.sipai.entity.work.GroupType; import com.sipai.service.user.UnitService; import com.sipai.service.user.UserService; import com.sipai.tools.CommService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class GroupTypeService implements CommService{ diff --git a/src/main/java/com/sipai/service/work/KPIPointProfessorParamService.java b/src/main/java/com/sipai/service/work/KPIPointProfessorParamService.java index 84830dd9..68d3edd1 100644 --- a/src/main/java/com/sipai/service/work/KPIPointProfessorParamService.java +++ b/src/main/java/com/sipai/service/work/KPIPointProfessorParamService.java @@ -1,14 +1,12 @@ package com.sipai.service.work; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; import com.sipai.dao.work.KPIPointProfessorParamDao; - import com.sipai.entity.work.KPIPointProfessorParam; import com.sipai.tools.CommService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class KPIPointProfessorParamService implements CommService{ diff --git a/src/main/java/com/sipai/service/work/KPIPointProfessorService.java b/src/main/java/com/sipai/service/work/KPIPointProfessorService.java index d869b411..7e00ded5 100644 --- a/src/main/java/com/sipai/service/work/KPIPointProfessorService.java +++ b/src/main/java/com/sipai/service/work/KPIPointProfessorService.java @@ -1,13 +1,12 @@ package com.sipai.service.work; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; import com.sipai.dao.work.KPIPointProfessorDao; import com.sipai.entity.work.KPIPointProfessor; import com.sipai.tools.CommService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class KPIPointProfessorService implements CommService{ diff --git a/src/main/java/com/sipai/service/work/LagerScreenConfigureDetailService.java b/src/main/java/com/sipai/service/work/LagerScreenConfigureDetailService.java index 03650eb0..c74292c5 100644 --- a/src/main/java/com/sipai/service/work/LagerScreenConfigureDetailService.java +++ b/src/main/java/com/sipai/service/work/LagerScreenConfigureDetailService.java @@ -1,13 +1,12 @@ package com.sipai.service.work; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; import com.sipai.dao.work.LagerScreenConfigureDetailDao; import com.sipai.entity.work.LagerScreenConfigureDetail; import com.sipai.tools.CommService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class LagerScreenConfigureDetailService implements CommService{ diff --git a/src/main/java/com/sipai/service/work/LagerScreenConfigureService.java b/src/main/java/com/sipai/service/work/LagerScreenConfigureService.java index 96f3077f..cc187980 100644 --- a/src/main/java/com/sipai/service/work/LagerScreenConfigureService.java +++ b/src/main/java/com/sipai/service/work/LagerScreenConfigureService.java @@ -1,13 +1,12 @@ package com.sipai.service.work; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; import com.sipai.dao.work.LagerScreenConfigureDao; import com.sipai.entity.work.LagerScreenConfigure; import com.sipai.tools.CommService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class LagerScreenConfigureService implements CommService{ diff --git a/src/main/java/com/sipai/service/work/LagerScreenDataService.java b/src/main/java/com/sipai/service/work/LagerScreenDataService.java index 11d36d04..f7ea67cc 100644 --- a/src/main/java/com/sipai/service/work/LagerScreenDataService.java +++ b/src/main/java/com/sipai/service/work/LagerScreenDataService.java @@ -1,24 +1,11 @@ package com.sipai.service.work; -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Date; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; import com.sipai.dao.work.LagerScreenDataDao; -import com.sipai.entity.scada.MPointHistory; -import com.sipai.entity.scada.ScadaAlarm; import com.sipai.entity.work.LagerScreenData; -import com.sipai.entity.work.LagerScreenData; -import com.sipai.tools.DateSpan; -import com.sipai.tools.DateUtil; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class LagerScreenDataService { diff --git a/src/main/java/com/sipai/service/work/MPointHisChangeDataService.java b/src/main/java/com/sipai/service/work/MPointHisChangeDataService.java index 56d7f9cb..b26cf6f2 100644 --- a/src/main/java/com/sipai/service/work/MPointHisChangeDataService.java +++ b/src/main/java/com/sipai/service/work/MPointHisChangeDataService.java @@ -1,16 +1,14 @@ package com.sipai.service.work; -import java.util.List; - -import javax.annotation.Resource; - +import com.sipai.dao.work.MPointHisChangeDataDao; import com.sipai.entity.user.User; +import com.sipai.entity.work.MPointHisChangeData; import com.sipai.service.user.UserService; +import com.sipai.tools.CommService; import org.springframework.stereotype.Service; -import com.sipai.dao.work.MPointHisChangeDataDao; -import com.sipai.entity.work.MPointHisChangeData; -import com.sipai.tools.CommService; +import javax.annotation.Resource; +import java.util.List; @Service public class MPointHisChangeDataService implements CommService { diff --git a/src/main/java/com/sipai/service/work/MeasurePoint_DATAService.java b/src/main/java/com/sipai/service/work/MeasurePoint_DATAService.java index f48db341..8f5734a2 100644 --- a/src/main/java/com/sipai/service/work/MeasurePoint_DATAService.java +++ b/src/main/java/com/sipai/service/work/MeasurePoint_DATAService.java @@ -1,15 +1,12 @@ package com.sipai.service.work; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; import com.sipai.dao.work.MeasurePoint_DATADao; - import com.sipai.entity.work.MeasurePoint_DATA; - import com.sipai.tools.CommService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class MeasurePoint_DATAService implements CommService{ diff --git a/src/main/java/com/sipai/service/work/ModbusFigService.java b/src/main/java/com/sipai/service/work/ModbusFigService.java index dc30392a..3a821dba 100644 --- a/src/main/java/com/sipai/service/work/ModbusFigService.java +++ b/src/main/java/com/sipai/service/work/ModbusFigService.java @@ -1,13 +1,12 @@ package com.sipai.service.work; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; import com.sipai.dao.work.ModbusFigDao; import com.sipai.entity.work.ModbusFig; import com.sipai.tools.CommService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class ModbusFigService implements CommService{ diff --git a/src/main/java/com/sipai/service/work/ModbusRecordService.java b/src/main/java/com/sipai/service/work/ModbusRecordService.java index 9ea4febf..c2ae605d 100644 --- a/src/main/java/com/sipai/service/work/ModbusRecordService.java +++ b/src/main/java/com/sipai/service/work/ModbusRecordService.java @@ -1,15 +1,12 @@ package com.sipai.service.work; -import java.util.List; -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - -import com.sipai.dao.work.ModbusFigDao; import com.sipai.dao.work.ModbusRecordDao; import com.sipai.entity.work.ModbusRecord; -import com.sipai.entity.work.ModbusRecord; import com.sipai.tools.CommService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class ModbusRecordService implements CommService{ diff --git a/src/main/java/com/sipai/service/work/ProductionIndexDataService.java b/src/main/java/com/sipai/service/work/ProductionIndexDataService.java index fafab128..4b445850 100644 --- a/src/main/java/com/sipai/service/work/ProductionIndexDataService.java +++ b/src/main/java/com/sipai/service/work/ProductionIndexDataService.java @@ -1,16 +1,13 @@ package com.sipai.service.work; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; import com.sipai.dao.work.ProductionIndexDataDao; -import com.sipai.entity.scada.MPoint; -import com.sipai.entity.work.ProductionIndexPlanNameConfigure; import com.sipai.entity.work.ProductionIndexData; -import com.sipai.service.scada.MPointHistoryService; +import com.sipai.entity.work.ProductionIndexPlanNameConfigure; import com.sipai.tools.CommService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service("productionIndexDataService") public class ProductionIndexDataService implements CommService{ diff --git a/src/main/java/com/sipai/service/work/ProductionIndexPlanNameConfigureService.java b/src/main/java/com/sipai/service/work/ProductionIndexPlanNameConfigureService.java index 5fa74835..587e629e 100644 --- a/src/main/java/com/sipai/service/work/ProductionIndexPlanNameConfigureService.java +++ b/src/main/java/com/sipai/service/work/ProductionIndexPlanNameConfigureService.java @@ -1,29 +1,22 @@ package com.sipai.service.work; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.sipai.dao.work.ProductionIndexPlanNameConfigureDao; import com.sipai.entity.scada.MPoint; import com.sipai.entity.scada.MPointHistory; -import com.sipai.entity.user.User; import com.sipai.entity.work.ProductionIndexData; import com.sipai.entity.work.ProductionIndexPlanNameConfigure; import com.sipai.entity.work.ProductionIndexPlanNameData; -import com.sipai.entity.work.ProductionIndexPlanNameConfigure; import com.sipai.service.scada.MPointHistoryService; import com.sipai.service.scada.MPointService; -import com.sipai.service.user.UserService; import com.sipai.tools.CommService; -import com.sipai.tools.CommUtil; - import net.sf.json.JSONArray; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; @Service("productionIndexPlanNameConfigureService") public class ProductionIndexPlanNameConfigureService implements CommService { diff --git a/src/main/java/com/sipai/service/work/ProductionIndexPlanNameDataHisService.java b/src/main/java/com/sipai/service/work/ProductionIndexPlanNameDataHisService.java index 613dc753..38edf85f 100644 --- a/src/main/java/com/sipai/service/work/ProductionIndexPlanNameDataHisService.java +++ b/src/main/java/com/sipai/service/work/ProductionIndexPlanNameDataHisService.java @@ -1,16 +1,14 @@ package com.sipai.service.work; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; import com.sipai.dao.user.UserDao; import com.sipai.dao.work.ProductionIndexPlanNameDataHisDao; import com.sipai.entity.user.User; import com.sipai.entity.work.ProductionIndexPlanNameDataHis; -import com.sipai.service.user.UserService; import com.sipai.tools.CommService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class ProductionIndexPlanNameDataHisService implements CommService{ diff --git a/src/main/java/com/sipai/service/work/ProductionIndexPlanNameDataService.java b/src/main/java/com/sipai/service/work/ProductionIndexPlanNameDataService.java index e7a4c836..2c453ecd 100644 --- a/src/main/java/com/sipai/service/work/ProductionIndexPlanNameDataService.java +++ b/src/main/java/com/sipai/service/work/ProductionIndexPlanNameDataService.java @@ -1,33 +1,13 @@ package com.sipai.service.work; -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.Date; -import java.util.List; -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.poi.hssf.usermodel.HSSFCell; -import org.apache.poi.hssf.usermodel.HSSFCellStyle; -import org.apache.poi.hssf.usermodel.HSSFClientAnchor; -import org.apache.poi.hssf.usermodel.HSSFComment; -import org.apache.poi.hssf.usermodel.HSSFFont; -import org.apache.poi.hssf.usermodel.HSSFPatriarch; -import org.apache.poi.hssf.usermodel.HSSFRichTextString; -import org.apache.poi.hssf.usermodel.HSSFRow; -import org.apache.poi.hssf.usermodel.HSSFSheet; -import org.apache.poi.hssf.usermodel.HSSFWorkbook; +import com.sipai.dao.work.ProductionIndexPlanNameDataDao; +import com.sipai.entity.work.ProductionIndexPlanNameConfigure; +import com.sipai.entity.work.ProductionIndexPlanNameData; +import com.sipai.tools.CommService; +import com.sipai.tools.CommUtil; +import org.apache.poi.hssf.usermodel.*; import org.apache.poi.ss.usermodel.*; import org.apache.poi.ss.util.CellRangeAddress; -import org.apache.poi.hssf.util.HSSFColor; import org.apache.poi.xssf.usermodel.XSSFCell; import org.apache.poi.xssf.usermodel.XSSFRow; import org.apache.poi.xssf.usermodel.XSSFSheet; @@ -35,18 +15,18 @@ import org.apache.poi.xssf.usermodel.XSSFWorkbook; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import com.sipai.dao.work.ProductionIndexPlanNameDataDao; -import com.sipai.entity.equipment.EquipmentCard; -import com.sipai.entity.equipment.EquipmentCardProp; -import com.sipai.entity.equipment.EquipmentCodeRule; -import com.sipai.entity.scada.MPoint; -import com.sipai.entity.work.ProductionIndexPlanNameConfigure; -import com.sipai.entity.work.ProductionIndexPlanNameData; -import com.sipai.service.scada.MPointHistoryService; -import com.sipai.tools.CommService; -import com.sipai.tools.CommUtil; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.net.URLEncoder; +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.List; -import static org.apache.poi.ss.usermodel.CellType.*; +import static org.apache.poi.ss.usermodel.CellType.STRING; @Service("productionIndexPlanNameDataService") public class ProductionIndexPlanNameDataService implements CommService{ diff --git a/src/main/java/com/sipai/service/work/ProductionIndexWorkOrderService.java b/src/main/java/com/sipai/service/work/ProductionIndexWorkOrderService.java index fafdac81..e0d090fb 100644 --- a/src/main/java/com/sipai/service/work/ProductionIndexWorkOrderService.java +++ b/src/main/java/com/sipai/service/work/ProductionIndexWorkOrderService.java @@ -1,16 +1,13 @@ package com.sipai.service.work; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; import com.sipai.dao.user.UserDao; import com.sipai.dao.work.ProductionIndexWorkOrderDao; -import com.sipai.entity.user.User; import com.sipai.entity.work.ProductionIndexWorkOrder; -import com.sipai.service.user.UserService; import com.sipai.tools.CommService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class ProductionIndexWorkOrderService implements CommService{ diff --git a/src/main/java/com/sipai/service/work/ScadaPicService.java b/src/main/java/com/sipai/service/work/ScadaPicService.java index b20368c7..625fcb63 100644 --- a/src/main/java/com/sipai/service/work/ScadaPicService.java +++ b/src/main/java/com/sipai/service/work/ScadaPicService.java @@ -1,15 +1,12 @@ package com.sipai.service.work; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; import com.sipai.dao.work.ScadaPicDao; -import com.sipai.entity.user.ProcessSection; import com.sipai.entity.work.ScadaPic; -import com.sipai.entity.work.ScadaPic_ProcessSection; import com.sipai.tools.CommService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class ScadaPicService implements CommService{ diff --git a/src/main/java/com/sipai/service/work/ScadaPic_EMService.java b/src/main/java/com/sipai/service/work/ScadaPic_EMService.java index 8671c0fa..f52941b1 100644 --- a/src/main/java/com/sipai/service/work/ScadaPic_EMService.java +++ b/src/main/java/com/sipai/service/work/ScadaPic_EMService.java @@ -1,18 +1,14 @@ package com.sipai.service.work; -import java.util.Iterator; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; import com.sipai.dao.work.ScadaPic_EMDao; import com.sipai.entity.equipment.EquipmentCard; -import com.sipai.entity.equipment.EquipmentClass; -import com.sipai.entity.scada.MPoint; import com.sipai.entity.work.ScadaPic_EM; import com.sipai.service.equipment.EquipmentCardService; import com.sipai.tools.CommService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class ScadaPic_EMService implements CommService{ diff --git a/src/main/java/com/sipai/service/work/ScadaPic_MPointService.java b/src/main/java/com/sipai/service/work/ScadaPic_MPointService.java index 6e734996..c48fa457 100644 --- a/src/main/java/com/sipai/service/work/ScadaPic_MPointService.java +++ b/src/main/java/com/sipai/service/work/ScadaPic_MPointService.java @@ -1,18 +1,16 @@ package com.sipai.service.work; -import java.math.BigDecimal; -import java.util.Iterator; -import java.util.List; - -import javax.annotation.Resource; - -import org.apache.commons.lang.ObjectUtils.Null; -import org.springframework.stereotype.Service; import com.sipai.dao.work.ScadaPic_MPointDao; import com.sipai.entity.scada.MPoint; import com.sipai.entity.work.ScadaPic_MPoint; import com.sipai.service.scada.MPointService; import com.sipai.tools.CommService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.math.BigDecimal; +import java.util.Iterator; +import java.util.List; @Service public class ScadaPic_MPointService implements CommService{ diff --git a/src/main/java/com/sipai/service/work/ScadaPic_MPoint_ExpressionService.java b/src/main/java/com/sipai/service/work/ScadaPic_MPoint_ExpressionService.java index 204db211..04d67f67 100644 --- a/src/main/java/com/sipai/service/work/ScadaPic_MPoint_ExpressionService.java +++ b/src/main/java/com/sipai/service/work/ScadaPic_MPoint_ExpressionService.java @@ -1,18 +1,13 @@ package com.sipai.service.work; -import java.util.Iterator; -import java.util.List; -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - -import com.sipai.dao.work.ScadaPic_MPointDao; import com.sipai.dao.work.ScadaPic_MPoint_ExpressionDao; -import com.sipai.entity.scada.MPoint; -import com.sipai.entity.work.ScadaPic_MPoint; import com.sipai.entity.work.ScadaPic_MPoint_Expression; import com.sipai.service.scada.MPointService; import com.sipai.tools.CommService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class ScadaPic_MPoint_ExpressionService implements CommService{ diff --git a/src/main/java/com/sipai/service/work/ScadaPic_ProcessSectionService.java b/src/main/java/com/sipai/service/work/ScadaPic_ProcessSectionService.java index 9ec75170..60729830 100644 --- a/src/main/java/com/sipai/service/work/ScadaPic_ProcessSectionService.java +++ b/src/main/java/com/sipai/service/work/ScadaPic_ProcessSectionService.java @@ -1,17 +1,14 @@ package com.sipai.service.work; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; import com.sipai.dao.work.ScadaPic_ProcessSectionDao; -import com.sipai.entity.maintenance.Maintenance; -import com.sipai.entity.user.Company; import com.sipai.entity.user.ProcessSection; import com.sipai.entity.work.ScadaPic_ProcessSection; import com.sipai.service.user.ProcessSectionService; import com.sipai.tools.CommService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class ScadaPic_ProcessSectionService implements CommService{ diff --git a/src/main/java/com/sipai/service/work/ScadaPic_TxtService.java b/src/main/java/com/sipai/service/work/ScadaPic_TxtService.java index 93b9b5a7..96ce876f 100644 --- a/src/main/java/com/sipai/service/work/ScadaPic_TxtService.java +++ b/src/main/java/com/sipai/service/work/ScadaPic_TxtService.java @@ -1,13 +1,12 @@ package com.sipai.service.work; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; import com.sipai.dao.work.ScadaPic_TxtDao; import com.sipai.entity.work.ScadaPic_Txt; import com.sipai.tools.CommService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class ScadaPic_TxtService implements CommService{ diff --git a/src/main/java/com/sipai/service/work/SchedulingReplaceJobService.java b/src/main/java/com/sipai/service/work/SchedulingReplaceJobService.java index 36c32273..67135fdc 100644 --- a/src/main/java/com/sipai/service/work/SchedulingReplaceJobService.java +++ b/src/main/java/com/sipai/service/work/SchedulingReplaceJobService.java @@ -1,13 +1,12 @@ package com.sipai.service.work; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; import com.sipai.dao.work.SchedulingReplaceJobDao; import com.sipai.entity.work.SchedulingReplaceJob; import com.sipai.tools.CommService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class SchedulingReplaceJobService implements CommService{ diff --git a/src/main/java/com/sipai/service/work/SchedulingService.java b/src/main/java/com/sipai/service/work/SchedulingService.java index e77e01d6..57d2def7 100644 --- a/src/main/java/com/sipai/service/work/SchedulingService.java +++ b/src/main/java/com/sipai/service/work/SchedulingService.java @@ -1,36 +1,32 @@ package com.sipai.service.work; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.net.URLEncoder; -import java.text.SimpleDateFormat; -import java.util.Calendar; -import java.util.Date; -import java.util.List; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletResponse; - +import com.sipai.dao.work.SchedulingDao; import com.sipai.entity.timeefficiency.PatrolModel; import com.sipai.entity.user.User; import com.sipai.entity.work.GroupDetail; import com.sipai.entity.work.GroupTime; import com.sipai.entity.work.GroupType; +import com.sipai.entity.work.Scheduling; import com.sipai.service.timeefficiency.PatrolModelService; +import com.sipai.service.user.UserService; +import com.sipai.tools.CommService; +import com.sipai.tools.CommUtil; import org.apache.poi.hssf.usermodel.*; -import org.apache.poi.hssf.util.HSSFColor; import org.apache.poi.ss.usermodel.*; import org.apache.poi.ss.util.CellRangeAddress; import org.springframework.stereotype.Service; -import com.sipai.dao.work.SchedulingDao; -import com.sipai.entity.work.Scheduling; -import com.sipai.service.user.UserService; -import com.sipai.tools.CommService; -import com.sipai.tools.CommUtil; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.net.URLEncoder; +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.List; -import static org.apache.poi.ss.usermodel.CellType.*; +import static org.apache.poi.ss.usermodel.CellType.STRING; @Service("schedulingService") public class SchedulingService implements CommService { diff --git a/src/main/java/com/sipai/service/work/SpeechRecognitionMpRespondService.java b/src/main/java/com/sipai/service/work/SpeechRecognitionMpRespondService.java index 3ff4e1cb..669121f2 100644 --- a/src/main/java/com/sipai/service/work/SpeechRecognitionMpRespondService.java +++ b/src/main/java/com/sipai/service/work/SpeechRecognitionMpRespondService.java @@ -1,14 +1,12 @@ package com.sipai.service.work; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.sipai.dao.work.SpeechRecognitionMpRespondDao; import com.sipai.entity.work.SpeechRecognitionMpRespond; import com.sipai.tools.CommService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class SpeechRecognitionMpRespondService implements CommService{ diff --git a/src/main/java/com/sipai/service/work/SpeechRecognitionService.java b/src/main/java/com/sipai/service/work/SpeechRecognitionService.java index c095d2ce..20ed8c1d 100644 --- a/src/main/java/com/sipai/service/work/SpeechRecognitionService.java +++ b/src/main/java/com/sipai/service/work/SpeechRecognitionService.java @@ -1,14 +1,12 @@ package com.sipai.service.work; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.sipai.dao.work.SpeechRecognitionDao; import com.sipai.entity.work.SpeechRecognition; import com.sipai.tools.CommService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class SpeechRecognitionService implements CommService{ diff --git a/src/main/java/com/sipai/service/work/WeatherNewService.java b/src/main/java/com/sipai/service/work/WeatherNewService.java index f947d9b1..bc0f117f 100644 --- a/src/main/java/com/sipai/service/work/WeatherNewService.java +++ b/src/main/java/com/sipai/service/work/WeatherNewService.java @@ -1,13 +1,12 @@ package com.sipai.service.work; -import java.io.IOException; -import java.io.InputStream; -import java.util.List; - import com.sipai.entity.work.WeatherNew; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.io.InputStream; +import java.util.List; public interface WeatherNewService { diff --git a/src/main/java/com/sipai/service/work/WeatherNewServiceImpl.java b/src/main/java/com/sipai/service/work/WeatherNewServiceImpl.java index 24a9ffcc..efd8c887 100644 --- a/src/main/java/com/sipai/service/work/WeatherNewServiceImpl.java +++ b/src/main/java/com/sipai/service/work/WeatherNewServiceImpl.java @@ -1,5 +1,25 @@ package com.sipai.service.work; +import com.sipai.dao.work.WeatherNewDao; +import com.sipai.entity.enums.WeatherTypeEnum; +import com.sipai.entity.scada.MPointHistory; +import com.sipai.entity.user.Company; +import com.sipai.entity.work.WeatherNew; +import com.sipai.entity.work.WeatherSaveName; +import com.sipai.service.company.CompanyService; +import com.sipai.service.scada.MPointHistoryService; +import com.sipai.tools.CommUtil; +import net.sf.json.JSONObject; +import org.apache.commons.lang3.StringUtils; +import org.apache.poi.hssf.usermodel.*; +import org.apache.poi.ss.usermodel.*; +import org.apache.poi.ss.util.CellRangeAddress; +import org.apache.poi.xssf.usermodel.XSSFCell; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; @@ -8,37 +28,6 @@ import java.net.URLEncoder; import java.text.SimpleDateFormat; import java.util.*; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import com.sipai.entity.enums.*; -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.work.WeatherSaveName; -import com.sipai.service.company.CompanyService; -import com.sipai.service.scada.MPointHistoryService; -import com.sipai.tools.CommUtil; -import com.sipai.tools.ValueTypeEnum; -import net.sf.json.JSONArray; -import net.sf.json.JSONObject; -import org.apache.commons.lang3.StringUtils; -import org.apache.commons.lang3.time.DateUtils; -import org.apache.poi.hssf.usermodel.*; -import org.apache.poi.ss.usermodel.*; -import org.apache.poi.ss.util.CellRangeAddress; -import org.apache.poi.xssf.usermodel.XSSFCell; -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.Service; - -import com.sipai.dao.work.WeatherNewDao; -import com.sipai.entity.work.WeatherNew; -import org.springframework.transaction.annotation.Transactional; - import static org.apache.poi.ss.usermodel.CellType.STRING; @Service("weatherNewService") diff --git a/src/main/java/com/sipai/service/work/WordAnalysisReportContentCurveAxisService.java b/src/main/java/com/sipai/service/work/WordAnalysisReportContentCurveAxisService.java index 669fa34a..e6702d40 100644 --- a/src/main/java/com/sipai/service/work/WordAnalysisReportContentCurveAxisService.java +++ b/src/main/java/com/sipai/service/work/WordAnalysisReportContentCurveAxisService.java @@ -1,13 +1,12 @@ package com.sipai.service.work; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; import com.sipai.dao.work.WordAnalysisReportContentCurveAxisDao; import com.sipai.entity.work.WordAnalysisReportContentCurveAxis; import com.sipai.tools.CommService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class WordAnalysisReportContentCurveAxisService implements CommService{ diff --git a/src/main/java/com/sipai/service/work/WordAnalysisReportContentCurveService.java b/src/main/java/com/sipai/service/work/WordAnalysisReportContentCurveService.java index 9b2f15ce..b6940b6c 100644 --- a/src/main/java/com/sipai/service/work/WordAnalysisReportContentCurveService.java +++ b/src/main/java/com/sipai/service/work/WordAnalysisReportContentCurveService.java @@ -1,13 +1,12 @@ package com.sipai.service.work; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; import com.sipai.dao.work.WordAnalysisReportContentCurveDao; import com.sipai.entity.work.WordAnalysisReportContentCurve; import com.sipai.tools.CommService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class WordAnalysisReportContentCurveService implements CommService{ diff --git a/src/main/java/com/sipai/service/work/WordAnalysisReportContentFormService.java b/src/main/java/com/sipai/service/work/WordAnalysisReportContentFormService.java index 30b2f916..1716d8b2 100644 --- a/src/main/java/com/sipai/service/work/WordAnalysisReportContentFormService.java +++ b/src/main/java/com/sipai/service/work/WordAnalysisReportContentFormService.java @@ -1,13 +1,12 @@ package com.sipai.service.work; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; import com.sipai.dao.work.WordAnalysisReportContentFormDao; import com.sipai.entity.work.WordAnalysisReportContentForm; import com.sipai.tools.CommService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class WordAnalysisReportContentFormService implements CommService{ diff --git a/src/main/java/com/sipai/service/work/WordAnalysisReportContentService.java b/src/main/java/com/sipai/service/work/WordAnalysisReportContentService.java index d14ef1fc..95229e77 100644 --- a/src/main/java/com/sipai/service/work/WordAnalysisReportContentService.java +++ b/src/main/java/com/sipai/service/work/WordAnalysisReportContentService.java @@ -1,13 +1,12 @@ package com.sipai.service.work; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; import com.sipai.dao.work.WordAnalysisReportContentDao; import com.sipai.entity.work.WordAnalysisReportContent; import com.sipai.tools.CommService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class WordAnalysisReportContentService implements CommService{ diff --git a/src/main/java/com/sipai/service/work/WordAnalysisReportFormDataService.java b/src/main/java/com/sipai/service/work/WordAnalysisReportFormDataService.java index a89ee1a8..97055628 100644 --- a/src/main/java/com/sipai/service/work/WordAnalysisReportFormDataService.java +++ b/src/main/java/com/sipai/service/work/WordAnalysisReportFormDataService.java @@ -1,13 +1,12 @@ package com.sipai.service.work; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; import com.sipai.dao.work.WordAnalysisReportFormDataDao; import com.sipai.entity.work.WordAnalysisReportFormData; import com.sipai.tools.CommService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class WordAnalysisReportFormDataService implements CommService{ diff --git a/src/main/java/com/sipai/service/work/WordAnalysisReportRecordService.java b/src/main/java/com/sipai/service/work/WordAnalysisReportRecordService.java index 9c43f2dc..6ff8820b 100644 --- a/src/main/java/com/sipai/service/work/WordAnalysisReportRecordService.java +++ b/src/main/java/com/sipai/service/work/WordAnalysisReportRecordService.java @@ -1,13 +1,12 @@ package com.sipai.service.work; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; import com.sipai.dao.work.WordAnalysisReportRecordDao; import com.sipai.entity.work.WordAnalysisReportRecord; import com.sipai.tools.CommService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class WordAnalysisReportRecordService implements CommService{ diff --git a/src/main/java/com/sipai/service/work/WordAnalysisReportStructureService.java b/src/main/java/com/sipai/service/work/WordAnalysisReportStructureService.java index 938e1ee7..e7812db8 100644 --- a/src/main/java/com/sipai/service/work/WordAnalysisReportStructureService.java +++ b/src/main/java/com/sipai/service/work/WordAnalysisReportStructureService.java @@ -1,12 +1,24 @@ package com.sipai.service.work; -import java.awt.image.BufferedImage; -import java.io.ByteArrayInputStream; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileNotFoundException; -import java.io.IOException; -import java.io.InputStream; +import com.sipai.controller.base.PoiUtils; +import com.sipai.dao.work.WordAnalysisReportStructureDao; +import com.sipai.entity.scada.MPoint; +import com.sipai.entity.work.*; +import com.sipai.service.scada.MPointService; +import com.sipai.tools.CommService; +import com.sipai.tools.CommUtil; +import net.sf.json.JSONArray; +import org.apache.poi.openxml4j.exceptions.InvalidFormatException; +import org.apache.poi.util.IOUtils; +import org.apache.poi.xwpf.usermodel.*; +import org.openxmlformats.schemas.wordprocessingml.x2006.main.*; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import javax.script.ScriptEngine; +import javax.script.ScriptEngineManager; +import javax.script.ScriptException; +import java.io.*; import java.math.BigDecimal; import java.math.BigInteger; import java.text.DecimalFormat; @@ -17,49 +29,6 @@ import java.util.Map; import java.util.regex.Matcher; import java.util.regex.Pattern; -import javax.annotation.Resource; -import javax.imageio.ImageIO; -import javax.script.ScriptEngine; -import javax.script.ScriptEngineManager; -import javax.script.ScriptException; - -import net.sf.json.JSONArray; - -import org.apache.poi.openxml4j.exceptions.InvalidFormatException; -import org.apache.poi.util.IOUtils; -import org.apache.poi.xwpf.usermodel.Document; -import org.apache.poi.xwpf.usermodel.ParagraphAlignment; -import org.apache.poi.xwpf.usermodel.XWPFDocument; -import org.apache.poi.xwpf.usermodel.XWPFParagraph; -import org.apache.poi.xwpf.usermodel.XWPFRun; -import org.apache.poi.xwpf.usermodel.XWPFTable; -import org.apache.poi.xwpf.usermodel.XWPFTableCell; -import org.apache.poi.xwpf.usermodel.XWPFTableRow; -import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTJc; -import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTP; -import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTPPr; -import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTTblWidth; -import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTTc; -import org.openxmlformats.schemas.wordprocessingml.x2006.main.STJc; -import org.openxmlformats.schemas.wordprocessingml.x2006.main.STMerge; -import org.openxmlformats.schemas.wordprocessingml.x2006.main.STTblWidth; -import org.springframework.stereotype.Service; - -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; -import com.sipai.controller.base.PoiUtils; -import com.sipai.dao.work.WordAnalysisReportStructureDao; -import com.sipai.entity.scada.MPoint; -import com.sipai.entity.work.WordAnalysisReportContent; -import com.sipai.entity.work.WordAnalysisReportContentCurve; -import com.sipai.entity.work.WordAnalysisReportContentForm; -import com.sipai.entity.work.WordAnalysisReportFormData; -import com.sipai.entity.work.WordAnalysisReportStructure; -import com.sipai.entity.work.WordAnalysisReportText; -import com.sipai.service.scada.MPointService; -import com.sipai.tools.CommService; -import com.sipai.tools.CommUtil; - @Service public class WordAnalysisReportStructureService implements CommService { @Resource diff --git a/src/main/java/com/sipai/service/work/WordAnalysisReportTextService.java b/src/main/java/com/sipai/service/work/WordAnalysisReportTextService.java index acabe7c8..fc0ab365 100644 --- a/src/main/java/com/sipai/service/work/WordAnalysisReportTextService.java +++ b/src/main/java/com/sipai/service/work/WordAnalysisReportTextService.java @@ -1,13 +1,12 @@ package com.sipai.service.work; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; import com.sipai.dao.work.WordAnalysisReportTextDao; import com.sipai.entity.work.WordAnalysisReportText; import com.sipai.tools.CommService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class WordAnalysisReportTextService implements CommService{ diff --git a/src/main/java/com/sipai/service/workorder/OverhaulItemEquipmentService.java b/src/main/java/com/sipai/service/workorder/OverhaulItemEquipmentService.java index 0df6e415..dcbedddf 100644 --- a/src/main/java/com/sipai/service/workorder/OverhaulItemEquipmentService.java +++ b/src/main/java/com/sipai/service/workorder/OverhaulItemEquipmentService.java @@ -1,13 +1,8 @@ package com.sipai.service.workorder; -import com.sipai.entity.business.BusinessUnitAudit; import com.sipai.entity.maintenance.EquipmentPlan; -import com.sipai.entity.user.User; -import com.sipai.entity.workorder.Overhaul; import com.sipai.entity.workorder.OverhaulItemEquipment; import com.sipai.entity.workorder.OverhaulStatistics; -import org.springframework.stereotype.Repository; -import org.springframework.stereotype.Service; import java.util.List; diff --git a/src/main/java/com/sipai/service/workorder/OverhaulItemProjectService.java b/src/main/java/com/sipai/service/workorder/OverhaulItemProjectService.java index 59d79ba4..fa39cfa0 100644 --- a/src/main/java/com/sipai/service/workorder/OverhaulItemProjectService.java +++ b/src/main/java/com/sipai/service/workorder/OverhaulItemProjectService.java @@ -2,6 +2,7 @@ package com.sipai.service.workorder; import com.sipai.entity.business.BusinessUnitAudit; import com.sipai.entity.workorder.OverhaulItemProject; + import java.util.List; public interface OverhaulItemProjectService { diff --git a/src/main/java/com/sipai/service/workorder/OverhaulService.java b/src/main/java/com/sipai/service/workorder/OverhaulService.java index ce35722f..34cd1163 100644 --- a/src/main/java/com/sipai/service/workorder/OverhaulService.java +++ b/src/main/java/com/sipai/service/workorder/OverhaulService.java @@ -1,10 +1,7 @@ package com.sipai.service.workorder; -import com.sipai.entity.base.Result; import com.sipai.entity.business.BusinessUnitAudit; -import com.sipai.entity.user.User; import com.sipai.entity.workorder.Overhaul; -import com.sipai.entity.workorder.OverhaulItemEquipment; import java.util.List; diff --git a/src/main/java/com/sipai/service/workorder/OverhaulTypeService.java b/src/main/java/com/sipai/service/workorder/OverhaulTypeService.java index 52b55aef..2d1f0a85 100644 --- a/src/main/java/com/sipai/service/workorder/OverhaulTypeService.java +++ b/src/main/java/com/sipai/service/workorder/OverhaulTypeService.java @@ -1,6 +1,7 @@ package com.sipai.service.workorder; import com.sipai.entity.workorder.OverhaulType; + import java.util.List; public interface OverhaulTypeService { diff --git a/src/main/java/com/sipai/service/workorder/WorkorderAchievementOrderService.java b/src/main/java/com/sipai/service/workorder/WorkorderAchievementOrderService.java index a56fc313..530ab0f2 100644 --- a/src/main/java/com/sipai/service/workorder/WorkorderAchievementOrderService.java +++ b/src/main/java/com/sipai/service/workorder/WorkorderAchievementOrderService.java @@ -1,16 +1,13 @@ package com.sipai.service.workorder; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - -import com.itextpdf.text.pdf.PdfStructTreeController.returnType; import com.sipai.dao.workorder.WorkorderAchievementOrderDao; import com.sipai.entity.workorder.WorkorderAchievementOrder; import com.sipai.service.work.CameraService; import com.sipai.tools.CommService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class WorkorderAchievementOrderService implements CommService{ @Resource diff --git a/src/main/java/com/sipai/service/workorder/WorkorderAchievementService.java b/src/main/java/com/sipai/service/workorder/WorkorderAchievementService.java index 8aaf1e1a..7a9577d5 100644 --- a/src/main/java/com/sipai/service/workorder/WorkorderAchievementService.java +++ b/src/main/java/com/sipai/service/workorder/WorkorderAchievementService.java @@ -1,9 +1,5 @@ package com.sipai.service.workorder; -import java.io.IOException; -import java.util.List; - -import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.sipai.entity.workorder.WorkTimeRespDto; import com.sipai.entity.workorder.WorkUserTimeRespDto; @@ -11,6 +7,8 @@ import com.sipai.entity.workorder.WorkorderAchievement; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.List; public interface WorkorderAchievementService { diff --git a/src/main/java/com/sipai/service/workorder/WorkorderDetailService.java b/src/main/java/com/sipai/service/workorder/WorkorderDetailService.java index 22edfea4..2dbfccbb 100644 --- a/src/main/java/com/sipai/service/workorder/WorkorderDetailService.java +++ b/src/main/java/com/sipai/service/workorder/WorkorderDetailService.java @@ -1,16 +1,13 @@ package com.sipai.service.workorder; -import java.io.IOException; -import java.util.List; - import com.alibaba.fastjson.JSONObject; import com.sipai.entity.business.BusinessUnitAudit; import com.sipai.entity.business.BusinessUnitHandle; -import com.sipai.entity.user.User; import com.sipai.entity.workorder.WorkorderDetail; -import net.sf.json.JSONArray; import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.List; public interface WorkorderDetailService { diff --git a/src/main/java/com/sipai/service/workorder/WorkorderRepairContentService.java b/src/main/java/com/sipai/service/workorder/WorkorderRepairContentService.java index 31167dcd..5994986d 100644 --- a/src/main/java/com/sipai/service/workorder/WorkorderRepairContentService.java +++ b/src/main/java/com/sipai/service/workorder/WorkorderRepairContentService.java @@ -1,9 +1,9 @@ package com.sipai.service.workorder; -import java.util.List; - import com.sipai.entity.workorder.WorkorderRepairContent; +import java.util.List; + public interface WorkorderRepairContentService { public abstract WorkorderRepairContent selectById(String t); diff --git a/src/main/java/com/sipai/service/workorder/impl/OverhaulItemEquipmentServiceImpl.java b/src/main/java/com/sipai/service/workorder/impl/OverhaulItemEquipmentServiceImpl.java index c48bb4dc..e2e28e9d 100644 --- a/src/main/java/com/sipai/service/workorder/impl/OverhaulItemEquipmentServiceImpl.java +++ b/src/main/java/com/sipai/service/workorder/impl/OverhaulItemEquipmentServiceImpl.java @@ -5,8 +5,6 @@ import com.sipai.dao.workorder.OverhaulItemEquipmentDao; import com.sipai.dao.workorder.OverhaulItemEquipmentSlaveDao; import com.sipai.dao.workorder.OverhaulStatisticsDao; import com.sipai.entity.activiti.ProcessType; -import com.sipai.entity.base.BusinessUnitAdapter; -import com.sipai.entity.business.BusinessUnitAudit; import com.sipai.entity.business.BusinessUnitRecord; import com.sipai.entity.maintenance.EquipmentPlan; import com.sipai.entity.maintenance.MaintenanceCommString; @@ -14,10 +12,8 @@ import com.sipai.entity.maintenance.PlanRecordAbnormity; import com.sipai.entity.workorder.Overhaul; import com.sipai.entity.workorder.OverhaulItemEquipment; import com.sipai.entity.workorder.OverhaulStatistics; -import com.sipai.service.activiti.LeaveWorkflowService; import com.sipai.service.activiti.WorkflowProcessDefinitionService; import com.sipai.service.activiti.WorkflowService; -import com.sipai.service.business.BusinessUnitAuditService; import com.sipai.service.maintenance.PlanRecordAbnormityService; import com.sipai.service.workorder.OverhaulItemEquipmentService; import com.sipai.service.workorder.OverhaulService; diff --git a/src/main/java/com/sipai/service/workorder/impl/OverhaulItemProjectServiceImpl.java b/src/main/java/com/sipai/service/workorder/impl/OverhaulItemProjectServiceImpl.java index 77e4ca7f..00ace5df 100644 --- a/src/main/java/com/sipai/service/workorder/impl/OverhaulItemProjectServiceImpl.java +++ b/src/main/java/com/sipai/service/workorder/impl/OverhaulItemProjectServiceImpl.java @@ -3,18 +3,17 @@ package com.sipai.service.workorder.impl; import com.sipai.dao.workorder.OverhaulItemProjectDao; import com.sipai.entity.base.BusinessUnitAdapter; import com.sipai.entity.business.BusinessUnitAudit; +import com.sipai.entity.user.User; import com.sipai.entity.workorder.OverhaulItemProject; import com.sipai.entity.workorder.OverhaulType; -import com.sipai.entity.maintenance.Repair; -import com.sipai.entity.sparepart.SparePartCommString; -import com.sipai.entity.user.User; import com.sipai.service.activiti.WorkflowService; import com.sipai.service.business.BusinessUnitAuditService; +import com.sipai.service.user.UserService; import com.sipai.service.workorder.OverhaulItemProjectService; import com.sipai.service.workorder.OverhaulTypeService; -import com.sipai.service.user.UserService; import org.activiti.engine.task.Task; import org.springframework.stereotype.Service; + import javax.annotation.Resource; import java.util.List; diff --git a/src/main/java/com/sipai/service/workorder/impl/OverhaulServiceImpl.java b/src/main/java/com/sipai/service/workorder/impl/OverhaulServiceImpl.java index 8aa8185c..755aff53 100644 --- a/src/main/java/com/sipai/service/workorder/impl/OverhaulServiceImpl.java +++ b/src/main/java/com/sipai/service/workorder/impl/OverhaulServiceImpl.java @@ -1,47 +1,25 @@ package com.sipai.service.workorder.impl; import com.sipai.dao.workorder.OverhaulDao; -import com.sipai.entity.activiti.ProcessType; import com.sipai.entity.base.BusinessUnitAdapter; -import com.sipai.entity.base.Result; import com.sipai.entity.business.BusinessUnitAudit; -import com.sipai.entity.business.BusinessUnitRecord; -import com.sipai.entity.enums.KpiConstant; import com.sipai.entity.equipment.EquipmentCard; import com.sipai.entity.maintenance.EquipmentPlanType; -import com.sipai.entity.maintenance.MaintenanceCommString; -import com.sipai.entity.maintenance.PlanRecordAbnormity; -import com.sipai.entity.process.ProcessAdjustment; -import com.sipai.entity.workorder.Overhaul; import com.sipai.entity.user.Company; import com.sipai.entity.user.User; -import com.sipai.entity.workorder.OverhaulItemEquipment; -import com.sipai.entity.workorder.WorkorderDetail; -import com.sipai.service.activiti.WorkflowProcessDefinitionService; -import com.sipai.service.activiti.WorkflowService; +import com.sipai.entity.workorder.Overhaul; import com.sipai.service.business.BusinessUnitAuditService; import com.sipai.service.company.CompanyService; import com.sipai.service.equipment.EquipmentCardService; import com.sipai.service.maintenance.EquipmentPlanTypeService; -import com.sipai.service.maintenance.PlanRecordAbnormityService; -import com.sipai.service.msg.MsgServiceImpl; -import com.sipai.service.workorder.OverhaulService; import com.sipai.service.user.UserService; -import com.sipai.tools.CommUtil; -import com.sipai.tools.DateUtil; -import org.activiti.engine.impl.task.TaskDefinition; -import org.activiti.engine.repository.ProcessDefinition; -import org.activiti.engine.runtime.ProcessInstance; -import org.activiti.engine.task.Task; +import com.sipai.service.workorder.OverhaulService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; -import java.util.Date; -import java.util.HashMap; import java.util.List; -import java.util.Map; @Service public class OverhaulServiceImpl implements OverhaulService { diff --git a/src/main/java/com/sipai/service/workorder/impl/OverhaulTypeServiceImpl.java b/src/main/java/com/sipai/service/workorder/impl/OverhaulTypeServiceImpl.java index 475d9abd..7d980465 100644 --- a/src/main/java/com/sipai/service/workorder/impl/OverhaulTypeServiceImpl.java +++ b/src/main/java/com/sipai/service/workorder/impl/OverhaulTypeServiceImpl.java @@ -4,6 +4,7 @@ import com.sipai.dao.workorder.OverhaulTypeDao; import com.sipai.entity.workorder.OverhaulType; import com.sipai.service.workorder.OverhaulTypeService; import org.springframework.stereotype.Service; + import javax.annotation.Resource; import java.util.List; diff --git a/src/main/java/com/sipai/service/workorder/impl/WorkorderAchievementServiceImpl.java b/src/main/java/com/sipai/service/workorder/impl/WorkorderAchievementServiceImpl.java index ce4dd5d6..c77f4ee2 100644 --- a/src/main/java/com/sipai/service/workorder/impl/WorkorderAchievementServiceImpl.java +++ b/src/main/java/com/sipai/service/workorder/impl/WorkorderAchievementServiceImpl.java @@ -1,5 +1,23 @@ package com.sipai.service.workorder.impl; +import com.alibaba.fastjson.JSONObject; +import com.sipai.dao.workorder.WorkorderAchievementDao; +import com.sipai.entity.user.User; +import com.sipai.entity.workorder.WorkTimeRespDto; +import com.sipai.entity.workorder.WorkUserTimeRespDto; +import com.sipai.entity.workorder.WorkorderAchievement; +import com.sipai.entity.workorder.WorkorderDetail; +import com.sipai.service.user.UserService; +import com.sipai.service.workorder.WorkorderAchievementService; +import org.apache.commons.lang3.StringUtils; +import org.apache.poi.hssf.usermodel.*; +import org.apache.poi.ss.usermodel.*; +import org.apache.poi.ss.util.CellRangeAddress; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.OutputStream; import java.math.BigDecimal; @@ -8,30 +26,6 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; -import com.sipai.entity.equipment.EquipmentScrapApplyCollect; -import com.sipai.entity.maintenance.Abnormity; -import com.sipai.entity.workorder.WorkTimeRespDto; -import com.sipai.entity.workorder.WorkUserTimeRespDto; -import com.sipai.entity.workorder.WorkorderDetail; -import org.apache.commons.lang3.StringUtils; -import org.apache.poi.hssf.usermodel.*; -import org.apache.poi.ss.usermodel.*; -import org.apache.poi.ss.util.CellRangeAddress; -import org.springframework.stereotype.Service; - -import com.sipai.dao.workorder.WorkorderAchievementDao; -import com.sipai.entity.workorder.WorkorderAchievement; -import com.sipai.entity.sparepart.Stock; -import com.sipai.entity.user.User; -import com.sipai.service.workorder.WorkorderAchievementService; -import com.sipai.service.user.UserService; - @Service public class WorkorderAchievementServiceImpl implements WorkorderAchievementService { @Resource diff --git a/src/main/java/com/sipai/service/workorder/impl/WorkorderConsumeServiceImpl.java b/src/main/java/com/sipai/service/workorder/impl/WorkorderConsumeServiceImpl.java index 7c7f1187..8a25516d 100644 --- a/src/main/java/com/sipai/service/workorder/impl/WorkorderConsumeServiceImpl.java +++ b/src/main/java/com/sipai/service/workorder/impl/WorkorderConsumeServiceImpl.java @@ -1,15 +1,13 @@ package com.sipai.service.workorder.impl; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.sipai.dao.workorder.WorkorderConsumeDao; import com.sipai.entity.workorder.WorkorderConsume; import com.sipai.service.sparepart.GoodsService; import com.sipai.service.workorder.WorkorderConsumeService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service public class WorkorderConsumeServiceImpl implements WorkorderConsumeService { diff --git a/src/main/java/com/sipai/service/workorder/impl/WorkorderDetailServiceImpl.java b/src/main/java/com/sipai/service/workorder/impl/WorkorderDetailServiceImpl.java index f06058db..a58663c6 100644 --- a/src/main/java/com/sipai/service/workorder/impl/WorkorderDetailServiceImpl.java +++ b/src/main/java/com/sipai/service/workorder/impl/WorkorderDetailServiceImpl.java @@ -1,69 +1,64 @@ package com.sipai.service.workorder.impl; -import java.io.IOException; -import java.io.OutputStream; -import java.net.URLEncoder; -import java.text.SimpleDateFormat; -import java.util.*; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletResponse; - import com.alibaba.fastjson.JSONObject; import com.serotonin.util.ArrayUtils; +import com.sipai.dao.workorder.WorkorderDetailDao; +import com.sipai.entity.activiti.ProcessType; import com.sipai.entity.activiti.WorkTask; +import com.sipai.entity.base.BusinessUnitAdapter; import com.sipai.entity.business.BusinessUnit; +import com.sipai.entity.business.BusinessUnitAudit; import com.sipai.entity.business.BusinessUnitHandle; -import com.sipai.entity.maintenance.*; -import com.sipai.entity.timeefficiency.PatrolRecord; -import com.sipai.entity.timeefficiency.PatrolType; +import com.sipai.entity.business.BusinessUnitRecord; +import com.sipai.entity.equipment.EquipmentCard; +import com.sipai.entity.maintenance.Abnormity; +import com.sipai.entity.maintenance.LibraryBase; +import com.sipai.entity.maintenance.MaintenanceCommString; +import com.sipai.entity.maintenance.PlanRecordAbnormity; +import com.sipai.entity.user.Company; import com.sipai.entity.user.Unit; import com.sipai.entity.user.User; import com.sipai.entity.work.GroupDetail; +import com.sipai.entity.workorder.WorkorderDetail; import com.sipai.entity.workorder.WorkorderRepairContent; +import com.sipai.service.activiti.WorkflowProcessDefinitionService; +import com.sipai.service.activiti.WorkflowService; +import com.sipai.service.business.BusinessUnitAuditService; import com.sipai.service.business.BusinessUnitHandleDetailService; import com.sipai.service.business.BusinessUnitHandleService; +import com.sipai.service.equipment.EquipmentCardService; import com.sipai.service.maintenance.AbnormityService; import com.sipai.service.maintenance.LibraryBaseService; import com.sipai.service.maintenance.PlanRecordAbnormityService; +import com.sipai.service.user.UnitService; import com.sipai.service.user.UserService; import com.sipai.service.work.GroupDetailService; +import com.sipai.service.workorder.WorkorderDetailService; import com.sipai.service.workorder.WorkorderRepairContentService; -import com.sipai.tools.*; -import com.sipai.tools.DateUtil; -import net.sf.json.JSON; +import com.sipai.tools.CommString; +import com.sipai.tools.CommUtil; +import com.sipai.tools.Mqtt; +import com.sipai.tools.MqttUtil; import net.sf.json.JSONArray; import org.activiti.engine.RuntimeService; import org.activiti.engine.history.HistoricTaskInstance; import org.activiti.engine.repository.ProcessDefinition; import org.activiti.engine.runtime.ProcessInstance; import org.activiti.engine.task.Task; -import org.apache.commons.lang3.StringUtils; import org.apache.poi.hssf.usermodel.*; import org.apache.poi.ss.usermodel.*; import org.apache.poi.ss.util.CellRangeAddress; -import org.apache.poi.hssf.util.HSSFColor; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import com.sipai.dao.workorder.WorkorderDetailDao; -import com.sipai.entity.activiti.ProcessType; -import com.sipai.entity.base.BusinessUnitAdapter; -import com.sipai.entity.business.BusinessUnitAudit; -import com.sipai.entity.business.BusinessUnitRecord; -import com.sipai.entity.equipment.EquipmentCard; -import com.sipai.entity.equipment.EquipmentSpecification; -import com.sipai.entity.process.ProcessAdjustment; -import com.sipai.entity.process.WaterTest; -import com.sipai.entity.user.Company; -import com.sipai.entity.workorder.WorkorderDetail; -import com.sipai.service.activiti.WorkflowProcessDefinitionService; -import com.sipai.service.activiti.WorkflowService; -import com.sipai.service.business.BusinessUnitAuditService; -import com.sipai.service.equipment.EquipmentCardService; -import com.sipai.service.user.UnitService; -import com.sipai.service.workorder.WorkorderDetailService; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.io.OutputStream; +import java.net.URLEncoder; +import java.text.SimpleDateFormat; +import java.util.*; @Service("workorderDetailService") public class WorkorderDetailServiceImpl implements WorkorderDetailService { diff --git a/src/main/java/com/sipai/service/workorder/impl/WorkorderRepairContentServiceImpl.java b/src/main/java/com/sipai/service/workorder/impl/WorkorderRepairContentServiceImpl.java index 18888252..b756bff0 100644 --- a/src/main/java/com/sipai/service/workorder/impl/WorkorderRepairContentServiceImpl.java +++ b/src/main/java/com/sipai/service/workorder/impl/WorkorderRepairContentServiceImpl.java @@ -1,18 +1,14 @@ package com.sipai.service.workorder.impl; -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - -import com.sipai.dao.maintenance.LibraryRepairBlocDao; import com.sipai.dao.workorder.WorkorderRepairContentDao; import com.sipai.entity.maintenance.LibraryRepairBloc; -import com.sipai.entity.user.Company; import com.sipai.entity.workorder.WorkorderRepairContent; import com.sipai.service.maintenance.LibraryRepairBlocService; import com.sipai.service.workorder.WorkorderRepairContentService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; @Service("workorderRepairContentService") public class WorkorderRepairContentServiceImpl implements WorkorderRepairContentService{ diff --git a/src/main/java/com/sipai/servlet/PushSmsServlet.java b/src/main/java/com/sipai/servlet/PushSmsServlet.java index 8da0340d..772c1cde 100644 --- a/src/main/java/com/sipai/servlet/PushSmsServlet.java +++ b/src/main/java/com/sipai/servlet/PushSmsServlet.java @@ -1,33 +1,21 @@ package com.sipai.servlet; -import java.io.IOException; -import java.io.PrintWriter; -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.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.jsp.jstl.sql.Result; - -import org.springframework.stereotype.Controller; -import org.springframework.stereotype.Service; -import org.springframework.web.bind.annotation.RequestMapping; - import com.google.gson.Gson; import com.sipai.entity.msg.Msg; import com.sipai.entity.msg.Sms; import com.sipai.service.msg.MsgService; -import com.sipai.service.msg.MsgServiceImpl; -import com.sipai.service.user.MenuService; import com.sipai.tools.SpringContextUtil; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.io.PrintWriter; +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.List; + public class PushSmsServlet extends HttpServlet { private static int index = 1; public void doGet(HttpServletRequest request, HttpServletResponse response) diff --git a/src/main/java/com/sipai/servlet/ShowImgServlet.java b/src/main/java/com/sipai/servlet/ShowImgServlet.java index a665026e..d5490684 100644 --- a/src/main/java/com/sipai/servlet/ShowImgServlet.java +++ b/src/main/java/com/sipai/servlet/ShowImgServlet.java @@ -1,14 +1,13 @@ package com.sipai.servlet; -import java.io.FileInputStream; -import java.io.FileNotFoundException; -import java.io.IOException; -import java.io.OutputStream; - import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.io.OutputStream; public class ShowImgServlet extends HttpServlet { diff --git a/src/main/java/com/sipai/servlet/engineeringServlet.java b/src/main/java/com/sipai/servlet/engineeringServlet.java index ed3a0e34..d06872eb 100644 --- a/src/main/java/com/sipai/servlet/engineeringServlet.java +++ b/src/main/java/com/sipai/servlet/engineeringServlet.java @@ -1,30 +1,11 @@ package com.sipai.servlet; -import java.io.BufferedReader; -import java.io.IOException; -import java.io.InputStreamReader; -import java.io.PrintWriter; -import java.io.UnsupportedEncodingException; -import java.lang.reflect.Method; -import java.math.BigDecimal; -import java.util.List; - -import javax.annotation.Resource; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.apache.commons.httpclient.HttpException; -import org.springframework.web.bind.annotation.ResponseBody; - import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.sipai.entity.sparepart.Channels; import com.sipai.entity.sparepart.Contract; import com.sipai.entity.sparepart.SparePartCommString; -import com.sipai.entity.sparepart.Subscribe; import com.sipai.entity.sparepart.SubscribeDetail; import com.sipai.service.sparepart.ChannelsService; import com.sipai.service.sparepart.ContractService; @@ -32,6 +13,14 @@ import com.sipai.service.sparepart.SubscribeDetailService; import com.sipai.tools.CommUtil; import com.sipai.tools.SpringContextUtil; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.*; +import java.lang.reflect.Method; +import java.util.List; + public class engineeringServlet extends HttpServlet { private static final long serialVersionUID = 1L; @Override diff --git a/src/main/java/com/sipai/servlet/wechat/CallBackServlet.java b/src/main/java/com/sipai/servlet/wechat/CallBackServlet.java index 18094d11..c7ce3d7b 100644 --- a/src/main/java/com/sipai/servlet/wechat/CallBackServlet.java +++ b/src/main/java/com/sipai/servlet/wechat/CallBackServlet.java @@ -1,29 +1,16 @@ package com.sipai.servlet.wechat; -import java.io.IOException; -import java.sql.Connection; -import java.sql.PreparedStatement; -import java.sql.ResultSet; +import com.sipai.controller.base.LoginServlet; +import com.sipai.tools.WeChatAuthUtil; +import net.sf.json.JSONObject; +import org.apache.http.client.ClientProtocolException; +import org.springframework.beans.factory.annotation.Autowired; -import javax.annotation.Resource; -import javax.servlet.ServletConfig; import javax.servlet.ServletException; -import javax.servlet.annotation.WebServlet; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; - -import org.apache.http.client.ClientProtocolException; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.ui.Model; - -import net.sf.json.JSONObject; - -import com.sipai.controller.base.LoginServlet; -import com.sipai.entity.user.User; -import com.sipai.service.user.UserService; -import com.sipai.tools.CommString; -import com.sipai.tools.WeChatAuthUtil; +import java.io.IOException; public class CallBackServlet extends HttpServlet{ @Autowired diff --git a/src/main/java/com/sipai/servlet/wechat/WeChatLoginInterface.java b/src/main/java/com/sipai/servlet/wechat/WeChatLoginInterface.java index 0231f530..b30fe635 100644 --- a/src/main/java/com/sipai/servlet/wechat/WeChatLoginInterface.java +++ b/src/main/java/com/sipai/servlet/wechat/WeChatLoginInterface.java @@ -1,20 +1,12 @@ package com.sipai.servlet.wechat; -import java.io.File; -import java.io.FileInputStream; -import java.io.IOException; -import java.io.PrintWriter; +import net.sf.json.JSONObject; import javax.servlet.ServletException; -import javax.servlet.annotation.WebServlet; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; - -import com.sipai.tools.WeChatAuthUtil; - -import net.sf.json.JSONArray; -import net.sf.json.JSONObject; +import java.io.IOException; /** * 运维平台接收微信用户数据接口 diff --git a/src/main/java/com/sipai/servlet/wechat/WeChatLoginServlet.java b/src/main/java/com/sipai/servlet/wechat/WeChatLoginServlet.java index 00830f5d..a0e007b4 100644 --- a/src/main/java/com/sipai/servlet/wechat/WeChatLoginServlet.java +++ b/src/main/java/com/sipai/servlet/wechat/WeChatLoginServlet.java @@ -1,20 +1,12 @@ package com.sipai.servlet.wechat; -import java.io.IOException; -import java.net.URLEncoder; +import com.sipai.tools.WeChatAuthUtil; -import javax.servlet.RequestDispatcher; -import javax.servlet.annotation.WebServlet; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; - -import org.springframework.web.bind.annotation.ModelAttribute; -import org.springframework.web.bind.annotation.RequestMapping; - -import com.sipai.entity.user.User; -import com.sipai.tools.CommString; -import com.sipai.tools.WeChatAuthUtil; +import java.io.IOException; +import java.net.URLEncoder; /** * 微信获取用户信息入口，请求方式只能为get diff --git a/src/main/java/com/sipai/tools/ActivitiUtil.java b/src/main/java/com/sipai/tools/ActivitiUtil.java index 23771ca0..8296ef0e 100644 --- a/src/main/java/com/sipai/tools/ActivitiUtil.java +++ b/src/main/java/com/sipai/tools/ActivitiUtil.java @@ -1,75 +1,13 @@ package com.sipai.tools; -import java.awt.Color; -import java.beans.BeanInfo; -import java.beans.Introspector; -import java.beans.PropertyDescriptor; -import java.io.BufferedReader; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.File; -import java.io.IOException; -import java.io.InputStreamReader; -import java.math.BigDecimal; -import java.net.Inet4Address; -import java.net.InetAddress; -import java.net.NetworkInterface; -import java.net.SocketException; -import java.net.UnknownHostException; -import java.security.MessageDigest; -import java.text.DateFormat; -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Calendar; -import java.util.Date; -import java.util.Enumeration; -import java.util.GregorianCalendar; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Locale; -import java.util.Map; -import java.util.Random; -import java.util.Set; -import java.util.StringTokenizer; -import java.util.zip.GZIPInputStream; -import java.util.zip.GZIPOutputStream; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; - -import net.sf.json.JSONArray; -import net.sf.json.JSONObject; - +import com.sipai.entity.activiti.WorkTask; import org.activiti.engine.impl.persistence.entity.ProcessDefinitionEntity; import org.activiti.engine.impl.pvm.process.ActivityImpl; -import org.apache.commons.codec.binary.Base64; -import org.dom4j.DocumentException; -import org.dom4j.Element; -import org.dom4j.io.SAXReader; -import org.springframework.beans.factory.BeanFactory; -import org.springframework.beans.factory.support.BeanDefinitionRegistry; -import org.springframework.beans.factory.support.DefaultListableBeanFactory; -import org.springframework.beans.factory.support.PropertiesBeanDefinitionReader; -import org.springframework.context.support.StaticApplicationContext; -import org.springframework.core.io.ClassPathResource; -import org.springframework.core.io.support.EncodedResource; -import org.w3c.dom.Document; -import org.w3c.dom.NodeList; -import com.sipai.entity.activiti.WorkTask; -import com.sipai.entity.base.BaseConfig; -import com.sipai.entity.base.ServerConfig; -import com.sipai.entity.equipment.EquipmentArrangement; -import com.sipai.entity.user.Company; -import com.sipai.entity.user.User; -import com.sipai.entity.user.UserPower; -import com.sipai.service.user.MenuService; -import com.sipai.service.user.UnitService; -import com.sipai.service.user.UserService; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; diff --git a/src/main/java/com/sipai/tools/AudioUtils.java b/src/main/java/com/sipai/tools/AudioUtils.java index 149f85b6..fac9c6fe 100644 --- a/src/main/java/com/sipai/tools/AudioUtils.java +++ b/src/main/java/com/sipai/tools/AudioUtils.java @@ -1,18 +1,10 @@ package com.sipai.tools; -import java.io.ByteArrayOutputStream; +import javazoom.spi.mpeg.sampled.file.MpegAudioFileReader; + +import javax.sound.sampled.*; import java.io.File; import java.io.IOException; -import java.io.OutputStream; - -import javax.sound.sampled.AudioFileFormat; -import javax.sound.sampled.AudioFormat; -import javax.sound.sampled.AudioInputStream; -import javax.sound.sampled.AudioSystem; -import javax.sound.sampled.DataLine; -import javax.sound.sampled.SourceDataLine; - -import javazoom.spi.mpeg.sampled.file.MpegAudioFileReader; /** * 创建日期:2018年1月14日 diff --git a/src/main/java/com/sipai/tools/BaiDuAipSpeech.java b/src/main/java/com/sipai/tools/BaiDuAipSpeech.java index b2bf4288..365af8e6 100644 --- a/src/main/java/com/sipai/tools/BaiDuAipSpeech.java +++ b/src/main/java/com/sipai/tools/BaiDuAipSpeech.java @@ -1,10 +1,7 @@ package com.sipai.tools; -import javax.servlet.http.HttpServletRequest; - -import org.json.JSONObject; - import com.baidu.aip.speech.AipSpeech; +import org.json.JSONObject; public class BaiDuAipSpeech { //设置APPID/AK/SK diff --git a/src/main/java/com/sipai/tools/CameraCall.java b/src/main/java/com/sipai/tools/CameraCall.java index a7e7394a..da829694 100644 --- a/src/main/java/com/sipai/tools/CameraCall.java +++ b/src/main/java/com/sipai/tools/CameraCall.java @@ -1,11 +1,13 @@ package com.sipai.tools; -import java.io.BufferedOutputStream; -import java.io.File; -import java.io.FileNotFoundException; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.UnsupportedEncodingException; +import com.sipai.tools.HCNetSDK2.FColGlobalDataCallBack; +import com.sipai.tools.HCNetSDK2.FMSGCallBack; +import com.sipai.tools.HCNetSDK2.NET_DVR_IPPARACFG; +import com.sun.jna.Pointer; +import com.sun.jna.ptr.IntByReference; +import org.slf4j.LoggerFactory; + +import java.io.*; import java.nio.ByteBuffer; import java.text.DateFormat; import java.text.SimpleDateFormat; @@ -14,19 +16,6 @@ import java.util.HashMap; import java.util.logging.Level; import java.util.logging.Logger; -import javax.swing.JOptionPane; - -import org.h2.value.Value; -import org.slf4j.LoggerFactory; - -import com.sipai.tools.HCNetSDK2.FColGlobalDataCallBack; -import com.sipai.tools.HCNetSDK2.FMSGCallBack; -import com.sipai.tools.HCNetSDK2.FMSGCallBack_V31; -import com.sipai.tools.HCNetSDK2.NET_DVR_IPPARACFG; -import com.sun.jna.NativeLong; -import com.sun.jna.Pointer; -import com.sun.jna.ptr.IntByReference; - public class CameraCall { private static HCNetSDK2 hcNetSDK = HCNetSDK2.INSTANCE; private static org.slf4j.Logger logger = LoggerFactory.getLogger(CameraCall.class); diff --git a/src/main/java/com/sipai/tools/ChangeToPinYinJP.java b/src/main/java/com/sipai/tools/ChangeToPinYinJP.java index 36cd2c57..aac82b76 100644 --- a/src/main/java/com/sipai/tools/ChangeToPinYinJP.java +++ b/src/main/java/com/sipai/tools/ChangeToPinYinJP.java @@ -4,7 +4,6 @@ package com.sipai.tools; import com.github.stuxuhai.jpinyin.ChineseHelper; import com.github.stuxuhai.jpinyin.PinyinFormat; import com.github.stuxuhai.jpinyin.PinyinHelper; - import org.springframework.stereotype.Component; @Component diff --git a/src/main/java/com/sipai/tools/CommUtil.java b/src/main/java/com/sipai/tools/CommUtil.java index 252231f7..79de1b86 100644 --- a/src/main/java/com/sipai/tools/CommUtil.java +++ b/src/main/java/com/sipai/tools/CommUtil.java @@ -55,8 +55,8 @@ import java.text.DateFormat; import java.text.ParseException; import java.text.ParsePosition; import java.text.SimpleDateFormat; -import java.util.List; import java.util.*; +import java.util.List; import java.util.Map.Entry; import java.util.regex.Matcher; import java.util.regex.Pattern; diff --git a/src/main/java/com/sipai/tools/DataSourceInterceptor.java b/src/main/java/com/sipai/tools/DataSourceInterceptor.java index b50281d4..3a68fa79 100644 --- a/src/main/java/com/sipai/tools/DataSourceInterceptor.java +++ b/src/main/java/com/sipai/tools/DataSourceInterceptor.java @@ -1,12 +1,6 @@ package com.sipai.tools; import org.aspectj.lang.JoinPoint; -import org.aspectj.lang.annotation.After; -import org.aspectj.lang.annotation.Aspect; -import org.aspectj.lang.annotation.Before; -import org.aspectj.lang.annotation.Pointcut; -import org.springframework.core.annotation.Order; -import org.springframework.stereotype.Component; /*@Aspect // for aop @Component // for auto scan diff --git a/src/main/java/com/sipai/tools/DynamicDataSource.java b/src/main/java/com/sipai/tools/DynamicDataSource.java index 098e520e..58b0e216 100644 --- a/src/main/java/com/sipai/tools/DynamicDataSource.java +++ b/src/main/java/com/sipai/tools/DynamicDataSource.java @@ -1,12 +1,5 @@ package com.sipai.tools; -import java.sql.SQLException; -import java.util.List; - -import org.apache.commons.lang3.StringUtils; - -import com.alibaba.druid.filter.Filter; -import com.alibaba.druid.pool.DruidDataSource; import org.springframework.jdbc.datasource.lookup.AbstractRoutingDataSource; public class DynamicDataSource extends AbstractRoutingDataSource { diff --git a/src/main/java/com/sipai/tools/EncryptionDecryption.java b/src/main/java/com/sipai/tools/EncryptionDecryption.java index bee552d2..132461f5 100644 --- a/src/main/java/com/sipai/tools/EncryptionDecryption.java +++ b/src/main/java/com/sipai/tools/EncryptionDecryption.java @@ -1,10 +1,9 @@ package com.sipai.tools; +import javax.crypto.Cipher; import java.security.Key; import java.security.Security; -import javax.crypto.Cipher; - public class EncryptionDecryption { /** 字符串默认键值 */ diff --git a/src/main/java/com/sipai/tools/FileUtil.java b/src/main/java/com/sipai/tools/FileUtil.java index 96b1e07a..302602a8 100644 --- a/src/main/java/com/sipai/tools/FileUtil.java +++ b/src/main/java/com/sipai/tools/FileUtil.java @@ -1,26 +1,16 @@ package com.sipai.tools; -import java.io.BufferedInputStream; -import java.io.BufferedOutputStream; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileNotFoundException; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.net.URLEncoder; - -import javax.servlet.http.HttpServletResponse; - -import org.apache.tools.zip.ZipEntry; -import org.apache.tools.zip.ZipOutputStream; - import com.jacob.activeX.ActiveXComponent; import com.jacob.com.ComThread; import com.jacob.com.Dispatch; import com.jacob.com.Variant; import com.sipai.entity.base.CommonFile; +import org.apache.tools.zip.ZipEntry; +import org.apache.tools.zip.ZipOutputStream; + +import javax.servlet.http.HttpServletResponse; +import java.io.*; +import java.net.URLEncoder; public class FileUtil { diff --git a/src/main/java/com/sipai/tools/HCNetSDK2.java b/src/main/java/com/sipai/tools/HCNetSDK2.java index 3c1b587b..b5ef1e18 100644 --- a/src/main/java/com/sipai/tools/HCNetSDK2.java +++ b/src/main/java/com/sipai/tools/HCNetSDK2.java @@ -19,9 +19,9 @@ import com.sun.jna.examples.win32.GDI32.RECT; import com.sun.jna.examples.win32.W32API; import com.sun.jna.examples.win32.W32API.HWND; import com.sun.jna.ptr.ByteByReference; -import com.sun.jna.win32.StdCallLibrary; import com.sun.jna.ptr.IntByReference; import com.sun.jna.ptr.ShortByReference; +import com.sun.jna.win32.StdCallLibrary; import java.io.File; import java.nio.ByteBuffer; diff --git a/src/main/java/com/sipai/tools/HttpUtil.java b/src/main/java/com/sipai/tools/HttpUtil.java index a97b0279..84f6bfbb 100644 --- a/src/main/java/com/sipai/tools/HttpUtil.java +++ b/src/main/java/com/sipai/tools/HttpUtil.java @@ -1,13 +1,5 @@ package com.sipai.tools; -import java.io.IOException; -import java.io.UnsupportedEncodingException; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - -import javax.xml.namespace.QName; - import com.alibaba.fastjson.JSONObject; import org.apache.axis2.addressing.EndpointReference; import org.apache.axis2.client.Options; @@ -29,6 +21,13 @@ import org.apache.http.message.BasicNameValuePair; import org.apache.http.protocol.HTTP; import org.apache.http.util.EntityUtils; +import javax.xml.namespace.QName; +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + /** * @author wxp diff --git a/src/main/java/com/sipai/tools/ImageTool.java b/src/main/java/com/sipai/tools/ImageTool.java index 0f824385..f39d6b4e 100644 --- a/src/main/java/com/sipai/tools/ImageTool.java +++ b/src/main/java/com/sipai/tools/ImageTool.java @@ -1,6 +1,6 @@ package com.sipai.tools; -import javax.swing.ImageIcon; +import javax.swing.*; public class ImageTool { diff --git a/src/main/java/com/sipai/tools/ImageUtil.java b/src/main/java/com/sipai/tools/ImageUtil.java index 7a343e76..08c375e6 100644 --- a/src/main/java/com/sipai/tools/ImageUtil.java +++ b/src/main/java/com/sipai/tools/ImageUtil.java @@ -1,25 +1,17 @@ package com.sipai.tools; -import java.awt.Color; -import java.awt.Font; -import java.awt.Graphics; -import java.awt.Image; -import java.awt.image.BufferedImage; -import java.io.File; -import java.io.IOException; -import java.text.DateFormat; -import java.text.SimpleDateFormat; -import java.util.Date; - -import javax.imageio.ImageIO; - import com.drew.imaging.jpeg.JpegMetadataReader; import com.drew.imaging.jpeg.JpegProcessingException; import com.drew.metadata.Directory; import com.drew.metadata.Metadata; -import com.drew.metadata.MetadataException; import com.drew.metadata.exif.ExifSubIFDDirectory; +import javax.imageio.ImageIO; +import java.awt.*; +import java.awt.image.BufferedImage; +import java.io.File; +import java.io.IOException; + public class ImageUtil { /** diff --git a/src/main/java/com/sipai/tools/JwtUtil.java b/src/main/java/com/sipai/tools/JwtUtil.java index 1501c6b5..59c2e4cf 100644 --- a/src/main/java/com/sipai/tools/JwtUtil.java +++ b/src/main/java/com/sipai/tools/JwtUtil.java @@ -1,16 +1,16 @@ package com.sipai.tools; -import java.io.UnsupportedEncodingException; -import java.util.Date; -import java.util.HashMap; -import java.util.Map; - import com.auth0.jwt.JWT; import com.auth0.jwt.JWTVerifier; import com.auth0.jwt.algorithms.Algorithm; import com.auth0.jwt.exceptions.JWTDecodeException; import com.auth0.jwt.interfaces.DecodedJWT; +import java.io.UnsupportedEncodingException; +import java.util.Date; +import java.util.HashMap; +import java.util.Map; + /** * Java web token 工具类 * diff --git a/src/main/java/com/sipai/tools/Listener.java b/src/main/java/com/sipai/tools/Listener.java index ecad0112..e11b6334 100644 --- a/src/main/java/com/sipai/tools/Listener.java +++ b/src/main/java/com/sipai/tools/Listener.java @@ -1,5 +1,12 @@ package com.sipai.tools; +import com.sipai.entity.base.ServerObject; +import com.sipai.entity.user.User; +import com.sipai.service.user.UserService; + +import javax.servlet.http.HttpSession; +import javax.servlet.http.HttpSessionAttributeListener; +import javax.servlet.http.HttpSessionBindingEvent; import java.io.IOException; import java.io.InputStreamReader; import java.io.UnsupportedEncodingException; @@ -7,14 +14,6 @@ import java.util.HashMap; import java.util.Iterator; import java.util.Properties; -import javax.servlet.http.HttpSession; -import javax.servlet.http.HttpSessionAttributeListener; -import javax.servlet.http.HttpSessionBindingEvent; - -import com.sipai.entity.base.ServerObject; -import com.sipai.entity.user.User; -import com.sipai.service.user.UserService; - /** diff --git a/src/main/java/com/sipai/tools/MiddleTableService.java b/src/main/java/com/sipai/tools/MiddleTableService.java index 42507d86..606558b2 100644 --- a/src/main/java/com/sipai/tools/MiddleTableService.java +++ b/src/main/java/com/sipai/tools/MiddleTableService.java @@ -1,18 +1,11 @@ package com.sipai.tools; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - +import com.sipai.service.data.XServerService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import com.alibaba.druid.pool.DruidDataSource; -import com.sipai.entity.data.XServer; -import com.sipai.service.data.XServerService; - @Component public class MiddleTableService { /** 日志 */ diff --git a/src/main/java/com/sipai/tools/MinioUtils.java b/src/main/java/com/sipai/tools/MinioUtils.java index 559d684c..ea611815 100644 --- a/src/main/java/com/sipai/tools/MinioUtils.java +++ b/src/main/java/com/sipai/tools/MinioUtils.java @@ -9,8 +9,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import org.springframework.web.multipart.MultipartFile; -import javax.annotation.Resource; - @Slf4j @Component public class MinioUtils { diff --git a/src/main/java/com/sipai/tools/MqttUtil.java b/src/main/java/com/sipai/tools/MqttUtil.java index dece773f..879c0e47 100644 --- a/src/main/java/com/sipai/tools/MqttUtil.java +++ b/src/main/java/com/sipai/tools/MqttUtil.java @@ -2,16 +2,13 @@ package com.sipai.tools; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import com.sipai.service.Listener.ListenerPointService; import org.eclipse.paho.client.mqttv3.MqttClient; import org.eclipse.paho.client.mqttv3.MqttConnectOptions; import org.eclipse.paho.client.mqttv3.MqttException; import org.eclipse.paho.client.mqttv3.MqttMessage; import org.eclipse.paho.client.mqttv3.persist.MemoryPersistence; -import org.springframework.beans.factory.annotation.Autowired; import java.io.UnsupportedEncodingException; -import java.net.URLDecoder; /** * Created with IntelliJ IDEA. diff --git a/src/main/java/com/sipai/tools/PythonModelUtil.java b/src/main/java/com/sipai/tools/PythonModelUtil.java index 558b92f8..ae6cb717 100644 --- a/src/main/java/com/sipai/tools/PythonModelUtil.java +++ b/src/main/java/com/sipai/tools/PythonModelUtil.java @@ -2,9 +2,6 @@ package com.sipai.tools; import com.alibaba.fastjson.JSONObject; -import java.io.BufferedReader; -import java.io.InputStreamReader; - public class PythonModelUtil { static PythonModelProp pythonModelProp = (PythonModelProp) SpringContextUtil.getBean("pythonModelProp"); diff --git a/src/main/java/com/sipai/tools/RemindUtil.java b/src/main/java/com/sipai/tools/RemindUtil.java index 3029bff1..a4dbe265 100644 --- a/src/main/java/com/sipai/tools/RemindUtil.java +++ b/src/main/java/com/sipai/tools/RemindUtil.java @@ -1,33 +1,12 @@ package com.sipai.tools; -import java.awt.BorderLayout; -import java.awt.Color; -import java.awt.Cursor; -import java.awt.Dimension; -import java.awt.FlowLayout; -import java.awt.Font; -import java.awt.Point; +import javax.swing.*; +import java.awt.*; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.awt.event.MouseMotionAdapter; import java.text.SimpleDateFormat; import java.util.Date; -import java.util.HashMap; -import java.util.Map; - -import javax.swing.BorderFactory; -import javax.swing.ImageIcon; -import javax.swing.JLabel; -import javax.swing.JOptionPane; -import javax.swing.JPanel; -import javax.swing.JScrollPane; -import javax.swing.JTextArea; -import javax.swing.SwingConstants; - -import java.awt.Insets; -import java.awt.Toolkit; - -import javax.swing.JDialog; public class RemindUtil { // private Map feaMap = null; diff --git a/src/main/java/com/sipai/tools/SSCL.java b/src/main/java/com/sipai/tools/SSCL.java index cd660bf0..0b76e4ba 100644 --- a/src/main/java/com/sipai/tools/SSCL.java +++ b/src/main/java/com/sipai/tools/SSCL.java @@ -1,17 +1,14 @@ package com.sipai.tools; -import java.util.Iterator; -import java.util.List; +import com.sipai.entity.base.ServerObject; +import org.dom4j.Document; +import org.dom4j.Element; import javax.servlet.ServletContext; import javax.servlet.ServletContextEvent; import javax.servlet.ServletContextListener; - -import org.dom4j.Document; -import org.dom4j.Element; - -import com.sipai.entity.base.ServerObject; -import com.sipai.tools.CommUtil; +import java.util.Iterator; +import java.util.List; /** * @author IBM 服务器配置监听程序 diff --git a/src/main/java/com/sipai/tools/SessionFilter.java b/src/main/java/com/sipai/tools/SessionFilter.java index a417fcbd..7e2c3958 100644 --- a/src/main/java/com/sipai/tools/SessionFilter.java +++ b/src/main/java/com/sipai/tools/SessionFilter.java @@ -1,23 +1,13 @@ package com.sipai.tools; -import java.io.IOException; -import java.io.InputStreamReader; -import java.util.Properties; - -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.RequestDispatcher; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; - import org.apache.log4j.Logger; -import com.sipai.entity.user.User; +import javax.servlet.*; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.io.InputStreamReader; +import java.util.Properties; /** * 用于过滤需要拦截的JSP文件 diff --git a/src/main/java/com/sipai/tools/SessionManager.java b/src/main/java/com/sipai/tools/SessionManager.java index d41e7874..f76e7389 100644 --- a/src/main/java/com/sipai/tools/SessionManager.java +++ b/src/main/java/com/sipai/tools/SessionManager.java @@ -1,25 +1,19 @@ package com.sipai.tools; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.concurrent.TimeUnit; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; -import javax.servlet.http.HttpSessionEvent; -import javax.servlet.http.HttpSessionListener; - -import org.redisson.api.RBucket; -import org.redisson.api.RedissonClient; - import com.alibaba.fastjson.JSONObject; import com.sipai.entity.user.User; import com.sipai.entity.user.UserPower; import com.sipai.service.user.MenuService; import com.sipai.service.user.UserService; +import org.redisson.api.RBucket; +import org.redisson.api.RedissonClient; + +import javax.servlet.http.*; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.concurrent.TimeUnit; public class SessionManager implements HttpSessionListener { diff --git a/src/main/java/com/sipai/tools/SpringConfiguration.java b/src/main/java/com/sipai/tools/SpringConfiguration.java index a4b1fb71..8aac7850 100644 --- a/src/main/java/com/sipai/tools/SpringConfiguration.java +++ b/src/main/java/com/sipai/tools/SpringConfiguration.java @@ -1,9 +1,5 @@ package com.sipai.tools; -import java.io.InputStreamReader; -import java.util.LinkedHashSet; -import java.util.Properties; - import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; @@ -11,6 +7,9 @@ import org.springframework.context.annotation.FilterType; import org.springframework.stereotype.Controller; import org.springframework.transaction.annotation.EnableTransactionManagement; +import java.io.InputStreamReader; +import java.util.Properties; + /** * @author fendo diff --git a/src/main/java/com/sipai/tools/SwaggerConfig.java b/src/main/java/com/sipai/tools/SwaggerConfig.java index 575d0534..a47f552a 100644 --- a/src/main/java/com/sipai/tools/SwaggerConfig.java +++ b/src/main/java/com/sipai/tools/SwaggerConfig.java @@ -1,30 +1,25 @@ package com.sipai.tools; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - +import io.swagger.annotations.ApiOperation; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; -import org.springframework.test.context.web.WebAppConfiguration; -import org.springframework.web.servlet.config.annotation.EnableWebMvc; -import com.google.common.collect.Lists; - -import io.swagger.annotations.ApiOperation; import springfox.bean.validators.configuration.BeanValidatorPluginsConfiguration; import springfox.documentation.builders.ApiInfoBuilder; import springfox.documentation.builders.ParameterBuilder; import springfox.documentation.builders.PathSelectors; import springfox.documentation.builders.RequestHandlerSelectors; import springfox.documentation.schema.ModelRef; -import springfox.documentation.service.*; +import springfox.documentation.service.ApiInfo; +import springfox.documentation.service.Parameter; import springfox.documentation.spi.DocumentationType; -import springfox.documentation.spi.service.contexts.SecurityContext; import springfox.documentation.spring.web.plugins.Docket; import springfox.documentation.swagger2.annotations.EnableSwagger2; +import java.util.ArrayList; +import java.util.List; + @Configuration //增强扫描 @ComponentScan( diff --git a/src/main/java/com/sipai/tools/TaskUtils.java b/src/main/java/com/sipai/tools/TaskUtils.java index de1565e1..9f6f0162 100644 --- a/src/main/java/com/sipai/tools/TaskUtils.java +++ b/src/main/java/com/sipai/tools/TaskUtils.java @@ -1,14 +1,12 @@ package com.sipai.tools; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; - -import org.quartz.JobExecutionContext; +import com.sipai.entity.schedule.ScheduleJob; import org.apache.commons.lang.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.sipai.entity.schedule.ScheduleJob; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; public class TaskUtils { diff --git a/src/main/java/com/sipai/tools/Test.java b/src/main/java/com/sipai/tools/Test.java index d42f68a8..56bdf4d2 100644 --- a/src/main/java/com/sipai/tools/Test.java +++ b/src/main/java/com/sipai/tools/Test.java @@ -1,30 +1,8 @@ package com.sipai.tools; -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; import com.sipai.entity.user.User; -import org.apache.http.Consts; -import org.apache.http.HttpEntity; -import org.apache.http.HttpResponse; -import org.apache.http.client.HttpClient; -import org.apache.http.client.entity.UrlEncodedFormEntity; -import org.apache.http.client.methods.CloseableHttpResponse; -import org.apache.http.client.methods.HttpGet; -import org.apache.http.client.methods.HttpPost; -import org.apache.http.entity.StringEntity; -import org.apache.http.impl.client.CloseableHttpClient; -import org.apache.http.impl.client.DefaultHttpClient; -import org.apache.http.impl.client.HttpClients; -import org.apache.http.message.BasicNameValuePair; -import org.apache.http.util.EntityUtils; -import java.io.BufferedReader; -import java.io.IOException; -import java.io.InputStreamReader; -import java.io.UnsupportedEncodingException; -import java.util.ArrayList; import java.util.Arrays; -import java.util.List; public class Test { /*public static void main(String[] args) throws IOException { diff --git a/src/main/java/com/sipai/tools/ThreadPoolUpdateMoney.java b/src/main/java/com/sipai/tools/ThreadPoolUpdateMoney.java index 86c83587..0f0f8a62 100644 --- a/src/main/java/com/sipai/tools/ThreadPoolUpdateMoney.java +++ b/src/main/java/com/sipai/tools/ThreadPoolUpdateMoney.java @@ -7,7 +7,6 @@ import com.sipai.service.sparepart.InStockRecordDetailService; import com.sipai.service.sparepart.InStockRecordService; import com.sipai.service.sparepart.InStockRecordUpdateMoneyService; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/com/sipai/tools/TransportClientFactory.java b/src/main/java/com/sipai/tools/TransportClientFactory.java index bf6dd847..e5688d7b 100644 --- a/src/main/java/com/sipai/tools/TransportClientFactory.java +++ b/src/main/java/com/sipai/tools/TransportClientFactory.java @@ -1,7 +1,5 @@ package com.sipai.tools; -import java.net.InetAddress; - import org.elasticsearch.client.transport.TransportClient; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.transport.TransportAddress; @@ -10,6 +8,8 @@ import org.springframework.beans.factory.DisposableBean; import org.springframework.beans.factory.FactoryBean; import org.springframework.beans.factory.InitializingBean; +import java.net.InetAddress; + public class TransportClientFactory implements FactoryBean,InitializingBean,DisposableBean{ diff --git a/src/main/java/com/sipai/tools/UEditorUtil.java b/src/main/java/com/sipai/tools/UEditorUtil.java index 54a037bf..8834dde9 100644 --- a/src/main/java/com/sipai/tools/UEditorUtil.java +++ b/src/main/java/com/sipai/tools/UEditorUtil.java @@ -1,21 +1,5 @@ package com.sipai.tools; -import java.io.BufferedInputStream; -import java.io.BufferedOutputStream; -import java.io.BufferedReader; -import java.io.File; -import java.io.FileOutputStream; -import java.io.InputStreamReader; -import java.io.OutputStream; -import java.text.SimpleDateFormat; -import java.util.Arrays; -import java.util.Date; -import java.util.HashMap; -import java.util.Iterator; -import java.util.Random; - -import javax.servlet.http.HttpServletRequest; - import org.apache.commons.fileupload.FileItemIterator; import org.apache.commons.fileupload.FileItemStream; import org.apache.commons.fileupload.FileUploadBase.InvalidContentTypeException; @@ -24,9 +8,13 @@ import org.apache.commons.fileupload.FileUploadException; import org.apache.commons.fileupload.disk.DiskFileItemFactory; import org.apache.commons.fileupload.servlet.ServletFileUpload; import org.apache.commons.fileupload.util.Streams; - import sun.misc.BASE64Decoder; +import javax.servlet.http.HttpServletRequest; +import java.io.*; +import java.text.SimpleDateFormat; +import java.util.*; + /** * UEditor文件上传辅助类 */ diff --git a/src/main/java/com/sipai/tools/ValueTypeEnum.java b/src/main/java/com/sipai/tools/ValueTypeEnum.java index ea40c8ea..83933820 100644 --- a/src/main/java/com/sipai/tools/ValueTypeEnum.java +++ b/src/main/java/com/sipai/tools/ValueTypeEnum.java @@ -1,7 +1,5 @@ package com.sipai.tools; -import com.sipai.entity.enums.SourceTypeEnum; - public enum ValueTypeEnum { /** diff --git a/src/main/java/com/sipai/tools/WeChatAuthUtil.java b/src/main/java/com/sipai/tools/WeChatAuthUtil.java index 4b38e915..e1614456 100644 --- a/src/main/java/com/sipai/tools/WeChatAuthUtil.java +++ b/src/main/java/com/sipai/tools/WeChatAuthUtil.java @@ -1,16 +1,7 @@ package com.sipai.tools; -import java.io.BufferedReader; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.io.OutputStream; -import java.net.URL; -import java.rmi.ConnectException; -import java.util.Properties; - -import javax.net.ssl.HttpsURLConnection; - +import com.sipai.service.msg.MsgServiceImpl; +import net.sf.json.JSONObject; import org.apache.http.HttpEntity; import org.apache.http.HttpResponse; import org.apache.http.client.ClientProtocolException; @@ -18,9 +9,11 @@ import org.apache.http.client.methods.HttpGet; import org.apache.http.impl.client.DefaultHttpClient; import org.apache.http.util.EntityUtils; -import com.sipai.service.msg.MsgServiceImpl; - -import net.sf.json.JSONObject; +import javax.net.ssl.HttpsURLConnection; +import java.io.*; +import java.net.URL; +import java.rmi.ConnectException; +import java.util.Properties; /** * 微信获取用户信息公共方法 diff --git a/src/main/java/com/sipai/tools/WeatherTest.java b/src/main/java/com/sipai/tools/WeatherTest.java index 6695c6ad..d359ef9b 100644 --- a/src/main/java/com/sipai/tools/WeatherTest.java +++ b/src/main/java/com/sipai/tools/WeatherTest.java @@ -1,22 +1,17 @@ package com.sipai.tools; +import net.sf.json.JSONObject; +import org.w3c.dom.Document; +import org.w3c.dom.Node; +import org.w3c.dom.NodeList; + +import javax.xml.parsers.DocumentBuilder; +import javax.xml.parsers.DocumentBuilderFactory; import java.io.InputStream; import java.io.OutputStream; import java.io.OutputStreamWriter; import java.net.URL; import java.net.URLConnection; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Map; - -import javax.xml.parsers.DocumentBuilder; -import javax.xml.parsers.DocumentBuilderFactory; - -import net.sf.json.JSONObject; - -import org.w3c.dom.Document; -import org.w3c.dom.Node; -import org.w3c.dom.NodeList; public class WeatherTest { diff --git a/src/main/java/com/sipai/tools/WebSocketCmdUtil.java b/src/main/java/com/sipai/tools/WebSocketCmdUtil.java index b4701f33..064317af 100644 --- a/src/main/java/com/sipai/tools/WebSocketCmdUtil.java +++ b/src/main/java/com/sipai/tools/WebSocketCmdUtil.java @@ -2,7 +2,6 @@ package com.sipai.tools; import com.alibaba.fastjson.JSONObject; import com.sipai.websocket.MsgWebSocket2; -import org.eclipse.paho.client.mqttv3.MqttClient; /** * 发送BIM指令工具类 diff --git a/src/main/java/com/sipai/tools/cs.java b/src/main/java/com/sipai/tools/cs.java index 9572628b..5f16a757 100644 --- a/src/main/java/com/sipai/tools/cs.java +++ b/src/main/java/com/sipai/tools/cs.java @@ -1,11 +1,5 @@ package com.sipai.tools; -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.time.LocalDateTime; -import java.time.format.DateTimeFormatter; -import java.util.Date; - class cs { public static void main(String[] args) { diff --git a/src/main/java/com/sipai/webservice/client/equipment/EquipmentClient.java b/src/main/java/com/sipai/webservice/client/equipment/EquipmentClient.java index 5d5bcf0b..1c8fa126 100644 --- a/src/main/java/com/sipai/webservice/client/equipment/EquipmentClient.java +++ b/src/main/java/com/sipai/webservice/client/equipment/EquipmentClient.java @@ -1,21 +1,15 @@ package com.sipai.webservice.client.equipment; -import java.io.IOException; -import java.io.InputStream; -import java.net.MalformedURLException; -import java.rmi.RemoteException; -import java.util.Properties; +import com.sipai.service.msg.MsgServiceImpl; +import org.apache.avalon.framework.service.ServiceException; +import org.apache.axis.client.Call; import javax.xml.namespace.QName; import javax.xml.rpc.ParameterMode; - -import org.apache.avalon.framework.service.ServiceException; -import org.apache.axis.AxisFault; -import org.apache.axis.client.Call; -import org.apache.cxf.ws.addressing.Names; - -import com.google.common.collect.Table.Cell; -import com.sipai.service.msg.MsgServiceImpl; +import java.io.IOException; +import java.io.InputStream; +import java.rmi.RemoteException; +import java.util.Properties; public class EquipmentClient { /** diff --git a/src/main/java/com/sipai/webservice/client/user/UserClient.java b/src/main/java/com/sipai/webservice/client/user/UserClient.java index b7a97b49..b55ff725 100644 --- a/src/main/java/com/sipai/webservice/client/user/UserClient.java +++ b/src/main/java/com/sipai/webservice/client/user/UserClient.java @@ -1,13 +1,8 @@ package com.sipai.webservice.client.user; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; - -import javax.xml.namespace.QName; - +import com.sipai.entity.user.Role; +import com.sipai.entity.user.User; import net.sf.json.JSONArray; - import org.apache.axiom.om.OMElement; import org.apache.axiom.om.OMNode; import org.apache.axis2.AxisFault; @@ -15,8 +10,10 @@ import org.apache.axis2.addressing.EndpointReference; import org.apache.axis2.client.Options; import org.apache.axis2.rpc.client.RPCServiceClient; -import com.sipai.entity.user.Role; -import com.sipai.entity.user.User; +import javax.xml.namespace.QName; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; public class UserClient { @SuppressWarnings("rawtypes") diff --git a/src/main/java/com/sipai/webservice/server/equipment/equipmentManagerServer.java b/src/main/java/com/sipai/webservice/server/equipment/equipmentManagerServer.java index 1940b155..383815fa 100644 --- a/src/main/java/com/sipai/webservice/server/equipment/equipmentManagerServer.java +++ b/src/main/java/com/sipai/webservice/server/equipment/equipmentManagerServer.java @@ -1,26 +1,18 @@ package com.sipai.webservice.server.equipment; -import java.math.BigDecimal; -import java.util.List; - -import net.sf.json.JSONArray; -import net.sf.json.JSONObject; - import com.sipai.entity.equipment.EquipmentCard; import com.sipai.entity.equipment.EquipmentCardProp; import com.sipai.entity.sparepart.Stock; -import com.sipai.entity.user.Company; import com.sipai.entity.user.Unit; -import com.sipai.entity.user.User; -import com.sipai.service.base.LoginService; import com.sipai.service.equipment.EquipmentCardPropService; import com.sipai.service.equipment.EquipmentCardService; import com.sipai.service.sparepart.StockService; -import com.sipai.service.user.UnitService; import com.sipai.service.user.UnitServiceImpl; -import com.sipai.service.user.UserService; -import com.sipai.tools.CommString; import com.sipai.tools.SpringContextUtil; +import net.sf.json.JSONArray; + +import java.math.BigDecimal; +import java.util.List; public class equipmentManagerServer { /** diff --git a/src/main/java/com/sipai/webservice/server/msg/ScadaAlarmServer.java b/src/main/java/com/sipai/webservice/server/msg/ScadaAlarmServer.java index aedf88d7..20ed1066 100644 --- a/src/main/java/com/sipai/webservice/server/msg/ScadaAlarmServer.java +++ b/src/main/java/com/sipai/webservice/server/msg/ScadaAlarmServer.java @@ -1,34 +1,19 @@ package com.sipai.webservice.server.msg; -import java.io.IOException; -import java.util.List; -import java.util.Map; -import java.util.concurrent.CopyOnWriteArraySet; - -import javax.annotation.Resource; - -import net.sf.json.JSONArray; -import net.sf.json.JSONObject; - -import com.alibaba.fastjson.JSON; - -import jodd.servlet.URLDecoder; - -import com.sipai.entity.scada.ScadaAlarm; import com.sipai.entity.scada.MPoint; import com.sipai.entity.user.User; -import com.sipai.entity.work.KPIPointProfessor; -import com.sipai.entity.work.KPIPointProfessorParam; import com.sipai.service.msg.MsgServiceImpl; -import com.sipai.service.user.UnitServiceImpl; -import com.sipai.service.work.KPIPointProfessorParamService; -import com.sipai.service.work.KPIPointProfessorService; import com.sipai.service.scada.MPointService; +import com.sipai.service.user.UnitServiceImpl; import com.sipai.tools.CommString; import com.sipai.tools.CommUtil; import com.sipai.tools.SpringContextUtil; import com.sipai.websocket.ScadaWebSocket; +import java.io.IOException; +import java.util.List; +import java.util.Map; + public class ScadaAlarmServer { private final String MsgType_Both ="ALARM"; public void proAlarm(String id,String type) { diff --git a/src/main/java/com/sipai/webservice/server/msg/SendMsgServer.java b/src/main/java/com/sipai/webservice/server/msg/SendMsgServer.java index 0a16de50..eb68bfbd 100644 --- a/src/main/java/com/sipai/webservice/server/msg/SendMsgServer.java +++ b/src/main/java/com/sipai/webservice/server/msg/SendMsgServer.java @@ -1,40 +1,23 @@ package com.sipai.webservice.server.msg; -import java.io.IOException; -import java.text.SimpleDateFormat; -import java.util.Calendar; -import java.util.Date; -import java.util.List; -import java.util.Map; -import java.util.concurrent.CopyOnWriteArraySet; - -import javax.annotation.Resource; - -import org.springframework.web.servlet.ModelAndView; - -import net.sf.json.JSONArray; -import net.sf.json.JSONObject; - import com.alibaba.fastjson.JSON; - -import jodd.servlet.URLDecoder; - -import com.sipai.entity.scada.MPointHistory; -import com.sipai.entity.scada.ScadaAlarm; import com.sipai.entity.scada.MPoint; +import com.sipai.entity.scada.MPointHistory; import com.sipai.entity.user.User; import com.sipai.entity.work.KPIPointProfessor; import com.sipai.entity.work.KPIPointProfessorParam; import com.sipai.service.msg.MsgServiceImpl; +import com.sipai.service.scada.MPointHistoryService; +import com.sipai.service.scada.MPointService; import com.sipai.service.user.UnitServiceImpl; import com.sipai.service.work.KPIPointProfessorParamService; import com.sipai.service.work.KPIPointProfessorService; -import com.sipai.service.scada.MPointHistoryService; -import com.sipai.service.scada.MPointService; -import com.sipai.tools.CommString; import com.sipai.tools.CommUtil; import com.sipai.tools.SpringContextUtil; -import com.sipai.websocket.ScadaWebSocket; +import net.sf.json.JSONArray; +import net.sf.json.JSONObject; + +import java.util.List; public class SendMsgServer { /** diff --git a/src/main/java/com/sipai/webservice/server/user/UserServer.java b/src/main/java/com/sipai/webservice/server/user/UserServer.java index 53801991..7825b61b 100644 --- a/src/main/java/com/sipai/webservice/server/user/UserServer.java +++ b/src/main/java/com/sipai/webservice/server/user/UserServer.java @@ -1,17 +1,10 @@ package com.sipai.webservice.server.user; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.springframework.web.servlet.ModelAndView; - -import net.sf.json.JSONArray; -import net.sf.json.JSONObject; - import com.sipai.entity.user.User; import com.sipai.service.base.LoginService; import com.sipai.service.user.UserService; import com.sipai.tools.SpringContextUtil; +import net.sf.json.JSONObject; public class UserServer { public User getUserById(String userId) { diff --git a/src/main/java/com/sipai/webservice/server/work/getSSOldOPMDataServer.java b/src/main/java/com/sipai/webservice/server/work/getSSOldOPMDataServer.java index 15e507df..6c7be297 100644 --- a/src/main/java/com/sipai/webservice/server/work/getSSOldOPMDataServer.java +++ b/src/main/java/com/sipai/webservice/server/work/getSSOldOPMDataServer.java @@ -1,23 +1,14 @@ package com.sipai.webservice.server.work; +import com.sipai.entity.scada.MPoint; +import com.sipai.entity.scada.MPointHistory; +import com.sipai.service.scada.MPointHistoryService; +import com.sipai.service.scada.MPointService; +import com.sipai.tools.SpringContextUtil; + import java.math.BigDecimal; import java.util.List; -import javax.security.auth.message.callback.PrivateKeyCallback.Request; - -import net.sf.json.JSONArray; -import net.sf.json.JSONObject; - -import com.lowagie.tools.split_pdf; -import com.sipai.entity.scada.MPoint; -import com.sipai.entity.scada.MPointHistory; -import com.sipai.entity.user.Unit; -import com.sipai.service.scada.MPointHistoryService; -import com.sipai.service.scada.MPointService; -import com.sipai.service.user.UnitServiceImpl; -import com.sipai.tools.CommUtil; -import com.sipai.tools.SpringContextUtil; - public class getSSOldOPMDataServer { /** * diff --git a/src/main/java/com/sipai/websocket/AjaxResult.java b/src/main/java/com/sipai/websocket/AjaxResult.java index fd7d98f4..6baaab43 100644 --- a/src/main/java/com/sipai/websocket/AjaxResult.java +++ b/src/main/java/com/sipai/websocket/AjaxResult.java @@ -2,8 +2,6 @@ package com.sipai.websocket; import java.util.HashMap; -import org.apache.commons.lang3.ObjectUtils; - public class AjaxResult extends HashMap{ private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/sipai/websocket/BaiDuAipSpeechMessage.java b/src/main/java/com/sipai/websocket/BaiDuAipSpeechMessage.java index 9468a3bc..cbab1b46 100644 --- a/src/main/java/com/sipai/websocket/BaiDuAipSpeechMessage.java +++ b/src/main/java/com/sipai/websocket/BaiDuAipSpeechMessage.java @@ -1,26 +1,9 @@ package com.sipai.websocket; -import java.awt.image.BufferedImage; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.util.HashMap; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.CopyOnWriteArraySet; - -import javax.imageio.ImageIO; -import javax.websocket.EncodeException; -import javax.websocket.EndpointConfig; -import javax.websocket.OnClose; -import javax.websocket.OnError; -import javax.websocket.OnMessage; -import javax.websocket.OnOpen; -import javax.websocket.Session; -import javax.websocket.server.PathParam; +import javax.websocket.*; import javax.websocket.server.ServerEndpoint; - -import com.sipai.service.work.CameraService; -import com.sipai.tools.SpringContextUtil; +import java.io.IOException; +import java.util.concurrent.CopyOnWriteArraySet; @ServerEndpoint(value = "/chat/baiDuAipSpeechMessage") public class BaiDuAipSpeechMessage { diff --git a/src/main/java/com/sipai/websocket/MsgWebSocket.java b/src/main/java/com/sipai/websocket/MsgWebSocket.java index 9b9fe173..0f5d4b6d 100644 --- a/src/main/java/com/sipai/websocket/MsgWebSocket.java +++ b/src/main/java/com/sipai/websocket/MsgWebSocket.java @@ -1,13 +1,12 @@ package com.sipai.websocket; -import java.io.IOException; -import java.util.HashMap; -import java.util.Map; -import java.util.concurrent.CopyOnWriteArraySet; - import javax.websocket.*; import javax.websocket.server.PathParam; import javax.websocket.server.ServerEndpoint; +import java.io.IOException; +import java.util.HashMap; +import java.util.Map; +import java.util.concurrent.CopyOnWriteArraySet; /** * @ServerEndpoint 注解是一个类层次的注解，它的功能主要是将目前的类定义成一个websocket服务器端, diff --git a/src/main/java/com/sipai/websocket/ScadaWebSocket.java b/src/main/java/com/sipai/websocket/ScadaWebSocket.java index eb073ea9..6f9f1f2a 100644 --- a/src/main/java/com/sipai/websocket/ScadaWebSocket.java +++ b/src/main/java/com/sipai/websocket/ScadaWebSocket.java @@ -1,13 +1,12 @@ package com.sipai.websocket; -import java.io.IOException; -import java.util.HashMap; -import java.util.Map; -import java.util.concurrent.CopyOnWriteArraySet; - import javax.websocket.*; import javax.websocket.server.PathParam; import javax.websocket.server.ServerEndpoint; +import java.io.IOException; +import java.util.HashMap; +import java.util.Map; +import java.util.concurrent.CopyOnWriteArraySet; /** * @ServerEndpoint 注解是一个类层次的注解，它的功能主要是将目前的类定义成一个websocket服务器端, diff --git a/src/main/java/com/sipai/websocket/VisualMessage.java b/src/main/java/com/sipai/websocket/VisualMessage.java index 981b9261..b6bc0992 100644 --- a/src/main/java/com/sipai/websocket/VisualMessage.java +++ b/src/main/java/com/sipai/websocket/VisualMessage.java @@ -1,26 +1,10 @@ package com.sipai.websocket; -import java.awt.image.BufferedImage; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.util.HashMap; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.CopyOnWriteArraySet; - -import javax.imageio.ImageIO; -import javax.websocket.EncodeException; -import javax.websocket.EndpointConfig; -import javax.websocket.OnClose; -import javax.websocket.OnError; -import javax.websocket.OnMessage; -import javax.websocket.OnOpen; -import javax.websocket.Session; +import javax.websocket.*; import javax.websocket.server.PathParam; import javax.websocket.server.ServerEndpoint; - -import com.sipai.service.work.CameraService; -import com.sipai.tools.SpringContextUtil; +import java.io.IOException; +import java.util.concurrent.CopyOnWriteArraySet; @ServerEndpoint(value = "/chat/{userName}") public class VisualMessage {