1.当前执行班次接口加入实际发车时间信息

王通
1 parent 8ba098bf
Showing 5 changed files with 42 additions and 2 deletions
src/main/java/com/bsth/controller/realcontrol/AdminUtilsController.java
src/main/java/com/bsth/controller/realcontrol/ServiceDataInterface.java
src/main/java/com/bsth/filter/SQLInjectFilter.java
src/main/resources/application-prod.properties
src/main/resources/application-test.properties
@@ -67,6 +67,9 @@ public class AdminUtilsController {
     @Autowired
     private BasicData.BasicDataLoader basicDataLoader;
+    @Autowired
+    private SQLInjectFilter sqlInjectFilter;
+
     /**
      * 出现重复班次的车辆
      *
@@ -320,4 +323,17 @@ public class AdminUtilsController {
         return "error";
     }
+
+    @RequestMapping("/setSqlInjectEnabled")
+    public String setInjectStr(@RequestParam boolean sqlInjectEnabled) {
+        Map<String, Object> result = new HashMap<>();
+        try {
+            sqlInjectFilter.setSqlInjectEnabled(sqlInjectEnabled);
+            return "success";
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        return "error";
+    }
 }
 \ No newline at end of file
@@ -99,8 +99,10 @@ public class ServiceDataInterface {
             map.put("qdzName", sch.getQdzName());
             map.put("zdzName", sch.getZdzName());
             map.put("fcsj", sch.getFcsj());
+            map.put("fcsjActualTime", sch.getFcsjActualTime());
             map.put("dfsj", sch.getDfsj());
             map.put("zdsj", sch.getZdsj());
+            map.put("zdsjActualTime", sch.getZdsjActualTime());
             map.put("bcType", sch.getBcType());
             map.put("remarks", sch.getRemark());
             map.put("status", sch.getStatus());
 package com.bsth.filter;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 import javax.servlet.FilterChain;
@@ -16,15 +17,24 @@ public class SQLInjectFilter extends BaseFilter{
 	private final static String specialUri = "adminUtils";
+	@Value("${enabled.sqlinject}")
+	private boolean sqlInjectEnabled;
+
 	@Override
 	public void doFilter(HttpServletRequest request, HttpServletResponse response, FilterChain chain)
 			throws IOException, ServletException {
+		if (!sqlInjectEnabled) {
+			chain.doFilter(request, response);
+			return;
+		}
+
 		//获取请求对象中的参数名称
 		Enumeration enu = request.getParameterNames();
 		String uri = request.getRequestURI();
 		if (uri.indexOf(specialUri) > -1) {
 			chain.doFilter(request, response);
+			return;
 		}
 		//遍历枚举
@@ -59,4 +69,12 @@ public class SQLInjectFilter extends BaseFilter{
 	public static void setInjStr(String injStr) {
 		SQLInjectFilter.injStr = injStr;
 	}
+
+	public boolean isSqlInjectEnabled() {
+		return sqlInjectEnabled;
+	}
+
+	public void setSqlInjectEnabled(boolean sqlInjectEnabled) {
+		this.sqlInjectEnabled = sqlInjectEnabled;
+	}
 }
@@ -56,4 +56,6 @@ dsm.ack.url= http://211.95.61.66:9008/modules/dsmCheckTheRecord/addDsm?
 ## cp ack interface
 cp.ack.url= http://114.80.178.12:8778/prod-api/serverApi/instructionsIssue/confirm/
 ## admin mail
-admin.mail= 3090342880@qq.com
 \ No newline at end of file
+admin.mail= 3090342880@qq.com
+## enabled
+enabled.sqlinject= false
 \ No newline at end of file
@@ -56,4 +56,6 @@ dsm.ack.url= http://211.95.61.66:9008/modules/dsmCheckTheRecord/addDsm?
 ## cp ack interface
 cp.ack.url= http://114.80.178.12:8778/prod-api/serverApi/instructionsIssue/confirm/
 ## admin mail
-admin.mail= 3090342880@qq.com
 \ No newline at end of file
+admin.mail= 3090342880@qq.com
+## enabled
+enabled.sqlinject= false
 \ No newline at end of file