Merge branch 'minhang' of git@192.168.168.201:panzhaov5/bsth_control.git into minhang

zb
2 parents 54203076 336b258c
Showing 12 changed files with 479 additions and 19 deletions
pom.xml
src/main/java/com/bsth/controller/PersonnelController.java
src/main/java/com/bsth/controller/realcontrol/BasicDataController.java
src/main/java/com/bsth/data/BasicData.java
src/main/java/com/bsth/data/pinyin/PersionPinYin.java
src/main/java/com/bsth/data/pinyin/PersionPinYinBuffer.java
src/main/java/com/bsth/data/schedule/DayOfSchedule.java
src/main/java/com/bsth/data/schedule/f_a_l/FirstAndLastHandler.java
src/main/java/com/bsth/data/schedule/f_a_l/entity/ToGateway.java
src/main/java/com/bsth/data/schedule/thread/ScheduleRefreshThread.java
src/main/java/com/bsth/service/schedule/impl/CarDeviceServiceImpl.java
src/main/java/com/bsth/service/schedule/impl/TTInfoDetailServiceImpl.java
@@ -299,6 +299,11 @@
             <version>3.3.0</version>
         </dependency>
+		<dependency>
+			<groupId>com.github.stuxuhai</groupId>
+			<artifactId>jpinyin</artifactId>
+			<version>1.1.8</version>
+		</dependency>
 	</dependencies>
 	<dependencyManagement>
 package com.bsth.controller;
+import com.bsth.common.Constants;
+import com.bsth.data.pinyin.PersionPinYin;
+import com.bsth.data.pinyin.PersionPinYinBuffer;
 import com.bsth.entity.Personnel;
+import com.bsth.entity.sys.CompanyAuthority;
 import com.bsth.service.PersonnelService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -8,6 +12,7 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
+import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 import java.util.Map;
@@ -21,8 +26,22 @@ public class PersonnelController extends BaseController&lt;Personnel, Integer&gt; {
     @Autowired
     private PersonnelService service;
+    @Autowired
+    PersionPinYinBuffer persionPinYinBuffer;
+
     @RequestMapping(value = "/sreachPersonnel", method = RequestMethod.GET)
 	public List<Map<String, String>> sreachPersonnel(@RequestParam String jobCode) {
 		return service.sreachPersonnel(jobCode);
 	}
+
+    @RequestMapping(value = "/all_py", method = RequestMethod.GET)
+	public List<PersionPinYin> findAll_PY(){
+        return persionPinYinBuffer.getAll();
+    }
+
+    @RequestMapping(value = "/list_py", method = RequestMethod.GET)
+    public List<PersionPinYin> findByCurrUser_PY(HttpServletRequest request){
+        List<CompanyAuthority> auths = (List<CompanyAuthority>) request.getSession().getAttribute(Constants.COMPANY_AUTHORITYS);
+        return persionPinYinBuffer.getAll(auths);
+    }
 }
 package com.bsth.controller.realcontrol;
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.serializer.PropertyFilter;
 import com.bsth.common.ResponseCode;
 import com.bsth.data.BasicData;
@@ -60,16 +59,16 @@ public class BasicDataController {
 		return rs;
 	}
-	@RequestMapping("/personnel")
+	/*@RequestMapping("/personnel")
 	public Map<String, Object> findPersonnelInfo(){
 		Map<String, Object> rs = new HashMap<>();
 		PersonnelFieldFilter filter=new PersonnelFieldFilter();
 		//驾驶员
 		rs.put("jsy", JSON.parse(JSON.toJSONString(BasicData.jsyMap.values(), filter)));
 		//售票员
-		rs.put("spy", JSON.parse(JSON.toJSONString(BasicData.spyMap.values(), filter)));
+		rs.put("spy", JSON.parse(JSON.toJSONString(BasicData.spyMap.values(), filter)));*//*
 		return rs;
-	}
+	}*/
 	@RequestMapping("/all_personnel")
 	public Map<String, String> all_personnel(){
@@ -179,15 +178,12 @@ public class BasicDataController {
 				map.put("lineCode", line.getLineCode());
 				rs.add(map);
 			}
-				//listMultimap.put(line.getName(), nbbm);
 		}
-		//return listMultimap.asMap();
-
 		return rs;
 	}
 	/**
-	 * 获取站点和停车场对照表
+	 * 获取站点和停车场历时公里对照表
 	 * @param idx
 	 * @return
 	 */
@@ -2,6 +2,7 @@ package com.bsth.data;
 import com.bsth.Application;
 import com.bsth.data.gpsdata.arrival.GeoCacheData;
+import com.bsth.data.pinyin.PersionPinYinBuffer;
 import com.bsth.entity.*;
 import com.bsth.entity.schedule.CarConfigInfo;
 import com.bsth.repository.*;
@@ -64,10 +65,10 @@ public class BasicData implements CommandLineRunner {
     //线路Code和shangHaiLinecode 对照
     public static Map<String, String> lineCode2ShangHaiCodeMap;
-    //驾驶员工号 和 personnel 对象映射
+    /*//驾驶员工号 和 personnel 对象映射
     public static Map<String, Personnel> jsyMap;
     //售票员工号 和 personnel 对象映射
-    public static Map<String, Personnel> spyMap;
+    public static Map<String, Personnel> spyMap;*/
     //所以员工和personnerl 对象映射
     public static Map<String, Personnel> perMap;
     //全量员工 工号和姓名对照
@@ -137,6 +138,9 @@ public class BasicData implements CommandLineRunner {
         @Autowired
         Station2ParkBuffer station2ParkBuffer;
+        @Autowired
+        PersionPinYinBuffer persionPinYinBuffer;
+
         @Override
         public void run() {
@@ -165,6 +169,8 @@ public class BasicData implements CommandLineRunner {
                 geoCacheData.loadData();
                 station2ParkBuffer.saveAll();
                 logger.info("加载基础数据成功！，");
+                //人员拼音转换
+                persionPinYinBuffer.refresh();
             } catch (Exception e) {
                 logger.error("加载基础数据时出现异常，", e);
             }
@@ -321,7 +327,7 @@ public class BasicData implements CommandLineRunner {
         public void loadPersonnelInfo() {
             Iterator<Personnel> iterator = personnelRepository.findAll().iterator();
-            Map<String, Personnel> jsyTempMap = new HashMap<>(), spyTempMap = new HashMap<>(),perTempMap=new HashMap<>();
+            Map<String, Personnel> /*jsyTempMap = new HashMap<>(), spyTempMap = new HashMap<>(),*/perTempMap=new HashMap<>();
             Map<String, String> allPersonMap = new HashMap<>();
             Personnel p;
@@ -333,20 +339,20 @@ public class BasicData implements CommandLineRunner {
                 if (StringUtils.isEmpty(jobCode))
                     continue;
-                if (p.getPosts() != null) {
+                /*if (p.getPosts() != null) {
                     if (p.getPosts().equals("1"))
                         jsyTempMap.put(jobCode, p);
                     else if (p.getPosts().equals("2"))
                         spyTempMap.put(jobCode, p);
-                }
+                }*/
                 perTempMap.put(jobCode, p);
                 allPersonMap.put(jobCode, p.getPersonnelName());
             }
-            jsyMap = jsyTempMap;
-            spyMap = spyTempMap;
+            //jsyMap = jsyTempMap;
+            //spyMap = spyTempMap;
             allPerson = allPersonMap;
             perMap = perTempMap;
         }
+package com.bsth.data.pinyin;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+
+/**
+ * 人员拼音映射
+ * Created by panzhao on 2017/7/19.
+ */
+public class PersionPinYin {
+
+    /**
+     * Id
+     */
+    private Integer id;
+
+    /**
+     * 工号
+     */
+    private String workId;
+
+    /**
+     * 姓名
+     */
+    private String name;
+
+    /**
+     * 全拼
+     */
+    private String fullChars;
+
+    /**
+     * 简便
+     */
+    private String camelChars;
+
+    /**
+     * 所属公司编码
+     */
+    @JsonIgnore
+    private String companyId;
+
+    /**
+     * 所属分公司编码
+     */
+    @JsonIgnore
+    private String fgsCompanyId;
+
+    public String getWorkId() {
+        return workId;
+    }
+
+    public void setWorkId(String workId) {
+        this.workId = workId;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getFullChars() {
+        return fullChars;
+    }
+
+    public void setFullChars(String fullChars) {
+        this.fullChars = fullChars;
+    }
+
+    public String getCamelChars() {
+        return camelChars;
+    }
+
+    public void setCamelChars(String camelChars) {
+        this.camelChars = camelChars;
+    }
+
+    public String getCompanyId() {
+        return companyId;
+    }
+
+    public void setCompanyId(String companyId) {
+        this.companyId = companyId;
+    }
+
+    public String getFgsCompanyId() {
+        return fgsCompanyId;
+    }
+
+    public void setFgsCompanyId(String fgsCompanyId) {
+        this.fgsCompanyId = fgsCompanyId;
+    }
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+}
+package com.bsth.data.pinyin;
+
+import com.bsth.data.BasicData;
+import com.bsth.entity.Personnel;
+import com.bsth.entity.sys.CompanyAuthority;
+import com.github.stuxuhai.jpinyin.PinyinException;
+import com.github.stuxuhai.jpinyin.PinyinFormat;
+import com.github.stuxuhai.jpinyin.PinyinHelper;
+import com.google.common.collect.ArrayListMultimap;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 人员拼音数据映射缓存
+ * Created by panzhao on 2017/7/19.
+ */
+@Component
+public class PersionPinYinBuffer {
+
+    static ArrayListMultimap<String, PersionPinYin> listMultimap = ArrayListMultimap.create();
+    static List<PersionPinYin> all = new ArrayList<>();
+
+    Logger log = LoggerFactory.getLogger(this.getClass());
+
+
+    public void refresh(){
+        ArrayListMultimap<String, PersionPinYin> listMultimapCopy = ArrayListMultimap.create();
+        List<PersionPinYin> allCopy = new ArrayList<>();
+        PersionPinYin ppy;
+
+        Collection<Personnel> list = BasicData.perMap.values();
+        for(Personnel p : list){
+            ppy = new PersionPinYin();
+            ppy.setId(p.getId());
+            ppy.setCompanyId(p.getCompanyCode());
+            ppy.setFgsCompanyId(p.getBrancheCompanyCode());
+            ppy.setName(p.getPersonnelName());
+            ppy.setWorkId(p.getJobCode());
+            try {
+                ppy.setFullChars(PinyinHelper.convertToPinyinString(ppy.getName(), "" , PinyinFormat.WITHOUT_TONE));
+                ppy.setCamelChars(PinyinHelper.getShortPinyin(ppy.getName()));
+            }catch (PinyinException pye){
+                log.error("拼音转换出现异常，" + ppy.getName(), pye);
+                continue;
+            }
+
+            listMultimapCopy.put(ppy.getCompanyId() + "_" + ppy.getFgsCompanyId(), ppy);
+            allCopy.add(ppy);
+        }
+
+        if(allCopy.size() > 0){
+            all = allCopy;
+            listMultimap = listMultimapCopy;
+        }
+    }
+
+    public List<PersionPinYin> getAll(){
+        return all;
+    }
+
+    public List<PersionPinYin> getAll(List<CompanyAuthority> auths){
+        List<PersionPinYin> rs = new ArrayList<>();
+        for(CompanyAuthority ca : auths){
+            rs.addAll(listMultimap.get(ca.getCompanyCode() + "_" + ca.getSubCompanyCode()));
+        }
+        return rs;
+    }
+}
@@ -7,6 +7,7 @@ import com.bsth.common.ResponseCode;
 import com.bsth.data.LineConfigData;
 import com.bsth.data.gpsdata.GpsRealData;
 import com.bsth.data.gpsdata.recovery.GpsDataRecovery;
+import com.bsth.data.schedule.f_a_l.FirstAndLastHandler;
 import com.bsth.entity.realcontrol.LineConfig;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.entity.schedule.SchedulePlanInfo;
@@ -176,6 +177,8 @@ public class DayOfSchedule {
             //添加到缓存
             putAll(list);
+            //标记首末班
+            FirstAndLastHandler.marks(list);
             Set<String> lps = searchAllLP(list);
             for (String lp : lps) {
+package com.bsth.data.schedule.f_a_l;
+
+import com.bsth.data.BasicData;
+import com.bsth.data.schedule.DayOfSchedule;
+import com.bsth.data.schedule.ScheduleComparator;
+import com.bsth.data.schedule.f_a_l.entity.ToGateway;
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import com.bsth.util.db.DBUtils_MS;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.BatchPreparedStatementSetter;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.datasource.DataSourceTransactionManager;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.TransactionDefinition;
+import org.springframework.transaction.TransactionStatus;
+import org.springframework.transaction.support.DefaultTransactionDefinition;
+
+import java.sql.PreparedStatement;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.concurrent.ConcurrentHashMap;
+
+/**
+ * 首末班处理程序
+ * Created by panzhao on 2017/7/19.
+ */
+@Component
+public class FirstAndLastHandler {
+
+    static ConcurrentHashMap<String, ToGateway> maps = new ConcurrentHashMap<>();
+
+    static Logger log = LoggerFactory.getLogger(FirstAndLastHandler.class);
+
+    static boolean flag;
+
+    @Autowired
+    DayOfSchedule dayOfSchedule;
+
+    public void marks(String lineCode){
+        marks(dayOfSchedule.findByLineCode(lineCode));
+    }
+
+    /**
+     * 标记首末班
+     * @param list
+     */
+    public static void marks(List<ScheduleRealInfo> list){
+        try{
+            Collections.sort(list, new ScheduleComparator.FCSJ());
+            //按上下行分组
+            List<ScheduleRealInfo> ups = new ArrayList<>(),
+                    downs = new ArrayList<>();
+
+            for(ScheduleRealInfo sch : list){
+                if(sch.getXlDir().equals("0"))
+                    ups.add(sch);
+                else
+                    downs.add(sch);
+            }
+
+            markOneWay(ups);
+            markOneWay(downs);
+        }catch (Exception e){
+            log.error("", e);
+        }
+    }
+
+    /**
+     * 标记单程，上行或下行
+     * @param list
+     */
+    private static void markOneWay(List<ScheduleRealInfo> list){
+        ScheduleRealInfo first = null, last = null;
+
+        for(ScheduleRealInfo sch: list){
+            if(sch._isInout() || sch.getBcType().equals("region")
+                    || sch.getBcType().equals("venting"))
+                continue;
+
+            if(first == null)
+                first = sch;
+
+            last = sch;
+        }
+
+        put(first, last);
+    }
+
+    private static void put(ScheduleRealInfo first, ScheduleRealInfo last){
+        if(first == null || last == null)
+            return;
+
+        ToGateway tg = new ToGateway();
+        tg.setLineCode(first.getXlBm());
+        tg.setUpDown(Integer.parseInt(first.getXlDir()));
+        tg.setsDeviceId(BasicData.deviceId2NbbmMap.inverse().get(first.getClZbh()));
+        tg.setSt(first.getDfsjT());
+
+        tg.setRq(first.getScheduleDateStr());
+
+        tg.seteDeviceId(BasicData.deviceId2NbbmMap.inverse().get(last.getClZbh()));
+        tg.setEt(last.getDfsjT());
+
+        maps.put(tg.getLineCode() + "_" + tg.getUpDown(), tg);
+        flag = true;
+    }
+
+    public static void saveAll(){
+        if(!flag)
+            return;
+
+        final List<ToGateway> pstList = new ArrayList<>(maps.values());
+        if(pstList == null || pstList.size() == 0)
+            return;
+
+        flag = false;
+        JdbcTemplate jdbcTemp = new JdbcTemplate(DBUtils_MS.getDataSource());
+        //编程式事务
+        DataSourceTransactionManager tran = new DataSourceTransactionManager(jdbcTemp.getDataSource());
+        DefaultTransactionDefinition def = new DefaultTransactionDefinition();
+        def.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRED);
+        TransactionStatus status = tran.getTransaction(def);
+
+        try{
+            //删除
+            jdbcTemp.update("delete from bsth_t_first_last");
+            //重新写入
+            jdbcTemp.batchUpdate("insert into bsth_t_first_last(line_code, s_device_id, st, e_device_id, et, up_down, rq) VALUES(?, ?, ?, ?, ?, ?, ?)", new BatchPreparedStatementSetter() {
+                @Override
+                public void setValues(PreparedStatement ps, int i) throws SQLException {
+                    ToGateway tg = pstList.get(i);
+                    ps.setString(1, tg.getLineCode());
+                    ps.setString(2, tg.getsDeviceId());
+                    ps.setLong(3, tg.getSt());
+                    ps.setString(4, tg.geteDeviceId());
+                    ps.setLong(5, tg.getEt());
+                    ps.setInt(6, tg.getUpDown());
+                    ps.setString(7, tg.getRq());
+                }
+
+                @Override
+                public int getBatchSize() {
+                    return pstList.size();
+                }
+            });
+
+            log.info("首末班数据入库，" + pstList.size());
+            tran.commit(status);
+        }catch (Exception e){
+            log.error("", e);
+            tran.rollback(status);
+        }
+    }
+}
+package com.bsth.data.schedule.f_a_l.entity;
+
+/**
+ * 发送给网关的首末班数据格式
+ * Created by panzhao on 2017/7/19.
+ */
+public class ToGateway {
+
+    /** 线路 */
+    private String lineCode;
+
+    /** 上下行 */
+    private int upDown;
+
+    /** 首班设备号 */
+    private String sDeviceId;
+
+    /** 首班时间 */
+    private Long st;
+
+    /** 末班设备号 */
+    private String eDeviceId;
+
+    /** 末班时间 */
+    private Long et;
+
+    /** 班次日期 */
+    private String rq;
+
+
+    public String getLineCode() {
+        return lineCode;
+    }
+
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
+    }
+
+    public Long getSt() {
+        return st;
+    }
+
+    public void setSt(Long st) {
+        this.st = st;
+    }
+
+    public Long getEt() {
+        return et;
+    }
+
+    public void setEt(Long et) {
+        this.et = et;
+    }
+
+    public String getRq() {
+        return rq;
+    }
+
+    public void setRq(String rq) {
+        this.rq = rq;
+    }
+
+    public int getUpDown() {
+        return upDown;
+    }
+
+    public void setUpDown(int upDown) {
+        this.upDown = upDown;
+    }
+
+    public String getsDeviceId() {
+        return sDeviceId;
+    }
+
+    public void setsDeviceId(String sDeviceId) {
+        this.sDeviceId = sDeviceId;
+    }
+
+    public String geteDeviceId() {
+        return eDeviceId;
+    }
+
+    public void seteDeviceId(String eDeviceId) {
+        this.eDeviceId = eDeviceId;
+    }
+}
@@ -5,6 +5,7 @@ import com.bsth.data.LineConfigData;
 import com.bsth.data.directive.DayOfDirectives;
 import com.bsth.data.pilot80.PilotReport;
 import com.bsth.data.schedule.DayOfSchedule;
+import com.bsth.data.schedule.f_a_l.FirstAndLastHandler;
 import com.bsth.entity.realcontrol.LineConfig;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -69,7 +70,9 @@ public class ScheduleRefreshThread extends Thread{
 					logger.info(lineCode + "翻班完成， " + currSchDate + " -班次数量：" + dayOfSchedule.findByLineCode(lineCode).size());
 				}
 			}
-			
+
+			//首末班入库（给网关用的数据）
+			FirstAndLastHandler.saveAll();
 		} catch (Exception e) {
 			logger.error("", e);
 		}
@@ -7,6 +7,8 @@ import com.bsth.service.schedule.CarDeviceService;
 import com.bsth.service.schedule.exception.ScheduleException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Isolation;
+import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
@@ -21,7 +23,7 @@ public class CarDeviceServiceImpl extends BServiceImpl&lt;CarDevice, Long&gt; implemen
     @Autowired
     private CarsService carsService;
-    @Transactional
+    @Transactional(propagation = Propagation.REQUIRED, isolation = Isolation.READ_COMMITTED)
     @Override
     public CarDevice save(CarDevice carDevice) {
         // 查找对应的车辆基础信息，更新设备编号数据
@@ -144,6 +144,11 @@ public class TTInfoDetailServiceImpl extends BServiceImpl&lt;TTInfoDetail, Long&gt; im
         return ttInfoDetailForEdit.getEditInfo(xlid, ttid, maxfcno);
     }
+    public static void main(String[] args) {
+        String test = "中1中111";
+        System.out.println(test.replaceAll("(\\d+)$", ""));
+    }
+
     @Override
     public void validateExcelSheet(String filename, String sheetname, Integer lineid, String linename) throws ScheduleException {
         try {
@@ -162,8 +167,9 @@ public class TTInfoDetailServiceImpl extends BServiceImpl&lt;TTInfoDetail, Long&gt; im
                         if (StringUtils.isEmpty(cell_con)) {
                             throw new Exception(String.format("第1行，第%d列数据不能为空", i + 1));
                         } else {
-                            // 正则表达式去除数字
-                            cell_con = cell_con.replaceAll("[\\d+]", "");
+                            // 正则表达式去除右侧数字
+//                            cell_con = cell_con.replaceAll("[\\d+]", "");
+                            cell_con = cell_con.replaceAll("(\\d+)$", "");
                             if (i == 0) { // 第一列必须是路牌2个字
                                 if (!"路牌".equals(cell_con.trim())) {