请假补假

# Conflicts:
#	src/main/java/com/sipai/controller/equipment/MaintenancePlanController.java

.gitignore

@@ -0,0 +1,25 @@
+# IntelliJ IDEA
+.idea/
+.smarttomcat/
+*.iml
+
+# Eclipse
+.settings/
+.classpath
+.project
+
+# VS Code
+.vscode/
+
+# Mac
+.DS_Store
+
+# Maven
+target/
+
+# Node
+node_modules/
+npm-debug.log
+
+# Logs
+*.log

pom.xml

@@ -1,8 +1,8 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <groupId>SIPAIIS_WMS</groupId>
-    <artifactId>SIPAIIS_WMS</artifactId>
+    <groupId>TGLW</groupId>
+    <artifactId>TGLW</artifactId>
     <version>0.0.1-SNAPSHOT</version>
     <packaging>war</packaging>
     <properties>
@@ -272,6 +272,7 @@
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
             <version>3.1.0</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>junit</groupId>
@@ -368,6 +369,12 @@
             <groupId>org.xhtmlrenderer</groupId>
             <artifactId>core-renderer</artifactId>
             <version>R8</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>bouncycastle</groupId>
+                    <artifactId>bcprov-jdk14</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <!-- 支持css样式渲染 -->
         <dependency>
@@ -596,6 +603,17 @@
             <groupId>org.redisson</groupId>
             <artifactId>redisson</artifactId>
             <version>3.11.4</version>
+            <exclusions>
+                <!-- 项目仍使用 jodd 3.x，排除 redisson 传入的 jodd 5.x，避免运行时方法签名冲突 -->
+                <exclusion>
+                    <groupId>org.jodd</groupId>
+                    <artifactId>jodd-bean</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.jodd</groupId>
+                    <artifactId>jodd-core</artifactId>
+                </exclusion>
+            </exclusions>
 <!--            <version>3.13.3</version>-->
         </dependency>
         <!-- zkclient -->
@@ -610,6 +628,12 @@
             <groupId>com.github.xiaoymin</groupId>
             <artifactId>knife4j-spring</artifactId>
             <version>2.0.5</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.google.guava</groupId>
+                    <artifactId>guava</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.github.xiaoymin</groupId>
@@ -655,7 +679,7 @@
         <dependency>
             <groupId>org.bouncycastle</groupId>
             <artifactId>bcprov-jdk15on</artifactId>
-            <version>1.68</version>
+            <version>1.70</version>
         </dependency>
         <dependency>
             <groupId>commons-codec</groupId>
@@ -698,6 +722,12 @@
             <groupId>org.apache.axis2</groupId>
             <artifactId>axis2-kernel</artifactId>
             <version>1.6.3</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>javax.servlet</groupId>
+                    <artifactId>servlet-api</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.apache.axis2</groupId>
@@ -781,7 +811,7 @@
         </dependency>
     </dependencies>
     <build>
-        <finalName>SIPAIIS_WMS</finalName>
+        <finalName>TGLW</finalName>
         <resources>
             <resource>
                 <directory>src/main/java</directory>
@@ -804,6 +834,9 @@
                 <includes>
                     <include>**/*.xml</include>
                     <include>**/*.properties</include>
+                    <include>**/*.json</include>
+                    <include>**/*.bpmn</include>
+                    <include>**/*.png</include>
                 </includes>
                 <filtering>false</filtering>
             </resource>
@@ -840,6 +873,22 @@
                     <overwrite>true</overwrite>
                 </configuration>
             </plugin>
+            
+            <!-- Jetty Plugin for Hot Deployment (Servlet 3.1 support for Spring 5) -->
+            <plugin>
+                <groupId>org.eclipse.jetty</groupId>
+                <artifactId>jetty-maven-plugin</artifactId>
+                <version>9.4.43.v20210629</version>
+                <configuration>
+                    <httpConnector>
+                        <port>8088</port>
+                    </httpConnector>
+                    <scanIntervalSeconds>5</scanIntervalSeconds>
+                    <webApp>
+                        <contextPath>/</contextPath>
+                    </webApp>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
-</project>
+</project>

src/applicationContext.xml

@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans
-		xmlns="http://www.springframework.org/schema/beans"
-		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-		xmlns:p="http://www.springframework.org/schema/p" xmlns:context="http://www.springframework.org/schema/context"
-		xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd http://www.springframework.org/schema/context https://www.springframework.org/schema/context/spring-context.xsd">
-
-	<!-- 自动扫描装配 -->
-	<context:component-scan base-package="com.sipai.quartz.job"/>
-	<!--<context:component-scan base-package="com.sipai"/>-->
-
-	<bean id="propertyConfigurer" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
-		<property name="fileEncoding" value="utf-8" />
-		<property name="locations">
-			<list>
-				<value>classpath*:xxl-job-executor.properties</value>
-			</list>
-		</property>
-	</bean>
-
-	<!-- 配置02、执行器 -->
-	<bean id="xxlJobSpringExecutor" class="com.xxl.job.core.executor.impl.XxlJobSpringExecutor" init-method="start" destroy-method="destroy" >
-		<!-- 执行器注册中心地址[选填]，为空则关闭自动注册 -->
-		<property name="adminAddresses" value="${xxl.job.admin.addresses}" />
-		<!-- 执行器AppName[选填]，为空则关闭自动注册 -->
-		<property name="appName" value="${xxl.job.executor.appname}" />
-		<!-- 执行器IP[选填]，为空则自动获取 -->
-		<property name="ip" value="${xxl.job.executor.ip}" />
-		<!-- 执行器端口号[选填]，小于等于0则自动获取 -->
-		<property name="port" value="${xxl.job.executor.port}" />
-		<!-- 访问令牌[选填]，非空则进行匹配校验 -->
-		<property name="accessToken" value="${xxl.job.accessToken}" />
-		<!-- 执行器日志路径[选填]，为空则使用默认路径 -->
-		<property name="logPath" value="${xxl.job.executor.logpath}" />
-		<!-- 日志保存天数[选填]，值大于3时生效 -->
-		<property name="logRetentionDays" value="${xxl.job.executor.logretentiondays}" />
-	</bean>
-
-</beans>

src/editor.html

@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"
-xmlns:b3mn="http://b3mn.org/2007/b3mn"
-xmlns:ext="http://b3mn.org/2007/ext"
-xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-xmlns:atom="http://b3mn.org/2007/atom+xhtml">
-<head profile="http://purl.org/NET/erdf/profile">
-<title>Activiti BPM suite</title>
-<!-- libraries -->
-<script src="../libs/prototype-1.5.1.js" type="text/javascript" />
-<script src="../libs/path_parser.js" type="text/javascript" />
-<script src="../libs/ext-2.0.2/adapter/ext/ext-base.js" type="text/javascript" />
-<script src="../libs/ext-2.0.2/ext-all-debug.js" type="text/javascript" />
-<script src="../libs/ext-2.0.2/color-field.js" type="text/javascript" />
-<style media="screen" type="text/css">
-@import url("../libs/ext-2.0.2/resources/css/ext-all.css");
-@import url("../libs/ext-2.0.2/resources/css/xtheme-darkgray.css");
-</style>
-<link rel="Stylesheet" media="screen" href="../editor/css/theme_norm.css" type="text/css" />
-<link rel="Stylesheet" media="screen" href="../editor/css/theme_norm_signavio.css" type="text/css" />
-<link rel="Stylesheet" media="screen" href="../explorer/src/css/xtheme-smoky.css" type="text/css" />
-<link rel="Stylesheet" media="screen" href="../explorer/src/css/custom-style.css" type="text/css" />
-<!-- oryx editor -->
-<!-- language files -->
-<script src="../editor/i18n/translation_en_us.js" type="text/javascript" />
-<script src="../editor/i18n/translation_signavio_en_us.js" type="text/javascript" />
-<script src="../libs/utils.js" type="text/javascript" />
-<script src="../editor/oryx.debug.js" type="text/javascript" />
-<!-- erdf schemas -->
-<link rel="schema.dc" href="http://purl.org/dc/elements/1.1/" />
-<link rel="schema.dcTerms" href="http://purl.org/dc/terms/" />
-<link rel="schema.b3mn" href="http://b3mn.org" />
-<link rel="schema.oryx" href="http://oryx-editor.org/" />
-<link rel="schema.raziel" href="http://raziel.org/" />
-</head>
-<body style="overflow:hidden;">
-</body>
-</html>

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;

src/main/java/com/sipai/activiti/util/DateConverter.java

@@ -28,7 +28,7 @@ public class DateConverter implements Converter {
             try {
                 result = doConvertToDate(value);
             } catch (ParseException e) {
-                e.printStackTrace();
+                logger.error("Failed to convert value to Date: " + value, e);
             }
         } else if (type == String.class) {
             result = doConvertToString(value);
@@ -56,8 +56,7 @@ public class DateConverter implements Converter {
                 try {
                     result = new Date(new Long((String) value).longValue());
                 } catch (Exception e) {
-                    logger.error("Converting from milliseconds to Date fails!");
-                    e.printStackTrace();
+                    logger.error("Converting from milliseconds to Date fails!", e);
                 }
 
             }

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;
 
 /**

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;

src/main/java/com/sipai/config/RedissonConfig.java

@@ -10,6 +10,8 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
+import java.util.concurrent.TimeUnit;
+
 /**
  * @Author : YYJ
  * @CreateTime : 2021/9/14
@@ -32,6 +34,18 @@ public class RedissonConfig {
 
     @Value("${redis.password}")
     public String password;
+    
+    @Value("${redis.timeout:10000}")
+    public int timeout;
+    
+    @Value("${redis.maxIdle:100}")
+    public int maxIdle;
+    
+    @Value("${redis.maxActive:300}")
+    public int maxActive;
+    
+    @Value("${redis.testOnBorrow:true}")
+    public boolean testOnBorrow;
 
     @Value("${cluster1.host.port:}")
     public String cluster1;
@@ -58,10 +72,33 @@ public class RedissonConfig {
             singleServerConfig.setAddress("redis://" + host + ":" + port);
             //设置连接密码
             singleServerConfig.setPassword(password);
+            // 设置超时时间（毫秒）
+            singleServerConfig.setTimeout(timeout);
+            // 设置连接池大小
+            singleServerConfig.setConnectionMinimumIdleSize(Math.min(10, maxIdle));
+            singleServerConfig.setConnectionPoolSize(maxActive);
+            // 设置空闲连接超时
+            singleServerConfig.setIdleConnectionTimeout(10000);
+            // 设置 ping 间隔，保持连接活跃
+            singleServerConfig.setPingConnectionInterval(10000);
+            // 设置失败重试次数
+            singleServerConfig.setRetryAttempts(3);
+            // 设置重试间隔
+            singleServerConfig.setRetryInterval(1500);
+            // 设置数据库索引
 //        singleServerConfig.setDatabase(Integer.valueOf(database));
         }else if(MODE_CLUSTER.equals(mode)){//集群
             conf.useClusterServers()
-                    .setScanInterval(2000);
+                    .setScanInterval(2000)
+                    .setTimeout(timeout)
+                    .setMasterConnectionMinimumIdleSize(Math.min(10, maxIdle))
+                    .setMasterConnectionPoolSize(maxActive)
+                    .setSlaveConnectionMinimumIdleSize(Math.min(10, maxIdle))
+                    .setSlaveConnectionPoolSize(maxActive)
+                    .setIdleConnectionTimeout(10000)
+                    .setPingConnectionInterval(10000)
+                    .setRetryAttempts(3)
+                    .setRetryInterval(1500);
             if(cluster1!=null && !cluster1.isEmpty()){
                 conf.useClusterServers().addNodeAddress("redis://" + cluster1);
             }
@@ -83,7 +120,7 @@ public class RedissonConfig {
 //                .setPassword(password);
         }
 
-        //使用json序列化方式
+        //使用 json 序列化方式
         Codec codec = new JsonJacksonCodec();
         conf.setCodec(codec);
         redisson = Redisson.create(conf);

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;

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;

src/main/java/com/sipai/controller/accident/AccidentController.java

@@ -1,12 +1,19 @@
 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.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.ModelAttribute;
@@ -14,22 +21,14 @@ 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")
 public class AccidentController {
+	private static final Logger logger = LoggerFactory.getLogger(AccidentController.class);
 	@Resource
 	private AccidentService accidentService;
 	@Resource
@@ -178,7 +177,7 @@ public class AccidentController {
 				this.accidentService.deleteById(idArray[i]);
 			}
 		} catch (Exception e) {
-			e.printStackTrace();
+			logger.error("Failed to delete accidents with ids: {}", ids, e);
 			Result result = Result.failed("删除失败");
 			model.addAttribute("result", CommUtil.toJson(result));
 			return "result";

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")

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,10 +21,33 @@ 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.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+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")
 public class ReasonableAdviceController {
+	private static final Logger logger = LoggerFactory.getLogger(ReasonableAdviceController.class);
 	@Resource
 	private ReasonableAdviceService reasonableAdviceService;
 	@Resource
@@ -222,7 +214,7 @@ public class ReasonableAdviceController {
 				this.reasonableAdviceService.deleteById(idArray[i]);
 			}
 		} catch (Exception e) {
-			e.printStackTrace();
+			logger.error("Failed to delete reasonable advices with ids: {}", ids, e);
 			Result result = Result.failed("删除失败");
 			model.addAttribute("result", CommUtil.toJson(result));
 			return "result";
@@ -313,10 +305,10 @@ public class ReasonableAdviceController {
 			wherestr += " and take_flag = '"+request.getParameter("takeFlag")+"' ";
 		}
         List<ReasonableAdvice> list = this.reasonableAdviceService.selectListByWhere(wherestr+orderstr);
-    	try {
+		try {
 			this.reasonableAdviceService.downloadExcel(response,list);
 		} catch (IOException e) {
-			e.printStackTrace();
+			logger.error("Failed to download excel for reasonable advice", e);
 		}
 		return null;
 	}
@@ -336,8 +328,7 @@ public class ReasonableAdviceController {
         try {
             result =this.reasonableAdviceService.startProcess(reasonableAdvice);
         } catch (Exception e) {
-            // TODO: handle exception
-            e.printStackTrace();
+            logger.error("Failed to start process for reasonable advice: {}", reasonableAdvice.getId(), e);
         }
         String resstr="{\"res\":\""+result+"\",\"id\":\""+reasonableAdvice.getId()+"\"}";
         model.addAttribute("result", resstr);
@@ -414,7 +405,7 @@ public class ReasonableAdviceController {
                         return 0;
                     }
                 }catch(Exception e){
-                    e.printStackTrace();
+                    logger.error("Failed to compare business unit records", e);
                     return 0;
                 }
                 
@@ -599,8 +590,7 @@ public class ReasonableAdviceController {
             }
             this.reasonableAdviceService.updateStatus(businessUnitHandle.getBusinessid(),passstatus);
         } catch (Exception e) {
-            // TODO: handle exception
-            e.printStackTrace();
+            logger.error("Failed to submit reasonable advice handle: {}", businessUnitHandle.getId(), e);
             result=0;
         }
         String resstr="{\"res\":\""+result+"\",\"id\":\""+businessUnitHandle.getId()+"\"}";

src/main/java/com/sipai/controller/accident/RoastController.java

@@ -28,6 +28,8 @@ 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.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.ModelAttribute;
@@ -45,6 +47,7 @@ import java.util.*;
 @Controller
 @RequestMapping("/accident/roast")
 public class RoastController {
+    private static final Logger logger = LoggerFactory.getLogger(RoastController.class);
     @Resource
     private RoastService roastService;
     @Resource
@@ -249,7 +252,7 @@ public class RoastController {
                 this.roastService.deleteById(idArray[i]);
             }
         } catch (Exception e) {
-            e.printStackTrace();
+            logger.error("Failed to delete roasts with ids: {}", ids, e);
             Result result = Result.failed("删除失败");
             model.addAttribute("result", CommUtil.toJson(result));
             return "result";
@@ -345,7 +348,7 @@ public class RoastController {
         try {
             this.roastService.downloadExcel(response, list);
         } catch (IOException e) {
-            e.printStackTrace();
+            logger.error("Failed to download excel for roast", e);
         }
         return null;
     }
@@ -367,8 +370,7 @@ public class RoastController {
         try {
             result = this.roastService.startProcess(roast);
         } catch (Exception e) {
-            // TODO: handle exception
-            e.printStackTrace();
+            logger.error("Failed to start process for roast: {}", roast.getId(), e);
         }
         String resstr = "{\"res\":\"" + result + "\",\"id\":\"" + roast.getId() + "\"}";
         model.addAttribute("result", resstr);
@@ -447,7 +449,7 @@ public class RoastController {
                         return 0;
                     }
                 } catch (Exception e) {
-                    e.printStackTrace();
+                    logger.error("Failed to compare business unit records", e);
                     return 0;
                 }
 
@@ -636,8 +638,7 @@ public class RoastController {
             }
             this.roastService.updateStatus(businessUnitHandle.getBusinessid(), passstatus);
         } catch (Exception e) {
-            // TODO: handle exception
-            e.printStackTrace();
+            logger.error("Failed to submit roast handle: {}", businessUnitHandle.getId(), e);
             result = 0;
         }
         String resstr = "{\"res\":\"" + result + "\",\"id\":\"" + businessUnitHandle.getId() + "\"}";

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;

src/main/java/com/sipai/controller/achievement/AcceptanceModelController.java

@@ -1,22 +1,24 @@
 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.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.ModelAttribute;
@@ -26,30 +28,20 @@ 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")
 public class AcceptanceModelController {
+	private static final Logger logger = LoggerFactory.getLogger(AcceptanceModelController.class);
 	@Resource
 	private AcceptanceModelService acceptanceModelService;
 	@Resource
@@ -273,7 +265,7 @@ public class AcceptanceModelController {
                 					file.mkdir();
                 				}
                 			}catch (Exception e){
-                				e.printStackTrace();
+                				logger.error("Failed to create directory for file conversion: {}", fileforder, e);
                 			}
                 			
                 			//开始生成
@@ -302,8 +294,8 @@ public class AcceptanceModelController {
                     } else {  
                         ret.put("suc", false);  
                     }  
-                } catch (Exception e) {  
-                	e.printStackTrace();
+                } catch (Exception e) {
+                	logger.error("Failed to upload file for acceptance model", e);
                     ret.put("suc", false);  
                     ret.put("msg", e.getMessage());  
                 } 

src/main/java/com/sipai/controller/achievement/AcceptanceModelCreateController.java

@@ -1,93 +1,59 @@
 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.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+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")
 public class AcceptanceModelCreateController {
+	private static final Logger logger = LoggerFactory.getLogger(AcceptanceModelCreateController.class);
 	@Resource
 	private AcceptanceModelService acceptanceModelService;
 	@Resource
@@ -784,7 +750,7 @@ public class AcceptanceModelCreateController {
 				file.mkdir();
 			}
 		}catch (Exception e){
-			e.printStackTrace();
+			logger.error("Failed to create directory for file conversion: {}", fileforder, e);
 		}
 
 		//开始生成

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")

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")

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")

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")

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

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;
 /**
  * 流程管理控制器
  *

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
@@ -161,10 +138,10 @@ public class OEProcessController {
     	String password=request.getParameter("password");
     	
     	if(null==username || "".equals(username)){
-    		return "redirect:http://192.168.2.10:5001/SIPAIIS_WMS/";
+    		return "redirect:http://192.168.2.10:5001/TGLW/";
     	}
     	if(null==password || "".equals(password)){
-    		return "redirect:http://192.168.2.10:5001/SIPAIIS_WMS/";
+    		return "redirect:http://192.168.2.10:5001/TGLW/";
     	}
 
     	List<User> userList=userService.selectListByWhere(" where name='"+username+"' and password='"+password+"'");
@@ -183,7 +160,7 @@ public class OEProcessController {
     		//return "/activiti/taskList";
     		return "/activiti/oeProcessTaskList";
     	}else{
-    		return "redirect:http://192.168.2.10:5001/SIPAIIS_WMS/";
+    		return "redirect:http://192.168.2.10:5001/TGLW/";
     		
     	}
 		

src/main/java/com/sipai/controller/administration/AttendanceController.java

@@ -0,0 +1,194 @@
+package com.sipai.controller.administration;
+
+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.servlet.http.HttpServletRequest;
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+@Controller
+@RequestMapping("/administration/attendance")
+public class AttendanceController {
+    private static final DateTimeFormatter DAY_FMT = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+
+    @RequestMapping("/showList.do")
+    public String showList(HttpServletRequest request, Model model) {
+        return "/administration/attendanceRecordList";
+    }
+
+    @RequestMapping("/getList.do")
+    public ModelAndView getList(HttpServletRequest request, Model model,
+                                @RequestParam(value = "page") Integer page,
+                                @RequestParam(value = "rows") Integer rows,
+                                @RequestParam(value = "sort", required = false) String sort,
+                                @RequestParam(value = "order", required = false) String order) {
+        String name = safe(request.getParameter("search_name"));
+        String dept = safe(request.getParameter("search_dept"));
+        String status = safe(request.getParameter("search_status"));
+        String start = safe(request.getParameter("search_start"));
+        String end = safe(request.getParameter("search_end"));
+
+        LocalDate startDate = parseDay(start);
+        LocalDate endDate = parseDay(end);
+        List<Map<String, Object>> allRows = buildMockRows();
+        List<Map<String, Object>> filtered = new ArrayList<Map<String, Object>>();
+
+        for (Map<String, Object> item : allRows) {
+            String employeeNo = str(item.get("employeeNo"));
+            String employeeName = str(item.get("employeeName"));
+            String deptName = str(item.get("deptName"));
+            String st = str(item.get("status"));
+            LocalDate day = parseDay(str(item.get("attendanceDate")));
+
+            if (!name.isEmpty()) {
+                String q = name.toLowerCase();
+                if (!employeeNo.toLowerCase().contains(q) && !employeeName.toLowerCase().contains(q)) {
+                    continue;
+                }
+            }
+            if (!dept.isEmpty() && !dept.equals(deptName)) {
+                continue;
+            }
+            if (!status.isEmpty() && !status.equals(st)) {
+                continue;
+            }
+            if (startDate != null && day != null && day.isBefore(startDate)) {
+                continue;
+            }
+            if (endDate != null && day != null && day.isAfter(endDate)) {
+                continue;
+            }
+            filtered.add(item);
+        }
+
+        sortRows(filtered, sort, order);
+        int total = filtered.size();
+        int from = Math.max(0, (page - 1) * rows);
+        int to = Math.min(total, from + rows);
+        List<Map<String, Object>> pageRows = from >= to ? Collections.<Map<String, Object>>emptyList() : filtered.subList(from, to);
+
+        JSONObject result = new JSONObject();
+        result.put("total", total);
+        result.put("rows", JSONArray.fromObject(pageRows));
+        model.addAttribute("result", result.toString());
+        return new ModelAndView("result");
+    }
+
+    private static void sortRows(List<Map<String, Object>> rows, String sort, String order) {
+        final boolean asc = "asc".equalsIgnoreCase(order);
+        final String sortField = (sort == null || sort.trim().isEmpty() || "id".equals(sort)) ? "attendanceDate" : sort;
+        Collections.sort(rows, new Comparator<Map<String, Object>>() {
+            @Override
+            public int compare(Map<String, Object> a, Map<String, Object> b) {
+                int cmp;
+                if ("employeeNo".equals(sortField)) {
+                    cmp = str(a.get("employeeNo")).compareTo(str(b.get("employeeNo")));
+                } else if ("employeeName".equals(sortField)) {
+                    cmp = str(a.get("employeeName")).compareTo(str(b.get("employeeName")));
+                } else if ("deptName".equals(sortField)) {
+                    cmp = str(a.get("deptName")).compareTo(str(b.get("deptName")));
+                } else if ("status".equals(sortField)) {
+                    cmp = str(a.get("status")).compareTo(str(b.get("status")));
+                } else if ("checkInTime".equals(sortField)) {
+                    cmp = str(a.get("checkInTime")).compareTo(str(b.get("checkInTime")));
+                } else {
+                    cmp = str(a.get("attendanceDate")).compareTo(str(b.get("attendanceDate")));
+                }
+                if (!asc) {
+                    cmp = -cmp;
+                }
+                if (cmp == 0) {
+                    return str(a.get("employeeNo")).compareTo(str(b.get("employeeNo")));
+                }
+                return cmp;
+            }
+        });
+    }
+
+    private static List<Map<String, Object>> buildMockRows() {
+        String[][] employees = {
+                {"E0001", "张三", "生产部"},
+                {"E0002", "李四", "设备部"},
+                {"E0003", "王五", "品控部"},
+                {"E0004", "赵六", "仓储部"},
+                {"E0005", "钱七", "行政部"}
+        };
+
+        List<Map<String, Object>> rows = new ArrayList<Map<String, Object>>();
+        LocalDate today = LocalDate.now();
+        int idSeq = 1;
+
+        for (int d = 0; d < 45; d++) {
+            LocalDate day = today.minusDays(d);
+            String dayStr = DAY_FMT.format(day);
+            for (int i = 0; i < employees.length; i++) {
+                String[] emp = employees[i];
+                int flag = d + i;
+
+                String status = "正常";
+                String checkIn = "08:55";
+                String checkOut = "18:05";
+                String workHours = "8.5";
+
+                if (flag % 19 == 0) {
+                    status = "缺卡";
+                    checkOut = "--";
+                    workHours = "4.2";
+                } else if (flag % 11 == 0) {
+                    status = "迟到";
+                    checkIn = "09:" + (10 + (flag % 20));
+                    workHours = "7.8";
+                } else if (flag % 13 == 0) {
+                    status = "早退";
+                    checkOut = "17:" + (20 + (flag % 30));
+                    workHours = "7.1";
+                }
+
+                Map<String, Object> row = new LinkedHashMap<String, Object>();
+                row.put("id", "mock-" + idSeq++);
+                row.put("employeeNo", emp[0]);
+                row.put("employeeName", emp[1]);
+                row.put("deptName", emp[2]);
+                row.put("attendanceDate", dayStr);
+                row.put("checkInTime", checkIn);
+                row.put("checkOutTime", checkOut);
+                row.put("workHours", workHours);
+                row.put("status", status);
+                row.put("source", "第三方接口(MOCK)");
+                rows.add(row);
+            }
+        }
+        return rows;
+    }
+
+    private static String safe(String s) {
+        return s == null ? "" : s.trim();
+    }
+
+    private static String str(Object o) {
+        return o == null ? "" : String.valueOf(o);
+    }
+
+    private static LocalDate parseDay(String day) {
+        if (day == null || day.trim().isEmpty()) {
+            return null;
+        }
+        try {
+            return LocalDate.parse(day.trim(), DAY_FMT);
+        } catch (Exception ex) {
+            return null;
+        }
+    }
+}

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")

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")

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")

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")

src/main/java/com/sipai/controller/administration/LeaveApplyController.java

@@ -0,0 +1,400 @@
+package com.sipai.controller.administration;
+
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.sipai.entity.activiti.WorkTask;
+import com.sipai.entity.administration.LeaveApply;
+import com.sipai.entity.administration.LeaveCommStr;
+import com.sipai.entity.base.Result;
+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.User;
+import com.sipai.service.activiti.WorkflowProcessDefinitionService;
+import com.sipai.service.activiti.WorkflowService;
+import com.sipai.service.administration.LeaveApplyService;
+import com.sipai.service.business.BusinessUnitAuditService;
+import com.sipai.service.business.BusinessUnitHandleService;
+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/leaveApply")
+public class LeaveApplyController {
+    @Resource
+    private LeaveApplyService leaveApplyService;
+    @Resource
+    private WorkflowProcessDefinitionService workflowProcessDefinitionService;
+    @Resource
+    private BusinessUnitHandleService businessUnitHandleService;
+    @Resource
+    private BusinessUnitAuditService businessUnitAuditService;
+    @Resource
+    private WorkflowService workflowService;
+    @Resource
+    private RuntimeService runtimeService;
+    @Resource
+    private TaskService taskService;
+    @Resource
+    private UserService userService;
+
+    @RequestMapping("/showList.do")
+    public String showList(HttpServletRequest request, Model model) {
+        return "/administration/leaveApplyList";
+    }
+
+    @RequestMapping("/getList.do")
+    public ModelAndView getList(HttpServletRequest request, Model model,
+                                @RequestParam(value = "page") Integer page,
+                                @RequestParam(value = "rows") Integer rows,
+                                @RequestParam(value = "sort", required = false) String sort,
+                                @RequestParam(value = "order", required = false) String order) {
+        if (sort == null || "id".equals(sort)) {
+            sort = " insdt ";
+        }
+        if (order == null) {
+            order = " desc ";
+        }
+        String wherestr = " where 1=1 ";
+        if (request.getParameter("search_code") != null && !request.getParameter("search_code").isEmpty()) {
+            wherestr += " and unit_id = '" + request.getParameter("search_code") + "'";
+        }
+        if (request.getParameter("search_name") != null && !request.getParameter("search_name").isEmpty()) {
+            wherestr += " and (reason like '%" + request.getParameter("search_name") + "%' or insuser like '%" + request.getParameter("search_name") + "%')";
+        }
+        if (request.getParameter("applyType") != null && !request.getParameter("applyType").isEmpty()) {
+            wherestr += " and apply_type = '" + request.getParameter("applyType") + "'";
+        }
+        PageHelper.startPage(page, rows);
+        List<LeaveApply> list = this.leaveApplyService.selectListByWhere(wherestr + " order by " + sort + " " + order);
+        PageInfo<LeaveApply> pInfo = new PageInfo<LeaveApply>(list);
+        JSONArray jsonArray = JSONArray.fromObject(list);
+        String result = "{\"total\":" + pInfo.getTotal() + ",\"rows\":" + jsonArray + "}";
+        model.addAttribute("result", result);
+        return new ModelAndView("result");
+    }
+
+    @RequestMapping("/add.do")
+    public String add(HttpServletRequest request, Model model) {
+        return "/administration/leaveApplyAdd";
+    }
+
+    @RequestMapping("/save.do")
+    public String save(HttpServletRequest request, Model model, @ModelAttribute LeaveApply leaveApply) {
+        User cu = (User) request.getSession().getAttribute("cu");
+        leaveApply.setId(CommUtil.getUUID());
+        leaveApply.setInsdt(CommUtil.nowDate());
+        leaveApply.setInsuser(cu.getId());
+        leaveApply.setState(LeaveCommStr.STATE_DRAFT);
+        leaveApply.setDelFlag("0");
+        int result = this.leaveApplyService.save(leaveApply);
+        String resultstr = "{\"res\":\"" + result + "\",\"id\":\"" + leaveApply.getId() + "\"}";
+        model.addAttribute("result", resultstr);
+        return "result";
+    }
+
+    @RequestMapping("/edit.do")
+    public String edit(HttpServletRequest request, Model model, @RequestParam(value = "id") String id) {
+        model.addAttribute("leaveApply", this.leaveApplyService.selectById(id));
+        return "/administration/leaveApplyEdit";
+    }
+
+    @RequestMapping("/update.do")
+    public String update(HttpServletRequest request, Model model, @ModelAttribute LeaveApply leaveApply) {
+        User cu = (User) request.getSession().getAttribute("cu");
+        leaveApply.setUpduser(cu.getId());
+        leaveApply.setUpddt(CommUtil.nowDate());
+        int result = this.leaveApplyService.update(leaveApply);
+        String resstr = "{\"res\":\"" + result + "\",\"id\":\"" + leaveApply.getId() + "\"}";
+        model.addAttribute("result", resstr);
+        return "result";
+    }
+
+    @RequestMapping("/view.do")
+    public String view(HttpServletRequest request, Model model, @RequestParam(value = "id") String id) {
+        model.addAttribute("leaveApply", this.leaveApplyService.selectById(id));
+        return "/administration/leaveApplyView";
+    }
+
+    @RequestMapping("/delete.do")
+    public String delete(HttpServletRequest request, Model model, @RequestParam(value = "id") String id) {
+        int result = this.leaveApplyService.deleteById(id);
+        model.addAttribute("result", result);
+        return "result";
+    }
+
+    @RequestMapping("/deletes.do")
+    public String deletes(HttpServletRequest request, Model model, @RequestParam(value = "ids") String ids) {
+        ids = ids.replace(",", "','");
+        int result = this.leaveApplyService.deleteByWhere("where id in ('" + ids + "')");
+        model.addAttribute("result", result);
+        return "result";
+    }
+
+    @RequestMapping("/startProcess.do")
+    public String startProcess(HttpServletRequest request, Model model, @ModelAttribute LeaveApply leaveApply) {
+        User cu = (User) request.getSession().getAttribute("cu");
+        if (leaveApply.getId() == null || leaveApply.getId().isEmpty()) {
+            leaveApply.setId(CommUtil.getUUID());
+        }
+        leaveApply.setInsuser(cu.getId());
+        leaveApply.setInsdt(CommUtil.nowDate());
+        int result = this.leaveApplyService.doStartProcess(leaveApply);
+        String resstr = "{\"res\":\"" + result + "\",\"id\":\"" + leaveApply.getId() + "\"}";
+        model.addAttribute("result", resstr);
+        return "result";
+    }
+
+    @RequestMapping("/showExecuteView.do")
+    public String showExecuteView(HttpServletRequest request, Model model) {
+        String id = request.getParameter("id");
+        LeaveApply leaveApply = this.leaveApplyService.selectById(id);
+        if (leaveApply == null) {
+            model.addAttribute("businessUnitRecords", JSONArray.fromObject(new ArrayList<BusinessUnitRecord>()));
+            model.addAttribute("finishFlag", false);
+            model.addAttribute("processStarted", false);
+            model.addAttribute("processMessage", "未找到对应的请假申请记录。");
+            if (request.getParameter("inModal") != null) {
+                return "administration/leaveApplyExecuteViewInModal";
+            }
+            return "administration/leaveApplyExecuteView";
+        }
+        request.setAttribute("business", leaveApply);
+        List<BusinessUnitRecord> businessUnitRecords = new ArrayList<BusinessUnitRecord>();
+        User launchUser = userService.getUserById(leaveApply.getInsuser());
+        String recordUser = leaveApply.getAuditMan();
+        BusinessUnitRecord businessUnitRecord = new BusinessUnitRecord(
+                leaveApply.getInsdt(), leaveApply.getInsuser(), leaveApply.getId(), leaveApply.getProcessid(),
+                leaveApply.getUnitId(), null, (recordUser == null || recordUser.trim().isEmpty() || "待签收".equals(recordUser))
+                ? "提交了请假补假申请，等待审批人签收。"
+                : "提交了请假补假申请至" + recordUser + "进行审批。", launchUser, "流程发起");
+        businessUnitRecords.add(businessUnitRecord);
+
+        boolean processStarted = leaveApply.getProcessdefid() != null && !leaveApply.getProcessdefid().trim().isEmpty();
+        if (processStarted) {
+            List<WorkTask> workTasks = workflowProcessDefinitionService.getAllPDTask(leaveApply.getProcessdefid(), "desc");
+            List<String> keys = new ArrayList<String>();
+            for (WorkTask workTask : workTasks) {
+                keys.add(workTask.getTaskKey());
+            }
+            Set set = new HashSet();
+            set.addAll(keys);
+            keys = new ArrayList<String>();
+            keys.addAll(set);
+            for (String item : keys) {
+                if (BusinessUnit.UNIT_LEAVE_APPLY_HANDLE.equals(item)) {
+                    List<BusinessUnitHandle> list = businessUnitHandleService.selectListByWhere("where businessid='" + id + "'");
+                    for (BusinessUnitHandle businessUnitHandle : list) {
+                        businessUnitRecord = new BusinessUnitRecord(businessUnitHandle);
+                        businessUnitRecords.add(businessUnitRecord);
+                    }
+                } else if (BusinessUnit.UNIT_LEAVE_APPLY_SECTION_AUDIT.equals(item)
+                        || BusinessUnit.UNIT_LEAVE_APPLY_MANAGER_AUDIT.equals(item)
+                        || BusinessUnit.UNIT_LEAVE_APPLY_GENERAL_MANAGER_AUDIT.equals(item)) {
+                    List<BusinessUnitAudit> listAudit = businessUnitAuditService.selectListByWhere("where businessid='" + id + "'");
+                    for (BusinessUnitAudit businessUnitAudit : listAudit) {
+                        businessUnitRecord = new BusinessUnitRecord(businessUnitAudit);
+                        businessUnitRecords.add(businessUnitRecord);
+                    }
+                    break;
+                }
+            }
+        }
+        if (leaveApply.getProcessid() != null && !leaveApply.getProcessid().trim().isEmpty()) {
+            List<HistoricTaskInstance> list = this.workflowService.getHistoryService().createHistoricTaskInstanceQuery()
+                    .processInstanceId(leaveApply.getProcessid()).list();
+            for (HistoricTaskInstance task : list) {
+                if (task.getAssignee() == null || task.getClaimTime() == null) {
+                    continue;
+                }
+                businessUnitRecord = new BusinessUnitRecord(task);
+                businessUnitRecords.add(businessUnitRecord);
+            }
+        }
+        Collections.sort(businessUnitRecords, new Comparator<BusinessUnitRecord>() {
+            public int compare(BusinessUnitRecord o1, BusinessUnitRecord o2) {
+                SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
+                try {
+                    Date dt1 = df.parse(o1.getInsdt());
+                    Date dt2 = df.parse(o2.getInsdt());
+                    if (dt1.getTime() > dt2.getTime()) {
+                        return 1;
+                    } else if (dt1.getTime() < dt2.getTime()) {
+                        return -1;
+                    }
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+                return 0;
+            }
+        });
+        model.addAttribute("businessUnitRecords", JSONArray.fromObject(businessUnitRecords));
+        long num = 0L;
+        if (leaveApply.getProcessid() != null && !leaveApply.getProcessid().trim().isEmpty()) {
+            num = runtimeService.createProcessInstanceQuery().processInstanceId(leaveApply.getProcessid()).count();
+        }
+        model.addAttribute("finishFlag", processStarted && num <= 0);
+        model.addAttribute("processStarted", processStarted);
+        model.addAttribute("processMessage", processStarted ? "" : "当前请假单尚未发起审批流程，仅显示单据信息。");
+        if (request.getParameter("inModal") != null) {
+            return "administration/leaveApplyExecuteViewInModal";
+        }
+        return "administration/leaveApplyExecuteView";
+    }
+
+    @RequestMapping("/showAudit.do")
+    public String showAudit(HttpServletRequest request, Model model) {
+        String taskId = request.getParameter("taskId");
+        String processInstanceId = request.getParameter("processInstanceId");
+        BusinessUnitAudit businessUnitAudit = new BusinessUnitAudit();
+
+        Task task = this.taskService.createTaskQuery().taskId(taskId).singleResult();
+        model.addAttribute("taskName", task.getName());
+        ProcessInstance pInstance = runtimeService.createProcessInstanceQuery().processInstanceId(processInstanceId).singleResult();
+
+        businessUnitAudit.setId(CommUtil.getUUID());
+        businessUnitAudit.setProcessid(processInstanceId);
+        businessUnitAudit.setTaskid(taskId);
+        businessUnitAudit.setBusinessid(pInstance.getBusinessKey());
+        businessUnitAudit.setTaskdefinitionkey(task.getTaskDefinitionKey());
+        model.addAttribute("businessUnitAudit", businessUnitAudit);
+        model.addAttribute("leaveApply", this.leaveApplyService.selectById(pInstance.getBusinessKey()));
+
+        List<ActivityImpl> activityImpls = workflowProcessDefinitionService.getNEXTActivities(task.getProcessDefinitionId(), task.getTaskDefinitionKey());
+        model.addAttribute("showTargetUsersFlag", activityImpls.size() > 0);
+        return "administration/leaveApplyAudit";
+    }
+
+    @RequestMapping("/doAudit.do")
+    public String doAudit(HttpServletRequest request, Model model, @ModelAttribute BusinessUnitAudit businessUnitAudit) {
+        User cu = (User) request.getSession().getAttribute("cu");
+        businessUnitAudit.setInsuser(cu.getId());
+        businessUnitAudit.setInsdt(CommUtil.nowDate());
+        if (businessUnitAudit.getPassstatus() && (businessUnitAudit.getTargetusers() == null || businessUnitAudit.getTargetusers().trim().isEmpty())) {
+            LeaveApply leaveApply = this.leaveApplyService.selectById(businessUnitAudit.getBusinessid());
+            businessUnitAudit.setTargetusers(this.leaveApplyService.getDefaultCandidateUserIdsForNextTask(
+                    leaveApply, businessUnitAudit.getTaskdefinitionkey(), businessUnitAudit.getRouteNum(), true));
+        }
+        int result = this.leaveApplyService.doAuditProcess(businessUnitAudit);
+        String resstr = "{\"res\":\"" + result + "\",\"id\":\"" + businessUnitAudit.getId() + "\"}";
+        model.addAttribute("result", resstr);
+        return "result";
+    }
+
+    @RequestMapping("/showHandle.do")
+    public String showHandle(HttpServletRequest request, Model model) {
+        String taskId = request.getParameter("taskId");
+        String processInstanceId = request.getParameter("processInstanceId");
+        String unitId = request.getParameter("unitId");
+        BusinessUnitHandle businessUnitHandle = new BusinessUnitHandle();
+        Task task = this.taskService.createTaskQuery().taskId(taskId).singleResult();
+        model.addAttribute("taskName", task.getName());
+        List<BusinessUnitHandle> businessUnitHandles = this.businessUnitHandleService.selectListByWhere("where processid='" + processInstanceId + "' and taskId='" + taskId + "'");
+        if (businessUnitHandles != null && businessUnitHandles.size() > 0) {
+            businessUnitHandle = businessUnitHandles.get(0);
+            businessUnitHandle.setTaskid(taskId);
+        } else {
+            businessUnitHandle.setId(CommUtil.getUUID());
+            businessUnitHandle.setProcessid(processInstanceId);
+            businessUnitHandle.setTaskid(taskId);
+            ProcessInstance pInstance = runtimeService.createProcessInstanceQuery().processInstanceId(processInstanceId).singleResult();
+            businessUnitHandle.setBusinessid(pInstance.getBusinessKey());
+            businessUnitHandle.setTaskdefinitionkey(task.getTaskDefinitionKey());
+            businessUnitHandle.setUnitid(unitId);
+        }
+        String userIds = businessUnitHandle.getTargetusers();
+        if (userIds != null && !userIds.isEmpty()) {
+            List<User> users = userService.selectListByWhere("where id in('" + userIds.replace(",", "','") + "')");
+            String targetUsersName = "";
+            for (User user : users) {
+                if (!targetUsersName.isEmpty()) {
+                    targetUsersName += ",";
+                }
+                targetUsersName += user.getCaption();
+            }
+            model.addAttribute("targetUsersName", targetUsersName);
+        }
+        model.addAttribute("businessUnitHandle", businessUnitHandle);
+        LeaveApply leaveApply = this.leaveApplyService.selectById(businessUnitHandle.getBusinessid());
+        model.addAttribute("leaveApply", leaveApply);
+        List<BusinessUnitAudit> businessUnitAudits = this.businessUnitAuditService.selectListByWhere("where businessId = '" + leaveApply.getId() + "' order by insdt desc");
+        String rejectReason = "";
+        if (businessUnitAudits != null && businessUnitAudits.size() > 0) {
+            rejectReason = businessUnitAudits.get(0).getAuditopinion();
+        }
+        model.addAttribute("rejectReason", rejectReason);
+        ActivityImpl activityImpl = workflowProcessDefinitionService.getNEXTActivityImpl(task.getProcessDefinitionId(), task.getTaskDefinitionKey(), CommString.ACTI_Condition_PASS);
+        model.addAttribute("showTargetUsersFlag", activityImpl != null && "userTask".equals(activityImpl.getProperties().get("type")));
+        return "administration/leaveApplyHandle";
+    }
+
+    @RequestMapping("/doHandle.do")
+    public String doHandle(HttpServletRequest request, Model model,
+                           @ModelAttribute LeaveApply leaveApply,
+                           @ModelAttribute BusinessUnitHandle businessUnitHandle) {
+        User cu = (User) request.getSession().getAttribute("cu");
+        int result = 0;
+        leaveApply.setUpduser(cu.getId());
+        leaveApply.setUpddt(CommUtil.nowDate());
+        leaveApply.setState(LeaveCommStr.STATE_SECTION_AUDIT);
+        result = this.leaveApplyService.update(leaveApply);
+        if (result > 0) {
+            String routeNum = request.getParameter("routeNum");
+            businessUnitHandle.setStatus(BusinessUnitHandle.Status_FINISH);
+            if (!this.businessUnitHandleService.checkExit(businessUnitHandle)) {
+                businessUnitHandle.setInsuser(cu.getId());
+                businessUnitHandle.setInsdt(CommUtil.nowDate());
+                result = this.businessUnitHandleService.save(businessUnitHandle);
+            } else {
+                result = this.businessUnitHandleService.update(businessUnitHandle);
+            }
+            try {
+                Map<String, Object> variables = new HashMap<String, Object>();
+                variables = ActivitiUtil.fixVariableWithRoute(variables, true, routeNum);
+                if (businessUnitHandle.getTargetusers() == null || businessUnitHandle.getTargetusers().trim().isEmpty()) {
+                    businessUnitHandle.setTargetusers(this.leaveApplyService.getDefaultCandidateUserIds(
+                            leaveApply, BusinessUnit.UNIT_LEAVE_APPLY_SECTION_AUDIT));
+                }
+                variables.put(CommString.ACTI_KEK_Candidate_Users, businessUnitHandle.getTargetusers());
+                variables.put(CommString.ACTI_KEK_Assignee, null);
+                taskService.complete(businessUnitHandle.getTaskid(), variables);
+            } catch (Exception e) {
+                e.printStackTrace();
+                result = 0;
+            }
+        }
+        String resstr = "{\"res\":\"" + result + "\",\"id\":\"" + leaveApply.getId() + "\"}";
+        model.addAttribute("result", resstr);
+        return "result";
+    }
+
+    @RequestMapping("/getList4Mobile.do")
+    public Result getList4Mobile(HttpServletRequest request, Model model) {
+        String wherestr = "where 1=1 order by insdt desc";
+        List<LeaveApply> list = this.leaveApplyService.selectListByWhere(wherestr);
+        JSONArray json = JSONArray.fromObject(list);
+        String res = "{\"total\":" + list.size() + ",\"rows\":" + json + "}";
+        return Result.success(res);
+    }
+}

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")

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")

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")

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")

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")

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;

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")

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")

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")
@@ -375,7 +369,9 @@ public class AlarmPointController {
                 this.mPointService.updateLalarmmin(alarmPoint.getUnitId(), mPoint.getMpointcode());
 //				mPoint.setLalarmmin(null);
             }
-//			this.mPointService.update2(alarmPoint.getUnitId(),mPoint);
+            // Enable TriggerAlarm to allow ScadaAlarmJob to process this MPoint
+            mPoint.setTriggeralarm("1");
+            this.mPointService.update2(alarmPoint.getUnitId(), mPoint);
         }
 
         if (code == Result.SUCCESS) {

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

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")

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")

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")

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")

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")
@@ -210,16 +197,15 @@ public class ProAlarmController {
 //        Iterator<String> sIterator = jsonObject.keys();
 
         JSONArray arr = new JSONArray();
-        List<XServer> allxServerList = this.xServerService.selectListByWhere(" where 1=1 ");
-        for (XServer xServer :
-                allxServerList) {
+//        List<XServer> allxServerList = this.xServerService.selectListByWhere(" where 1=1 ");
+//        for (XServer xServer : allxServerList) {
 //            if (jsonObject.get(xServer.getBizid()) != null) {
 //                String code_value = jsonObject.get(xServer.getBizid()).toString();
 //                code_value = code_value + ",data_stop_alarm";
 //                code_value = code_value.replace(",", "','");
 //                List<ProAlarm> list = this.proAlarmService.selectListByWhere(xServer.getBizid(), wherestr + " and point_code in ('" + code_value + "')"
 //                        + orderstr);
-            List<ProAlarm> list = this.proAlarmService.selectListByWhere(xServer.getBizid(), wherestr + orderstr);
+            List<ProAlarm> list = this.proAlarmService.selectListByWhere(companyId, wherestr + orderstr);
 //                System.out.println(wherestr + " and point_code in ('" + code_value + "')");
                 if (list != null && list.size() > 0) {
                     for (int i = 0; i < list.size(); i++) {
@@ -262,7 +248,7 @@ public class ProAlarmController {
                 }
 //            }
 
-        }
+//        }
         model.addAttribute("result", arr);
         return new ModelAndView("result");
     }

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 {

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

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")

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")

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")

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")

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")

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")

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 {

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")

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")

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

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

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

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

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 {  

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 {

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.  

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

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

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

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;

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对象 

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;

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;

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;
 
 
 

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

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;
 
 

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")

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;

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")

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
@@ -60,14 +47,11 @@ public class BusinessUnitController {
 			@RequestParam(value = "order", required=false) String order) {
 		HttpSession currentSession = request.getSession(false);
 		User cu=(User)request.getSession().getAttribute("cu");
-//		if(cu==null){
-//			cu=loginService.Login(request.getParameter("username"), request.getParameter("pwd"));
-//		}
 		if(sort==null){
 			sort = " insdt ";
 		}
 		if(order==null){
-			order = " asc ";
+			order = " desc ";
 		}
 		String orderstr=" order by "+sort+" "+order;
 		
@@ -78,6 +62,9 @@ public class BusinessUnitController {
 		if(request.getParameter("search_name")!=null && !request.getParameter("search_name").isEmpty()){
 			wherestr += " and name like '%"+request.getParameter("search_name")+"%' ";
 		}
+		if(request.getParameter("search_processType")!=null && !request.getParameter("search_processType").isEmpty()){
+			wherestr += " and process_type_id = '"+request.getParameter("search_processType")+"' ";
+		}
 		PageHelper.startPage(page, rows);
         List<BusinessUnit> list = this.businessUnitService.selectListByWhere(wherestr+orderstr);
         
@@ -85,7 +72,6 @@ public class BusinessUnitController {
 		JSONArray json=JSONArray.fromObject(list);
 		
 		String result="{\"total\":"+pi.getTotal()+",\"rows\":"+json+"}";
-//		System.out.println(result);
 		model.addAttribute("result",result);
         return new ModelAndView("result");
 	}

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;
 

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

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

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")

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")

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 {

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 {

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

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")

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")

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")

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")

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
@@ -1742,13 +1732,21 @@ public class DataCurveController {
                 name = curveRemarkFile.getFilename();
             }
             byte[] bytes = commonFileService.getInputStreamBytes("curve", path);
+            if (bytes == null || bytes.length == 0) {
+                response.setHeader("Content-type", "text/html;charset=UTF-8");
+                String data = "文件不存在或已被删除";
+                OutputStream ps = response.getOutputStream();
+                ps.write(data.getBytes("UTF-8"));
+                return;
+            }
             InputStream object = new ByteArrayInputStream(bytes);
             byte buf[] = new byte[1024];
             int length = 0;
 
-            String fileName = new String(name.getBytes(), "ISO-8859-1");//压缩包中文名称，不然乱码
+            // 使用UTF-8编码处理中文文件名
+            String encodedFileName = java.net.URLEncoder.encode(name, "UTF-8").replaceAll("\\+", "%20");
             response.reset();
-            response.setHeader("Content-Disposition", "attachment;filename=" + fileName);
+            response.setHeader("Content-Disposition", "attachment;filename*=UTF-8''" + encodedFileName);
             response.setContentType("application/octet-stream");
             response.setCharacterEncoding("UTF-8");
             OutputStream outputStream = response.getOutputStream();

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

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;

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;

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")

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;

src/main/java/com/sipai/controller/document/DataController.java

@@ -327,13 +327,13 @@ public class DataController {
              fileIds = fileIds.replace(",","','");
 	    	 wherestr += " and (id in ('"+fileIds+"') or filename like '%"+fileName+"%') ";
 		 }
-	     if(request.getParameter("masterId")!=null && !request.getParameter("masterId").isEmpty()){
-			    String masterId = request.getParameter("masterId");
-			    masterId = masterId.replace(",","','");
-				wherestr += " and masterid in ('"+masterId+"')";
-		 }else if(request.getParameter("equipmentId") == null){
-			    wherestr += " and masterid in ('')";
-		 }
+//	     if(request.getParameter("masterId")!=null && !request.getParameter("masterId").isEmpty()){
+//			    String masterId = request.getParameter("masterId");
+//			    masterId = masterId.replace(",","','");
+//				wherestr += " and masterid in ('"+masterId+"')";
+//		 }else if(request.getParameter("equipmentId") == null){
+//			    wherestr += " and masterid in ('')";
+//		 }
 	     if(request.getParameter("equipmentId")!=null && !request.getParameter("equipmentId").isEmpty()){
 	    	    String fileIds = this.equipmentFileService.getFileIds(request.getParameter("equipmentId"));
 	    	    fileIds = fileIds.replace(",","','");