update

徐烜
1 parent 27a0a49e
Showing 12 changed files with 800 additions and 32 deletions
src/main/java/com/bsth/controller/schedule/ScheduleRule1FlatController.java
src/main/java/com/bsth/entity/schedule/rule/ScheduleRule1Flat.java
src/main/java/com/bsth/repository/ScheduleRule1FlatRepository.java
src/main/java/com/bsth/service/schedule/ScheduleRule1FlatService.java
src/main/java/com/bsth/service/schedule/ScheduleRule1FlatServiceImpl.java
src/main/resources/static/pages/scheduleApp/module/core/scheduleRuleManage/detail.html
src/main/resources/static/pages/scheduleApp/module/core/scheduleRuleManage/edit.html
src/main/resources/static/pages/scheduleApp/module/core/scheduleRuleManage/form.html
src/main/resources/static/pages/scheduleApp/module/core/scheduleRuleManage/list.html
src/main/resources/static/pages/scheduleApp/module/core/scheduleRuleManage/scheduleRuleManage.html
src/main/resources/static/pages/scheduleApp/module/core/scheduleRuleManage/scheduleRuleManage.js
src/main/resources/static/pages/scheduleApp/module/main.js
+package com.bsth.controller.schedule;
+
+import com.bsth.controller.BaseController;
+import com.bsth.entity.schedule.EmployeeConfigInfo;
+import com.bsth.entity.schedule.GuideboardInfo;
+import com.bsth.entity.schedule.rule.ScheduleRule1Flat;
+import com.bsth.repository.ScheduleRule1FlatRepository;
+import com.bsth.service.schedule.EmployeeConfigInfoService;
+import com.bsth.service.schedule.GuideboardInfoService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Created by xu on 16/7/4.
+ */
+@RestController
+@RequestMapping("sr1fc")
+public class ScheduleRule1FlatController extends BaseController<ScheduleRule1Flat, Long> {
+
+    @Autowired
+    private ScheduleRule1FlatRepository scheduleRule1FlatRepository;
+    @Autowired
+    private GuideboardInfoService guideboardInfoService;
+    @Autowired
+    private EmployeeConfigInfoService employeeConfigInfoService;
+
+    @Override
+    public ScheduleRule1Flat findById(@PathVariable("id") Long aLong) {
+        return scheduleRule1FlatRepository.findOneExtend(aLong);
+    }
+
+    /**
+     * 覆写方法，因为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 ScheduleRule1Flat t){
+        // TODO：根据编码查找id，不做错误检测，暂时这样做，以后前端直接传过来
+        // 1、查找路牌配置id
+        Map<String, Object> param1 = new HashMap<>();
+        param1.put("xl.id_eq", t.getXl().getId());
+        param1.put("lpName_eq", null);
+
+        String[] lpNames = t.getLpNames().split(",");
+        String[] lpIds = new String[lpNames.length];
+        for (int i = 0; i < lpNames.length; i++) {
+            param1.put("lpName_eq", lpNames[i]);
+            Iterable<GuideboardInfo> guideboardInfos = guideboardInfoService.list(param1);
+            lpIds[i] = guideboardInfos.iterator().next().getId().toString();
+        }
+        t.setLpIds(StringUtils.join(lpIds, ","));
+
+        // 2、查找人员配置id
+        Map<String, Object> param2 = new HashMap<>();
+        param2.put("xl.id_eq", t.getXl().getId());
+        param2.put("dbbm_eq", null);
+
+        String[] ryDbbms = t.getRyDbbms().split(",");
+        String[] ryIds = new String[ryDbbms.length];
+        for (int j = 0; j < ryDbbms.length; j++) {
+            param2.put("dbbm_eq", ryDbbms[j]);
+            Iterable<EmployeeConfigInfo> employeeConfigInfos = employeeConfigInfoService.list(param2);
+            ryIds[j] = employeeConfigInfos.iterator().next().getId().toString();
+        }
+        t.setRyIds(StringUtils.join(ryIds, ","));
+
+        return baseService.save(t);
+    }
+
+}
+package com.bsth.entity.schedule.rule;
+
+import com.bsth.entity.Cars;
+import com.bsth.entity.Line;
+import com.bsth.entity.sys.SysUser;
+
+import javax.persistence.*;
+import javax.validation.constraints.NotNull;
+import java.util.Date;
+
+/**
+ * 排班规则1（flat，路牌，人员都不关联表，全部保存相关id），
+ * 基于老系统的规则设定实体，
+ * 有所谓的路牌范围，就是关联多个路牌
+ * 有所谓的人员返回，就是关联多个人（可能带早晚班）
+ * 有起始路牌，起始人员，翻班格式
+ */
+@Entity
+@Table(name = "bsth_c_s_sr1_flat")
+@NamedEntityGraphs({
+        @NamedEntityGraph(name = "scheduleRule1Flat_xl_cl", attributeNodes = {
+                @NamedAttributeNode("xl"),
+                @NamedAttributeNode("cl")
+        })
+})
+public class ScheduleRule1Flat {
+    /** 主键Id */
+    @Id
+    @GeneratedValue
+    private Long id;
+
+    /** 关联线路 */
+    @ManyToOne(optional = false, cascade = CascadeType.DETACH, fetch = FetchType.LAZY)
+    private Line xl;
+    /** 关联车辆 */
+    @ManyToOne(optional = false, cascade = CascadeType.DETACH, fetch = FetchType.LAZY)
+    private Cars cl;
+    /** 启用日期 */
+    @NotNull
+    private Date qyrq;
+
+    /** 路牌名称s（用逗号隔开） */
+    @NotNull
+    private String lpNames;
+    /** 对应的路牌ids（用逗号隔开） */
+    @NotNull
+    private String lpIds;
+    /** 起始路牌（从0开始） */
+    @NotNull
+    private Integer lpStart;
+    /** 人员搭班编码s（用逗号隔开） */
+    @NotNull
+    private String ryDbbms;
+    /** 对应的人员配置ids（用逗号隔开） */
+    @NotNull
+    private String ryIds;
+    /** 起始人员（从0开始） */
+    @NotNull
+    private Integer ryStart;
+
+    /** 翻班格式（TODO：这个用在车子上的，暂时不管）*/
+    private String fbgs;
+
+    /** 创建人 */
+    @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;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Line getXl() {
+        return xl;
+    }
+
+    public void setXl(Line xl) {
+        this.xl = xl;
+    }
+
+    public Cars getCl() {
+        return cl;
+    }
+
+    public void setCl(Cars cl) {
+        this.cl = cl;
+    }
+
+    public Date getQyrq() {
+        return qyrq;
+    }
+
+    public void setQyrq(Date qyrq) {
+        this.qyrq = qyrq;
+    }
+
+    public String getLpNames() {
+        return lpNames;
+    }
+
+    public void setLpNames(String lpNames) {
+        this.lpNames = lpNames;
+    }
+
+    public String getLpIds() {
+        return lpIds;
+    }
+
+    public void setLpIds(String lpIds) {
+        this.lpIds = lpIds;
+    }
+
+    public Integer getLpStart() {
+        return lpStart;
+    }
+
+    public void setLpStart(Integer lpStart) {
+        this.lpStart = lpStart;
+    }
+
+    public String getRyDbbms() {
+        return ryDbbms;
+    }
+
+    public void setRyDbbms(String ryDbbms) {
+        this.ryDbbms = ryDbbms;
+    }
+
+    public String getRyIds() {
+        return ryIds;
+    }
+
+    public void setRyIds(String ryIds) {
+        this.ryIds = ryIds;
+    }
+
+    public Integer getRyStart() {
+        return ryStart;
+    }
+
+    public void setRyStart(Integer ryStart) {
+        this.ryStart = ryStart;
+    }
+
+    public String getFbgs() {
+        return fbgs;
+    }
+
+    public void setFbgs(String fbgs) {
+        this.fbgs = fbgs;
+    }
+
+    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;
+    }
+}
+package com.bsth.repository;
+
+import com.bsth.entity.schedule.rule.ScheduleRule1Flat;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.jpa.domain.Specification;
+import org.springframework.data.jpa.repository.EntityGraph;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.stereotype.Repository;
+
+/**
+ * Created by xu on 16/7/4.
+ */
+@Repository
+public interface ScheduleRule1FlatRepository extends BaseRepository<ScheduleRule1Flat, Long> {
+
+    @EntityGraph(value = "scheduleRule1Flat_xl_cl", type = EntityGraph.EntityGraphType.FETCH)
+    @Override
+    Page<ScheduleRule1Flat> findAll(Specification<ScheduleRule1Flat> spec, Pageable pageable);
+
+    @EntityGraph(value = "scheduleRule1Flat_xl_cl", type = EntityGraph.EntityGraphType.FETCH)
+    @Query("select cc from ScheduleRule1Flat cc where cc.id=?1")
+    ScheduleRule1Flat findOneExtend(Long aLong);
+}
+package com.bsth.service.schedule;
+
+import com.bsth.entity.schedule.rule.ScheduleRule1Flat;
+import com.bsth.service.BaseService;
+
+/**
+ * Created by xu on 16/7/4.
+ */
+public interface ScheduleRule1FlatService extends BaseService<ScheduleRule1Flat, Long> {
+}
+package com.bsth.service.schedule;
+
+import com.bsth.entity.schedule.rule.ScheduleRule1Flat;
+import com.bsth.service.impl.BaseServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * Created by xu on 16/7/4.
+ */
+@Service
+public class ScheduleRule1FlatServiceImpl extends BaseServiceImpl<ScheduleRule1Flat, Long> implements ScheduleRule1FlatService {
+}
+<div class="page-head">
+    <div class="page-title">
+        <h1>排班规则管理</h1>
+    </div>
+</div>
+
+<ul class="page-breadcrumb breadcrumb">
+    <li>
+        <a href="/pages/home.html" data-pjax>首页</a>
+        <i class="fa fa-circle"></i>
+    </li>
+    <li>
+        <span class="active">运营计划管理</span>
+        <i class="fa fa-circle"></i>
+    </li>
+    <li>
+        <a ui-sref="scheduleRuleManage">排班规则管理</a>
+        <i class="fa fa-circle"></i>
+    </li>
+    <li>
+        <span class="active">添加排班规则信息</span>
+    </li>
+</ul>
+
+<div class="portlet light bordered" ng-controller="ScheduleRuleManageFormCtrl as ctrl">
+    <div class="portlet-title">
+        <div class="caption">
+            <i class="icon-equalizer font-red-sunglo"></i> <span
+                class="caption-subject font-red-sunglo bold uppercase">表单</span>
+        </div>
+    </div>
+
+    <div class="portlet-body form">
+        <form ng-submit="ctrl.submit()" class="form-horizontal" novalidate name="myForm">
+            <!--<div class="alert alert-danger display-hide">-->
+            <!--<button class="close" data-close="alert"></button>-->
+            <!--您的输入有误，请检查下面的输入项-->
+            <!--</div>-->
+
+
+            <!-- 其他信息放置在这里 -->
+            <div class="form-body">
+                <div class="form-group has-success has-feedback">
+                    <label class="col-md-2 control-label">线路*：</label>
+                    <div class="col-md-3">
+                        <sa-Select2 model="ctrl.scheduleRuleManageForSave"
+                                    name="xl"
+                                    required="true"
+                                    type="xl"
+                                    modelcolname1="xl_id"
+                                    datacolname1="id"
+                                    showcolname="name"
+                                    placeholder="请输拼音...">
+                        </sa-Select2>
+                    </div>
+                    <!-- 隐藏块，显示验证信息 -->
+                    <div class="alert alert-danger well-sm" ng-show="myForm.xl.$error.required">
+                        线路必须选择
+                    </div>
+                </div>
+                <div class="form-group has-success has-feedback">
+                    <label class="col-md-2 control-label">车辆*：</label>
+                    <div class="col-md-3">
+                        <sa-Select2 model="ctrl.scheduleRuleManageForSave"
+                                    name="cl"
+                                    required="true"
+                                    type="cl"
+                                    modelcolname1="cl_id"
+                                    datacolname1="id"
+                                    showcolname="insideCode"
+                                    placeholder="请输拼音...">
+                        </sa-Select2>
+                    </div>
+                    <!-- 隐藏块，显示验证信息 -->
+                    <div class="alert alert-danger well-sm" ng-show="myForm.cl.$error.required">
+                        车辆必须选择
+                    </div>
+                </div>
+
+                <div class="form-group">
+                    <label class="col-md-2 control-label">启用日期：</label>
+                    <div class="col-md-3">
+                        <div class="input-group">
+                            <input type="text" class="form-control"
+                                   name="qyrq" placeholder="请选择启用日期..."
+                                   uib-datepicker-popup="yyyy年MM月dd日"
+                                   is-open="ctrl.qyrqOpen" required
+                                   ng-model="ctrl.scheduleRuleManageForSave.qyrq"/>
+                            <span class="input-group-btn">
+                                <button type="button" class="btn btn-default" ng-click="ctrl.qyrq_open()">
+                                    <i class="glyphicon glyphicon-calendar"></i>
+                                </button>
+                            </span>
+                        </div>
+                    </div>
+                    <!-- 隐藏块，显示验证信息 -->
+                    <div class="alert alert-danger well-sm" ng-show="myForm.qyrq.$error.required">
+                        启用日期必须选择
+                    </div>
+                </div>
+
+                <div class="form-group">
+                    <label class="col-md-2 control-label">路牌范围*：</label>
+                    <div class="col-md-3">
+                        <input type="text" class="form-control" name="lpNames" ng-model="ctrl.scheduleRuleManageForSave.lpNames" required
+                               placeholder="由路牌名称组成，逗号分隔"/>
+                    </div>
+                    <!-- 隐藏块，显示验证信息 -->
+                    <div class="alert alert-danger well-sm" ng-show="myForm.lpNames.$error.required">
+                        路牌范围必须填写
+                    </div>
+                </div>
+
+                <div class="form-group">
+                    <label class="col-md-2 control-label">起始路牌*：</label>
+                    <div class="col-md-3">
+                        <input type="text" class="form-control" name="lpStart" ng-model="ctrl.scheduleRuleManageForSave.lpStart" required
+                               placeholder="起始路牌，从0开始"/>
+                    </div>
+                    <!-- 隐藏块，显示验证信息 -->
+                    <div class="alert alert-danger well-sm" ng-show="myForm.lpStart.$error.required">
+                        起始路牌必须填写
+                    </div>
+                </div>
+
+                <div class="form-group">
+                    <label class="col-md-2 control-label">人员范围*：</label>
+                    <div class="col-md-3">
+                        <input type="text" class="form-control" name="ryDbbms" ng-model="ctrl.scheduleRuleManageForSave.ryDbbms" required
+                               placeholder="由人员配置的搭班编码组成，逗号分隔"/>
+                    </div>
+                    <!-- 隐藏块，显示验证信息 -->
+                    <div class="alert alert-danger well-sm" ng-show="myForm.ryDbbms.$error.required">
+                        人员范围必须填写
+                    </div>
+                </div>
+
+                <div class="form-group">
+                    <label class="col-md-2 control-label">起始人员*：</label>
+                    <div class="col-md-3">
+                        <input type="text" class="form-control" name="ryStart" ng-model="ctrl.scheduleRuleManageForSave.ryStart" required
+                               placeholder="起始路牌，从0开始"/>
+                    </div>
+                    <!-- 隐藏块，显示验证信息 -->
+                    <div class="alert alert-danger well-sm" ng-show="myForm.ryStart.$error.required">
+                        起始路牌必须填写
+                    </div>
+                </div>
+
+                <div class="form-group">
+                    <label class="col-md-2 control-label">翻班格式：</label>
+                    <div class="col-md-3">
+                        <input type="text" class="form-control" name="fbgs" ng-model="ctrl.scheduleRuleManageForSave.fbgs"
+                               placeholder="车辆翻班格式"/>
+                    </div>
+                </div>
+
+
+                <!-- 其他form-group -->
+
+            </div>
+
+            <!-- TODO：!myForm.$valid 在这里有点问题，改用以下方法验证 -->
+            <div class="form-actions">
+                <div class="row">
+                    <div class="col-md-offset-3 col-md-4">
+                        <button type="submit" class="btn green"
+                                ng-disabled="myForm.xl.$error.required ||
+                                            myForm.cl.$error.required ||
+                                            myForm.qyrq.$error.required ||
+                                            myForm.lpNames.$error.required ||
+                                            myForm.lpStart.$error.required ||
+                                            myForm.ryDbbms.$error.required ||
+                                            myForm.ryStart.$error.required"
+                                ><i class="fa fa-check"></i> 提交</button>
+                        <a type="button" class="btn default" ui-sref="scheduleRuleManage" ><i class="fa fa-times"></i> 取消</a>
+                    </div>
+                </div>
+            </div>
+
+        </form>
+
+    </div>
+
+
+</div>
 \ No newline at end of file
@@ -5,8 +5,7 @@
             <th>序号</th>
             <th>线路</th>
             <th>修改时间</th>
-            <th>启用时间</th>
-            <th>规则类型</th>
+            <th>启用日期</th>
             <th>车辆</th>
             <th>翻版模式</th>
             <th>起始路牌</th>
@@ -17,11 +16,30 @@
         </tr>
         <tr role="row" class="filter">
             <td></td>
+            <td>
+                <div style="width: 150px">
+                    <sa-Select2 model="ctrl.searchCondition()"
+                                type="xl"
+                                modelcolname1="xl.id_eq"
+                                datacolname1="id"
+                                showcolname="name"
+                                placeholder="请输拼音...">
+                    </sa-Select2>
+                </div>
+            </td>
             <td></td>
             <td></td>
-            <td></td>
-            <td></td>
-            <td></td>
+            <td>
+                <div style="width: 150px">
+                    <sa-Select2 model="ctrl.searchCondition()"
+                                type="cl"
+                                modelcolname1="cl.id_eq"
+                                datacolname1="id"
+                                showcolname="insideCode"
+                                placeholder="请输拼音...">
+                    </sa-Select2>
+                </div>
+            </td>
             <td></td>
             <td></td>
             <td></td>
@@ -45,7 +63,7 @@
                 <span ng-bind="$index + 1"></span>
             </td>
             <td>
-                <span ng-bind="info.xl"></span>
+                <span ng-bind="info.xl.name"></span>
             </td>
             <td>
                 <span ng-bind="info.updateDate | date: 'yyyy-MM-dd HH:mm:ss'"></span>
@@ -54,29 +72,27 @@
                 <span ng-bind="info.qyrq | date: 'yyyy-MM-dd '"></span>
             </td>
             <td>
-                <span>周期循环类型</span>
-            </td>
-            <td>
-                <span ng-bind="info.cl"></span>
+                <span ng-bind="info.cl.insideCode"></span>
             </td>
             <td>
-                <span ng-bind="info.fbms"></span>
+                <span ng-bind="info.fbgs"></span>
             </td>
             <td>
-                <span ng-bind="info.qslp"></span>
+                <span ng-bind="info.lpStart"></span>
             </td>
             <td>
-                <span ng-bind="info.lpfw"></span>
+                <span ng-bind="info.lpNames"></span>
             </td>
             <td>
-                <span ng-bind="info.qsry"></span>
+                <span ng-bind="info.ryStart"></span>
             </td>
             <td>
-                <span ng-bind="info.ryfw"></span>
+                <span ng-bind="info.ryDbbms"></span>
             </td>
             <td>
                 <!--<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="#" class="btn default blue-stripe btn-sm"> 详细 </a>
                 <a ui-sref="#" class="btn default blue-stripe btn-sm"> 修改 </a>
             </td>
         </tr>
-排班规则管理
 \ No newline at end of file
-// 车辆配置管理 service controller 等写在一起
-// TODO
+// 规则配置管理 service controller 等写在一起
+angular.module('ScheduleApp').factory('ScheduleRuleManageService', ['ScheduleRuleManageService_g', function(service) {
+    /** 当前的查询条件信息 */
+    var currentSearchCondition = {};
  
-angular.module('ScheduleApp').controller('ScheduleRuleManageCtrl', ['$state', function($state) {
+    /** 当前第几页 */
+    var currentPageNo = 1;
+
+    return {
+        /**
+         * 获取查询条件信息，
+         * 用于给controller用来和页面数据绑定。
+         */
+        getSearchCondition: function() {
+            return currentSearchCondition;
+        },
+        /**
+         * 重置查询条件信息。
+         */
+        resetSearchCondition: function() {
+            var key;
+            for (key in currentSearchCondition) {
+                currentSearchCondition[key] = null;
+            }
+        },
+        /**
+         * 设置当前页码。
+         * @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 id 车辆id
+         * @return 返回一个 promise
+         */
+        getDetail: function(id) {
+            var params = {id: id};
+            return service.rest.get(params).$promise;
+        },
+        /**
+         * 保存信息。
+         * @param obj 车辆详细信息
+         * @return 返回一个 promise
+         */
+        saveDetail: function(obj) {
+            return service.rest.save(obj).$promise;
+        }
+    };
+
+}]);
+
+angular.module('ScheduleApp').controller('ScheduleRuleManageCtrl', ['ScheduleRuleManageService', '$state', function(busConfigService, $state) {
     var self = this;
  
     // 切换到form状态
     self.goForm = function() {
-        alert("生成");
+        //alert("切换");
+        $state.go("scheduleRuleManage_form");
+    };
  
-    }
 }]);
  
-angular.module('ScheduleApp').controller('ScheduleRuleManageListCtrl', [function() {
+angular.module('ScheduleApp').controller('ScheduleRuleManageListCtrl', ['ScheduleRuleManageService', function(scheduleRuleManageService) {
     var self = this;
     self.pageInfo = {
         totalItems : 0,
@@ -20,16 +81,17 @@ angular.module(&#39;ScheduleApp&#39;).controller(&#39;ScheduleRuleManageListCtrl&#39;, [function
     };
  
     // 初始创建的时候，获取一次列表数据
-    // TODO：假数据
-    self.pageInfo.infos.push({
-        xl: "85路",
-        cl: "Q4A-001",
-        fbms: "0111110",
-        qslp: "1",
-        lpfw: "+1,+2,+3,+4,+5",
-        qsry: "1",
-        ryfw: "36"
-    });
+    scheduleRuleManageService.getPage().then(
+        function(result) {
+            self.pageInfo.totalItems = result.totalElements;
+            self.pageInfo.currentPage = result.number + 1;
+            self.pageInfo.infos = result.content;
+            scheduleRuleManageService.setCurrentPageNo(result.number + 1);
+        },
+        function(result) {
+            alert("出错啦！");
+        }
+    );
  
     //$scope.$watch("ctrl.pageInfo.currentPage", function() {
     //    alert("dfdfdf");
@@ -37,16 +99,119 @@ angular.module(&#39;ScheduleApp&#39;).controller(&#39;ScheduleRuleManageListCtrl&#39;, [function
  
     // 翻页的时候调用
     self.pageChanaged = function() {
+        scheduleRuleManageService.setCurrentPageNo(self.pageInfo.currentPage);
+        scheduleRuleManageService.getPage().then(
+            function(result) {
+                self.pageInfo.totalItems = result.totalElements;
+                self.pageInfo.currentPage = result.number + 1;
+                self.pageInfo.infos = result.content;
+                scheduleRuleManageService.setCurrentPageNo(result.number + 1);
+            },
+            function(result) {
+                alert("出错啦！");
+            }
+        );
     };
     // 获取查询条件数据
     self.searchCondition = function() {
+        return scheduleRuleManageService.getSearchCondition();
     };
     // 重置查询条件
     self.resetSearchCondition = function() {
+        scheduleRuleManageService.resetSearchCondition();
+        self.pageInfo.currentPage = 1;
+        self.pageChanaged();
     };
  
 }]);
  
+angular.module('ScheduleApp').controller('ScheduleRuleManageFormCtrl', ['ScheduleRuleManageService', '$stateParams', '$state', '$scope', function(scheduleRuleManageService, $stateParams, $state, $scope) {
+    var self = this;
+
+    // 启用日期 日期控件开关
+    self.qyrqOpen = false;
+    self.qyrq_open = function() {
+        self.qyrqOpen = true;
+    };
+
+    // 欲保存的busInfo信息，绑定
+    self.scheduleRuleManageForSave = {};
+
+    // 获取传过来的id，有的话就是修改，获取一遍数据
+    var id = $stateParams.id;
+    if (id) {
+        self.scheduleRuleManageForSave.id = id;
+        scheduleRuleManageService.getDetail(id).then(
+            function(result) {
+                var key;
+                for (key in result) {
+                    self.scheduleRuleManageForSave[key] = result[key];
+                }
+
+                // 添加xl_id，cl_id
+                self.scheduleRuleManageForSave["xl_id"] = self.scheduleRuleManageForSave.xl.id;
+                self.scheduleRuleManageForSave["cl_id"] = self.scheduleRuleManageForSave.cl.id;
+            },
+            function(result) {
+                alert("出错啦！");
+            }
+        );
+    }
+
+    // 提交方法
+    self.submit = function() {
+        console.log(self.scheduleRuleManageForSave);
+
+        var mf = $scope.myForm;
+
+        // xl_id，cl_id要组织成对象，然后删除
+        self.scheduleRuleManageForSave["xl"] = {};
+        self.scheduleRuleManageForSave.xl["id"] = self.scheduleRuleManageForSave["xl_id"];
+        delete self.scheduleRuleManageForSave["xl_id"];
+        self.scheduleRuleManageForSave["cl"] = {};
+        self.scheduleRuleManageForSave.cl["id"] = self.scheduleRuleManageForSave["cl_id"];
+        delete self.scheduleRuleManageForSave["cl_id"];
+
+        scheduleRuleManageService.saveDetail(self.scheduleRuleManageForSave).then(
+            function(result) {
+                // TODO：弹出框方式以后改
+                if (result.status == 'SUCCESS') {
+                    alert("保存成功！");
+                    $state.go("scheduleRuleManage");
+                } else {
+                    alert("保存异常！");
+                }
+            },
+            function(result) {
+                // TODO：弹出框方式以后改
+                alert("出错啦！");
+            }
+        );
+    };
+}]);
+
+angular.module('ScheduleApp').controller('ScheduleRuleManageDetailCtrl', ['ScheduleRuleManageService', '$stateParams', function(scheduleRuleManageService, $stateParams) {
+    var self = this;
+    self.title = "";
+    self.scheduleRuleManageForDetail = {};
+    self.scheduleRuleManageForDetail.id = $stateParams.id;
+
+    // 当转向到此页面时，就获取明细信息并绑定
+    scheduleRuleManageService.getDetail($stateParams.id).then(
+        function(result) {
+            var key;
+            for (key in result) {
+                self.scheduleRuleManageForDetail[key] = result[key];
+            }
+
+            self.title = "规则配置详细信息";
+        },
+        function(result) {
+            // TODO：弹出框方式以后改
+            alert("出错啦！");
+        }
+    );
+}]);
  
  
  
@@ -618,6 +618,63 @@ ScheduleApp.config([&#39;$stateProvider&#39;, &#39;$urlRouterProvider&#39;, function($stateProvi
                         name: 'scheduleRuleManage_module',
                         insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置
                         files: [
+                            "assets/bower_components/angular-ui-select/dist/select.min.css",
+                            "assets/bower_components/angular-ui-select/dist/select.min.js",
+                            "pages/scheduleApp/module/core/scheduleRuleManage/scheduleRuleManage.js"
+                        ]
+                    });
+                }]
+            }
+        })
+        .state("scheduleRuleManage_form", {
+            url: '/scheduleRuleManage_form',
+            views: {
+                "": {templateUrl: 'pages/scheduleApp/module/core/scheduleRuleManage/form.html'}
+            },
+            resolve: {
+                deps: ['$ocLazyLoad', function($ocLazyLoad) {
+                    return $ocLazyLoad.load({
+                        name: 'scheduleRuleManage_form_module',
+                        insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置
+                        files: [
+                            "assets/bower_components/angular-ui-select/dist/select.min.css",
+                            "assets/bower_components/angular-ui-select/dist/select.min.js",
+                            "pages/scheduleApp/module/core/scheduleRuleManage/scheduleRuleManage.js"
+                        ]
+                    });
+                }]
+            }
+        })
+        .state("scheduleRuleManage_edit", {
+            url: '/scheduleRuleManage_edit/:id',
+            views: {
+                "": {templateUrl: 'pages/scheduleApp/module/core/scheduleRuleManage/edit.html'}
+            },
+            resolve: {
+                deps: ['$ocLazyLoad', function($ocLazyLoad) {
+                    return $ocLazyLoad.load({
+                        name: 'scheduleRuleManage_edit_module',
+                        insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置
+                        files: [
+                            "assets/bower_components/angular-ui-select/dist/select.min.css",
+                            "assets/bower_components/angular-ui-select/dist/select.min.js",
+                            "pages/scheduleApp/module/core/scheduleRuleManage/scheduleRuleManage.js"
+                        ]
+                    });
+                }]
+            }
+        })
+        .state("scheduleRuleManage_detail", {
+            url: '/scheduleRuleManage_detail/:id',
+            views: {
+                "": {templateUrl: 'pages/scheduleApp/module/core/scheduleRuleManage/detail.html'}
+            },
+            resolve: {
+                deps: ['$ocLazyLoad', function($ocLazyLoad) {
+                    return $ocLazyLoad.load({
+                        name: 'scheduleRuleManage_detail_module',
+                        insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置
+                        files: [
                             "pages/scheduleApp/module/core/scheduleRuleManage/scheduleRuleManage.js"
                         ]
                     });
@@ -881,6 +938,30 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;GuideboardManageService_g&#39;, [&#39;$resource&#39;,
     };
 }]);
  
+// 排班管理service
+angular.module('ScheduleApp').factory('ScheduleRuleManageService_g', ['$resource', function($resource) {
+    return {
+        rest: $resource(
+            '/sr1fc/:id',
+            {order: 'createDate', direction: 'DESC', id: '@id_route'},
+            {
+                list: {
+                    method: 'GET',
+                    params: {
+                        page: 0
+                    }
+                },
+                get: {
+                    method: 'GET'
+                },
+                save: {
+                    method: 'POST'
+                }
+            }
+        )
+    };
+}]);
+
 // 时刻表管理service
 angular.module('ScheduleApp').factory('TimeTableManageService_g', ['$resource', function($resource) {
     // TODO：之后返回两个$resource，包含 时刻表和时刻表明细