Update

徐烜
1 parent 9a65026d
Showing 10 changed files with 216 additions and 283 deletions
src/main/java/com/bsth/controller/schedule/BController.java
src/main/java/com/bsth/controller/schedule/SchedulePlanController.java → src/main/java/com/bsth/controller/schedule/core/SchedulePlanController.java
src/main/java/com/bsth/entity/schedule/SchedulePlan.java
src/main/java/com/bsth/service/schedule/SchedulePlanService.java
src/main/java/com/bsth/service/schedule/SchedulePlanServiceImpl.java → src/main/java/com/bsth/service/schedule/impl/SchedulePlanServiceImpl.java
src/main/resources/static/pages/scheduleApp/module/common/prj-common-globalservice.js
src/main/resources/static/pages/scheduleApp/module/core/schedulePlanManage/list.html
src/main/resources/static/pages/scheduleApp/module/core/schedulePlanManage/module.js
src/main/resources/static/pages/scheduleApp/module/core/schedulePlanManage/service.js
src/main/resources/static/pages/scheduleApp/module/core/scheduleRuleManage/list.html
@@ -40,9 +40,12 @@ public class BController&lt;T, ID extends Serializable&gt; {
         SysUser sysUser = sysUserService.findByUserName(userName);
         BEntity t_b = null;
         if (t instanceof BEntity) {
+            Date cdate = new Date();
             t_b = (BEntity) t;
             t_b.setCreateBy(sysUser);
-            t_b.setCreateDate(new Date());
+            t_b.setCreateDate(cdate);
+            t_b.setUpdateBy(sysUser);
+            t_b.setUpdateDate(cdate);
         }
         T t_saved = bService.save(t_b == null ? t : (T) t_b);
-package com.bsth.controller.schedule;
+package com.bsth.controller.schedule.core;
-import com.bsth.controller.BaseController;
+import com.bsth.controller.schedule.BController;
 import com.bsth.entity.schedule.SchedulePlan;
 import com.bsth.service.schedule.SchedulePlanService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
-import java.util.Map;
-
 /**
  * Created by xu on 16/6/16.
  */
 @RestController
 @RequestMapping("spc")
-public class SchedulePlanController extends BaseController<SchedulePlan, Long> {
+public class SchedulePlanController extends BController<SchedulePlan, Long> {
     @Autowired
     private SchedulePlanService schedulePlanService;
     /**
-     * 覆写方法，因为form提交的方式参数不全，改用 json形式提交 @RequestBody
-     * @Title: save
-     * @Description: TODO(持久化对象)
-     * @param @param t
-     * @param @return    设定文件
-     * @return Map<String,Object>  {status: 1（成功），-1（失败）}
-     * @throws
-     */
-    @RequestMapping(method = RequestMethod.POST)
-    public Map<String, Object> save(@RequestBody SchedulePlan t){
-
-        return baseService.save(t);
-    }
-
-    /**
      * 获取明天的一歌排班计划。
      * @return
      * @throws Exception
@@ -2,7 +2,6 @@ package com.bsth.entity.schedule;
 import com.bsth.entity.Line;
 import com.bsth.entity.schedule.rule.ScheduleRule1;
-import com.bsth.entity.sys.SysUser;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import javax.persistence.*;
@@ -21,7 +20,7 @@ import java.util.List;
             @NamedAttributeNode("ttInfo")
         })
 })
-public class SchedulePlan {
+public class SchedulePlan extends BEntity {
     /** 主键Id */
     @Id
@@ -60,19 +59,6 @@ public class SchedulePlan {
     @OneToMany(mappedBy = "schedulePlan", cascade = CascadeType.ALL, fetch = FetchType.LAZY)
     private List<SchedulePlanInfo> schedulePlanInfoList = new ArrayList<>();
-    /** 创建人 */
-    @ManyToOne(cascade = CascadeType.PERSIST, fetch = FetchType.LAZY)
-    private SysUser createBy;
-    /** 修改人 */
-    @ManyToOne(cascade = CascadeType.PERSIST, fetch = FetchType.LAZY)
-    private SysUser updateBy;
-    /** 创建日期 */
-    @Column(updatable = false, name = "create_date", columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP")
-    private Date createDate;
-    /** 修改日期 */
-    @Column(name = "update_date", columnDefinition = "TIMESTAMP  DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP")
-    private Date updateDate;
-
     public Long getId() {
         return id;
     }
@@ -129,38 +115,6 @@ public class SchedulePlan {
         this.schedulePlanInfoList = schedulePlanInfoList;
     }
-    public SysUser getCreateBy() {
-        return createBy;
-    }
-
-    public void setCreateBy(SysUser createBy) {
-        this.createBy = createBy;
-    }
-
-    public SysUser getUpdateBy() {
-        return updateBy;
-    }
-
-    public void setUpdateBy(SysUser updateBy) {
-        this.updateBy = updateBy;
-    }
-
-    public Date getCreateDate() {
-        return createDate;
-    }
-
-    public void setCreateDate(Date createDate) {
-        this.createDate = createDate;
-    }
-
-    public Date getUpdateDate() {
-        return updateDate;
-    }
-
-    public void setUpdateDate(Date updateDate) {
-        this.updateDate = updateDate;
-    }
-
     public String getTtInfoNames() {
         return ttInfoNames;
     }
 package com.bsth.service.schedule;
 import com.bsth.entity.schedule.SchedulePlan;
-import com.bsth.service.BaseService;
 /**
  * Created by xu on 16/6/16.
  */
-public interface SchedulePlanService extends BaseService<SchedulePlan, Long> {
+public interface SchedulePlanService extends BService<SchedulePlan, Long> {
     /**
      * 获取有明日排班的计划。
      * @return
-package com.bsth.service.schedule;
+package com.bsth.service.schedule.impl;
 import com.bsth.entity.Line;
 import com.bsth.entity.schedule.*;
 import com.bsth.entity.schedule.rule.ScheduleRule1Flat;
 import com.bsth.repository.schedule.SchedulePlanInfoRepository;
 import com.bsth.repository.schedule.SchedulePlanRepository;
-import com.bsth.service.impl.BaseServiceImpl;
+import com.bsth.service.schedule.SchedulePlanService;
 import com.bsth.service.schedule.rules.shiftloop.ScheduleCalcuParam_input;
 import com.bsth.service.schedule.rules.shiftloop.ScheduleResult_output;
 import com.bsth.service.schedule.rules.shiftloop.ScheduleResults_output;
@@ -28,7 +28,7 @@ import java.util.*;
  * Created by xu on 16/6/16.
  */
 @Service
-public class SchedulePlanServiceImpl extends BaseServiceImpl<SchedulePlan, Long> implements SchedulePlanService {
+public class SchedulePlanServiceImpl extends BServiceImpl<SchedulePlan, Long> implements SchedulePlanService {
     @Autowired
     private KieBase kieBase;
     @Autowired
@@ -40,7 +40,7 @@ public class SchedulePlanServiceImpl extends BaseServiceImpl&lt;SchedulePlan, Long&gt;
     @Transactional(propagation = Propagation.REQUIRED, isolation = Isolation.READ_COMMITTED)
     @Override
-    public Map<String, Object> save(SchedulePlan schedulePlan) {
+    public SchedulePlan save(SchedulePlan schedulePlan) {
         // 1-1、查找线路具体信息
         Line xl = strategy.getLine(schedulePlan.getXl().getId());
         // 1-2、查出指定线路的所有规则
@@ -126,7 +126,9 @@ public class SchedulePlanServiceImpl extends BaseServiceImpl&lt;SchedulePlan, Long&gt;
         // 3-2、保存生成的排班和明细
         schedulePlan.getSchedulePlanInfoList().addAll(schedulePlanInfos); // 关联的排班明细信息
-        return super.save(schedulePlan);
+        super.save(schedulePlan);
+
+        return new SchedulePlan();
     }
     @Override
@@ -425,16 +425,32 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;SchedulePlanManageService_g&#39;, [&#39;$resource
     return {
         rest : $resource(
             '/spc/:id',
-            {order: 'xl.id,createDate', direction: 'DESC,DESC', id: '@id_route'},
+            {order: 'xl.id,createDate', direction: 'DESC,DESC', id: '@id'},
             {
                 list: {
                     method: 'GET',
                     params: {
                         page: 0
+                    },
+                    transformResponse: function(rs) {
+                        var dst = angular.fromJson(rs);
+                        if (dst.status == 'SUCCESS') {
+                            return dst.data;
+                        } else {
+                            return dst; // 业务错误留给控制器处理
+                        }
                     }
                 },
                 get: {
-                    method: 'GET'
+                    method: 'GET',
+                    transformResponse: function(rs) {
+                        var dst = angular.fromJson(rs);
+                        if (dst.status == 'SUCCESS') {
+                            return dst.data;
+                        } else {
+                            return dst;
+                        }
+                    }
                 },
                 save: {
                     method: 'POST'
@@ -9,7 +9,7 @@
                 <th style="width: 100%;">关联时刻表</th>
                 <th style="width: 150px;">排班开始日期</th>
                 <th style="width: 150px;">排班结束日期</th>
-                <th style="width: 180px;">排班操作时间</th>
+                <th style="width: 250px;">排班人/操作时间</th>
                 <th style="width: 180px;">操作</th>
             </tr>
             <tr role="row" class="filter">
@@ -59,18 +59,18 @@
                 <td></td>
                 <td>
                     <button class="btn btn-sm green btn-outline filter-submit margin-bottom"
-                            ng-click="ctrl.pageChanaged()">
+                            ng-click="ctrl.doPage()">
                         <i class="fa fa-search"></i> 搜索</button>
                     <button class="btn btn-sm red btn-outline filter-cancel"
-                            ng-click="ctrl.resetSearchCondition()">
+                            ng-click="ctrl.reset()">
                         <i class="fa fa-times"></i> 重置</button>
                 </td>
             </tr>
             </thead>
             <tbody>
-            <tr ng-repeat="info in ctrl.pageInfo.infos" class="odd gradeX">
+            <tr ng-repeat="info in ctrl.page()['content']" class="odd gradeX">
                 <td>
                     <span ng-bind="$index + 1"></span>
                 </td>
@@ -87,6 +87,8 @@
                     <span ng-bind="info.scheduleToTime | date: 'yyyy-MM-dd '"></span>
                 </td>
                 <td>
+                    <span ng-bind="info.updateBy.name"></span>
+                    /
                     <span ng-bind="info.updateDate | date: 'yyyy-MM-dd HH:mm:ss'"></span>
                 </td>
                 <td>
@@ -95,6 +97,7 @@
                     <a ui-sref="schedulePlanInfoManage({spid : info.id, xlname : info.xl.name, ttname : info.ttInfoNames, stime : info.scheduleFromTime, etime : info.scheduleToTime})"
                        class="btn btn-info btn-sm"> 明细 </a>
                     <a ng-click="ctrl.deletePlan(info.id)"
+                       uib-popover="删除当前排班计划，请慎重处理！" popover-trigger="mouseenter"
                        class="btn btn-danger btn-sm"> 删除 </a>
                 </td>
             </tr>
@@ -104,9 +107,9 @@
     <div style="text-align: right;">
-        <uib-pagination total-items="ctrl.pageInfo.totalItems"
-                        ng-model="ctrl.pageInfo.currentPage"
-                        ng-change="ctrl.pageChanaged()"
+        <uib-pagination total-items="ctrl.page()['totalElements']"
+                        ng-model="ctrl.page()['uiNumber']"
+                        ng-change="ctrl.doPage()"
                         rotate="false"
                         max-size="10"
                         boundary-links="true"
 // 车辆配置管理 service controller 等写在一起
-angular.module('ScheduleApp').factory('SchedulePlanManageService', ['SchedulePlanManageService_g', function(service) {
-    /** 当前的查询条件信息 */
-    var currentSearchCondition = {};
-
-    /** 当前第几页 */
-    var currentPageNo = 1;
-
-    return {
-        /**
-         * 获取查询条件信息，
-         * 用于给controller用来和页面数据绑定。
-         */
-        getSearchCondition: function() {
-            return currentSearchCondition;
-        },
-        /**
-         * 重置查询条件信息。
-         */
-        resetSearchCondition: function() {
-            var key;
-            for (key in currentSearchCondition) {
-                currentSearchCondition[key] = undefined;
-            }
-        },
-        /**
-         * 设置当前页码。
-         * @param cpn 从1开始，后台是从0开始的
-         */
-        setCurrentPageNo: function(cpn) {
-            currentPageNo = cpn;
-        },
-        /**
-         * 组装查询参数，返回一个promise查询结果。
-         * @param params 查询参数
-         * @return 返回一个 promise
-         */
-        getPage: function() {
-            var params = currentSearchCondition; // 查询条件
-            params.page = currentPageNo - 1; // 服务端页码从0开始
-            return service.rest.list(params).$promise;
-        },
-        /**
-         * 保存信息。
-         * @param obj 车辆详细信息
-         * @return 返回一个 promise
-         */
-        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;
-        }
+angular.module('ScheduleApp').factory(
+    'SchedulePlanManageService',
+    [
+        'SchedulePlanManageService_g',
+        function(service) {
+            /** 当前的查询条件信息 */
+            var currentSearchCondition = {};
+
+            // 当前查询返回的信息
+            var currentPage = { // 后台spring data返回的格式
+                totalElements: 0,
+                number: 0, // 后台返回的页码，spring返回从0开始
+                content: [],
+
+                uiNumber: 1 // 页面绑定的页码
+            };
+
+            // 查询对象
+            var queryClass = service.rest;
+
+            return {
+                getQueryClass: function() {
+                    return queryClass;
+                },
+                getSearchCondition: function() {
+                    currentSearchCondition.page = currentPage.uiNumber - 1;
+                    return currentSearchCondition;
+                },
+                getPage: function(page) {
+                    if (page) {
+                        currentPage.totalElements = page.totalElements;
+                        currentPage.number = page.number;
+                        currentPage.content = page.content;
+                    }
+                    return currentPage;
+                },
+                resetStatus: function() {
+                    currentSearchCondition = {page: 0};
+                    currentPage = {
+                        totalElements: 0,
+                        number: 0,
+                        content: [],
+                        uiNumber: 1
+                    };
+                }
-    };
+            };
 }]);
-angular.module('ScheduleApp').controller('SchedulePlanManageCtrl', ['SchedulePlanManageService', '$state', function(schedulePlanManageService, $state) {
-    var self = this;
+// index.html控制器
+angular.module('ScheduleApp').controller(
+    'SchedulePlanManageCtrl',
+    [
+        'SchedulePlanManageService',
+        '$state',
+        function(service, $state) {
+            var self = this;
-    // 切换到form状态
-    self.goForm = function() {
-        $state.go("schedulePlanManage_form");
-    }
-}]);
+            // 切换到form状态
+            self.goForm = function() {
+                $state.go("schedulePlanManage_form");
+            };
-angular.module('ScheduleApp').controller('SchedulePlanManageListCtrl', ['SchedulePlanManageService', function(schedulePlanManageService) {
-    var self = this;
-    self.pageInfo = {
-        totalItems : 0,
-        currentPage : 1,
-        infos: []
-    };
-
-    // 日期 日期控件开关
-    self.scheduleFromTime = false;
-    self.scheduleFromTime_open = function() {
-        self.scheduleFromTime = true;
-    };
-    self.scheduleToTime = false;
-    self.scheduleToTime_open = function() {
-        self.scheduleToTime = true;
-    };
-
-    // 初始创建的时候，获取一次列表数据
-    schedulePlanManageService.getPage().then(
-        function(result) {
-            self.pageInfo.totalItems = result.totalElements;
-            self.pageInfo.currentPage = result.number + 1;
-            self.pageInfo.infos = result.content;
-            schedulePlanManageService.setCurrentPageNo(result.number + 1);
-        },
-        function(result) {
-            alert("出错啦！");
         }
-    );
-
-    //$scope.$watch("ctrl.pageInfo.currentPage", function() {
-    //    alert("dfdfdf");
-    //});
-
-    // 翻页的时候调用
-    self.pageChanaged = function() {
-        schedulePlanManageService.setCurrentPageNo(self.pageInfo.currentPage);
-        schedulePlanManageService.getPage().then(
-            function(result) {
-                self.pageInfo.totalItems = result.totalElements;
-                self.pageInfo.currentPage = result.number + 1;
-                self.pageInfo.infos = result.content;
-                schedulePlanManageService.setCurrentPageNo(result.number + 1);
-            },
-            function(result) {
-                alert("出错啦！");
-            }
-        );
-    };
-    // 获取查询条件数据
-    self.searchCondition = function() {
-        return schedulePlanManageService.getSearchCondition();
-    };
-    // 重置查询条件
-    self.resetSearchCondition = function() {
-        schedulePlanManageService.resetSearchCondition();
-        self.pageInfo.currentPage = 1;
-        self.pageChanaged();
-    };
-
-    // 删除排班（整个删除）
-    self.deletePlan = function(id) {
-        schedulePlanManageService.deleteDetail(id).then(
-            function(result) {
-                alert("删除成功！");
-
-                schedulePlanManageService.getPage().then(
-                    function(result) {
-                        self.pageInfo.totalItems = result.totalElements;
-                        self.pageInfo.currentPage = result.number + 1;
-                        self.pageInfo.infos = result.content;
-                        schedulePlanManageService.setCurrentPageNo(result.number + 1);
-                    },
-                    function(result) {
-                        alert("出错啦！");
-                    }
-                );
-            },
-            function(result) {
-                alert("出错啦！");
-            }
-        );
-    }
-
-}]);
-
-
-angular.module('ScheduleApp').controller('SchedulePlanManageFormCtrl', ['SchedulePlanManageService', '$stateParams', '$state', '$scope', function(schedulePlanManageService, $stateParams, $state, $scope) {
-    var self = this;
-
-    // 开始日期 日期控件开关
-    self.scheduleFromTimeOpen = false;
-    self.scheduleFromTime_open = function() {
-        self.scheduleFromTimeOpen = true;
-    };
-
-    // 结束日期 日期控件开关
-    self.scheduleToTimeOpen = false;
-    self.scheduleToTime_open = function() {
-        self.scheduleToTimeOpen = true;
-    };
-
-    // 欲保存的busInfo信息，绑定
-    self.schedulePlanManageForSave = {xl: {}};
-
-    // 提交方法
-    self.submit = function() {
-        console.log(self.schedulePlanManageForSave);
-
-        schedulePlanManageService.saveDetail(self.schedulePlanManageForSave).then(
-            function(result) {
-                // TODO：弹出框方式以后改
-                if (result.status == 'SUCCESS') {
-                    alert("保存成功！");
+    ]
+);
+
+// list.html控制器
+angular.module('ScheduleApp').controller(
+    'SchedulePlanManageListCtrl',
+    [
+        'SchedulePlanManageService',
+        function(service) {
+            var self = this;
+            // 日期 日期控件开关
+            self.scheduleFromTime = false;
+            self.scheduleFromTime_open = function() {
+                self.scheduleFromTime = true;
+            };
+            self.scheduleToTime = false;
+            self.scheduleToTime_open = function() {
+                self.scheduleToTime = true;
+            };
+
+            var SPlan = service.getQueryClass();
+            self.page = function() {
+                return service.getPage();
+            };
+
+            self.searchCondition = function() {
+                return service.getSearchCondition();
+            };
+
+            self.doPage = function() {
+                var page = SPlan.list(self.searchCondition(), function() {
+                    service.getPage(page);
+                });
+            };
+            self.reset = function() {
+                service.resetStatus();
+                var page = SPlan.list(self.searchCondition(), function() {
+                    service.getPage(page);
+                });
+            };
+
+            // 删除排班（整个删除）
+            self.deletePlan = function(id) {
+                SPlan.delete({id: id}, function() {
+                    self.doPage();
+                });
+            };
+
+            self.doPage();
+        }
+    ]
+);
+
+// form.html控制器
+angular.module('ScheduleApp').controller(
+    'SchedulePlanManageFormCtrl',
+    [
+        'SchedulePlanManageService',
+        '$stateParams',
+        '$state',
+        '$scope',
+        function(service, $stateParams, $state, $scope) {
+            var self = this;
+
+            var SPlan = service.getQueryClass();
+
+            // 开始日期 日期控件开关
+            self.scheduleFromTimeOpen = false;
+            self.scheduleFromTime_open = function() {
+                self.scheduleFromTimeOpen = true;
+            };
+
+            // 结束日期 日期控件开关
+            self.scheduleToTimeOpen = false;
+            self.scheduleToTime_open = function() {
+                self.scheduleToTimeOpen = true;
+            };
+
+            // 欲保存的busInfo信息，绑定
+            self.schedulePlanManageForSave = new SPlan;
+            self.schedulePlanManageForSave.xl = {};
+
+            // 提交方法
+            self.submit = function() {
+                console.log(self.schedulePlanManageForSave);
+
+                self.schedulePlanManageForSave.$save(function() {
                     $state.go("schedulePlanManage");
-                } else {
-                    alert("保存异常！");
-                }
-            },
-            function(result) {
-                // TODO：弹出框方式以后改
-                alert("出错啦！");
-            }
-        );
-    };
-}]);
+                });
+            };
+
+        }
+    ]
+);
@@ -3,16 +3,32 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;SchedulePlanManageService_g&#39;, [&#39;$resource
     return {
         rest : $resource(
             '/spc/:id',
-            {order: 'xl.id,createDate', direction: 'DESC,DESC', id: '@id_route'},
+            {order: 'xl.id,createDate', direction: 'DESC,DESC', id: '@id'},
             {
                 list: {
                     method: 'GET',
                     params: {
                         page: 0
+                    },
+                    transformResponse: function(rs) {
+                        var dst = angular.fromJson(rs);
+                        if (dst.status == 'SUCCESS') {
+                            return dst.data;
+                        } else {
+                            return dst; // 业务错误留给控制器处理
+                        }
                     }
                 },
                 get: {
-                    method: 'GET'
+                    method: 'GET',
+                    transformResponse: function(rs) {
+                        var dst = angular.fromJson(rs);
+                        if (dst.status == 'SUCCESS') {
+                            return dst.data;
+                        } else {
+                            return dst;
+                        }
+                    }
                 },
                 save: {
                     method: 'POST'
@@ -5,10 +5,9 @@
             <tr role="row" class="heading">
                 <th style="width: 5%;">序号</th>
                 <th style="width: 15%;">线路</th>
-                <th style="width: 15%;">修改时间</th>
+                <th style="width: 15%;">修改人/修改时间</th>
                 <th style="width: 10%;">启用日期</th>
                 <th style="width: 10%;">车辆</th>
-                <th>翻版模式</th>
                 <th>起始路牌</th>
                 <th>路牌范围</th>
                 <th>起始人员</th>
@@ -38,7 +37,6 @@
                 <td></td>
                 <td></td>
                 <td></td>
-                <td></td>
                 <td>
                     <button class="btn btn-sm green btn-outline filter-submit margin-bottom"
                             ng-click="ctrl.doPage()">
@@ -60,6 +58,8 @@
                     <span ng-bind="info.xl.name"></span>
                 </td>
                 <td>
+                    <span ng-bind="info.updateBy.name"></span>
+                    /
                     <span ng-bind="info.updateDate | date: 'yyyy-MM-dd HH:mm:ss'"></span>
                 </td>
                 <td>
@@ -69,9 +69,6 @@
                     <span ng-bind="info.carConfigInfo.cl.insideCode"></span>
                 </td>
                 <td>
-                    <span ng-bind="info.fbgs"></span>
-                </td>
-                <td>
                     <span ng-bind="info.lpStart"></span>
                 </td>
                 <td>