Merge branch 'pudong' of 192.168.168.201:panzhaov5/bsth_control into pudong

娄高锋
2 parents 7690f231 13886e75
Showing 7 changed files with 95 additions and 32 deletions
src/main/java/com/bsth/controller/schedule/core/TTInfoController.java
src/main/java/com/bsth/repository/schedule/TTInfoRepository.java
src/main/java/com/bsth/service/schedule/TTInfoService.java
src/main/java/com/bsth/service/schedule/impl/TTInfoServiceImpl.java
src/main/resources/static/pages/scheduleApp/module/common/prj-common-globalservice.js
src/main/resources/static/pages/scheduleApp/module/core/ttInfoManage/detailedit/module.js
src/main/resources/static/pages/scheduleApp/module/core/ttInfoManage/service.js
@@ -55,6 +55,23 @@ public class TTInfoController extends BController&lt;TTInfo, Long&gt; {
         return rtn;
     }
+    @RequestMapping(value = "/versiondesc2/{lineid}/{status}")
+    public Map<String, Object> getLineVersionDesc2(
+            @PathVariable(value = "lineid") Integer lineid,
+            @PathVariable(value = "status") Integer status) {
+        Map<String, Object> rtn = new HashMap<>();
+        try {
+            rtn.put("status", ResponseCode.SUCCESS);
+            rtn.put("data", ttInfoService.getLineVersions(lineid, status));
+
+        } catch (Exception exp) {
+            rtn.put("status", ResponseCode.ERROR);
+            rtn.put("msg", exp.getMessage());
+        }
+
+        return rtn;
+    }
+
     @RequestMapping(value = "/validate_name", method = RequestMethod.GET)
     public Map<String, Object> validate_name(@RequestParam Map<String, Object> param) {
         Map<String, Object> rtn = new HashMap<>();
@@ -11,7 +11,9 @@ import org.springframework.data.jpa.repository.EntityGraph;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
+import javax.persistence.Tuple;
 import java.util.List;
+import java.util.Map;
 /**
  * Created by xu on 16/5/12.
@@ -31,4 +33,19 @@ public interface TTInfoRepository extends BaseRepository&lt;TTInfo, Long&gt; {
     @Query("select t from TTInfo t where t.xl = ?1 and t.isCancel = false")
     List<TTInfo> findInCanceledByXl(Line xl);
+
+    @Query(value = "select new map(lv.name as name, lv.startDate as sd, " +
+            "lv.status as status, lv.versions as version) " +
+            "from LineVersions lv where lv.line.id = ?1 ")
+    List<Map<String, Object>> findLineVersionDescs(Integer lineId);
+
+    @Query(value = "select new map(lv.name as name, lv.startDate as sd, " +
+            "lv.status as status, lv.versions as version) " +
+            "from LineVersions lv where lv.line.id = ?1 and lv.versions = ?2 ")
+    List<Map<String, Object>> findLineVersionDescs2(Integer lineId, Integer version);
+
+    @Query(value = "select new map(lv.name as name, lv.versions as version) " +
+            "from LineVersions lv where lv.line.id = ?1 and lv.status = ?2 ")
+    List<Map<String, Object>> findLineVersionDescs3(Integer lineId, Integer status);
+
 }
@@ -21,4 +21,6 @@ public interface TTInfoService extends BService&lt;TTInfo, Long&gt; {
     String getLineVersionDesc(Integer lineId, Integer version);
+    List<Map<String, Object>> getLineVersions(Integer lineId, Integer status);
+
 }
 package com.bsth.service.schedule.impl;
-import com.bsth.entity.LineVersions;
 import com.bsth.entity.schedule.TTInfo;
 import com.bsth.entity.schedule.TTInfoBackup;
 import com.bsth.entity.schedule.TTInfoDetail;
 import com.bsth.repository.schedule.TTInfoBackupRepository;
 import com.bsth.repository.schedule.TTInfoDetailRepository;
 import com.bsth.repository.schedule.TTInfoRepository;
-import com.bsth.service.LineVersionsService;
 import com.bsth.service.schedule.TTInfoService;
 import com.bsth.service.schedule.exception.ScheduleException;
 import com.bsth.service.schedule.utils.TimeTableProto;
@@ -24,6 +22,7 @@ import org.springframework.util.CollectionUtils;
 import java.io.PrintWriter;
 import java.io.StringWriter;
+import java.sql.Timestamp;
 import java.util.*;
 /**
@@ -40,8 +39,6 @@ public class TTInfoServiceImpl extends BServiceImpl&lt;TTInfo, Long&gt; implements TTI
     private TTInfoDetailRepository ttInfoDetailRepository;
     @Autowired
     private TTInfoBackupRepository ttInfoBackupRepository;
-    @Autowired
-    private LineVersionsService lineVersionsService;
     @Override
     public void validate_name(TTInfo ttInfo) throws ScheduleException {
@@ -140,15 +137,18 @@ public class TTInfoServiceImpl extends BServiceImpl&lt;TTInfo, Long&gt; implements TTI
     @Override
     public List<Map<String, Object>> getLineStationRouteVersions(Integer lineId) {
-        // 获取线路版本
-        List<LineVersions> lineVersionsList = lineVersionsService.findByLineCode(lineId);
+        // 获取线路版本数据
+        List<Map<String, Object>> lineVersionDescs = ttInfoRepository.findLineVersionDescs(lineId);
         // 按照version版本降序排序
-        Collections.sort(lineVersionsList, new Comparator<LineVersions>() {
+        Collections.sort(lineVersionDescs, new Comparator<Map<String, Object>>() {
             @Override
-            public int compare(LineVersions o1, LineVersions o2) {
-                if (o1.getVersions() > o2.getVersions()) {
+            public int compare(Map<String, Object> o1, Map<String, Object> o2) {
+                int o1_v = Integer.parseInt(o1.get("version").toString());
+                int o2_v = Integer.parseInt(o2.get("version").toString());
+
+                if (o1_v > o2_v) {
                     return -1;
-                } else if (o1.getVersions() < o2.getVersions()) {
+                } else if (o1_v < o2_v) {
                     return 1;
                 } else {
                     return 0;
@@ -158,14 +158,19 @@ public class TTInfoServiceImpl extends BServiceImpl&lt;TTInfo, Long&gt; implements TTI
         // 取最开始的2条记录
         List<Map<String, Object>> mapList = new ArrayList<>();
-        for (LineVersions lv: lineVersionsList) {
-            String vname = lv.getName();
-            String rq = lv.getStartDate() == null ? "未知启用日期" : new DateTime(lv.getStartDate()).toString("YYYY年MM月dd日");
-            String sdesc = lv.getStatus() == 0 ? "历史" : (lv.getStatus() == 1 ? "当前" : "待更新");
+        for (Map<String, Object> lv: lineVersionDescs) {
+            String t_name = (String) lv.get("name");
+            Timestamp t_sd = (Timestamp) lv.get("sd");
+            int status = Integer.parseInt(lv.get("status").toString());
+            int version = Integer.parseInt(lv.get("version").toString());
+
+            String vname = t_name;
+            String rq = t_sd == null ? "未知启用日期" : new DateTime(t_sd).toString("YYYY年MM月dd日");
+            String sdesc = status == 0 ? "历史" : (status == 1 ? "当前" : "待更新");
             Map<String, Object> value = new HashMap<>();
             value.put("desc", vname + "-" + rq + "-" + sdesc);
-            value.put("version", lv.getVersions());
+            value.put("version", version);
             mapList.add(value);
@@ -180,28 +185,34 @@ public class TTInfoServiceImpl extends BServiceImpl&lt;TTInfo, Long&gt; implements TTI
     @Override
     public String getLineVersionDesc(Integer lineId, Integer version) {
         // 查找指定版本，并判定
-        Map<String, Object> param = new HashMap<>();
-        param.put("line_eq", lineId);
-        param.put("versions_eq", version);
-        List<LineVersions> lineVersionsList = (List<LineVersions>) lineVersionsService.list(param);
+        List<Map<String, Object>> lineVersionDescs = ttInfoRepository.findLineVersionDescs2(lineId, version);
-        LineVersions lv;
-        if (CollectionUtils.isEmpty(lineVersionsList)) {
+        Map<String, Object> lv;
+        if (CollectionUtils.isEmpty(lineVersionDescs)) {
             return "未知版本";
-        } else if (lineVersionsList.size() > 1) {
+        } else if (lineVersionDescs.size() > 1) {
             return "重复版本";
         } else {
-            lv = lineVersionsList.get(0);
+            lv = lineVersionDescs.get(0);
         }
-        String vname = lv.getName();
-        String rq = lv.getStartDate() == null ? "未知启用日期" : new DateTime(lv.getStartDate()).toString("YYYY年MM月dd日");
-        String sdesc = lv.getStatus() == 0 ? "历史" : (lv.getStatus() == 1 ? "当前" : "待更新");
+        String t_name = (String) lv.get("name");
+        Timestamp t_sd = (Timestamp) lv.get("sd");
+        int status = Integer.parseInt(lv.get("status").toString());
+
+        String vname = t_name;
+        String rq = t_sd == null ? "未知启用日期" : new DateTime(t_sd).toString("YYYY年MM月dd日");
+        String sdesc = status == 0 ? "历史" : (status == 1 ? "当前" : "待更新");
         return String.format("%s-%s-%s", vname, rq, sdesc);
     }
     @Override
+    public List<Map<String, Object>> getLineVersions(Integer lineId, Integer status) {
+        return ttInfoRepository.findLineVersionDescs3(lineId, status);
+    }
+
+    @Override
     @Transactional(propagation = Propagation.REQUIRED, isolation = Isolation.REPEATABLE_READ)
     public void backUp(Long ttInfoId) throws ScheduleException {
         LOG.info(">>>>>>开始备份时刻表<<<<<<");
@@ -748,12 +748,20 @@ angular.module(&#39;ScheduleApp&#39;).factory(
                 ),
                 lineverions: $resource(
-                    '/lineVersions/all',
+                    '/tic_ec/versiondesc2/:lineId/:status',
                     {},
                     {
                         list: {
                             method: 'GET',
-                            isArray: true
+                            isArray: true,
+                            transformResponse: function(rs) {
+                                var dst = angular.fromJson(rs);
+                                if (dst.status == 'SUCCESS') {
+                                    return dst.data;
+                                } else {
+                                    return dst; // 业务错误留给控制器处理
+                                }
+                            }
                         }
                     }
                 )
@@ -25,7 +25,7 @@ angular.module(&#39;ScheduleApp&#39;).factory(
                  * @returns {*|Function|promise|n}
                  */
                 getCurrentLineVersion: function(xlid) {
-                    var params = {'line.id_eq': xlid, 'status_eq': 1};
+                    var params = {'lineId': xlid, 'status': 1};
                     return service2.lineverions.list(params).$promise;
                 }
@@ -69,7 +69,7 @@ angular.module(&#39;ScheduleApp&#39;).controller(
                                 } else if (result.length > 1) {
                                     alert("有多个线路当前版本");
                                 } else {
-                                    self.ttInfoDetailManageForForm.lineversion = result[0].versions;
+                                    self.ttInfoDetailManageForForm.lineversion = result[0].version;
                                 }
                             }
                         );
@@ -74,12 +74,20 @@ angular.module(&#39;ScheduleApp&#39;).factory(
                 ),
                 lineverions: $resource(
-                    '/lineVersions/all',
+                    '/tic_ec/versiondesc2/:lineId/:status',
                     {},
                     {
                         list: {
                             method: 'GET',
-                            isArray: true
+                            isArray: true,
+                            transformResponse: function(rs) {
+                                var dst = angular.fromJson(rs);
+                                if (dst.status == 'SUCCESS') {
+                                    return dst.data;
+                                } else {
+                                    return dst; // 业务错误留给控制器处理
+                                }
+                            }
                         }
                     }
                 )