Merge branch 'PSM-16' into qingpu

徐烜
2 parents 305072ec 58a35adb
Showing 6 changed files with 140 additions and 7 deletions
src/main/java/com/bsth/entity/schedule/CarConfigInfo.java
src/main/java/com/bsth/service/schedule/CarConfigInfoServiceImpl.java
src/main/resources/static/pages/scheduleApp/module/common/prj-common-globalservice.js
src/main/resources/static/pages/scheduleApp/module/core/busConfig/busConfig.js
src/main/resources/static/pages/scheduleApp/module/core/busConfig/list.html
src/main/resources/static/pages/scheduleApp/module/core/scheduleRuleManage/form.html
@@ -53,6 +53,10 @@ public class CarConfigInfo implements Serializable {
     @Column(nullable = false)
     private int isSwitch;
  
+    /** 是否删除（标记） */
+    @Column(nullable = false)
+    private Boolean isCancel = false;
+
     /** 创建人 */
     @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.PERSIST)
     private SysUser createBy;
@@ -170,4 +174,12 @@ public class CarConfigInfo implements Serializable {
     public void setUpdateDate(Date updateDate) {
         this.updateDate = updateDate;
     }
+
+    public Boolean getIsCancel() {
+        return isCancel;
+    }
+
+    public void setIsCancel(Boolean isCancel) {
+        this.isCancel = isCancel;
+    }
 }
 package com.bsth.service.schedule;
  
+import com.bsth.common.ResponseCode;
 import com.bsth.entity.schedule.CarConfigInfo;
+import com.bsth.entity.schedule.rule.ScheduleRule1Flat;
+import com.bsth.repository.schedule.CarConfigInfoRepository;
 import com.bsth.service.impl.BaseServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
  
+import javax.transaction.Transactional;
+import java.util.*;
+
 /**
  * Created by xu on 16/5/9.
  */
 @Service
 public class CarConfigInfoServiceImpl extends BaseServiceImpl<CarConfigInfo, Long> implements CarConfigInfoService {
+    @Autowired
+    private CarConfigInfoRepository carConfigInfoRepository;
+    @Autowired
+    private ScheduleRule1FlatService scheduleRule1FlatService;
+
+    @Override
+    @Transactional
+    public Map<String, Object> delete(Long aLong) {
+        // 获取待作废的车辆配置
+        CarConfigInfo carConfigInfo = carConfigInfoRepository.findOne(aLong);
+        // 查询有无规则使用过此车辆配置
+        Map<String, Object> param = new HashMap<>();
+        param.put("carConfigInfo.id_eq", carConfigInfo.getId());
+        Iterator<ScheduleRule1Flat> scheduleRule1FlatIterator =
+                scheduleRule1FlatService.list(param).iterator();
+        boolean isExist = false;
+        while (scheduleRule1FlatIterator.hasNext()) {
+            ScheduleRule1Flat scheduleRule1Flat = scheduleRule1FlatIterator.next();
+            if (scheduleRule1Flat.getCarConfigInfo().getId().equals(carConfigInfo.getId())) {
+                isExist = true;
+                break;
+            }
+        }
+
+        Map<String, Object> map = new HashMap<>();
+
+        if (isExist) {
+            throw new RuntimeException("车辆配置已被规则使用，不能删除，请先修改规则！");
+        } else {
+            carConfigInfo.setIsCancel(true);
+            map.put("status", ResponseCode.SUCCESS);
+        }
+
+        return map;
+
+    }
 }
@@ -198,7 +198,7 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;BusConfigService_g&#39;, [&#39;$resource&#39;, functi
     return {
         rest : $resource(
             '/cci/:id',
-            {order: 'createDate', direction: 'ASC', id: '@id_route'},
+            {order: 'xl.id,cl.insideCode,isCancel', direction: 'ASC', id: '@id_route'},
             {
                 list: {
                     method: 'GET',
@@ -56,6 +56,14 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;BusConfigService&#39;, [&#39;BusConfigService_g&#39;,
          */
         saveDetail: function(obj) {
             return service.rest.save(obj).$promise;
+        },
+        /**
+         * 删除信息。
+         * @param id 主键id
+         * @returns {*|Function|promise|n}
+         */
+        deleteDetail: function(id) {
+            return service.rest.delete({id: id}).$promise;
         }
     };
  
@@ -184,6 +192,74 @@ angular.module(&#39;ScheduleApp&#39;).controller(&#39;BusConfigListCtrl&#39;, [&#39;BusConfigService
         self.pageChanaged();
     };
  
+    // 删除时刻表
+    self.deleteEci = function(id) {
+        // TODO:
+        busConfigService.deleteDetail(id).then(
+            function(result) {
+                if (result.message) { // 暂时这样做，之后全局拦截
+                    alert("失败：" + result.message);
+                } else {
+                    alert("作废成功！");
+
+                    busConfigService.getPage().then(
+                        function(result) {
+                            self.pageInfo.totalItems = result.totalElements;
+                            self.pageInfo.currentPage = result.number + 1;
+                            self.pageInfo.infos = result.content;
+                            busConfigService.setCurrentPageNo(result.number + 1);
+                        },
+                        function(result) {
+                            alert("出错啦！");
+                        }
+                    );
+                }
+
+            },
+            function(result) {
+                alert("出错啦！" + result);
+            }
+        );
+    };
+
+    // 撤销修改
+    self.redoDeleteEci = function(id) {
+        busConfigService.getDetail(id).then(
+            function(result) {
+                result.isCancel = 'false';
+                busConfigService.saveDetail(result).then(
+                    function(result) {
+                        if (result.message) { // 暂时这样做，之后全局拦截
+                            alert("失败：" + result.message);
+                        } else {
+                            alert("撤销成功！");
+
+                            busConfigService.getPage().then(
+                                function(result) {
+                                    self.pageInfo.totalItems = result.totalElements;
+                                    self.pageInfo.currentPage = result.number + 1;
+                                    self.pageInfo.infos = result.content;
+                                    busConfigService.setCurrentPageNo(result.number + 1);
+                                },
+                                function(result) {
+                                    alert("出错啦！");
+                                }
+                            );
+                        }
+                    },
+                    function(result) {
+                        // TODO：弹出框方式以后改
+                        alert("出错啦！");
+                    }
+                );
+            },
+            function(result) {
+                // TODO：弹出框方式以后改
+                alert("出错啦！");
+            }
+        );
+    };
+
 }]);
  
 angular.module('ScheduleApp').controller('BusConfigFormCtrl', ['BusConfigService', '$stateParams', '$state', '$scope', function(busConfigService, $stateParams, $state, $scope) {
@@ -27,13 +27,13 @@
                         </sa-Select3>
                     </div>
                 </td>
+                <td>
+                    <input type="text" class="form-control form-filter input-sm" ng-model="ctrl.searchCondition()['cl.insideCode_like']" placeholder="输入内部编号..."/>
+                </td>
                 <td></td>
                 <td></td>
                 <td></td>
                 <td>
-                    <input type="text" class="form-control form-filter input-sm" ng-model="ctrl.searchCondition().tcd_like"/>
-                </td>
-                <td>
                     <button class="btn btn-sm green btn-outline filter-submit margin-bottom"
                             ng-click="ctrl.pageChanaged()">
                         <i class="fa fa-search"></i> 搜索</button>
@@ -47,7 +47,7 @@
  
             </thead>
             <tbody>
-            <tr ng-repeat="info in ctrl.pageInfo.infos" class="odd gradeX">
+            <tr ng-repeat="info in ctrl.pageInfo.infos" ng-class="{odd: true, gradeX: true, danger: info.isCancel}">
                 <td>
                     <span ng-bind="$index + 1"></span>
                 </td>
@@ -70,7 +70,9 @@
                     <!--<a href="details.html?lineId={{obj.id}}" class="btn default blue-stripe btn-sm"> 详细 </a>-->
                     <!--<a href="edit.html?lineId={{obj.id}}" class="btn default blue-stripe btn-sm"> 修改 </a>-->
                     <a ui-sref="busConfig_detail({id: info.id})" class="btn default blue-stripe btn-sm"> 详细 </a>
-                    <a ui-sref="busConfig_edit({id: info.id})" class="btn default blue-stripe btn-sm"> 修改 </a>
+                    <a ui-sref="busConfig_edit({id: info.id})" class="btn default blue-stripe btn-sm" ng-if="info.isCancel == '0'"> 修改 </a>
+                    <a ng-click="ctrl.deleteEci(info.id)" class="btn default blue-stripe btn-sm" ng-if="info.isCancel == '0'"> 作废 </a>
+                    <a ng-click="ctrl.redoDeleteEci(info.id)" class="btn default blue-stripe btn-sm" ng-if="info.isCancel == '1'"> 撤销 </a>
                 </td>
             </tr>
             </tbody>
@@ -72,7 +72,7 @@
                                     icnames="cl.insideCode"
                                     datatype="cci2"
                                     dataassociate="true"
-                                    dataparam="{{ {'xl.id_eq': ctrl.scheduleRuleManageForSave.xl.id} | json }}"
+                                    dataparam="{{ {'xl.id_eq': ctrl.scheduleRuleManageForSave.xl.id, 'isCancel_eq': false} | json }}"
                                     mlp="true"
                                     required >
                         </sa-Select3>