update...

潘钊
1 parent 15bdf37e
Showing 10 changed files with 489 additions and 15 deletions
src/main/java/com/bsth/CXFConfig.java
src/main/java/com/bsth/server_rs/base_info/person/buffer/PersonRefreshThread.java
src/main/java/com/bsth/server_rs/gps/GpsRestService.java
src/main/java/com/bsth/server_rs/gps/dao/HistoryGpsDao.java
src/main/java/com/bsth/server_rs/gps/entity/HistoryGpsEntity.java
src/main/java/com/bsth/server_rs/logs/RealLogRestService.java
src/main/java/com/bsth/server_rs/logs/entity/EditType.java
src/main/java/com/bsth/server_rs/logs/entity/SchEditInfo.java
src/main/java/com/bsth/util/DBUtils_MS.java
src/main/resources/ms-jdbc.properties
@@ -8,6 +8,7 @@ import com.bsth.server_rs.base_info.section.LD_SectionRestService;
 import com.bsth.server_rs.base_info.station.StationRestService;
 import com.bsth.server_rs.exception.AesExceptionMapper;
 import com.bsth.server_rs.gps.GpsRestService;
+import com.bsth.server_rs.logs.RealLogRestService;
 import com.bsth.server_rs.schedule.plan.SchedulePlanService;
 import com.bsth.server_rs.schedule.real.ScheduleRealService;
 import com.bsth.server_ws.attendance.AttendanceServiceSoap;
@@ -81,6 +82,10 @@ public class CXFConfig {
     LD_SectionRestService ldSectionRestService;
     @Autowired
     SchedulePlanService schedulePlanService;
+    @Autowired
+    RealLogRestService realLogRestService;
+    @Autowired
+    GpsRestService gpsRestService;
     @Bean
     public Server rsServer() {
@@ -91,11 +96,12 @@ public class CXFConfig {
                 new LineRestService(),
                 new CarRestService(),
                 new PersonRestService(),
-                new GpsRestService(),
+                gpsRestService,
                 scheduleRealService,
                 stationRestService,
                 ldSectionRestService,
-                schedulePlanService));
+                schedulePlanService,
+                realLogRestService));
         endpoint.setProviders(Arrays.asList(new JacksonJsonProvider(), new AesExceptionMapper()));
         //endpoint.setFeatures(Arrays.asList(new Swagger2Feature()));
         endpoint.getInInterceptors().add(new AuthorizeInterceptor_IN());
@@ -8,7 +8,10 @@ import org.springframework.jdbc.core.BeanPropertyRowMapper;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Component;
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 /**
  * Created by panzhao on 2017/3/27.
@@ -27,8 +30,15 @@ public class PersonRefreshThread extends Thread{
         try {
             List<Personnel> list = jdbcTemplate.query("select DISTINCT t1.*,t2.name as line_name,t2.line_code  from (SELECT company_code,branche_company_code,job_code,personnel_name,papers_code,ic_card_code,personnel_type,posts,card,telphone,ic_rfid,id_rfid,tag_rfid,e.xl FROM bsth_c_personnel p left JOIN bsth_c_s_ecinfo e on p.id=e.jsy) t1 LEFT JOIN bsth_c_line t2 on t1.xl=t2.id "
                     ,BeanPropertyRowMapper.newInstance(Personnel.class));
+
+            Map<String, Personnel> map = new HashMap<>();
+            //过滤数据，多条线路配车的保留一条
+            for(Personnel p : list){
+                map.put(p.getJobCode(), p);
+            }
+
             if(list != null && list.size() > 0)
-                PersonBufferData.replaceAll(list);
+                PersonBufferData.replaceAll(new ArrayList(map.values()));
         }catch (Exception e){
             logger.error("", e);
         }
 package com.bsth.server_rs.gps;
 import com.bsth.server_rs.gps.buffer.GpsRealDataBuffer;
+import com.bsth.server_rs.gps.dao.HistoryGpsDao;
 import com.bsth.server_rs.gps.entity.GpsEntity;
+import com.bsth.server_rs.gps.entity.HistoryGpsEntity;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
@@ -13,19 +17,31 @@ import java.util.Collection;
 /**
  * Created by panzhao on 2017/3/28.
  */
+@Component
 @Path("/gps")
 @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
 public class GpsRestService {
+    @Autowired
+    HistoryGpsDao historyGpsDao;
+
     @GET
     @Path("/{deviceId}")
-    public GpsEntity findOne(@PathParam("deviceId") String deviceId){
+    public GpsEntity findOne(@PathParam("deviceId") String deviceId) {
         return GpsRealDataBuffer.get(deviceId);
     }
     @GET
     @Path("/all")
-    public Collection<GpsEntity> findAll(){
+    public Collection<GpsEntity> findAll() {
         return GpsRealDataBuffer.all();
     }
+
+    @GET
+    @Path("/history/{nbbm}/{st}/{et}")
+    public Collection<HistoryGpsEntity> history(@PathParam("nbbm") String nbbm
+            , @PathParam("st") String st
+            , @PathParam("et") String et) {
+        return historyGpsDao.query(nbbm, Long.parseLong(st), Long.parseLong(et));
+    }
 }
 package com.bsth.server_rs.gps.dao;
+import com.bsth.redis.util.DateUtils;
+import com.bsth.server_rs.base_info.car.Car;
+import com.bsth.server_rs.base_info.car.buffer.CarBufferData;
+import com.bsth.server_rs.gps.entity.HistoryGpsEntity;
+import com.bsth.util.DBUtils_MS;
+import org.springframework.jdbc.core.BeanPropertyRowMapper;
+import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Component;
+import java.util.*;
+
 /**
  * Created by panzhao on 2017/8/31.
  */
@@ -9,4 +18,103 @@ import org.springframework.stereotype.Component;
 public class HistoryGpsDao {
+    /**
+     * 最大查询间隔
+     */
+    private static final long GPS_RANGE = 1000 * 60 * 60 * 24;
+
+    public Collection<HistoryGpsEntity> query(String nbbm, Long st, Long et) {
+        //分区字段 day_years
+        Calendar sCal = Calendar.getInstance();
+        sCal.setTime(new Date(st));
+        Calendar eCal = Calendar.getInstance();
+        eCal.setTime(new Date(et));
+
+        if (null == st)
+            return null;
+        if (null == et)
+            return null;
+        if (et < st)
+            return null;
+
+        if (et - st > GPS_RANGE)
+            return null;
+
+        Car c = CarBufferData.findOne(nbbm);
+        if (null == c)
+            return null;
+
+        List<HistoryGpsEntity> list = query(c.getEquipmentCode(), sCal, eCal);
+        for (HistoryGpsEntity gps : list) {
+            gps.setNbbm(nbbm);
+            gps.setUpDown(getUpOrDown(gps.getServiceState()));
+            gps.setState(getService(gps.getServiceState()));
+        }
+        return list;
+    }
+
+    private List<HistoryGpsEntity> query(String deviceId, Calendar sCal, Calendar eCal) {
+        int sDayOfYear = sCal.get(Calendar.DAY_OF_YEAR);
+        int eDayOfYear = eCal.get(Calendar.DAY_OF_YEAR);
+        long st = sCal.getTimeInMillis();
+        long et = eCal.getTimeInMillis();
+
+        List<HistoryGpsEntity> list = new ArrayList<>();
+        // 如果是同一天
+        if (sDayOfYear == eDayOfYear) {
+            list = query(sDayOfYear, st, et, deviceId);
+        } else {
+            // 跨天
+            Long tempSt = 0L, tempEt = 0L;
+            for (int i = sDayOfYear; i <= eDayOfYear; i++) {
+
+                if (i == sDayOfYear) {
+                    tempSt = st;
+                    tempEt = DateUtils.getTimesnight(sCal);
+                } else if (i == eDayOfYear) {
+                    tempSt = DateUtils.getTimesmorning(sCal);
+                    tempEt = et;
+                } else {
+                    tempSt = DateUtils.getTimesmorning(sCal);
+                    tempEt = DateUtils.getTimesnight(sCal);
+                }
+
+                list.addAll(query(sDayOfYear, tempSt, tempEt, deviceId));
+                // 加一天
+                sCal.add(Calendar.DATE, 1);
+            }
+        }
+        return list;
+    }
+
+    private List<HistoryGpsEntity> query(int dayOfYear, Long st, Long et, String deviceId) {
+        String sql = "select device_id,line_id,service_state,direction,lon,lat,ts,stop_no,speed_gps as speed,inout_stop from bsth_c_gps_info where days_year=" + dayOfYear + " and device_id='"+deviceId+"' and ts > " + st + " and ts < " + et;
+
+        JdbcTemplate jdbcTemplate = new JdbcTemplate(DBUtils_MS.getDataSource());
+        List<HistoryGpsEntity> list = jdbcTemplate.query(sql, BeanPropertyRowMapper.newInstance(HistoryGpsEntity.class));
+        return list;
+    }
+
+    /**
+     * 王通 2016/6/29 9:23:24 获取车辆线路上下行
+     *
+     * @return -1无效 0上行 1下行
+     */
+    private static byte getUpOrDown(long serviceState) {
+        if ((serviceState & 0x00020000) == 0x00020000 || (serviceState & 0x80000000) == 0x80000000
+                || (serviceState & 0x01000000) == 0x01000000 || (serviceState & 0x08000000) == 0x08000000)
+            return -1;
+        return (byte) (((serviceState & 0x10000000) == 0x10000000) ? 1 : 0);
+    }
+
+    /**
+     * 获取运营状态
+     *
+     * @return -1无效 0运营 1未运营
+     */
+    private static byte getService(long serviceState) {
+        if ((serviceState & 0x00020000) == 0x00020000 || (serviceState & 0x80000000) == 0x80000000)
+            return -1;
+        return (byte) (((serviceState & 0x02000000) == 0x02000000) ? 1 : 0);
+    }
 }
 package com.bsth.server_rs.gps.entity;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+
+import java.io.Serializable;
+
 /**
  * 历史GPS
  * Created by panzhao on 2017/8/31.
  */
-public class HistoryGpsEntity {
+public class HistoryGpsEntity  implements Serializable {
     /** 车辆自编号 */
     private String nbbm;
@@ -37,11 +41,15 @@ public class HistoryGpsEntity {
     private float speed;
     /** 进出站状态 */
-    private int inout_stop;
+    private int inoutStop;
     /** 营运状态 */
     private int state;
+    @JsonIgnore
+    /** 多状态字段 */
+    private Long serviceState;
+
     public String getNbbm() {
         return nbbm;
     }
@@ -122,14 +130,6 @@ public class HistoryGpsEntity {
         this.speed = speed;
     }
-    public int getInout_stop() {
-        return inout_stop;
-    }
-
-    public void setInout_stop(int inout_stop) {
-        this.inout_stop = inout_stop;
-    }
-
     public int getState() {
         return state;
     }
@@ -137,4 +137,20 @@ public class HistoryGpsEntity {
     public void setState(int state) {
         this.state = state;
     }
+
+    public Long getServiceState() {
+        return serviceState;
+    }
+
+    public void setServiceState(Long serviceState) {
+        this.serviceState = serviceState;
+    }
+
+    public int getInoutStop() {
+        return inoutStop;
+    }
+
+    public void setInoutStop(int inoutStop) {
+        this.inoutStop = inoutStop;
+    }
 }
+package com.bsth.server_rs.logs;
+
+import com.bsth.server_rs.logs.entity.SchEditInfo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.BeanPropertyRowMapper;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.stereotype.Component;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+import java.util.List;
+
+/**
+ * Created by panzhao on 2017/3/28.
+ */
+@Component
+@Path("/real_log")
+@Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
+public class RealLogRestService {
+
+    @Autowired
+    JdbcTemplate jdbcTemplate;
+
+    @GET
+    @Path("/company/{companyId}/{rq}")
+    public List<SchEditInfo> findByCompany(@PathParam("companyId") String companyId, @PathParam("rq") String rq) {
+        //不走缓存，暂时直连数据库
+        List<SchEditInfo> list = jdbcTemplate.query("select * from  logger_sch_modify where gsbm='" + companyId + "' and rq='" + rq + "'", BeanPropertyRowMapper.newInstance(SchEditInfo.class));
+        return list;
+    }
+}
+package com.bsth.server_rs.logs.entity;
+
+/**
+ * Created by panzhao on 2017/5/18.
+ */
+public enum EditType {
+
+    DFTZ,SFTZ,FCXXWT,TZRC,LPDD,ZRW,JHLB,CXLB, CXSF, LSBCTZ, CXZX
+}
 \ No newline at end of file
+package com.bsth.server_rs.logs.entity;
+
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
+
+/**
+ * 线调操作日志
+ * Created by panzhao on 2017/9/6.
+ */
+public class SchEditInfo {
+
+    /**
+     * 日期 yyyy-MM-dd
+     */
+    private String rq;
+
+    /**
+     * 时间戳
+     */
+    private long ts;
+
+    private String lineCode;
+
+
+    private String fgsbm;
+
+    /**
+     * 班次ID
+     */
+    private long schId;
+
+    /**
+     * 类型
+     */
+    @Enumerated(EnumType.STRING)
+    private EditType type;
+
+    private String type2;
+    /**
+     * 操作人 @system 系统/用户名
+     */
+    private String user;
+
+    /**
+     * 操作明细
+     */
+    private String jsonArray;
+
+    private String remarks;
+
+    public String getRq() {
+        return rq;
+    }
+
+    public void setRq(String rq) {
+        this.rq = rq;
+    }
+
+    public long getTs() {
+        return ts;
+    }
+
+    public void setTs(long ts) {
+        this.ts = ts;
+    }
+
+    public String getLineCode() {
+        return lineCode;
+    }
+
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
+    }
+
+    public String getFgsbm() {
+        return fgsbm;
+    }
+
+    public void setFgsbm(String fgsbm) {
+        this.fgsbm = fgsbm;
+    }
+
+    public long getSchId() {
+        return schId;
+    }
+
+    public void setSchId(long schId) {
+        this.schId = schId;
+    }
+
+    public EditType getType() {
+        return type;
+    }
+
+    public void setType(EditType type) {
+        this.type = type;
+    }
+
+    public String getType2() {
+        return type2;
+    }
+
+    public void setType2(String type2) {
+        this.type2 = type2;
+    }
+
+    public String getUser() {
+        return user;
+    }
+
+    public void setUser(String user) {
+        this.user = user;
+    }
+
+    public String getJsonArray() {
+        return jsonArray;
+    }
+
+    public void setJsonArray(String jsonArray) {
+        this.jsonArray = jsonArray;
+    }
+
+    public String getRemarks() {
+        return remarks;
+    }
+
+    public void setRemarks(String remarks) {
+        this.remarks = remarks;
+    }
+}
+package com.bsth.util;
+
+import com.mchange.v2.c3p0.DataSources;
+import org.apache.log4j.Logger;
+
+import javax.sql.DataSource;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
+
+/**
+ * 网关ms库连接池
+ * @author PanZhao
+ *
+ */
+//@Component
+public class DBUtils_MS {
+
+	private static String url = null;
+
+	private static String username = null;
+
+	private static String pwd = null;
+
+	private static DataSource ds_pooled;
+
+	static Logger logger = Logger.getLogger(DBUtils_MS.class);
+	
+	static {
+		Properties env = new Properties();
+
+		try {
+			env.load(DBUtils_MS.class.getClassLoader().getResourceAsStream("ms-jdbc.properties"));
+			// 1. 加载驱动类
+			Class.forName(env.getProperty("ms.mysql.driver"));
+
+			url = env.getProperty("ms.mysql.url");
+			username = env.getProperty("ms.mysql.username");
+			pwd = env.getProperty("ms.mysql.password");
+
+			// 设置连接数据库的配置信息
+			DataSource ds_unpooled = DataSources.unpooledDataSource(url,
+					username, pwd);
+
+			Map<String, Object> pool_conf = new HashMap<String, Object>();
+			// 设置最大连接数
+			pool_conf.put("maxPoolSize", 10);
+			
+			pool_conf.put("testConnectionOnCheckout", false);
+			//异步检测连接的有效性
+			pool_conf.put("testConnectionOnCheckin", true);
+			//30秒检测一次
+			pool_conf.put("idleConnectionTestPeriod", 30);
+			ds_pooled = DataSources.pooledDataSource(ds_unpooled, pool_conf);
+		} catch (FileNotFoundException e) {
+			logger.error(e.toString());
+			e.printStackTrace();
+		} catch (IOException e) {
+			logger.error(e.toString());
+			e.printStackTrace();
+		} catch (ClassNotFoundException e) {
+			logger.error(e.toString());
+			e.printStackTrace();
+		} catch (SQLException e) {
+			logger.error(e.toString());
+			e.printStackTrace();
+		}
+	}
+
+	/**
+	 * 获取连接对象
+	 */
+	public static Connection getConnection() throws SQLException {
+		return ds_pooled.getConnection();
+	}
+
+	/**
+	 * 释放连接池资源
+	 */
+	public static void clearup() {
+		if (ds_pooled != null) {
+			try {
+				DataSources.destroy(ds_pooled);
+			} catch (SQLException e) {
+				logger.error(e.toString());
+				e.printStackTrace();
+			}
+		}
+	}
+
+	/**
+	 * 资源关闭
+	 * 
+	 * @param rs
+	 * @param stmt
+	 * @param conn
+	 */
+	public static void close(ResultSet rs, Statement stmt, Connection conn) {
+		if (rs != null) {
+			try {
+				rs.close();
+			} catch (SQLException e) {
+				logger.error(e.toString());
+				e.printStackTrace();
+			}
+		}
+
+		if (stmt != null) {
+			try {
+				stmt.close();
+			} catch (SQLException e) {
+				logger.error(e.toString());
+				e.printStackTrace();
+			}
+		}
+
+		if (conn != null) {
+			try {
+				conn.close();
+			} catch (SQLException e) {
+				logger.error(e.toString());
+				e.printStackTrace();
+			}
+		}
+	}
+
+	public static DataSource getDataSource(){
+		return ds_pooled;
+	}
+}
+#ms.mysql.driver= com.mysql.jdbc.Driver
+#ms.mysql.url= jdbc:mysql://127.0.0.1:3306/ms?useUnicode=true&characterEncoding=utf-8
+#ms.mysql.username= root
+#ms.mysql.password= panzhao
+
+ms.mysql.driver= com.mysql.jdbc.Driver
+ms.mysql.url= jdbc:mysql://10.10.150.21:3306/ms?useUnicode=true&characterEncoding=utf-8
+ms.mysql.username= root
+ms.mysql.password= root2jsp@JSP
 \ No newline at end of file