Commit e87614d9233ce0821fa61bcfa4c3caea124ee18d
1 parent
6b20be58
1.2020-07-30更新日志
Showing
2 changed files
with
112 additions
and
96 deletions
src/main/java/com/bsth/data/gpsdata_v2/DataHandleProcess.java
| @@ -108,7 +108,7 @@ public class DataHandleProcess { | @@ -108,7 +108,7 @@ public class DataHandleProcess { | ||
| 108 | //发送邮件 | 108 | //发送邮件 |
| 109 | EmailBean mail = new EmailBean(); | 109 | EmailBean mail = new EmailBean(); |
| 110 | mail.setSubject("线调GPS处理"); | 110 | mail.setSubject("线调GPS处理"); |
| 111 | - mail.setContent("GPS处理超时,检查线程栈文件信息<br/>"); | 111 | + mail.setContent("GPS处理超时,检查文件信息<br/>"); |
| 112 | sendEmailController.sendMail("113252620@qq.com", mail); | 112 | sendEmailController.sendMail("113252620@qq.com", mail); |
| 113 | logger.info("DataHandlerProcess:邮件发送成功!"); | 113 | logger.info("DataHandlerProcess:邮件发送成功!"); |
| 114 | } catch (Exception e){ | 114 | } catch (Exception e){ |
src/main/resources/static/pages/home.html
| 1 | -<style> | ||
| 2 | - .system_change_log{ | ||
| 3 | - background: #fff; | ||
| 4 | - color: #666; | ||
| 5 | - box-shadow: 0 5px 15px rgba(0,0,0,0.08); | ||
| 6 | - height: calc(100% + 10px); | ||
| 7 | - margin-top: -10px; | ||
| 8 | - font-size: 14px; | ||
| 9 | - padding: 10px 0 0 15px; | ||
| 10 | - overflow: auto; | ||
| 11 | - } | ||
| 12 | - .system_change_log>ul{ | ||
| 13 | - margin:0px; | ||
| 14 | - list-style:none; | ||
| 15 | - } | ||
| 16 | - | ||
| 17 | - .system_change_log>ul>li.sub_title{ | ||
| 18 | - text-indent: 0; | ||
| 19 | - } | ||
| 20 | - | ||
| 21 | - .system_change_log>ul>li.sub_title>h6{ | ||
| 22 | - font-size: 12px; | ||
| 23 | - font-family: 微软雅黑; | ||
| 24 | - color: #000; | ||
| 25 | - margin-top: 8px; | ||
| 26 | - margin-bottom: 8px; | ||
| 27 | - } | ||
| 28 | - | ||
| 29 | - .system_change_log>ul>li{ | ||
| 30 | - margin: 5px 0; | ||
| 31 | - text-indent: 25px; | ||
| 32 | - } | ||
| 33 | - | ||
| 34 | - .system_change_log .label{ | ||
| 35 | - width: 55px; | ||
| 36 | - display: inline-block; | ||
| 37 | - padding: 0 10px; | ||
| 38 | - line-height: 1.5; | ||
| 39 | - font-size: 12px; | ||
| 40 | - color: #fff; | ||
| 41 | - vertical-align: middle; | ||
| 42 | - white-space: nowrap; | ||
| 43 | - border-radius: 2px !important; | ||
| 44 | - text-transform: uppercase; | ||
| 45 | - text-align: center; | ||
| 46 | - text-indent: 3px; | ||
| 47 | - margin-right: 15px; | ||
| 48 | - } | ||
| 49 | - .system_change_log .label.s_c_add{ | ||
| 50 | - background-color: #32d296; | ||
| 51 | - } | ||
| 52 | - | ||
| 53 | - .system_change_log .label.s_c_change{ | ||
| 54 | - background-color: #1e87f0; | ||
| 55 | - } | ||
| 56 | - | ||
| 57 | - .system_change_log .label.s_c_remove{ | ||
| 58 | - background-color: #faa05a; | ||
| 59 | - } | ||
| 60 | -</style> | ||
| 61 | -<div class="system_change_log"> | ||
| 62 | - <h2 style="text-indent: 35px;margin: 10px 0 5px;">2020-03-12 更新说明 Changelog</h2> | ||
| 63 | - <br><br> | ||
| 64 | - <ul > | ||
| 65 | - <li class="sub_title"><h6>权限管理</h6></li> | ||
| 66 | - <li><span class="label s_c_change">修改</span>1、密码修改加入密码复杂度校验机制</li> | ||
| 67 | - <li class="sub_title"><h6>线调</h6></li> | ||
| 68 | - <li><span class="label s_c_change">新增</span>1、线调页面新增维修上报功能</li> | ||
| 69 | - </ul> | ||
| 70 | - | ||
| 71 | -</div> | ||
| 72 | - | ||
| 73 | -<script type="text/javascript"> | ||
| 74 | - $.ajax({ | ||
| 75 | - url: '/eci/validate_get_destroy_info', | ||
| 76 | - dataType: "json", | ||
| 77 | - success: function(rs) { | ||
| 78 | - if (rs && rs.status === "SUCCESS") { | ||
| 79 | - if (rs.data && rs.data.length && rs.data.length > 0) { | ||
| 80 | - swal({ | ||
| 81 | - title: "人员配置停用信息", | ||
| 82 | - text: rs.data.join("</br>"), | ||
| 83 | - html: true, | ||
| 84 | - type: "warning", | ||
| 85 | - showCancelButton: true, | ||
| 86 | - confirmButtonColor: "RED", | ||
| 87 | - confirmButtonText: "是", | ||
| 88 | - cancelButtonText: "取消" | ||
| 89 | - }); | ||
| 90 | - } | ||
| 91 | - } | ||
| 92 | - } | ||
| 93 | - }); | ||
| 94 | - | ||
| 95 | -</script> | 1 | +<style> |
| 2 | + .system_change_log{ | ||
| 3 | + background: #fff; | ||
| 4 | + color: #666; | ||
| 5 | + box-shadow: 0 5px 15px rgba(0,0,0,0.08); | ||
| 6 | + height: calc(100% + 10px); | ||
| 7 | + margin-top: -10px; | ||
| 8 | + font-size: 14px; | ||
| 9 | + padding: 10px 0 0 15px; | ||
| 10 | + overflow: auto; | ||
| 11 | + } | ||
| 12 | + .system_change_log>ul{ | ||
| 13 | + margin:0px; | ||
| 14 | + list-style:none; | ||
| 15 | + } | ||
| 16 | + | ||
| 17 | + .system_change_log>ul>li.sub_title{ | ||
| 18 | + text-indent: 0; | ||
| 19 | + } | ||
| 20 | + | ||
| 21 | + .system_change_log>ul>li.sub_title>h6{ | ||
| 22 | + font-size: 12px; | ||
| 23 | + font-family: 微软雅黑; | ||
| 24 | + color: #000; | ||
| 25 | + margin-top: 8px; | ||
| 26 | + margin-bottom: 8px; | ||
| 27 | + } | ||
| 28 | + | ||
| 29 | + .system_change_log>ul>li{ | ||
| 30 | + margin: 5px 0; | ||
| 31 | + text-indent: 25px; | ||
| 32 | + } | ||
| 33 | + | ||
| 34 | + .system_change_log .label{ | ||
| 35 | + width: 55px; | ||
| 36 | + display: inline-block; | ||
| 37 | + padding: 0 10px; | ||
| 38 | + line-height: 1.5; | ||
| 39 | + font-size: 12px; | ||
| 40 | + color: #fff; | ||
| 41 | + vertical-align: middle; | ||
| 42 | + white-space: nowrap; | ||
| 43 | + border-radius: 2px !important; | ||
| 44 | + text-transform: uppercase; | ||
| 45 | + text-align: center; | ||
| 46 | + text-indent: 3px; | ||
| 47 | + margin-right: 15px; | ||
| 48 | + } | ||
| 49 | + .system_change_log .label.s_c_add{ | ||
| 50 | + background-color: #32d296; | ||
| 51 | + } | ||
| 52 | + | ||
| 53 | + .system_change_log .label.s_c_change{ | ||
| 54 | + background-color: #1e87f0; | ||
| 55 | + } | ||
| 56 | + | ||
| 57 | + .system_change_log .label.s_c_remove{ | ||
| 58 | + background-color: #faa05a; | ||
| 59 | + } | ||
| 60 | +</style> | ||
| 61 | +<div class="system_change_log"> | ||
| 62 | + <h2 style="text-indent: 35px;margin: 10px 0 5px;">2020-07-30 更新说明 Changelog</h2> | ||
| 63 | + <br><br> | ||
| 64 | + <ul > | ||
| 65 | + <li class="sub_title"><h6>权限管理</h6></li> | ||
| 66 | + <li><span class="label s_c_change">修改</span>1、权限加入分级概念,同级、上级不能操作,如:下级账户不能创建管理员账户</li> | ||
| 67 | + <li><span class="label s_c_change">修改</span>2、权限操作时验证角色信息</li> | ||
| 68 | + <li class="sub_title"><h6>线调</h6></li> | ||
| 69 | + <li><span class="label s_c_change">修改</span>1、轨迹回放版本切换问题修复</li> | ||
| 70 | + <li><span class="label s_c_change">修改</span>2、批量换人换车可能造成某日班次不能清除问题修复</li> | ||
| 71 | + <li><span class="label s_c_change">修改</span>3、调度系统中偶然出现的批量掉线问题修复(调度网关有数据情况)</li> | ||
| 72 | + <li><span class="label s_c_change">修改</span>4、安全驾驶添加了安全检查类别、接口地址调整</li> | ||
| 73 | + <li><span class="label s_c_change">新增</span>5、与服务热线系统对接,可在线调页填写服务投诉信息</li> | ||
| 74 | + <li class="sub_title"><h6>计调</h6></li> | ||
| 75 | + <li><span class="label s_c_change">新增</span>1、人员停用在home.html做弹出框,后台获取当前用户权限下的线路人员配置停用信息</li> | ||
| 76 | + <li><span class="label s_c_change">新增</span>2、人员管理添加金蝶工号显示</li> | ||
| 77 | + <li><span class="label s_c_change">新增</span>3、修改时刻表明细编辑页面,添加班型编辑列,修改相关指令</li> | ||
| 78 | + <li><span class="label s_c_change">修改</span>4、修复时刻表批量修改问题所在</li> | ||
| 79 | + <li><span class="label s_c_change">新增</span>5、添加车辆同步接口web服务</li> | ||
| 80 | + <li><span class="label s_c_change">新增</span>6、调度执勤日报修改人员,车辆时,初始会修改已有车辆人员配置(如套跑某个班次的车辆不一样,初始时会修改)</li> | ||
| 81 | + <li><span class="label s_c_change">修改</span>7、排班明细修改班次时,修改去除工号的前缀</li> | ||
| 82 | + <li class="sub_title"><h6>基础信息</h6></li> | ||
| 83 | + <li><span class="label s_c_change">新增</span>1、添加线路和修改线路时,选择环线或者双向的提示</li> | ||
| 84 | + <li><span class="label s_c_change">新增</span>2、添加站点行业编码字段</li> | ||
| 85 | + </ul> | ||
| 86 | + | ||
| 87 | +</div> | ||
| 88 | + | ||
| 89 | +<script type="text/javascript"> | ||
| 90 | + $.ajax({ | ||
| 91 | + url: '/eci/validate_get_destroy_info', | ||
| 92 | + dataType: "json", | ||
| 93 | + success: function(rs) { | ||
| 94 | + if (rs && rs.status === "SUCCESS") { | ||
| 95 | + if (rs.data && rs.data.length && rs.data.length > 0) { | ||
| 96 | + swal({ | ||
| 97 | + title: "人员配置停用信息", | ||
| 98 | + text: rs.data.join("</br>"), | ||
| 99 | + html: true, | ||
| 100 | + type: "warning", | ||
| 101 | + showCancelButton: true, | ||
| 102 | + confirmButtonColor: "RED", | ||
| 103 | + confirmButtonText: "是", | ||
| 104 | + cancelButtonText: "取消" | ||
| 105 | + }); | ||
| 106 | + } | ||
| 107 | + } | ||
| 108 | + } | ||
| 109 | + }); | ||
| 110 | + | ||
| 111 | +</script> |