潘钊 / bsth_control · Commits

Commit ec4279a2eeb6addf5b3c798d2e1dd1684fe62e8f

Authored by 王通
1 parent c2d594c8
build: skipped

1.

Inline Side-by-side
Showing 8 changed files with 154 additions and 298 deletions

Too many changes to show.
Reload with full diff Plain diff Email patch

To preserve performance only 8 of 20 files are displayed.

src/main/java/com/bsth/XDApplication.java
  View file @ec4279a
... ... @@ -87,8 +87,8 @@ public class XDApplication implements CommandLineRunner {
87 87 @Autowired
88 88 SafeDrivDataLoadThread safeDrivDataLoadThread;
89 89  
90   - @Autowired
91   - MtPlanDataLoadThread mtPlanDataLoadThread;
  90 +// @Autowired
  91 +// MtPlanDataLoadThread mtPlanDataLoadThread;
92 92  
93 93 @Autowired
94 94 FixedCheckStationCodeThread fixedCheckStationCodeThread;
... ... @@ -190,7 +190,7 @@ public class XDApplication implements CommandLineRunner {
190 190 ScheduledExecutorService sexec = Application.mainServices;
191 191 //安全驾驶
192 192 sexec.scheduleWithFixedDelay(safeDrivDataLoadThread, 180, 10, TimeUnit.SECONDS);
193   - sexec.scheduleWithFixedDelay(mtPlanDataLoadThread, 180, 10, TimeUnit.SECONDS);
  193 + //sexec.scheduleWithFixedDelay(mtPlanDataLoadThread, 180, 10, TimeUnit.SECONDS);
194 194  
195 195 GpsDataLoaderThread.setFlag(-1);
196 196 /** 线调业务 */
... ... @@ -235,7 +235,7 @@ public class XDApplication implements CommandLineRunner {
235 235 ScheduledExecutorService sexec = Application.mainServices;
236 236 //安全驾驶
237 237 sexec.scheduleWithFixedDelay(safeDrivDataLoadThread, 180, 10, TimeUnit.SECONDS);
238   - sexec.scheduleWithFixedDelay(mtPlanDataLoadThread, 180, 10, TimeUnit.SECONDS);
  238 + //sexec.scheduleWithFixedDelay(mtPlanDataLoadThread, 180, 10, TimeUnit.SECONDS);
239 239  
240 240 GpsDataLoaderThread.setFlag(-1);
241 241 //dayOfSchedule.dataRecovery();
... ... @@ -281,7 +281,7 @@ public class XDApplication implements CommandLineRunner {
281 281 ScheduledExecutorService sexec = Application.mainServices;
282 282 //安全驾驶
283 283 sexec.scheduleWithFixedDelay(safeDrivDataLoadThread, 180, 10, TimeUnit.SECONDS);
284   - sexec.scheduleWithFixedDelay(mtPlanDataLoadThread, 180, 10, TimeUnit.SECONDS);
  284 + //sexec.scheduleWithFixedDelay(mtPlanDataLoadThread, 180, 10, TimeUnit.SECONDS);
285 285  
286 286 GpsDataLoaderThread.setFlag(-1);
287 287 /** 线调业务 */
... ...
src/main/java/com/bsth/controller/calc/CalcMixController.java
  View file @ec4279a
1   -package com.bsth.controller.calc;
2   -
3   -import java.util.List;
4   -import java.util.Map;
5   -
6   -import org.springframework.beans.factory.annotation.Autowired;
7   -import org.springframework.web.bind.annotation.RequestMapping;
8   -import org.springframework.web.bind.annotation.RequestMethod;
9   -import org.springframework.web.bind.annotation.RequestParam;
10   -import org.springframework.web.bind.annotation.RestController;
11   -
12   -import com.bsth.entity.calc.CalcInvestigateMonth;
13   -import com.bsth.service.calc.CalcMixService;
14   -
15   -@RestController
16   -@RequestMapping("calc_mix")
17   -public class CalcMixController {
18   -
19   - @Autowired
20   - CalcMixService service;
21   -
22   - @RequestMapping(value="/calcjsyspy")
23   - public List<Map<String, Object>> calcjsyspy(@RequestParam Map<String, Object> map){
24   - String line="";
25   - if(map.get("line")!=null){
26   - line=map.get("line").toString().trim();
27   - }
28   - String startDate="";
29   - if(map.get("startDate")!=null){
30   - startDate=map.get("startDate").toString().trim();
31   - }
32   - String endDate="";
33   - if(map.get("endDate")!=null){
34   - endDate=map.get("endDate").toString().trim();
35   - }
36   - String empnames="";
37   - if(map.get("empnames")!=null){
38   - empnames=map.get("empnames").toString().trim();
39   - }
40   - String cont="";
41   - if(map.get("cont")!=null){
42   - cont=map.get("cont").toString().trim();
43   - }
44   - String gsdmManth="";
45   - if(map.get("gsdmManth")!=null){
46   - gsdmManth=map.get("gsdmManth").toString().trim();
47   - }
48   - String fgsdmManth="";
49   - if(map.get("fgsdmManth")!=null){
50   - fgsdmManth=map.get("fgsdmManth").toString().trim();
51   - }
52   - return service.calcjsyspy(line, startDate, endDate, empnames, cont, gsdmManth, fgsdmManth);
53   - }
54   -
55   - @RequestMapping(value = "/singledatatj", method = RequestMethod.GET)
56   - public List<Map<String, Object>> singledatatj(@RequestParam Map<String, Object> map) {
57   - String line="";
58   - if(map.get("line")!=null){
59   - line=map.get("line").toString().trim();
60   - }
61   - String startDate="";
62   - if(map.get("startDate")!=null){
63   - startDate=map.get("startDate").toString().trim();
64   - }
65   - String endDate="";
66   - if(map.get("endDate")!=null){
67   - endDate=map.get("endDate").toString().trim();
68   - }
69   - String tjtype="";
70   - if(map.get("tjtype")!=null){
71   - tjtype=map.get("tjtype").toString().trim();
72   - }
73   - String cont="";
74   - if(map.get("cont")!=null){
75   - cont=map.get("cont").toString().trim();
76   - }
77   - String gsdmSing="";
78   - if(map.get("gsdmSing")!=null){
79   - gsdmSing=map.get("gsdmSing").toString().trim();
80   - }
81   - String fgsdmSing="";
82   - if(map.get("fgsdmSing")!=null){
83   - fgsdmSing=map.get("fgsdmSing").toString().trim();
84   - }
85   - String sfdc="";
86   - if(map.get("sfdc")!=null){
87   - sfdc=map.get("sfdc").toString().trim();
88   - }
89   - return service.singledatatj(line, startDate, endDate, tjtype, cont, gsdmSing, fgsdmSing, sfdc);
90   - }
91   -
92   - //浦东公交线路调查表
93   - @RequestMapping(value = "/calcInvestigateMonth", method = RequestMethod.GET)
94   - public List<CalcInvestigateMonth> calcInvestigateMonth(@RequestParam Map<String, Object> map) {
95   - String gsbm="";
96   - if(map.get("gsbm")!=null){
97   - gsbm=map.get("gsbm").toString().trim();
98   - }
99   - String fgsbm="";
100   - if(map.get("fgsbm")!=null){
101   - fgsbm=map.get("fgsbm").toString().trim();
102   - }
103   - String month="";
104   - if(map.get("month")!=null){
105   - month=map.get("month").toString().trim();
106   - }
107   - String line="";
108   - if(map.get("line")!=null){
109   - line=map.get("line").toString().trim();
110   - }
111   - String xlName="";
112   - if(map.get("xlName")!=null){
113   - xlName=map.get("xlName").toString().trim();
114   - }
115   - String nature="";
116   - if(map.get("nature")!=null){
117   - nature=map.get("nature").toString().trim();
118   - }
119   - String type="";
120   - if(map.get("type")!=null){
121   - type=map.get("type").toString().trim();
122   - }
123   - return service.calcInvestigateMonth(gsbm, fgsbm, month, line, xlName, nature, type);
124   - }
125   -
126   -}
  1 +package com.bsth.controller.calc;
  2 +
  3 +import java.util.List;
  4 +import java.util.Map;
  5 +
  6 +import org.springframework.beans.factory.annotation.Autowired;
  7 +import org.springframework.web.bind.annotation.RequestMapping;
  8 +import org.springframework.web.bind.annotation.RequestMethod;
  9 +import org.springframework.web.bind.annotation.RequestParam;
  10 +import org.springframework.web.bind.annotation.RestController;
  11 +
  12 +import com.bsth.entity.calc.CalcInvestigateMonth;
  13 +import com.bsth.service.calc.CalcMixService;
  14 +
  15 +@RestController
  16 +@RequestMapping("calc_mix")
  17 +public class CalcMixController {
  18 +
  19 + @Autowired
  20 + CalcMixService service;
  21 +
  22 + @RequestMapping(value="/calcjsyspy")
  23 + public List<Map<String, Object>> calcjsyspy(@RequestParam Map<String, Object> map){
  24 + String line="";
  25 + if(map.get("line")!=null){
  26 + line=map.get("line").toString().trim();
  27 + }
  28 + String startDate="";
  29 + if(map.get("startDate")!=null){
  30 + startDate=map.get("startDate").toString().trim();
  31 + }
  32 + String endDate="";
  33 + if(map.get("endDate")!=null){
  34 + endDate=map.get("endDate").toString().trim();
  35 + }
  36 + String empnames="";
  37 + if(map.get("empnames")!=null){
  38 + empnames=map.get("empnames").toString().trim();
  39 + }
  40 + String cont="";
  41 + if(map.get("cont")!=null){
  42 + cont=map.get("cont").toString().trim();
  43 + }
  44 + String gsdmManth="";
  45 + if(map.get("gsdmManth")!=null){
  46 + gsdmManth=map.get("gsdmManth").toString().trim();
  47 + }
  48 + String fgsdmManth="";
  49 + if(map.get("fgsdmManth")!=null){
  50 + fgsdmManth=map.get("fgsdmManth").toString().trim();
  51 + }
  52 + return service.calcjsyspy(line, startDate, endDate, empnames, cont, gsdmManth, fgsdmManth);
  53 + }
  54 +
  55 + @RequestMapping(value = "/singledatatj", method = RequestMethod.GET)
  56 + public List<Map<String, Object>> singledatatj(@RequestParam Map<String, Object> map) {
  57 + String line="";
  58 + if(map.get("line")!=null){
  59 + line=map.get("line").toString().trim();
  60 + }
  61 + String startDate="";
  62 + if(map.get("startDate")!=null){
  63 + startDate=map.get("startDate").toString().trim();
  64 + }
  65 + String endDate="";
  66 + if(map.get("endDate")!=null){
  67 + endDate=map.get("endDate").toString().trim();
  68 + }
  69 + String tjtype="";
  70 + if(map.get("tjtype")!=null){
  71 + tjtype=map.get("tjtype").toString().trim();
  72 + }
  73 + String cont="";
  74 + if(map.get("cont")!=null){
  75 + cont=map.get("cont").toString().trim();
  76 + }
  77 + String gsdmSing="";
  78 + if(map.get("gsdmSing")!=null){
  79 + gsdmSing=map.get("gsdmSing").toString().trim();
  80 + }
  81 + String fgsdmSing="";
  82 + if(map.get("fgsdmSing")!=null){
  83 + fgsdmSing=map.get("fgsdmSing").toString().trim();
  84 + }
  85 + String sfdc="";
  86 + if(map.get("sfdc")!=null){
  87 + sfdc=map.get("sfdc").toString().trim();
  88 + }
  89 + return service.singledatatj(line, startDate, endDate, tjtype, cont, gsdmSing, fgsdmSing, sfdc);
  90 + }
  91 +
  92 + //陆家嘴旅游线路调查表
  93 + @RequestMapping(value = "/calcInvestigateMonth", method = RequestMethod.GET)
  94 + public List<CalcInvestigateMonth> calcInvestigateMonth(@RequestParam Map<String, Object> map) {
  95 + String gsbm="";
  96 + if(map.get("gsbm")!=null){
  97 + gsbm=map.get("gsbm").toString().trim();
  98 + }
  99 + String fgsbm="";
  100 + if(map.get("fgsbm")!=null){
  101 + fgsbm=map.get("fgsbm").toString().trim();
  102 + }
  103 + String month="";
  104 + if(map.get("month")!=null){
  105 + month=map.get("month").toString().trim();
  106 + }
  107 + String line="";
  108 + if(map.get("line")!=null){
  109 + line=map.get("line").toString().trim();
  110 + }
  111 + String xlName="";
  112 + if(map.get("xlName")!=null){
  113 + xlName=map.get("xlName").toString().trim();
  114 + }
  115 + String nature="";
  116 + if(map.get("nature")!=null){
  117 + nature=map.get("nature").toString().trim();
  118 + }
  119 + String type="";
  120 + if(map.get("type")!=null){
  121 + type=map.get("type").toString().trim();
  122 + }
  123 + return service.calcInvestigateMonth(gsbm, fgsbm, month, line, xlName, nature, type);
  124 + }
  125 +
  126 +}
... ...
src/main/java/com/bsth/controller/sys/UserController.java
  View file @ec4279a
... ... @@ -192,25 +192,6 @@ public class UserController extends BaseController&lt;SysUser, Integer&gt; {
192 192 return rs;
193 193 }
194 194  
195   - // 检验密码有效期
196   - Date lastPwdDate = user.getLastPwdDate();
197   - if (lastPwdDate != null) {
198   - if (user.getPwdExpiredDate().before(new Date())) {
199   - return put(rs, "msg", "密码已过期，不能登录，请联系管理员");
200   - }
201   -
202   - Integer validPeriod = user.getPwdValidPeriod();
203   - if (validPeriod == null) {
204   - validPeriod = 30;
205   - }
206   - Period p = new Period(new DateTime(lastPwdDate), new DateTime(new Date()), PeriodType.days());
207   - if (p.getDays() > validPeriod) {
208   - return put(rs, "msg", "天没有修改密码，不能登录，请联系管理员");
209   - }
210   - } else {
211   - return put(rs, "msg", "从未更新过密码，不能登录，请联系管理员");
212   - }
213   -
214 195 // 弱密码检查
215 196 Matcher matcher = pattern.matcher(password);
216 197 if (!matcher.matches()) {
... ... @@ -489,66 +470,4 @@ public class UserController extends BaseController&lt;SysUser, Integer&gt; {
489 470  
490 471 return result;
491 472 }
492   -
493   - /**
494   - * 弱密码
495   - * @return
496   - */
497   - @RequestMapping(value = "/isRealName", method = RequestMethod.POST)
498   - public Map<String, Object> hasJobCode() {
499   - Map<String, Object> result = new HashMap<>();
500   - SysUser user = SecurityUtils.getCurrentUser();
501   - result.put("status", ResponseCode.SUCCESS);
502   - result.put("data", (StringUtils.isBlank(user.getJobCode()) || StringUtils.isBlank(user.getRealName())) ? 0 : 1);
503   -
504   - return result;
505   - }
506   -
507   - // 重置密码
508   - @RequestMapping(value = "/realName", method = RequestMethod.POST)
509   - public Map<String, Object> setJobCode(@RequestParam String jobCode, @RequestParam String realName) throws Exception {
510   - Map<String, Object> data = new HashMap<>(), result = new HashMap<>();
511   - result.put("status", ResponseCode.ERROR);
512   - result.put("data", "设置成功");
513   -
514   - if (jobCode == null || realName == null) {
515   - result.put("data", "你跳过验证了是吧");
516   - return result;
517   - }
518   - data.put("account", jobCode);
519   - data.put("pageSize", 2);
520   - data.put("pageNum", 1);
521   - StringBuilder stringBuilder = HttpClientUtils.post("https://112.64.45.51/businessCenter/userInfo/queryUserList", mapper.writeValueAsString(data));
522   - if (stringBuilder == null) {
523   - result.put("data", "统一平台验证失败1");
524   - return result;
525   - } else {
526   - List<Map<String, Object>> maps = mapper.readValue(mapper.writeValueAsString(((Map) mapper.readValue(stringBuilder.toString(), Map.class).get("data")).get("list")), mapper.getTypeFactory().constructParametricType(List.class, Map.class));
527   - if (maps.size() == 0) {
528   - result.put("data", "统一平台验证失败2");
529   - return result;
530   - } else {
531   - boolean isAuth = false;
532   - for (Map<String, Object> map : maps) {
533   - if (realName.equals(map.get("name"))) {
534   - isAuth = true;
535   - break;
536   - }
537   - }
538   - if (!isAuth) {
539   - result.put("data", "统一平台验证失败3");
540   - return result;
541   - }
542   - }
543   - }
544   -
545   - SysUser user = SecurityUtils.getCurrentUser();
546   - sysUserService.realName(jobCode, realName, user.getId());
547   - user.setJobCode(jobCode);
548   - user.setRealName(realName);
549   -
550   - result.put("status", ResponseCode.SUCCESS);
551   - return result;
552   - }
553   -
554 473 }
... ...
src/main/java/com/bsth/data/maintenance_plan/MtPlanDataLoadThread.java
  View file @ec4279a
... ... @@ -29,7 +29,7 @@ import java.util.Map;
29 29 * 维修保养计划
30 30 * @author Hill
31 31 */
32   -@Component
  32 +//@Component
33 33 public class MtPlanDataLoadThread extends Thread implements InitializingBean {
34 34  
35 35 private Logger logger = LoggerFactory.getLogger(this.getClass());
... ...
src/main/java/com/bsth/entity/sys/SecurityUser.java
  View file @ec4279a
... ... @@ -21,8 +21,6 @@ public class SecurityUser extends SysUser implements UserDetails {
21 21 this.setAgencies(user.getAgencies());
22 22 this.setRoles(user.getRoles());
23 23 this.setEnabled(user.isEnabled());
24   - this.setJobCode(user.getJobCode());
25   - this.setRealName(user.getRealName());
26 24 }
27 25 }
28 26  
... ...
src/main/java/com/bsth/entity/sys/SysUser.java
  View file @ec4279a
... ... @@ -42,12 +42,6 @@ public class SysUser implements Serializable {
42 42 @DateTimeFormat(pattern = "yyyy-MM-dd")
43 43 private Date lastLoginDate;
44 44  
45   - /** 最近密码更新时间 */
46   - @DateTimeFormat(pattern = "yyyy-MM-dd")
47   - private Date lastPwdDate;
48   - /** 密码有效期 */
49   - private Integer pwdValidPeriod;
50   -
51 45 private String agencies;
52 46  
53 47 private boolean enabled;
... ... @@ -55,16 +49,6 @@ public class SysUser implements Serializable {
55 49 @ManyToMany(fetch = FetchType.EAGER)
56 50 private Set<Role> roles = new LinkedHashSet<>();
57 51  
58   - private String jobCode;
59   -
60   - private String realName;
61   -
62   - /**
63   - * 密码过期时间
64   - */
65   - @Transient
66   - private Date pwdExpiredDate;
67   -
68 52 public Integer getId() {
69 53 return id;
70 54 }
... ... @@ -145,22 +129,6 @@ public class SysUser implements Serializable {
145 129 this.roles = roles;
146 130 }
147 131  
148   - public String getJobCode() {
149   - return jobCode;
150   - }
151   -
152   - public void setJobCode(String jobCode) {
153   - this.jobCode = jobCode;
154   - }
155   -
156   - public String getRealName() {
157   - return realName;
158   - }
159   -
160   - public void setRealName(String realName) {
161   - this.realName = realName;
162   - }
163   -
164 132 public Set<String> getLinks() {
165 133 Set<String> links = new HashSet<>();
166 134 if (links.size() == 0) {
... ... @@ -181,33 +149,4 @@ public class SysUser implements Serializable {
181 149  
182 150 return links;
183 151 }
184   -
185   - public Date getLastPwdDate() {
186   - return lastPwdDate;
187   - }
188   -
189   - public void setLastPwdDate(Date lastPwdDate) {
190   - this.lastPwdDate = lastPwdDate;
191   - }
192   -
193   - public Integer getPwdValidPeriod() {
194   - return pwdValidPeriod;
195   - }
196   -
197   - public void setPwdValidPeriod(Integer pwdValidPeriod) {
198   - this.pwdValidPeriod = pwdValidPeriod;
199   - }
200   -
201   - public Date getPwdExpiredDate() {
202   - DateTime dateTime = new DateTime(getLastPwdDate());
203   - if (pwdValidPeriod != null) {
204   - dateTime = dateTime.plusDays(pwdValidPeriod);
205   - }
206   -
207   - return dateTime.toDate();
208   - }
209   -
210   - public void setPwdExpiredDate(Date pwdExpiredDate) {
211   - this.pwdExpiredDate = pwdExpiredDate;
212   - }
213 152 }
... ...
src/main/java/com/bsth/service/calc/CalcMixService.java
  View file @ec4279a
1   -package com.bsth.service.calc;
2   -
3   -import java.util.List;
4   -import java.util.Map;
5   -
6   -import com.bsth.entity.calc.CalcInvestigateMonth;
7   -
8   -/**
9   - * Created by 19/02/28.
10   - */
11   -public interface CalcMixService {
12   -
13   - List<Map<String, Object>> calcjsyspy(String line, String startDate, String endDate, String cont, String empnames, String gsdmManth, String fgsdmManth);
14   -
15   - List<Map<String, Object>> singledatatj(String line, String startDate, String endDate, String tjtype, String cont, String gsdmSing, String fgsdmSing, String sfdc);
16   -
17   - //浦东公交线路调查表
18   - List<CalcInvestigateMonth> calcInvestigateMonth(String gsbm, String fgsbm, String month, String line, String xlName, String nature, String type);
19   -
20   -}
  1 +package com.bsth.service.calc;
  2 +
  3 +import java.util.List;
  4 +import java.util.Map;
  5 +
  6 +import com.bsth.entity.calc.CalcInvestigateMonth;
  7 +
  8 +/**
  9 + * Created by 19/02/28.
  10 + */
  11 +public interface CalcMixService {
  12 +
  13 + List<Map<String, Object>> calcjsyspy(String line, String startDate, String endDate, String cont, String empnames, String gsdmManth, String fgsdmManth);
  14 +
  15 + List<Map<String, Object>> singledatatj(String line, String startDate, String endDate, String tjtype, String cont, String gsdmSing, String fgsdmSing, String sfdc);
  16 +
  17 + //陆家嘴旅游线路调查表
  18 + List<CalcInvestigateMonth> calcInvestigateMonth(String gsbm, String fgsbm, String month, String line, String xlName, String nature, String type);
  19 +
  20 +}
... ...
src/main/java/com/bsth/service/calc/impl/CalcMixServiceImpl.java
  View file @ec4279a
... ... @@ -353,7 +353,7 @@ public class CalcMixServiceImpl implements CalcMixService {
353 353 return resList;
354 354 }
355 355  
356   - //浦东公交线路调查表
  356 + //陆家嘴旅游线路调查表
357 357 @Override
358 358 public List<CalcInvestigateMonth> calcInvestigateMonth(String gsbm, String fgsbm, String month, String line,
359 359 String xlName, String nature, String type) {
... ... @@ -445,7 +445,7 @@ public class CalcMixServiceImpl implements CalcMixService {
445 445 listI.add(mapList.iterator());
446 446 String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
447 447 ee.excelReplace(listI, new Object[]{m}, path + "mould/calcInvestigateMonth.xls",
448   - path + "export/" + "浦东公交线路调查表"+month+".xls");
  448 + path + "export/" + "陆家嘴旅游线路调查表"+month+".xls");
449 449 } catch (Exception e) {
450 450 // TODO: handle exception
451 451 e.printStackTrace();
... ...