update...

潘钊
1 parent 609d71b6
Showing 10 changed files with 148 additions and 26 deletions
src/main/java/com/bsth/controller/realcontrol/summary/DestroySituationController.java
src/main/java/com/bsth/data/summary/service/DestroySituationService.java
src/main/java/com/bsth/data/summary/service/impl/DestroySituationServiceImpl.java
src/main/java/com/bsth/data/summary/service/impl/FastAndSlowServiceImpl.java
src/main/java/com/bsth/data/utils/CustomStringUtils.java
src/main/resources/static/pages/summary/destory_sch_detail/list.html
src/main/resources/static/pages/summary/excel/烂班明细情况.xls
src/main/resources/static/pages/summary/fast_and_slow/main.html
src/main/resources/static/real_control_v2/css/home.css
src/main/resources/static/real_control_v2/js/main.js
@@ -2,13 +2,28 @@ package com.bsth.controller.realcontrol.summary;
 import com.bsth.controller.BaseController;
 import com.bsth.data.summary.entity.DestroySituation;
+import com.bsth.data.summary.service.DestroySituationService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Map;
+
 /**
  * Created by panzhao on 2017/11/1.
  */
 @RestController
 @RequestMapping("/summary/destroy_detail")
 public class DestroySituationController extends BaseController<DestroySituation, Long> {
+
+    @Autowired
+    DestroySituationService destroySituationService;
+
+    @RequestMapping("excel")
+    public void excel(@RequestParam Map<String, Object> map, HttpServletRequest request, HttpServletResponse response) {
+        destroySituationService.excel(map, request, response);
+    }
 }
@@ -3,8 +3,13 @@ package com.bsth.data.summary.service;
 import com.bsth.data.summary.entity.DestroySituation;
 import com.bsth.service.BaseService;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Map;
+
 /**
  * Created by panzhao on 2017/11/1.
  */
 public interface DestroySituationService extends BaseService<DestroySituation, Long> {
+    void excel(Map<String, Object> map, HttpServletRequest request, HttpServletResponse response);
 }
@@ -2,12 +2,94 @@ package com.bsth.data.summary.service.impl;
 import com.bsth.data.summary.entity.DestroySituation;
 import com.bsth.data.summary.service.DestroySituationService;
+import com.bsth.data.utils.CustomStringUtils;
 import com.bsth.service.impl.BaseServiceImpl;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.apache.poi.poifs.filesystem.POIFSFileSystem;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.FileInputStream;
+import java.io.OutputStream;
+import java.net.URLEncoder;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
 /**
  * Created by panzhao on 2017/11/1.
  */
 @Service
 public class DestroySituationServiceImpl extends BaseServiceImpl<DestroySituation, Long> implements DestroySituationService {
+
+    Logger logger = LoggerFactory.getLogger(this.getClass());
+
+    @Override
+    public void excel(Map<String, Object> map, HttpServletRequest request, HttpServletResponse response) {
+        try {
+            map.put("rq_le", CustomStringUtils.maxEndTime(map.get("rq_ge").toString()
+                    , map.get("rq_le").toString(), 62));
+
+            List<DestroySituation> list = (List<DestroySituation>) super.list(map);
+
+            if(list.size() == 0){
+                response.setHeader("Content-type", "text/html;charset=UTF-8");
+                response.getWriter().print("<span style='color:red;font-size:24px;'>根据查询条件没有搜索到数据，别导了！</span>");
+                return ;
+            }
+
+            //排序
+            Collections.sort(list, new Comparator<DestroySituation>() {
+                @Override
+                public int compare(DestroySituation o1, DestroySituation o2) {
+                    return (int) (o1.getT() - o2.getT());
+                }
+            });
+
+            //输出excel
+            String basePath = Thread.currentThread().getContextClassLoader().getResource("").getPath();
+            String filePath = basePath + "/static/pages/summary/excel/烂班明细情况.xls";
+            POIFSFileSystem fs = new POIFSFileSystem(new FileInputStream(filePath));
+            HSSFWorkbook wb = new HSSFWorkbook(fs);
+
+            //写入数据
+            Sheet sheet = wb.getSheetAt(0);
+            Row row;
+            DestroySituation dys;
+            SimpleDateFormat sdf = new SimpleDateFormat("HH:mm");
+            for(int i = 0; i < list.size(); i++){
+                dys = list.get(i);
+                row = sheet.createRow(i + 1);
+                row.createCell(0).setCellValue(dys.getRq());
+                row.createCell(1).setCellValue(dys.getLineName());
+                row.createCell(2).setCellValue(dys.getNbbm());
+                row.createCell(3).setCellValue(dys.getjGh());
+                row.createCell(4).setCellValue(dys.getsGh());
+                row.createCell(5).setCellValue(dys.getReason());
+                row.createCell(6).setCellValue(dys.getSize());
+                row.createCell(7).setCellValue(dys.getMileage());
+                row.createCell(8).setCellValue(sdf.format(new Date(dys.getT())));
+                row.createCell(9).setCellValue(dys.getRemark());
+            }
+
+            String name = list.get(0).getLineName();
+            wb.setSheetName(0, name + "烂班明细");
+            //response 输出
+            String filename = name + map.get("rq_ge") + "至" + map.get("rq_le") + "烂班明细情况.xls";
+            response.setContentType("application/x-msdownload");
+            response.setHeader("content-disposition", "attachment;filename=" + URLEncoder.encode(filename, "UTF-8"));
+
+            OutputStream os = response.getOutputStream();
+            wb.write(os);
+            os.flush();
+            os.close();
+        } catch (Exception e) {
+            logger.error("", e);
+        }
+    }
+
 }
@@ -4,6 +4,7 @@ import com.bsth.data.BasicData;
 import com.bsth.data.summary.entity.FastAndSlow;
 import com.bsth.data.summary.service.FastAndSlowService;
 import com.bsth.data.utils.ConvertUtil;
+import com.bsth.data.utils.CustomStringUtils;
 import com.bsth.service.impl.BaseServiceImpl;
 import com.google.common.collect.ArrayListMultimap;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
@@ -22,8 +23,6 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.FileInputStream;
 import java.io.OutputStream;
 import java.net.URLEncoder;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
 import java.util.*;
 /**
@@ -40,7 +39,7 @@ public class FastAndSlowServiceImpl extends BaseServiceImpl&lt;FastAndSlow, Long&gt; i
     public Iterable<FastAndSlow> list(Map<String, Object> map) {
         try {
             //最多5天
-            map.put("rq_le", maxEndTime(map.get("rq_ge").toString()
+            map.put("rq_le", CustomStringUtils.maxEndTime(map.get("rq_ge").toString()
                     , map.get("rq_le").toString(), 4));
             List<FastAndSlow> list = (List) super.list(map);
@@ -58,7 +57,7 @@ public class FastAndSlowServiceImpl extends BaseServiceImpl&lt;FastAndSlow, Long&gt; i
         try {
             Map<String, Object> params = new HashMap();
             //最多31天
-            et = maxEndTime(st, et, 31);
+            et = CustomStringUtils.maxEndTime(st, et, 31);
             params.put("rq_ge", st);
             params.put("rq_le", et);
             params.put("lineCode_eq", lineCode);
@@ -198,23 +197,6 @@ public class FastAndSlowServiceImpl extends BaseServiceImpl&lt;FastAndSlow, Long&gt; i
     }
-    private String maxEndTime(String sStr, String eStr, int space) throws ParseException {
-        try {
-            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-            long st = sdf.parse(sStr).getTime();
-            long et = sdf.parse(eStr).getTime();
-            long dayTime = 24 * 60 * 60 * 1000;
-            long spaceTime = dayTime * space;
-
-            if (et - st > spaceTime) {
-                eStr = sdf.format(new Date(st + spaceTime));
-            }
-        } catch (Exception e) {
-            throw e;
-        }
-        return eStr;
-    }
-
     /**
      * 计划发出快误点
      * @param list
@@ -2,6 +2,10 @@ package com.bsth.data.utils;
 import org.apache.commons.lang3.StringUtils;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
 /**
  * Created by panzhao on 2017/7/10.
  */
@@ -16,4 +20,21 @@ public class CustomStringUtils {
         }
         return s1.equals(s2);
     }
+
+    public static String maxEndTime(String sStr, String eStr, int space) throws ParseException {
+        try {
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+            long st = sdf.parse(sStr).getTime();
+            long et = sdf.parse(eStr).getTime();
+            long dayTime = 24 * 60 * 60 * 1000;
+            long spaceTime = dayTime * space;
+
+            if (et - st > spaceTime) {
+                eStr = sdf.format(new Date(st + spaceTime));
+            }
+        } catch (Exception e) {
+            throw e;
+        }
+        return eStr;
+    }
 }
@@ -158,7 +158,10 @@
                     <button class="uk-button uk-button-primary search"><i uk-icon="icon: search"></i>搜索</button>
                 </div>
                 <div class="ct_field ct_field_bottom">
-                    <span uk-icon="icon: question" title="导出功能先等等" uk-tooltip="pos: bottom"></span>
+                    <button class="uk-button uk-button-text export_excel" style="padding: 0 5px;">导出数据</button>
+                </div>
+                <div class="ct_field ct_field_bottom">
+                    <span uk-icon="icon: question" title="不统计进出场和子任务" uk-tooltip="pos: bottom"></span>
                 </div>
             </form>
         </div>
@@ -198,7 +201,7 @@
             <td>{{obj.jGh}}</td>
             <td>{{obj.sGh}}</td>
             <td>{{obj.reason}}</td>
-            <td><a>{{obj.size}}</a></td>
+            <td><a style="text-decoration: underline;">{{obj.size}}</a></td>
             <td>{{obj.mileage}}</td>
             <td>{{obj.timeStr}}</td>
             <td>{{obj.remark}}</td>
@@ -332,6 +335,19 @@
         return false;
     });
+    /**
+     * 导出
+     */
+    $('.export_excel').on('click', function () {
+        var data = f.serializeJSON();
+        data.rq_ge = data.rq.substr(0, 10);
+        data.rq_le = data.rq.substr(13);
+        data.order='t';
+        delete data.rq;
+
+        window.open('/summary/destroy_detail/excel?' + $.param(data));
+    });
+
 </script>
 </body>
 </html>
 \ No newline at end of file
@@ -259,7 +259,7 @@
                     <button class="uk-button uk-button-text export_excel" style="padding: 0 5px;">导出数据</button>
                 </div>
                 <div class="ct_field ct_field_bottom">
-                    <span uk-icon="icon: question" title="快1慢3; 排除进出场班次<br>一次至多查询5天的数据，如需更大查询范围，请导出" uk-tooltip="pos: bottom"></span>
+                    <span uk-icon="icon: question" title="快1慢3; 排除进出场和子任务班次<br>一次至多查询5天的数据，如需更大查询范围，请导出" uk-tooltip="pos: bottom"></span>
                 </div>
             </form>
         </div>
@@ -58,6 +58,7 @@
     padding-left: 0;
     overflow: hidden;
     background: #fff;
+    height: 100%;
 }
 .home-gps-table {
@@ -168,8 +168,8 @@ var disabled_submit_btn = function (form) {
 function showUpdateDescription() {
     //更新说明
     var updateDescription = {
-        date: '2017-10-25',
-        text: '<h5>1、修正了双击调整待发时，备注会被清空的bug。！</h5><h5>2、现在发车和到站信使可以撤销和编辑。</h5>'
+        date: '2017-11-01',
+        text: '<h5>1、修正了XP系统下主页滚动条的显示问题（Windows XP sp3 + chrome 49.0.2623.112）。</h5>'
     };
     var storage = window.localStorage