Commit eb2159f0ca1524e88203b8accd6e94c96cf9b9dc
1 parent
aa93fdaf
1.更新日志
Showing
2 changed files
with
54 additions
and
11 deletions
src/main/java/com/bsth/controller/realcontrol/AdminUtilsController.java
| @@ -5,7 +5,9 @@ import java.lang.reflect.Modifier; | @@ -5,7 +5,9 @@ import java.lang.reflect.Modifier; | ||
| 5 | import java.text.SimpleDateFormat; | 5 | import java.text.SimpleDateFormat; |
| 6 | import java.util.*; | 6 | import java.util.*; |
| 7 | 7 | ||
| 8 | +import com.bsth.data.BasicData; | ||
| 8 | import com.bsth.service.schedule.utils.SpringUtils; | 9 | import com.bsth.service.schedule.utils.SpringUtils; |
| 10 | +import com.bsth.util.MailUtils; | ||
| 9 | import com.fasterxml.jackson.core.JsonProcessingException; | 11 | import com.fasterxml.jackson.core.JsonProcessingException; |
| 10 | import com.fasterxml.jackson.databind.MapperFeature; | 12 | import com.fasterxml.jackson.databind.MapperFeature; |
| 11 | import com.fasterxml.jackson.databind.ObjectMapper; | 13 | import com.fasterxml.jackson.databind.ObjectMapper; |
| @@ -58,6 +60,12 @@ public class AdminUtilsController { | @@ -58,6 +60,12 @@ public class AdminUtilsController { | ||
| 58 | @Autowired | 60 | @Autowired |
| 59 | PilotReport pilotReport; | 61 | PilotReport pilotReport; |
| 60 | 62 | ||
| 63 | + @Autowired | ||
| 64 | + private MailUtils mailUtils; | ||
| 65 | + | ||
| 66 | + @Autowired | ||
| 67 | + private BasicData.BasicDataLoader basicDataLoader; | ||
| 68 | + | ||
| 61 | /** | 69 | /** |
| 62 | * 出现重复班次的车辆 | 70 | * 出现重复班次的车辆 |
| 63 | * | 71 | * |
| @@ -258,4 +266,44 @@ public class AdminUtilsController { | @@ -258,4 +266,44 @@ public class AdminUtilsController { | ||
| 258 | 266 | ||
| 259 | return "error"; | 267 | return "error"; |
| 260 | } | 268 | } |
| 269 | + | ||
| 270 | + | ||
| 271 | + | ||
| 272 | + @RequestMapping("/changeEmail") | ||
| 273 | + public String changeEmail(@RequestParam String email) { | ||
| 274 | + Map<String, Object> result = new HashMap<>(); | ||
| 275 | + try { | ||
| 276 | + mailUtils.setEmailSendToAddress(email); | ||
| 277 | + return "success"; | ||
| 278 | + } catch (Exception e) { | ||
| 279 | + e.printStackTrace(); | ||
| 280 | + } | ||
| 281 | + | ||
| 282 | + return "error"; | ||
| 283 | + } | ||
| 284 | + | ||
| 285 | + @RequestMapping("/viewEmail") | ||
| 286 | + public String viewEmail() { | ||
| 287 | + Map<String, Object> result = new HashMap<>(); | ||
| 288 | + try { | ||
| 289 | + return mailUtils.getEmailSendToAddress(); | ||
| 290 | + } catch (Exception e) { | ||
| 291 | + e.printStackTrace(); | ||
| 292 | + } | ||
| 293 | + | ||
| 294 | + return "error"; | ||
| 295 | + } | ||
| 296 | + | ||
| 297 | + @RequestMapping("/refreshBasicAll") | ||
| 298 | + public String refreshBasicAll() { | ||
| 299 | + Map<String, Object> result = new HashMap<>(); | ||
| 300 | + try { | ||
| 301 | + basicDataLoader.loadAllData(); | ||
| 302 | + return "success"; | ||
| 303 | + } catch (Exception e) { | ||
| 304 | + e.printStackTrace(); | ||
| 305 | + } | ||
| 306 | + | ||
| 307 | + return "error"; | ||
| 308 | + } | ||
| 261 | } | 309 | } |
| 262 | \ No newline at end of file | 310 | \ No newline at end of file |
src/main/resources/static/pages/home.html
| @@ -62,17 +62,12 @@ | @@ -62,17 +62,12 @@ | ||
| 62 | <h2 style="text-indent: 35px;margin: 10px 0 5px;">2022-06-13 更新说明 Changelog</h2> | 62 | <h2 style="text-indent: 35px;margin: 10px 0 5px;">2022-06-13 更新说明 Changelog</h2> |
| 63 | <br><br> | 63 | <br><br> |
| 64 | <ul > | 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 class="sub_title"><h6>运管处</h6></li> | ||
| 72 | - <li><span class="label s_c_change">修改</span>1.电子路单上传至运管处时采用多次上传降低上传失败率</li> | ||
| 73 | - <li class="sub_title"><h6>线调</h6></li> | ||
| 74 | - <li><span class="label s_c_change">修改</span>1.线调->车载设备->设备管理 中"最后GPS时间"列显示异常修正</li> | ||
| 75 | - <li><span class="label s_c_change">修改</span>2.无排班线路添加"临加班次"功能</li> | 65 | + <li class="sub_title"><h6>系统安全</h6></li> |
| 66 | + <li><span class="label s_c_change">修改</span>1.登录密码错误2次加验证码,错4次锁定10分钟,管理员可解锁</li> | ||
| 67 | + <li><span class="label s_c_change">修改</span>2.登录时做弱密码检查,存在弱密码在进入主页面后强制修改密码</li> | ||
| 68 | + <li><span class="label s_c_change">修改</span>3.密码规则必须满足有大小写字母+数字+特殊字符的8-16位密码,加入连续性字符验证,如不能出现123、abc样的连续字符</li> | ||
| 69 | + <li class="sub_title"><h6>油电氢</h6></li> | ||
| 70 | + <li><span class="label s_c_change">修改</span>1.完善了备车的油电氢逻辑,以解决新增的车队属性造成的干扰</li> | ||
| 76 | </ul> | 71 | </ul> |
| 77 | 72 | ||
| 78 | </div> | 73 | </div> |