添加稽查页面逻辑

VisualInspection/js/mytask/unchecked.js

@@ -0,0 +1,35 @@
+// var page_size=10;
+function queryUncheckedTask(){
+    var data = {
+        "start_time": $("#start_time").val(),
+        "end_time": $("#end_time").val(),
+        "dept": $("#dept").val()
+    }
+    var cols = [
+                {width: 80, text: '序号', type: 'number', flex: false, colClass: 'text-center',field: 'num'},
+                {width: 160, text: '任务名称', type: 'date', flex: false, sort: 'down',field: 'name'},
+                {width: 80, text: '考核人员', type: 'string', flex: true, colClass: '',field: 'checked_person'},
+                {width: 160, text: '考核部门', type: 'date', flex: false, sort: 'down',field: 'checked_dept'},
+                {width: 80, text: '稽查人员', type: 'string', flex: true, colClass: '',field: 'checkman'},
+                {width: 160, text: '稽查时间段', type: 'date', flex: false, sort: 'down',field: 'start_time'},
+                {width: 80, text: '状态', type: 'string', flex: true, colClass: '',field: 'check_status_name'},
+                {width: 160, text: '操作', type: 'string', flex: true, field: 'id',
+                    oper:[
+                        {func:'showCheck',text:'稽查',icon_class:'icon-edit'}
+                    ]
+                }
+            ];
+    
+    // var pager = {
+    //     page_size:10
+    // }
+    $('.datatable').mytable({'cols':cols,
+                            'url':"/task/getTaskList/",
+                            'param':data}
+                            );
+}
+function showCheck(id){
+    // $('#myModal').modal({name:"dd"});
+    $.checkTask =getItemByIdFromArr(id,$('.datatable').mytable('getTableData'));
+    changePage("/view/mytask/check.html");
+}

VisualInspection/js/mytask/undispatched.js

@@ -0,0 +1,88 @@
+// var page_size=10;
+function queryUndispatchedTask(){
+    var data = {
+        "start_time": $("#start_time").val(),
+        "end_time": $("#end_time").val(),
+        "dept": $("#dept").val()
+    }
+    var cols = [
+                {width: 30, text: '序号', type: 'number', flex: true, colClass: 'text-center'},
+                {width: 80, text: '任务名称', type: 'date', flex: true, sort: 'down'},
+                {width: 80, text: '考核人员', type: 'string', flex: true, colClass: ''},
+                {width: 80, text: '考核部门', type: 'date', flex: false, sort: 'down'},
+                {width: 80, text: '稽查人员', type: 'string', flex: true, colClass: ''},
+                {width: 80, text: '稽查时间段', type: 'date', flex: true, sort: 'down'},
+                {width: 80, text: '状态', type: 'string', flex: true, colClass: ''},
+                {width: 80, text: '稽查时间', type: 'string', flex: true, colClass: ''},
+                {width: 160, text: '操作', type: 'string', flex: true, field: 'id',
+                    oper:[
+                        {func:'showTaskDetail',text:'稽查',icon_class:'icon-edit'}
+                    ]
+                }
+            ];
+    
+    // var pager = {
+    //     page_size:10
+    // }
+    $('.datatable').mytable({'cols':cols,
+                            'url':"/task/getTaskList/",
+                            'param':data}
+                            );
+}
+function showTaskDetail(){
+    changePage("/view/mytask/taskDetail.html");
+}
+function showCheck(){
+    $('#code_flag').val('');
+    $('#flag_name').val('');
+    $('#code_value').val('');
+    $('#code_name').val('');
+    $('#sort_no').val('');
+    $('#remark').val('');
+    $("#valid").attr('checked','true');
+    showPopup4Common('稽查页面',function(){
+        addOrUpdateConstant("/constant/add/");
+    },'400px');
+}
+var cur_id;
+function addOrUpdateConstant(url){
+    var valid=1;
+    if(!$("#valid").is(':checked')) valid=0;
+    var param ={
+        'id':cur_id,
+        'code_flag':$('#code_flag').val(),
+        'flag_name':$('#flag_name').val(),
+        'code_value':Number($('#code_value').val()),
+        'code_name':$('#code_name').val(),
+        'sort_no':Number($('#sort_no').val()),
+        'remark':$('#remark').val(),
+        'valid':valid
+    };
+    addOrUpdateItem4Common(param,url,queryConstant);
+}
+
+function showEditConstant(id){
+    cur_id='';
+    var rowData=getItemByIdFromArr(id,$('.datatable').mytable('getTableData'));
+    if(rowData) {
+        cur_id = rowData.id;
+        $('#code_flag').val(rowData.code_flag);
+        $('#flag_name').val(rowData.flag_name);
+        $('#code_value').val(rowData.code_value);
+        $('#code_name').val(rowData.code_name);
+        $('#sort_no').val(rowData.sort_no);
+        $('#remark').val(rowData.remark);
+        if(rowData.valid==1){
+            $("#valid").attr('checked','true');
+        }else{
+            $("#valid").attr('checked','false');
+        }
+        showPopup4Common('修改常量',function(){
+            addOrUpdateConstant("/constant/update/");
+        },'400px');
+    }
+}
+
+function deleteConstant(id){
+    deleteItem4Common(id,"/constant/delete/",queryConstant);
+}

VisualInspection/js/util/util.js

@@ -159,6 +159,39 @@ function addOrUpdateItem4Common(param,url,okCb){
         alert(error);
     });
 }
+function setFeSelect(div,selectId){
+    get_common_service("/dept/getAllFs",null,function(data){
+        var optStr = '<option value="">全部</option>';
+        for(var i in data) {
+            if(data[i].deptid==selectId)
+                optStr += '<option value="'+data[i].deptid+'" selected="selected">'+data[i].name+'</option>';
+            else
+                optStr += '<option value="'+data[i].deptid+'">'+data[i].name+'</option>';
+        }
+        $(div).html('');
+        $(div).html(optStr);
+    });
+}
+
+function setLaneSelect(div,selectId){
+    var optStr = '';
+    var data =[];
+    for(var i =0;i<=8;i++) {
+        if(i==0)
+            data.push({id:i,name:'值机室'});
+        else
+            data.push({id:i,name:i+'车道'});
+    }
+    for(var i in data) {
+        if(i==selectId)
+            optStr += '<option value="'+data[i].id+'" selected="selected">'+data[i].name+'</option>';
+        else
+            optStr += '<option value="'+data[i].id+'">'+data[i].name+'</option>';
+    }
+    $(div).html('');
+    $(div).html(optStr);
+}
+
 // var ViewMap = new HashMap()
 // ViewMap.set("/view/mytask/unchecked.html", __inline('/view/mytask/unchecked.html'));
 // ViewMap.set("/view/mytask/unexamined.html", __inline('/view/mytask/unexamined.html'));

VisualInspection/view/main.html

@@ -7,6 +7,7 @@
     <link rel="import" href="/view/common/commoncsslink.html?__inline">
     <link rel="stylesheet" type="text/css" href="/css/main.css">
     <link rel="import" href="/view/common/commonscriptlink.html?__inline">
+    <script src="/js/mytask/unchecked.js"></script> 
     <!--<link rel="stylesheet" type="text/css" href="/css/user/userManager.css?__inline">
 <script type="text/javascript" src="/node_modules/zui/dist/lib/dashboard/zui.dashboard.min.js?__inline"></script>
 <link rel="stylesheet" type="text/css" href="/node_modules/zui/dist/lib/dashboard/zui.dashboard.min.css">

VisualInspection/view/mytask/check.html

@@ -4,7 +4,7 @@
             <div class="form-group">
                 <label for="exampleInputAccount1" class="col-sm-1">收费站</label>
                 <div class="col-sm-2">
-                    <select class="form-control">
+                    <select class="form-control"  id="fsList">
                             <option value="">全部</option>
                             <option value="1">东台收费站</option>
                             <option value="2">收费站</option>
@@ -13,18 +13,13 @@
                 </div>
                 <label for="exampleInputAccount1" class="col-sm-1">车道号</label>
                 <div class="col-sm-2">
-                    <select class="form-control">
-                            <option value="">1</option>
-                            <option value="1">2</option>
-                            <option value="2">3</option>
-                            <option value="3">4</option>
-                        </select>
+                    <select class="form-control" id="lane"></select>
                 </div>
-                <label for="exampleInputAccount1" class="col-sm-1">考核人员</label>
+                <label class="col-sm-1">考核人员</label>
                 <div class="col-sm-2">
                     <!-- 使用图片 -->
                     <a href="../../images/img4.jpg" class="lightbox-toggle" data-toggle="lightbox" data-group="image-group-1"><img src="../../images/img4.jpg" class="img-rounded" alt="" width="50px"></a>
-                    <label id="checkedPerson">0518 盛兴峰</label>
+                    <label id="checked_person">0518 盛兴峰</label>
                 </div>
                 <div class="col-sm-2">
                     <button class="btn btn-primary " type="button" data-toggle="modal" data-target="#changePersonWin">更改考核人员</button>
@@ -235,6 +230,11 @@
             forceParse: 0,
             format: "yyyy-mm-dd"
         });
+        setFeSelect("#fsList",$.checkTask.deptid);
+        setLaneSelect("#lane",$.checkTask.checked_location);
+        get_common_service('user/getUserById/'+$.checkTask.checked_person, null, function(data){
+            $("#checked_person").html(data.truename);
+        }) 
         // 使用data参数更新数据：
         $('.datatable').datatable({
             checkable: false,

VisualInspection/view/mytask/dispatched.html

@@ -111,7 +111,5 @@
                 }
             });
         });
-        function showTaskDetail(){
-            changePage("/view/mytask/taskDetail.html");
-        }
+        
     </script>

VisualInspection/view/mytask/unchecked.html

@@ -1,108 +1,59 @@
-    <div class="container-fluid ">
-        <div class="row">
-            <form  class="form-horizontal">
-                <div class="form-group">
-                    <label for="exampleInputAccount1" class="col-sm-1">稽查日期</label>
-                    <div class="col-sm-2">
-                        <input type="text" id="start-time" class="form-control form-date" placeholder="开始时间">
-                    </div>
-                    <div class="col-sm-2">
-                        <input type="text" id="end-time" class="form-control form-date" placeholder="截止时间">
-                    </div>
-                    <label for="exampleInputAccount1" class="col-sm-1">考核部门</label>
-                    <div class="col-sm-2">
-                        <select class="form-control">
-                            <option value="">全部</option>
-                            <option value="1">东台收费站</option>
-                            <option value="2">收费站</option>
-                            <option value="3">收费站</option>
-                        </select>
-                    </div>
-                    <div class="col-sm-2">
-                        <button class="btn btn-primary " type="button">查询</button>
-                    </div>
+<!--<script src="/js/mytask/unchecked.js"></script> -->
+<div class="container-fluid ">
+    <div class="row">
+        <form  class="form-horizontal">
+            <div class="form-group">
+                <label for="exampleInputAccount1" class="col-sm-1">稽查日期</label>
+                <div class="col-sm-2">
+                    <input type="text" id="start-time" class="form-control form-date" placeholder="开始时间">
+                </div>
+                <div class="col-sm-2">
+                    <input type="text" id="end-time" class="form-control form-date" placeholder="截止时间">
+                </div>
+                <label for="exampleInputAccount1" class="col-sm-1">考核部门</label>
+                <div class="col-sm-2">
+                    <select class="form-control" id="fsList">
+                    </select>
+                </div>
+                <div class="col-sm-2">
+                    <button class="btn btn-primary " type="button" onclick="queryUncheckedTask()">查询</button>
                 </div>
-            </form>
-        </div>
-        <br>
-
-        <div class="row">
-            <!-- 使用一个div来显示数据表格 -->
-            <div class="datatable" data-checkable="true" data-sortable="true"></div> 
-        </div>
-        <div class="row" style="text-align:center">
-            <ul class="pager center-block">
-                <li class="previous"><a href="#">« 上一页</a></li>
-                <li><a href="#">1</a></li>
-                <li class="active"><a href="#">2</a></li>
-                <li><a href="#">3</a></li>
-                <li><a href="#">4</a></li>
-                <li><a href="#">5</a></li>
-                <li class="next"><a href="#">下一页 »</a></li>
-            </ul>
-        </div>
-    </div>
-    <!-- 对话框HTML -->
-    <div class="modal fade" id="myModal">
-        <div class="modal-dialog modal-lg">
-            <div class="modal-content">
-            ...
             </div>
-        </div>
+        </form>
     </div>
-    <script>
-        $(document).ready(function() {
-            // 仅选择日期
-            $("#start-time").datetimepicker(
-            {
-                language:  "zh-CN",
-                weekStart: 1,
-                todayBtn:  1,
-                autoclose: 1,
-                todayHighlight: 1,
-                startView: 2,
-                minView: 2,
-                forceParse: 0,
-                format: "yyyy-mm-dd"
-            });
-            // 仅选择日期
-            $("#end-time").datetimepicker(
-            {
-                language:  "zh-CN",
-                weekStart: 1,
-                todayBtn:  1,
-                autoclose: 1,
-                todayHighlight: 1,
-                startView: 2,
-                minView: 2,
-                forceParse: 0,
-                format: "yyyy-mm-dd"
-            });
-            // 使用data参数更新数据：
-            $('.datatable').datatable( {
-                checkable:false,
-                sortable:false,
-                data: {
-                    cols: [
-                        {width: 80, text: '序号', type: 'number', flex: false, colClass: 'text-center'},
-                        {width: 160, text: '任务名称', type: 'date', flex: false, sort: 'down'},
-                        {width: 80, text: '考核人员', type: 'string', flex: true, colClass: ''},
-                        {width: 160, text: '考核部门', type: 'date', flex: false, sort: 'down'},
-                        {width: 80, text: '稽查人员', type: 'string', flex: true, colClass: ''},
-                        {width: 160, text: '稽查时间段', type: 'date', flex: false, sort: 'down'},
-                        {width: 80, text: '状态', type: 'string', flex: true, colClass: ''},
-                        {width: 80, text: '操作', type: 'string', flex: true, colClass: ''}
-                    ],
-                    rows: [
-                        {checked: false, data: [1, '20170404收费站稽查任务','李敏','收费站','徐薇','2017-04-04  00:00-24:00','未稽查','<a href="#" onclick="showCheck(1)"><i class="icon-ok-sign"></i>稽查</a>']},
-                        {checked: false, data: [2, '20170404收费站稽查任务','李敏','收费站','徐薇','2017-04-04  00:00-24:00','未稽查','<a href="#" onclick="showCheck(2)"><i class="icon-ok-sign"></i>稽查</a>']},
-                        // 更多数据
-                    ]
-                }
-            });
+    <br>
+
+    <div class="datatable"></div>
+</div>
+<script>
+    $(document).ready(function() {
+        // 仅选择日期
+        $("#start-time").datetimepicker(
+        {
+            language:  "zh-CN",
+            weekStart: 1,
+            todayBtn:  1,
+            autoclose: 1,
+            todayHighlight: 1,
+            startView: 2,
+            minView: 2,
+            forceParse: 0,
+            format: "yyyy-mm-dd"
+        });
+        // 仅选择日期
+        $("#end-time").datetimepicker(
+        {
+            language:  "zh-CN",
+            weekStart: 1,
+            todayBtn:  1,
+            autoclose: 1,
+            todayHighlight: 1,
+            startView: 2,
+            minView: 2,
+            forceParse: 0,
+            format: "yyyy-mm-dd"
         });
-        function showCheck(id){
-            // $('#myModal').modal({name:"dd"});
-            changePage("/view/mytask/check.html");
-        }
-    </script>
+        setFeSelect("#fsList");
+        queryUncheckedTask();
+    });
+</script>

VisualInspection/view/mytask/undispatched.html

@@ -1,128 +1,76 @@
-    <div class="container-fluid ">
-        <div class="row">
-            <form  class="form-horizontal">
-                <div class="form-group">
-                    <label for="exampleInputAccount1" class="col-sm-1">稽查日期</label>
-                    <div class="col-sm-2">
-                        <input type="text" id="start-time" class="form-control form-date" placeholder="开始时间">
-                    </div>
-                    <div class="col-sm-2">
-                        <input type="text" id="end-time" class="form-control form-date" placeholder="截止时间">
-                    </div>
-                    <label for="exampleInputAccount1" class="col-sm-1">考核部门</label>
-                    <div class="col-sm-2">
-                        <select class="form-control">
-                            <option value="">全部</option>
-                            <option value="1">东台收费站</option>
-                            <option value="2">收费站</option>
-                            <option value="3">收费站</option>
-                        </select>
-                    </div>
-                    <div class="col-sm-2">
-                        <button class="btn btn-primary " type="button">查询</button>
-                    </div>
-                    <div style="float:right;">
-                        <button class="btn btn-success" type="button" onclick="dispatchAll()"><i class="icon icon-plus-sign"></i> 一键下发</button>
-                    </div>
+<script src="/js/mytask/undispatched.js"></script> 
+<div class="container-fluid ">
+    <div class="row">
+        <form  class="form-horizontal">
+            <div class="form-group">
+                <label for="exampleInputAccount1" class="col-sm-1">稽查日期</label>
+                <div class="col-sm-2">
+                    <input type="text" id="start-time" class="form-control form-date" placeholder="开始时间">
                 </div>
-            </form>
-        </div>
-        <br>
-
-        <div class="row">
-            <!-- 使用一个div来显示数据表格 -->
-            <div class="datatable" data-checkable="true" data-sortable="true"></div 
-        </div>
-        <div class="row" style="text-align:center">
-            <ul class="pager center-block">
-                <li class="previous"><a href="#">« 上一页</a></li>
-                <li><a href="#">1</a></li>
-                <li class="active"><a href="#">2</a></li>
-                <li><a href="#">3</a></li>
-                <li><a href="#">4</a></li>
-                <li><a href="#">5</a></li>
-                <li class="next"><a href="#">下一页 »</a></li>
-            </ul>
-        </div>
-    </div>
-    <!-- 对话框HTML -->
-    <div class="modal fade" id="myModal">
-    <div class="modal-dialog">
-        <div class="modal-content">
-            
-        </div>
-        <div class="modal-content">
-      <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">×</span><span class="sr-only">关闭</span></button>
-        <h4 class="modal-title">添加常量</h4>
-      </div>
-      <div class="modal-body">
-        <link rel="import" href="/view/constant/form.html?__inline">
-      </div>
-    </div>
-    </div>
+                <div class="col-sm-2">
+                    <input type="text" id="end-time" class="form-control form-date" placeholder="截止时间">
+                </div>
+                <label for="exampleInputAccount1" class="col-sm-1">考核部门</label>
+                <div class="col-sm-2">
+                    <select class="form-control">
+                        <option value="">全部</option>
+                        <option value="1">东台收费站</option>
+                        <option value="2">收费站</option>
+                        <option value="3">收费站</option>
+                    </select>
+                </div>
+                <div class="col-sm-2">
+                    <button class="btn btn-primary " type="button" onclick="queryUndispatchedTask()">查询</button>
+                </div>
+                <div style="float:right;">
+                    <button class="btn btn-success" type="button" onclick="dispatchAll()"><i class="icon icon-plus-sign"></i> 一键下发</button>
+                </div>
+            </div>
+        </form>
     </div>
-    <script>
-        $(document).ready(function() {
-            // 仅选择日期
-            $("#start-time").datetimepicker(
-            {
-                language:  "zh-CN",
-                weekStart: 1,
-                todayBtn:  1,
-                autoclose: 1,
-                todayHighlight: 1,
-                startView: 2,
-                minView: 2,
-                forceParse: 0,
-                format: "yyyy-mm-dd"
-            });
-            // 仅选择日期
-            $("#end-time").datetimepicker(
-            {
-                language:  "zh-CN",
-                weekStart: 1,
-                todayBtn:  1,
-                autoclose: 1,
-                todayHighlight: 1,
-                startView: 2,
-                minView: 2,
-                forceParse: 0,
-                format: "yyyy-mm-dd"
-            });
-            // 使用data参数更新数据：
-            $('.datatable').datatable( {
-                checkable:false,
-                sortable:false,
-                data: {
-                    cols: [
-                        {width: 30, text: '序号', type: 'number', flex: false, colClass: 'text-center'},
-                        {width: 80, text: '任务名称', type: 'date', flex: false, sort: 'down'},
-                        {width: 80, text: '考核人员', type: 'string', flex: true, colClass: ''},
-                        {width: 80, text: '考核部门', type: 'date', flex: false, sort: 'down'},
-                        {width: 80, text: '稽查人员', type: 'string', flex: true, colClass: ''},
-                        {width: 80, text: '稽查时间段', type: 'date', flex: false, sort: 'down'},
-                        {width: 80, text: '状态', type: 'string', flex: true, colClass: ''},
-                        {width: 80, text: '稽查时间', type: 'string', flex: true, colClass: ''},
-                        {width: 160, text: '操作', type: 'string', flex: true, colClass: ''}
-                    ],
-                    rows: [
-                        {checked: false, data: [1, '20170404收费站稽查任务','李敏','收费站','徐薇','2017-04-04  00:00-24:00','待审核','2017-04-05 10:00','<a href="###" onclick="dispatch()"><i class="icon-envelope"></i>下发任务 </a><a href="###" onclick="showTaskDetail()"><i class="icon-table"></i>查看结果</a>']},
-                        {checked: false, data: [2, '20170404收费站稽查任务','李敏','收费站','徐薇1','2017-04-04  00:00-24:00','待审核','2017-04-05 10:00','<a href="###"><i class="icon-envelope"></i>下发任务 </a><a href="###"><i class="icon-table"></i>查看结果</a>']},
-                        // 更多数据
-                    ]
-                }
-            });
+    <br>
+
+    <div class="datatable"></div>
+</div>
+<script>
+    $(document).ready(function() {
+        // 仅选择日期
+        $("#start-time").datetimepicker(
+        {
+            language:  "zh-CN",
+            weekStart: 1,
+            todayBtn:  1,
+            autoclose: 1,
+            todayHighlight: 1,
+            startView: 2,
+            minView: 2,
+            forceParse: 0,
+            format: "yyyy-mm-dd"
+        });
+        // 仅选择日期
+        $("#end-time").datetimepicker(
+        {
+            language:  "zh-CN",
+            weekStart: 1,
+            todayBtn:  1,
+            autoclose: 1,
+            todayHighlight: 1,
+            startView: 2,
+            minView: 2,
+            forceParse: 0,
+            format: "yyyy-mm-dd"
         });
+        queryUndispatchedTask();
+    });
 
-        function dispatch(){
-            alert("下发成功！");
-        }
+    function dispatch(){
+        alert("下发成功！");
+    }
 
-        function dispatchAll(){
-            alert("下发成功！");
-        }
-        function showTaskDetail(){
-            changePage("/view/mytask/taskDetail.html");
-        }
-    </script>
+    function dispatchAll(){
+        alert("下发成功！");
+    }
+    function showTaskDetail(){
+        changePage("/view/mytask/taskDetail.html");
+    }
+</script>

VisualInspection_server/src/main/java/com/xintong/visualinspection/bean/FeeStation.java

@@ -0,0 +1,31 @@
+package com.xintong.visualinspection.bean;
+
+import java.util.List;
+
+import lombok.Data;
+
+/**
+ * 文件名：Organ
+ * 版本信息：日期：2017/4/18 Copyright 江苏省交通规划设计院 Corporation 2017 版权所有.
+ */
+@Data
+public class FeeStation {
+    //编号
+    private Integer id;
+    //组织机构名称
+    private String name;
+    //总车道数
+    private Integer lanes_number;
+    //出口车道数'
+    private Integer exit_numer;
+    //入口车道数'
+    private Integer entrance_numer;
+    //出口etc车道数
+    private Integer exit_etc;
+    //入口etc车道数
+    private Integer entrance_etc;
+    //机构编码
+    private String deptid;
+    //是否显示，0：不显示，1：显示
+    private String isshow;
+}

VisualInspection_server/src/main/java/com/xintong/visualinspection/bean/Task.java

@@ -20,6 +20,8 @@ public class Task{
     private String name;
     //审核状态
     private Integer check_status;
+    //审核状态
+    private String check_status_name;
     //视屏编号
     private String video_id;
     //监控位置类型

VisualInspection_server/src/main/java/com/xintong/visualinspection/controller/BaseController.java

@@ -65,7 +65,7 @@ public class BaseController {
     	Map<String,Object> result = new HashMap<>();
     	result.put("result_code", 0);
     	result.put("result_desc", "success");
-        return JSON.toJSON(result).toString();
+        return JSON.toJSONStringWithDateFormat(result,"yyyy-MM-dd HH:mm");
     }
     
     /**
@@ -80,7 +80,7 @@ public class BaseController {
     	result.put("result_code", 0);
     	result.put("result_desc", "success");
     	result.put("result_data", o);
-        return JSON.toJSON(result).toString();
+        return JSON.toJSONStringWithDateFormat(result,"yyyy-MM-dd HH:mm");
     }
     
     /**
@@ -95,7 +95,7 @@ public class BaseController {
     	result.put("result_code", 0);
     	result.put("result_desc", result_desc);
     	result.put("result_data", o);
-        return JSON.toJSON(result).toString();
+        return JSON.toJSONStringWithDateFormat(result,"yyyy-MM-dd HH:mm");
     }
     
     /** 基于@ExceptionHandler异常处理 */  

VisualInspection_server/src/main/java/com/xintong/visualinspection/controller/DepartmentController.java

@@ -13,6 +13,7 @@ import org.springframework.web.bind.annotation.RestController;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.xintong.system.err.BusinessException;
+import com.xintong.visualinspection.bean.FeeStation;
 import com.xintong.visualinspection.bean.Organ;
 import com.xintong.visualinspection.service.DepartmentService;
 
@@ -125,5 +126,10 @@ public class DepartmentController extends BaseController {
         }
     }
    
+    @RequestMapping(value = "/getAllFs",method=RequestMethod.GET,produces="application/json;charset=UTF-8")
+    public String getAllFs(){
+    	List<FeeStation> organs = departmentService.getAllFS();
+    	return returnResult(0, "获取成功", organs);
+    }
     
 }

VisualInspection_server/src/main/java/com/xintong/visualinspection/controller/TaskController.java

@@ -5,11 +5,16 @@ import java.util.List;
 import javax.validation.Valid;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.mysql.jdbc.StringUtils;
 import com.xintong.system.err.BusinessException;
+import com.xintong.visualinspection.bean.Constant;
 import com.xintong.visualinspection.bean.Task;
 import com.xintong.visualinspection.service.TaskService;
 
@@ -93,9 +98,10 @@ public class TaskController extends BaseController {
      * @exception
      * @since  1.0.0
      */
-    @RequestMapping(value = "/getTaskList")
-    public String getTaskList(@RequestBody Task task){
+    @RequestMapping(value = "/getTaskList/{page}/{size}")
+    public String getTaskList(@PathVariable Integer page,@PathVariable Integer size, @RequestBody Task task){
+    	PageHelper.startPage(page, size); 
     	List<Task> taskList = taskService.getTaskList(task);
-    	return super.returnSuccessResult(taskList);
+    	return super.returnSuccessResult(new PageInfo(taskList));
     }
 }

VisualInspection_server/src/main/java/com/xintong/visualinspection/dao/cluster/DepartmentDao.java

@@ -4,6 +4,7 @@ import java.util.List;
 
 import org.apache.ibatis.annotations.Mapper;
 
+import com.xintong.visualinspection.bean.FeeStation;
 import com.xintong.visualinspection.bean.Organ;
 
 /**
@@ -16,4 +17,5 @@ public interface DepartmentDao  {
     public void insert(Organ organ);
     public void update(Organ organ);
     public void delete(Integer id);
+    public List<FeeStation> getAllFS();
 }

VisualInspection_server/src/main/java/com/xintong/visualinspection/mapper/cluster/DepartmentMapper.xml

@@ -13,6 +13,16 @@
         <result column="status" property="status" jdbcType="INTEGER" />
     </resultMap>
 
+	<resultMap id="FeeStationMap" type="com.xintong.visualinspection.bean.FeeStation" >
+        <id column="id" property="id" jdbcType="INTEGER" />
+        <result column="name" property="name" jdbcType="VARCHAR" />
+        <result column="lanes_number" property="lanes_number" jdbcType="INTEGER" />
+        <result column="exit_numer" property="exit_numer" jdbcType="VARCHAR" />
+        <result column="entrance_numer" property="entrance_numer" jdbcType="VARCHAR" />
+        <result column="exit_etc" property="exit_etc" jdbcType="VARCHAR" />
+        <result column="entrance_etc" property="entrance_etc" jdbcType="VARCHAR" />
+        <result column="deptid" property="deptid" jdbcType="VARCHAR" />
+    </resultMap>
    <!--  <select id="getAll" resultMap="BaseResultMap"  >
         SELECT
         id,organname,remark,parentid,classtype,organcode,isshow,deptype,status 
@@ -25,7 +35,9 @@
         FROM t_sys_organ
         WHERE id = #{id}
     </select> -->
-    
+    <select id="getAllFS" resultMap="FeeStationMap">
+        SELECT * FROM t_br_layer_fee_station
+    </select>
     <select id="getOrgan" parameterType="com.xintong.visualinspection.bean.Organ" resultMap="BaseResultMap">
         SELECT 
         id,organname,remark,parentid,classtype,organcode,isshow,deptype,status

VisualInspection_server/src/main/java/com/xintong/visualinspection/mapper/master/TaskMapper.xml

@@ -5,6 +5,7 @@
         <id column="id" property="id" jdbcType="INTEGER" />
         <result column="name" property="name" jdbcType="VARCHAR" />
         <result column="check_status" property="check_status" jdbcType="INTEGER" />
+        <result column="check_status_name" property="check_status_name" jdbcType="VARCHAR" />
         <result column="video_id" property="video_id" jdbcType="VARCHAR" />
         <result column="create_time" property="create_time" jdbcType="VARCHAR" />
         <result column="update_time" property="update_time" jdbcType="VARCHAR" />
@@ -40,7 +41,8 @@
     </select>
     
     <select id="getList" parameterType="com.xintong.visualinspection.bean.Task" resultMap="BaseResultMap" >
-        SELECT *
+        SELECT *,
+              (select a.code_name from sys_code a where a.code_flag='task_status' and a.code_value=check_status) as check_status_name
         FROM check_task
         WHERE 1=1
         	<if test="check_status != null">AND check_status = #{check_status}</if>

VisualInspection_server/src/main/java/com/xintong/visualinspection/service/DepartmentService.java

@@ -2,6 +2,7 @@ package com.xintong.visualinspection.service;
 
 import java.util.List;
 
+import com.xintong.visualinspection.bean.FeeStation;
 import com.xintong.visualinspection.bean.Organ;
 
 /**
@@ -15,4 +16,6 @@ public interface DepartmentService {
 	public void update(Organ organ);
 
 	public void delete(Integer id);
+	
+	public List<FeeStation> getAllFS();
 }

VisualInspection_server/src/main/java/com/xintong/visualinspection/service/impl/DepartmentServiceImpl.java

@@ -9,6 +9,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import com.xintong.visualinspection.bean.FeeStation;
 import com.xintong.visualinspection.bean.Menu;
 import com.xintong.visualinspection.bean.Organ;
 import com.xintong.visualinspection.dao.cluster.DepartmentDao;
@@ -78,4 +79,10 @@ public class DepartmentServiceImpl extends BaseService implements DepartmentServ
 		departmentDao.delete(id);
 	}
 
+	@Override
+	public List<FeeStation> getAllFS() {
+		// TODO Auto-generated method stub
+		return departmentDao.getAllFS();
+	}
+
 }

VisualInspection_server/src/main/resources/application.properties

@@ -2,16 +2,16 @@ server.port=8089
 spring.thymeleaf.cache=false
 
 
-master.datasource.url = jdbc:mysql://localhost:3307/visualinspection?useUnicode=true&characterEncoding=utf-8
+master.datasource.url = jdbc:mysql://git_xt.git.topm.win:9001/visualinspection?useUnicode=true&characterEncoding=utf-8
 master.datasource.username = root
-master.datasource.password = wenhongquan
+master.datasource.password = root
 master.datasource.driver-class-name = com.mysql.jdbc.Driver
 master.mapper-locations=classpath:com/xintong/visualinspection/mapper/master/*.xml
 
 ## \u7528\u6237\u6570\u636e\u6e90\u914d\u7f6e
-cluster.datasource.url=jdbc:mysql://localhost:3307/yanhai?useUnicode=true&characterEncoding=utf8
+cluster.datasource.url=jdbc:mysql://git_xt.git.topm.win:9001/yanhai?useUnicode=true&characterEncoding=utf8
 cluster.datasource.username=root
-cluster.datasource.password=wenhongquan
+cluster.datasource.password=root
 cluster.datasource.driver-class-name = com.mysql.jdbc.Driver
 cluster.mapper-locations=classpath:com/xintong/visualinspection/mapper/cluster/*.xml
 
@@ -50,9 +50,9 @@ spring.datasource.useGlobalDataSourceStat=true
 # Redis\u6570\u636e\u5e93\u7d22\u5f15\uff08\u9ed8\u8ba4\u4e3a0\uff09
 spring.redis.database=0  
 # Redis\u670d\u52a1\u5668\u5730\u5740
-spring.redis.host=localhost
+spring.redis.host=git_xt.git.topm.win
 # Redis\u670d\u52a1\u5668\u8fde\u63a5\u7aef\u53e3
-spring.redis.port=32768  
+spring.redis.port=6379  
 # Redis\u670d\u52a1\u5668\u8fde\u63a5\u5bc6\u7801\uff08\u9ed8\u8ba4\u4e3a\u7a7a\uff09
 spring.redis.password=xintong
 # \u8fde\u63a5\u6c60\u6700\u5927\u8fde\u63a5\u6570\uff08\u4f7f\u7528\u8d1f\u503c\u8868\u793a\u6ca1\u6709\u9650\u5236\uff09