Merge branch 'minhang' of http://222.66.0.204:8090/panzhaov5/bsth_control into minhang

潘钊
2 parents 90ef1850 8f19eb25
Showing 4 changed files with 25 additions and 3 deletions
src/main/java/com/bsth/data/pinyin/PersionPinYin.java
src/main/java/com/bsth/data/pinyin/PersionPinYinBuffer.java
src/main/java/com/bsth/service/schedule/impl/CarDeviceServiceImpl.java
src/main/java/com/bsth/service/schedule/impl/TTInfoDetailServiceImpl.java
@@ -9,6 +9,11 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
 public class PersionPinYin {
     /**
+     * Id
+     */
+    private Integer id;
+
+    /**
      * 工号
      */
     private String workId;
@@ -87,4 +92,12 @@ public class PersionPinYin {
     public void setFgsCompanyId(String fgsCompanyId) {
         this.fgsCompanyId = fgsCompanyId;
     }
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
 }
@@ -36,6 +36,7 @@ public class PersionPinYinBuffer {
         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());
@@ -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())) {