指令和操作日志

潘钊
1 parent 8e1333ea
Showing 16 changed files with 432 additions and 38 deletions
src/main/java/com/bsth/WebAppConfiguration.java
src/main/java/com/bsth/controller/directive/DirectiveController.java
src/main/java/com/bsth/controller/directive/UpstreamEntrance.java
src/main/java/com/bsth/data/LineConfigData.java
src/main/java/com/bsth/data/gpsdata/GpsRealData.java
src/main/java/com/bsth/entity/directive/DC0_A3.java
src/main/java/com/bsth/entity/directive/DC0_A4.java
src/main/java/com/bsth/oplog/Type.java
src/main/java/com/bsth/oplog/db/DBHelper.java
src/main/java/com/bsth/oplog/http/HttpOpLogInterceptor.java
src/main/java/com/bsth/oplog/http/HttpRecorder.java
src/main/java/com/bsth/oplog/normal/OpLogger.java
src/main/java/com/bsth/service/directive/DirectiveService.java
src/main/java/com/bsth/service/directive/DirectiveServiceImpl.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/java/com/bsth/util/db/DBUtils_MS.java
@@ -63,11 +63,11 @@ public class WebAppConfiguration extends WebMvcConfigurerAdapter implements WebS
 	 * 
 	 * @Title: addInterceptors 
 	 * @Description: TODO(HTTP结构化访问日志记录 ) 
-	
+	*/
 	@Override
 	public void addInterceptors(InterceptorRegistry registry) {
 		registry.addInterceptor(httpOpLogInterceptor);
-	}*/
+	}
 	@Override
 	public void registerWebSocketHandlers(WebSocketHandlerRegistry registry) {
@@ -3,13 +3,17 @@ package com.bsth.controller.directive;
 import java.util.List;
 import java.util.Map;
+import org.apache.commons.lang3.StringEscapeUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.bsth.entity.directive.D80;
+import com.bsth.entity.directive.DC0_A3;
 import com.bsth.entity.sys.SysUser;
 import com.bsth.security.util.SecurityUtils;
 import com.bsth.service.directive.DirectiveService;
@@ -130,4 +134,28 @@ public class DirectiveController {
 		return directiveService.findDirective(nbbm, dType, page, size);
 	}
+	
+	@RequestMapping(value = "/c0a4", method = RequestMethod.POST)
+	public int c0a4(@RequestParam String nbbm){
+		return directiveService.sendC0A4(nbbm);
+	}
+	
+//	@RequestMapping(value = "/c0a3", method = RequestMethod.POST)
+//	public int c0a3(@RequestParam DC0_A4 c0a4){
+//		return directiveService.sendC0A3(c0a4);
+//	}
+	
+	@RequestMapping(value = "/c0a3", method = RequestMethod.POST)
+	public int c0a3(String json){
+		json = StringEscapeUtils.unescapeHtml4(json);
+		DC0_A3 c0a3 = JSON.toJavaObject(JSONObject.parseObject(json), DC0_A3.class);
+		return directiveService.sendC0A3(c0a3);
+	}
+	
+	@RequestMapping(value = "/c0a5", method = RequestMethod.POST)
+	public int c0a5(String json){
+		json = StringEscapeUtils.unescapeHtml4(json);
+		//DC0_A3 c0a3 = JSON.toJavaObject(JSONObject.parseObject(json), DC0_A3.class);
+		return directiveService.sendC0A5(json);
+	}
 }
@@ -13,6 +13,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.bsth.data.directive.DayOfDirectives;
 import com.bsth.data.pilot80.PilotReport;
 import com.bsth.entity.directive.D80;
+import com.bsth.entity.directive.DC0_A4;
 import com.bsth.entity.directive.DirectiveReponse;
 /**
@@ -53,10 +54,25 @@ public class UpstreamEntrance {
 			// 80协议上报
 			else if (jsonParam.getInteger("operCode") == 0X80) {
 				try {
-					D80 d80 = JSON.toJavaObject(jsonParam, D80.class);
-					// 驾驶员上报
-					if (d80.getData().getOperCode2() == 0x26)
+					JSONObject data = jsonParam.getJSONObject("data");
+					switch (data.getShort("operCode2")) {
+					case 0x26:
+						// 驾驶员上报
+						D80 d80 = JSON.toJavaObject(jsonParam, D80.class);
 						pilotReport.report(d80);
+						break;
+
+					case 0xA4:
+						data.put("port", data.getString("port").trim());
+						data.put("posPort", data.getString("posPort").trim());
+						data.put("posIpAddress", data.getString("posIpAddress").trim());
+						data.put("ipAddress", data.getString("ipAddress").trim());
+						
+						DC0_A4 c0a4 = JSON.toJavaObject(jsonParam, DC0_A4.class);
+						System.out.println(c0a4);
+						break;
+					}
+					
 				} catch (Exception e) {
 					logger.error("", e);
 				}
@@ -15,6 +15,7 @@ import org.springframework.stereotype.Component;
 import com.bsth.entity.Line;
 import com.bsth.entity.realcontrol.D80ReplyTemp;
 import com.bsth.entity.realcontrol.LineConfig;
+import com.bsth.oplog.normal.OpLogger;
 import com.bsth.service.LineService;
 import com.bsth.service.realcontrol.LineConfigService;
@@ -39,6 +40,9 @@ public class LineConfigData implements CommandLineRunner {
 	@Autowired
 	LineService lineService;
+	
+	@Autowired
+	OpLogger opLog;
 	@Override
 	public void run(String... arg0) throws Exception {
@@ -47,6 +51,8 @@ public class LineConfigData implements CommandLineRunner {
 		Iterator<LineConfig> itr = lineConfigService.findAll().iterator();
 		while (itr.hasNext()) 
 			setBuffer(itr.next());
+		
+		opLog.info("Line_config_data");
 	}
 	public LineConfig get(String lineCode){
@@ -72,7 +72,7 @@ public class GpsRealData implements CommandLineRunner{
 	@Override
 	public void run(String... arg0) throws Exception {
-		Application.mainServices.scheduleWithFixedDelay(gpsDataLoader, 20, 7, TimeUnit.SECONDS);
+		Application.mainServices.scheduleWithFixedDelay(gpsDataLoader, 20, 18, TimeUnit.SECONDS);
 	}
 	public GpsEntity add(GpsEntity gps) {
@@ -200,7 +200,10 @@ public class GpsRealData implements CommandLineRunner{
 					}
 				} else
 					logger.error("result is null");
-			} finally {
+			} catch(Exception e){
+				logger.error("", e);
+			}
+			finally {
 				if (null != httpClient)
 					httpClient.close();
 				if(null != response)
+package com.bsth.entity.directive;
+
+import javax.persistence.Embeddable;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import javax.persistence.Transient;
+
+/**
+ * 
+ * @ClassName: DC0_A4
+ * @Description: TODO(设备参数) 
+ * @author PanZhao 
+ * @date 2016年10月18日 下午5:22:36 
+ *
+ */
+@Entity
+@Table(name = "bsth_v_C0_A3")
+public class DC0_A3 extends Directive{
+	
+	@Id
+	@GeneratedValue
+	private Integer id;
+	
+	private DC0_A3Data data;
+	
+	@Embeddable
+	public static class DC0_A3Data {
+		/**
+		 * 二级协议
+		 */
+		private Short operCode2 = 0xA3;
+		/** 设备编号 */
+		@Transient
+		private String deviceId;
+		/** 网关IP地址 */
+		private String ipAddress;
+		/** 网关端口 */
+		private int port;
+		/** 定时定距上报模式 */
+		private short reportMode;
+		/** 定时上报时间间隔 */
+		private int interval;
+		/** 定距上报距离间隔 */
+		private String distance; 
+		/** 非线路状态超速阀门 */
+		private short speedingThreshold;
+		/** 预警阀门 */
+		private short alarmThreshold;
+		/** pos机IP地址 */
+		private String posIpAddress;
+		/** pos机端口 */
+		private String posPort;
+		/** 延迟机关时间 */
+		private int delay;
+		/** 中门视频切换到码表界面速度阀门 默认45 */
+		private short speedThreshold1;
+		/** 码表界面切换到中门视频速度阀门 默认35 */
+		private short speedThreshold2;
+		/** 对比度 */
+		private short contrast;
+		/** 亮度 */
+		private short brightness;
+		/** 饱和度 */
+		private short saturation;
+		public Short getOperCode2() {
+			return operCode2;
+		}
+		public void setOperCode2(Short operCode2) {
+			this.operCode2 = operCode2;
+		}
+		public String getDeviceId() {
+			return deviceId;
+		}
+		public void setDeviceId(String deviceId) {
+			this.deviceId = deviceId;
+		}
+		public String getIpAddress() {
+			return ipAddress;
+		}
+		public void setIpAddress(String ipAddress) {
+			this.ipAddress = ipAddress;
+		}
+		public int getPort() {
+			return port;
+		}
+		public void setPort(int port) {
+			this.port = port;
+		}
+		public short getReportMode() {
+			return reportMode;
+		}
+		public void setReportMode(short reportMode) {
+			this.reportMode = reportMode;
+		}
+		public int getInterval() {
+			return interval;
+		}
+		public void setInterval(int interval) {
+			this.interval = interval;
+		}
+		public String getDistance() {
+			return distance;
+		}
+		public void setDistance(String distance) {
+			this.distance = distance;
+		}
+		public short getSpeedingThreshold() {
+			return speedingThreshold;
+		}
+		public void setSpeedingThreshold(short speedingThreshold) {
+			this.speedingThreshold = speedingThreshold;
+		}
+		public short getAlarmThreshold() {
+			return alarmThreshold;
+		}
+		public void setAlarmThreshold(short alarmThreshold) {
+			this.alarmThreshold = alarmThreshold;
+		}
+		public String getPosIpAddress() {
+			return posIpAddress;
+		}
+		public void setPosIpAddress(String posIpAddress) {
+			this.posIpAddress = posIpAddress;
+		}
+		public String getPosPort() {
+			return posPort;
+		}
+		public void setPosPort(String posPort) {
+			this.posPort = posPort;
+		}
+		public int getDelay() {
+			return delay;
+		}
+		public void setDelay(int delay) {
+			this.delay = delay;
+		}
+		public short getSpeedThreshold1() {
+			return speedThreshold1;
+		}
+		public void setSpeedThreshold1(short speedThreshold1) {
+			this.speedThreshold1 = speedThreshold1;
+		}
+		public short getSpeedThreshold2() {
+			return speedThreshold2;
+		}
+		public void setSpeedThreshold2(short speedThreshold2) {
+			this.speedThreshold2 = speedThreshold2;
+		}
+		public short getContrast() {
+			return contrast;
+		}
+		public void setContrast(short contrast) {
+			this.contrast = contrast;
+		}
+		public short getBrightness() {
+			return brightness;
+		}
+		public void setBrightness(short brightness) {
+			this.brightness = brightness;
+		}
+		public short getSaturation() {
+			return saturation;
+		}
+		public void setSaturation(short saturation) {
+			this.saturation = saturation;
+		}
+	}
+
+	public Integer getId() {
+		return id;
+	}
+
+	public void setId(Integer id) {
+		this.id = id;
+	}
+
+	public DC0_A3Data getData() {
+		return data;
+	}
+
+	public void setData(DC0_A3Data data) {
+		this.data = data;
+	}
+
+}
 package com.bsth.entity.directive;
 import javax.persistence.Embeddable;
+import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
+import javax.persistence.Table;
+import javax.persistence.Transient;
 /**
  * 
- * @ClassName: DC0_A4 
- * @Description: TODO(参数查询) 
+ * @ClassName: DC0_A4
+ * @Description: TODO(设备参数) 
  * @author PanZhao 
  * @date 2016年10月18日 下午5:22:36 
  *
  */
+@Entity
+@Table(name = "bsth_v_C0_A4")
 public class DC0_A4 extends Directive{
 	@Id
 	@GeneratedValue
 	private Integer id;
+	private DC0A4Data data;
 	@Embeddable
 	public static class DC0A4Data {
@@ -26,6 +32,7 @@ public class DC0_A4 extends Directive{
 		 */
 		private Short operCode2;
 		/** 设备编号 */
+		@Transient
 		private String deviceId;
 		/** 网关IP地址 */
 		private String ipAddress;
@@ -43,5 +50,137 @@ public class DC0_A4 extends Directive{
 		private short alarmThreshold;
 		/** pos机IP地址 */
 		private String posIpAddress;
+		/** pos机端口 */
+		private String posPort;
+		/** 延迟机关时间 */
+		private int delay;
+		/** 中门视频切换到码表界面速度阀门 默认45 */
+		private short speedThreshold1;
+		/** 码表界面切换到中门视频速度阀门 默认35 */
+		private short speedThreshold2;
+		/** 对比度 */
+		private short contrast;
+		/** 亮度 */
+		private short brightness;
+		/** 饱和度 */
+		private short saturation;
+		public Short getOperCode2() {
+			return operCode2;
+		}
+		public void setOperCode2(Short operCode2) {
+			this.operCode2 = operCode2;
+		}
+		public String getDeviceId() {
+			return deviceId;
+		}
+		public void setDeviceId(String deviceId) {
+			this.deviceId = deviceId;
+		}
+		public String getIpAddress() {
+			return ipAddress;
+		}
+		public void setIpAddress(String ipAddress) {
+			this.ipAddress = ipAddress;
+		}
+		public int getPort() {
+			return port;
+		}
+		public void setPort(int port) {
+			this.port = port;
+		}
+		public short getReportMode() {
+			return reportMode;
+		}
+		public void setReportMode(short reportMode) {
+			this.reportMode = reportMode;
+		}
+		public int getInterval() {
+			return interval;
+		}
+		public void setInterval(int interval) {
+			this.interval = interval;
+		}
+		public String getDistance() {
+			return distance;
+		}
+		public void setDistance(String distance) {
+			this.distance = distance;
+		}
+		public short getSpeedingThreshold() {
+			return speedingThreshold;
+		}
+		public void setSpeedingThreshold(short speedingThreshold) {
+			this.speedingThreshold = speedingThreshold;
+		}
+		public short getAlarmThreshold() {
+			return alarmThreshold;
+		}
+		public void setAlarmThreshold(short alarmThreshold) {
+			this.alarmThreshold = alarmThreshold;
+		}
+		public String getPosIpAddress() {
+			return posIpAddress;
+		}
+		public void setPosIpAddress(String posIpAddress) {
+			this.posIpAddress = posIpAddress;
+		}
+		public String getPosPort() {
+			return posPort;
+		}
+		public void setPosPort(String posPort) {
+			this.posPort = posPort;
+		}
+		public int getDelay() {
+			return delay;
+		}
+		public void setDelay(int delay) {
+			this.delay = delay;
+		}
+		public short getSpeedThreshold1() {
+			return speedThreshold1;
+		}
+		public void setSpeedThreshold1(short speedThreshold1) {
+			this.speedThreshold1 = speedThreshold1;
+		}
+		public short getSpeedThreshold2() {
+			return speedThreshold2;
+		}
+		public void setSpeedThreshold2(short speedThreshold2) {
+			this.speedThreshold2 = speedThreshold2;
+		}
+		public short getContrast() {
+			return contrast;
+		}
+		public void setContrast(short contrast) {
+			this.contrast = contrast;
+		}
+		public short getBrightness() {
+			return brightness;
+		}
+		public void setBrightness(short brightness) {
+			this.brightness = brightness;
+		}
+		public short getSaturation() {
+			return saturation;
+		}
+		public void setSaturation(short saturation) {
+			this.saturation = saturation;
+		}
+	}
+
+	public Integer getId() {
+		return id;
+	}
+
+	public void setId(Integer id) {
+		this.id = id;
+	}
+
+	public DC0A4Data getData() {
+		return data;
+	}
+
+	public void setData(DC0A4Data data) {
+		this.data = data;
 	}
 }
-package com.bsth.oplog;
-
-public enum Type {
-	
-	HTTP_GET,HTTP_POST,HTTP_DELETE,HTTP_PUT,NORMAL
-}
@@ -11,11 +11,11 @@ import com.bsth.Application;
 import com.bsth.oplog.Log;
 import com.bsth.oplog.db.mysql.DBPersistence;
-//@Component
+@Component
 public class DBHelper implements CommandLineRunner{
 	private final static int maxBufSize = 1000;
-	private final static int fixedMinute = 1;
+	private final static int fixedMinute = 10;
 	private static LinkedList<Log> buffer = new LinkedList<>();
@@ -25,7 +25,7 @@ public class HttpOpLogInterceptor implements HandlerInterceptor {
 	private final PathMatcher pathMatcher = new AntPathMatcher();
 	// GET 白名单
-	private String[] httpGetWhiteList = { "/user/login/**", "/user/currentUser", "/dictionary/**", "/module/findByCurrentUser" };
+	private String[] httpGetWhiteList = { "/user/login/**", "/user/currentUser", "/dictionary/**", "/module/findByCurrentUser", "/gps/**", "/error/**" };
 	// POST 白名单
 	private String[] httpPostWhiteList = {
@@ -16,7 +16,6 @@ import com.alibaba.fastjson.JSON;
 import com.bsth.entity.sys.SysUser;
 import com.bsth.oplog.Level;
 import com.bsth.oplog.Log;
-import com.bsth.oplog.Type;
 import com.bsth.oplog.db.DBHelper;
 import com.bsth.security.util.SecurityUtils;
 import com.bsth.util.IpUtils;
@@ -42,22 +41,7 @@ public class HttpRecorder {
 	public void record(HttpServletRequest request, HandlerMethod method){
 		Log log = new Log();
-		Type type = null;
-		switch (request.getMethod()) {
-		case "GET":
-			type = Type.HTTP_GET;
-			break;
-		case "POST":
-			type = 	Type.HTTP_POST;
-			break;
-		case "DELETE":
-			type = 	Type.HTTP_DELETE;
-			break;
-		case "PUT":
-			type = 	Type.HTTP_PUT;
-			break;
-		}
-		log.setType(type.toString());
+		log.setType(request.getMethod().toUpperCase());
 		log.setLevel(Level.INFO.toString());
 		try {
 			log.setServerIp(InetAddress.getLocalHost().getHostAddress());
@@ -10,7 +10,6 @@ import org.springframework.stereotype.Component;
 import com.bsth.entity.sys.SysUser;
 import com.bsth.oplog.Log;
-import com.bsth.oplog.Type;
 import com.bsth.oplog.db.DBHelper;
 import com.bsth.security.util.SecurityUtils;
 import com.bsth.util.IpUtils;
@@ -55,7 +54,7 @@ public class OpLogger {
 		Log log = new Log();
 		log.setTimestamp(System.currentTimeMillis());
 		log.setPath(path);
-		log.setType(Type.NORMAL.toString());
+		log.setType("NORMAL");
 		//get caller
 		StackTraceElement[] stack = (new Throwable()).getStackTrace();
@@ -7,6 +7,7 @@ import java.util.Map;
 import com.bsth.entity.directive.D60;
 import com.bsth.entity.directive.D64;
 import com.bsth.entity.directive.D80;
+import com.bsth.entity.directive.DC0_A3;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.service.BaseService;
@@ -82,4 +83,10 @@ public interface DirectiveService extends BaseService&lt;D60, Integer&gt;{
 	Map<String, Object> findAll80(Map<String, Object> map, int page, int size);
 	D64 save64(D64 d64);
+
+	int sendC0A4(String nbbm);
+
+	int sendC0A3(DC0_A3 c0a4);
+
+	int sendC0A5(String json);
 }
@@ -30,6 +30,7 @@ import com.bsth.data.schedule.DayOfSchedule;
 import com.bsth.entity.directive.D60;
 import com.bsth.entity.directive.D64;
 import com.bsth.entity.directive.D80;
+import com.bsth.entity.directive.DC0_A3;
 import com.bsth.entity.directive.Directive;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.entity.sys.SysUser;
@@ -470,4 +471,32 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen
 	public D64 save64(D64 d64) {
 		return d64Repository.save(d64);
 	}
+
+	@Override
+	public int sendC0A4(String nbbm) {
+		String deviceId = BasicData.deviceId2NbbmMap.inverse().get(nbbm);
+		
+		Map<String, Object> c0a4 = new HashMap<>();
+		c0a4.put("deviceId", deviceId);
+		c0a4.put("timestamp", System.currentTimeMillis());
+		c0a4.put("operCode", (short)0xC0);
+		
+		Map<String, Object> data = new HashMap<>();
+		data.put("deviceId", deviceId);
+		data.put("operCode2", (short)0xA4);
+		c0a4.put("data", data);
+		
+		return GatewayHttpUtils.postJson(JSON.toJSONString(c0a4));
+	}
+
+	@Override
+	public int sendC0A3(DC0_A3 c0a3) {
+		GatewayHttpUtils.postJson(JSON.toJSONString(c0a3));
+		return 0;
+	}
+
+	@Override
+	public int sendC0A5(String json) {
+		return GatewayHttpUtils.postJson(json);
+	}
 }
@@ -13,6 +13,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import javax.transaction.Transactional;
+
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -22,7 +22,7 @@ import com.mchange.v2.c3p0.DataSources;
  * @author PanZhao
  *
  */
-@Component
+//@Component
 public class DBUtils_MS {
 	private static String url = null;