update...

潘钊
1 parent 3eaea7a9
Showing 11 changed files with 337 additions and 5 deletions
src/main/java/com/bsth/controller/attendace/AttendaceController.java
src/main/java/com/bsth/data/attendance/entity/JsyAttendance.java
src/main/java/com/bsth/data/schedule/real/ScheduleDataBuffer.java
src/main/java/com/bsth/repository/attendace/AttendaceRepository.java
src/main/java/com/bsth/service/attendace/AttendaceService.java
src/main/java/com/bsth/service/attendace/AttendaceServiceImpl.java
src/main/resources/static/assets/css/main.css
src/main/resources/static/index.html
src/main/resources/static/pages/attendance/att_data_main.html
src/main/resources/static/pages/attendance/list.html
src/main/resources/static/pages/inout/in_out_schedule/list.html
 package com.bsth.controller.attendace;
+import com.bsth.controller.BaseController;
+import com.bsth.data.attendance.entity.JsyAttendance;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -8,7 +10,7 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("attendace")
-public class AttendaceController {
+public class AttendaceController extends BaseController<JsyAttendance, Long> {
 }
@@ -7,6 +7,7 @@ import org.slf4j.LoggerFactory;
 import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 import java.util.Date;
 /**
@@ -22,8 +23,17 @@ public class JsyAttendance {
     private String company;
+    private String fgsCompany;
+
     private String userId;
+    private String userName;
+
+    private String lineCode;
+
+    @Transient
+    private String lineName;
+
     /**
      * 0: 签到
      * 1：签退
@@ -40,6 +50,7 @@ public class JsyAttendance {
     private Date serverTime;
+    private String cardNo;
     static Logger logger = LoggerFactory.getLogger(JsyAttendance.class);
@@ -135,4 +146,44 @@ public class JsyAttendance {
     public void setServerTime(Date serverTime) {
         this.serverTime = serverTime;
     }
+
+    public String getFgsCompany() {
+        return fgsCompany;
+    }
+
+    public void setFgsCompany(String fgsCompany) {
+        this.fgsCompany = fgsCompany;
+    }
+
+    public String getCardNo() {
+        return cardNo;
+    }
+
+    public void setCardNo(String cardNo) {
+        this.cardNo = cardNo;
+    }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    public String getLineCode() {
+        return lineCode;
+    }
+
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
+    }
+
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
 }
@@ -197,7 +197,7 @@ public class ScheduleDataBuffer implements CommandLineRunner {
     @Override
     public void run(String... strings) throws Exception {
-        Application.mainServices.scheduleWithFixedDelay(fixedRefreshThread, 40, 30, TimeUnit.SECONDS);
+        Application.mainServices.scheduleWithFixedDelay(fixedRefreshThread, 40, 230, TimeUnit.SECONDS);
     }
     /**
+package com.bsth.repository.attendace;
+
+import com.bsth.data.attendance.entity.JsyAttendance;
+import com.bsth.repository.BaseRepository;
+import org.springframework.stereotype.Repository;
+
+/**
+ * Created by panzhao on 2018/2/23.
+ */
+@Repository
+public interface AttendaceRepository extends BaseRepository<JsyAttendance, Long>{
+}
+package com.bsth.service.attendace;
+
+import com.bsth.data.attendance.entity.JsyAttendance;
+import com.bsth.service.BaseService;
+
+/**
+ * Created by panzhao on 2018/2/23.
+ */
+public interface AttendaceService extends BaseService<JsyAttendance, Long>{
+}
+package com.bsth.service.attendace;
+
+import com.bsth.data.attendance.entity.JsyAttendance;
+import com.bsth.data.basic.line.LineDataBuffer;
+import com.bsth.entity.Line;
+import com.bsth.service.impl.BaseServiceImpl;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.stereotype.Service;
+
+import java.util.Map;
+
+/**
+ * Created by panzhao on 2018/2/23.
+ */
+@Service
+public class AttendaceServiceImpl extends BaseServiceImpl<JsyAttendance, Long> implements AttendaceService{
+
+    @Override
+    public Page<JsyAttendance> list(Map<String, Object> map, Pageable pageable) {
+        Page<JsyAttendance> page = super.list(map, pageable);
+
+        Line line;
+        for(JsyAttendance att : page.getContent()){
+            line = LineDataBuffer.get(att.getLineCode());
+            if(null != line)
+                att.setLineName(line.getName());
+        }
+        return page;
+    }
+}
@@ -574,7 +574,7 @@ table tr th, table tr td{
 /*ct_plan_inout_tab_width*/
 .ct_plan_inout_tab_width{
-    font-size: 18px;
+    font-size: 15px;
 }
 .ct_plan_inout_tab_width.uk-table{
@@ -952,4 +952,33 @@ table tr th, table tr td{
 .charge_pile_wrap>.berth_card:nth-of-type(1){
     margin-right: 4px;
+}
+
+.ct_attendance_list_table a{
+    text-decoration: underline;
+}
+
+.ct_attendance_tab_width th:nth-of-type(1), .ct_attendance_tab_width td:nth-of-type(1) {
+    width: 12%;
+}
+.ct_attendance_tab_width th:nth-of-type(2), .ct_attendance_tab_width td:nth-of-type(2) {
+    width: 12%;
+}
+.ct_attendance_tab_width th:nth-of-type(3), .ct_attendance_tab_width td:nth-of-type(3) {
+    width: 8%;
+}
+.ct_attendance_tab_width th:nth-of-type(4), .ct_attendance_tab_width td:nth-of-type(4) {
+    width: 14%;
+}
+.ct_attendance_tab_width th:nth-of-type(5), .ct_attendance_tab_width td:nth-of-type(5) {
+    width: 14%;
+}
+.ct_attendance_tab_width th:nth-of-type(6), .ct_attendance_tab_width td:nth-of-type(6) {
+    width: 14%;
+}
+.ct_attendance_tab_width th:nth-of-type(7), .ct_attendance_tab_width td:nth-of-type(7) {
+    width: 13%;
+}
+.ct_attendance_tab_width th:nth-of-type(8), .ct_attendance_tab_width td:nth-of-type(8) {
+    width: 13%;
 }
 \ No newline at end of file
@@ -29,7 +29,7 @@
             <span class="ct-btn-link lasting" data-name="b_p_manager" data-page="/pages/b_p_manager/b_p_main.html">停放监管</span>
             <span class="ct-btn-link lasting">异常监管</span>
             <span class="ct-btn-link" data-name="inout_data" data-page="/pages/inout/in_out_main.html">进出场</span>
-            <span class="ct-btn-link">签到/退</span>
+            <span class="ct-btn-link" data-name="attendance_data" data-page="/pages/attendance/att_data_main.html">签到/退</span>
             <span class="ct-btn-link">计划/任务</span>
             <span class="ct-btn-link" data-name="basic_data" data-page="/pages/basic_data/main.html">基础数据</span>
             <span class="ct-btn-link">系统管理</span>
+<div id="att_data_wrap" class="l_r_split_screen">
+
+    <div class="left-menus">
+        <ul class="uk-list">
+            <li class="ct-btn-link" data-name="att_list" data-page="/pages/attendance/list.html">签到退记录</li>
+        </ul>
+    </div>
+    <div class="right-body">
+
+    </div>
+
+    <script>
+        (function () {
+            var wrap = '#att_data_wrap', $body = $('.right-body', wrap);
+
+            $('.left-menus .ct-btn-link', wrap).on('click', function () {
+                var page = $(this).data('page');
+                if(!page)
+                    return;
+
+                var that = this;
+                $body.empty().load(page, function () {
+                    $('.left-menus .ct-btn-link.active', wrap).removeClass('active');
+                    $(that).addClass('active');
+                });
+            });
+
+            //默认选中第一项
+            $('.left-menus .ct-btn-link:eq(0)', wrap).trigger('click');
+        })();
+    </script>
+</div>
 \ No newline at end of file
+<div id="attendance_list_wrap" style="padding: 25px;height: calc(100% - 50px);">
+
+    <div class="ct_cont" style="height: 100%;">
+        <div class="ct_search_form_wrap">
+            <form>
+                <div class="ct_field">
+                    <label>公司：
+                        <select class="uk-select" name="company_eq">
+                        </select>
+                    </label>
+                </div>
+                <div class="ct_field">
+                    <label>分公司：
+                        <select class="uk-select" name="fgsCompany_eq">
+                        </select>
+                    </label>
+                </div>
+                <div class="ct_field">
+                    <label>状态：
+                        <select class="uk-select" name="type_eq">
+                            <option value="">全部</option>
+                            <option value="0">签到</option>
+                            <option value="1">签退</option>
+                        </select>
+                    </label>
+                </div>
+                <div class="ct_field">
+                    <label>出入时间：
+                        <input class="uk-input flatpickr_input" name="at_gt" style="width: 130px">
+                        至
+                        <input class="uk-input flatpickr_input" name="t_lt" style="width: 130px">
+                    </label>
+                </div>
+                <div class="ct_field">
+                    <label>线路：
+                        <select class="" name="lineCode_eq">
+                        </select>
+                    </label>
+                </div>
+                <div class="ct_field">
+                    <label>工号：
+                        <input class="uk-input" name="userId_like" placeholder="员工号">
+                    </label>
+                </div>
+                <div class="ct_field">
+                    <button class="uk-button uk-button-primary search"><i uk-icon="icon: search"></i>搜索</button>
+                </div>
+            </form>
+        </div>
+        <div class="ct_table_wrap" >
+            <table class="uk-table uk-table-small ct_attendance_tab_width" style="margin-bottom: 0;">
+                <thead>
+                <tr>
+                    <th>人卡号</th>
+                    <th>员工号</th>
+                    <th>状态</th>
+                    <th>操作时间</th>
+                    <th>出门证内容</th>
+                    <th>线路</th>
+                    <th>所属分公司</th>
+                    <th>查询机IP</th>
+                </tr>
+                </thead>
+            </table>
+            <div class="t_body_wrap" >
+                <table class="uk-table uk-table-divider uk-table-hover uk-table-small ct_attendance_list_table ct_attendance_tab_width">
+                    <tbody>
+                    </tbody>
+                </table>
+            </div>
+            <div class="pagination-holder"></div>
+            <div class="count_text"></div>
+        </div>
+    </div>
+
+    <script id="attendance_list_body-temp" type="text/html">
+        {{each list as obj i}}
+        <tr>
+            <td>{{obj.cardNo}}</td>
+            <td>{{obj.userId}}/{{obj.userName}}</td>
+            <td>{{obj.type==0?'签到':'签退'}}</td>
+            <td>{{obj.tStr}}</td>
+            <td><a>{{obj.outCard}}</a></td>
+            <td>{{obj.lineCode}}/{{obj.lineName}}</td>
+            <td>{{company_ns[obj.company+'_'+obj.fgsCompany]}}</td>
+            <td>{{obj.ip}}</td>
+        </tr>
+        {{/each}}
+    </script>
+
+    <script>
+        (function () {
+            var wrap = '#attendance_list_wrap', ps = $('.t_body_wrap', wrap);
+
+            var page=0, pageSize=14, fs = 'YYYY-MM-DD HH:mm';
+            //日期控件
+            flatpickr(wrap + ' .flatpickr_input', flatpickrDateTimeConfig);
+            //初始化公司——>分公司 ——> 线路级联下拉框
+            var comp = $('[name=company_eq]', wrap);
+            var fgsComp = $('[name=fgsCompany_eq]', wrap);
+            var lineSelect = $('[name=lineCode_eq]', wrap);
+            gb_common.companySelect(comp, fgsComp, lineSelect);
+
+            query();
+            function query() {
+                var data = $('.ct_search_form_wrap>form', wrap).serializeJSON();
+                data.page=page;
+                data.size=pageSize;
+                data.order='at';
+                //时间戳转换
+                if(data.t_gt)
+                    data.at_gt = moment(data.t_gt, fs).format('X') + '000';
+                if(data.t_lt)
+                    data.at_lt = moment(data.t_lt, fs).format('X') + '000';
+
+                delete data.t_gt;
+                delete data.t_lt;
+                //query
+                gb_common.$get('/attendace', data, function (rs) {
+                    //处理时间戳
+                    handlerTime(rs.content);
+                    var tbodyStr = template('attendance_list_body-temp', {list:rs.content, company_ns: company_code_name});
+                    $('.ct_attendance_list_table>tbody', wrap).html(tbodyStr);
+
+                    if (resetPagination){
+                        pagination(rs['totalPages'], rs.number);
+                    }
+                });
+
+            }
+
+            var resetPagination = true;
+            var pagination = function(pages, currentPage) {
+                //分页
+                $('.pagination-holder', wrap).pagination({
+                    pages: pages,
+                    currentPage: currentPage,
+                    cssStyle: 'light-theme',
+                    onPageClick: function (pageNumber, e) {
+                        e.stopPropagation();
+                        page = pageNumber - 1;
+                        query();
+                        return false;
+                    }
+                });
+                resetPagination = false;
+            };
+
+            $('.ct_search_form_wrap', wrap).on('submit', function () {
+                resetPagination = true;
+                page = 0;
+                query();
+                return false;
+            });
+
+            function handlerTime(list) {
+                for(var i=0,obj;obj=list[i++];){
+                    if(obj.at)
+                        obj.tStr = moment(obj.at).format(fs+':ss');
+                }
+            }
+
+        })();
+    </script>
+</div>
 \ No newline at end of file
-<div id="in_out_schedule_list_wrap" style="height: calc(100% - 20px);padding: 20px 0 0 10px;background: #fdfdfd;">
+<div id="in_out_schedule_list_wrap" style="height: calc(100% - 20px);padding: 20px 0 0 10px;">
     <div class="ct_table_wrap" style="height: calc(100% - 40px);">
         <table class="uk-table uk-table-small ct_plan_inout_tab_width" style="margin-bottom: 0;">