潘钊 / bus_park_dispatch · Commits

Commit ea964b99a9b3f4392d9f3a01b13928db64afc72d

Authored by panzhaov5
1 parent 5d00aa0e
build: skipped

update...

Inline Side-by-side
Showing 7 changed files with 52 additions and 24 deletions
... ... @@ -97,6 +97,12 @@
97 97 <artifactId>commons-io</artifactId>
98 98 <version>2.4</version>
99 99 </dependency>
  100 +
  101 + <dependency>
  102 + <groupId>org.springframework.boot</groupId>
  103 + <artifactId>spring-boot-starter-data-redis</artifactId>
  104 + </dependency>
  105 +
100 106 <dependency>
101 107 <groupId>org.codehaus.janino</groupId>
102 108 <artifactId>janino</artifactId>
... ...
src/main/java/com/bsth/data/utils/HttpClientUtils.java
  View file @ea964b9
... ... @@ -8,6 +8,7 @@ import org.apache.http.client.methods.HttpPost;
8 8 import org.apache.http.entity.StringEntity;
9 9 import org.apache.http.impl.client.CloseableHttpClient;
10 10 import org.apache.http.impl.client.HttpClients;
  11 +import org.apache.http.message.BasicHeader;
11 12 import org.slf4j.Logger;
12 13 import org.slf4j.LoggerFactory;
13 14  
... ... @@ -29,6 +30,10 @@ public class HttpClientUtils {
29 30 try {
30 31 httpClient = HttpClients.createDefault();
31 32 HttpGet get = new HttpGet(url);
  33 +
  34 + get.setHeader("Accept", "application/json;charset=utf-8");
  35 + get.setHeader(new BasicHeader("Content-Type", "application/json; charset=utf-8"));
  36 +
32 37 //超时时间
33 38 RequestConfig requestConfig = RequestConfig.custom()
34 39 .setConnectTimeout(12500).setConnectionRequestTimeout(12000)
... ...
src/main/java/com/bsth/service/schedule/impl/ScheduleServiceImpl.java
  View file @ea964b9
... ... @@ -156,6 +156,13 @@ public class ScheduleServiceImpl implements ScheduleService {
156 156 public Map<String, Object> dftz(Map<String, Object> map) {
157 157 Map<String, Object> rs = new HashMap<>();
158 158 try {
  159 + //拦截
  160 + if(1 == 1){
  161 + rs.put("status", ResponseCode.ERROR);
  162 + rs.put("msg", "相关功能还未进行培训，功能禁止提交！！");
  163 + return rs;
  164 + }
  165 +
159 166 map.put("userId", SecurityUtils.getCurrentUser().getUserName());
160 167 StringBuilder sb = HttpClientUtils.post(ScheduleDataBuffer.dataUrl + "/tcc_dftz" + RsRequestUtils.getParams(), JSON.toJSONString(map));
161 168  
... ... @@ -248,7 +255,7 @@ public class ScheduleServiceImpl implements ScheduleService {
248 255 AbnormalEntity ae = mainAbnormalClient.rybd(id, timeStr, reason, remarks);
249 256  
250 257 //重新计算签到准点率
251   - if(RateNCalculator.calcBdzdRateNo())
  258 + if (RateNCalculator.calcBdzdRateNo())
252 259 sendUtils.sendAllRates();
253 260  
254 261 rs.put("status", ResponseCode.SUCCESS);
... ... @@ -289,7 +296,7 @@ public class ScheduleServiceImpl implements ScheduleService {
289 296 //处理掉异常
290 297 AbnormalEntity ae = mainAbnormalClient.cycc(id, timeStr, reason, remarks);
291 298 //重新计算出场准点率
292   - if(RateNCalculator.calcCczdRateNo())
  299 + if (RateNCalculator.calcCczdRateNo())
293 300 sendUtils.sendAllRates();
294 301  
295 302 rs.put("status", ResponseCode.SUCCESS);
... ... @@ -306,6 +313,13 @@ public class ScheduleServiceImpl implements ScheduleService {
306 313 public Map<String, Object> tzrc_check(Map<String, String> map) {
307 314 Map<String, Object> rs = new HashMap<>();
308 315 try {
  316 + //拦截
  317 + if(1 == 1){
  318 + rs.put("status", ResponseCode.ERROR);
  319 + rs.put("msg", "相关功能还未进行培训，功能禁止提交！！");
  320 + return rs;
  321 + }
  322 +
309 323 rs.put("status", ResponseCode.SUCCESS);
310 324 String jsy = map.get("jsy");
311 325 String lineCode = map.get("line");
... ...
src/main/resources/application-prod.properties
  View file @ea964b9
... ... @@ -2,7 +2,7 @@ server.port=9999
2 2 management.port= 10001
3 3 management.address= 127.0.0.1
4 4  
5   -spring.jpa.hibernate.ddl-auto= none
  5 +spring.jpa.hibernate.ddl-auto= update
6 6 spring.jpa.hibernate.naming_strategy= org.hibernate.cfg.ImprovedNamingStrategy
7 7 #DATABASE
8 8 spring.jpa.database= MYSQL
... ...
src/main/resources/application.properties
  View file @ea964b9
1 1 spring.profiles: dev,prod
2 2 spring.profiles.active: dev
3 3  
  4 +server.tomcat.uri-encoding=UTF-8
4 5 spring.view.suffix=.html
5 6 server.session-timeout=-1
6 7 security.basic.enabled=false
... ...
src/main/resources/auths.json
  View file @ea964b9
... ... @@ -2,105 +2,105 @@
2 2 "list": [
3 3 {
4 4 "code": "b_p_manager",
5   - "name": "停放监管",
  5 + "name": "&#x505C;&#x653E;&#x76D1;&#x7BA1;",
6 6 "page": "/pages/b_p_manager/b_p_main.html"
7 7 },
8 8 {
9 9 "code": "abnormal_data",
10   - "name": "异常监管",
  10 + "name": "&#x5F02;&#x5E38;&#x76D1;&#x7BA1;",
11 11 "page": "/pages/abnormal/main.html"
12 12 },
13 13 {
14 14 "code": "inout_data",
15   - "name": "进出场",
  15 + "name": "&#x8FDB;&#x51FA;&#x573A;",
16 16 "page": "/pages/inout/in_out_main.html",
17 17 "items": [
18 18 {
19 19 "code": "in_out_schedule",
20   - "name": "计划出场",
  20 + "name": "&#x8BA1;&#x5212;&#x51FA;&#x573A;",
21 21 "page": "/pages/inout/in_out_schedule/list.html"
22 22 },
23 23 {
24 24 "code": "rfid_cljcc_list",
25   - "name": "车辆进出场",
  25 + "name": "&#x8F66;&#x8F86;&#x8FDB;&#x51FA;&#x573A;",
26 26 "page": "/pages/inout/signal/signal_inout_list.html"
27 27 }
28 28 ]
29 29 },
30 30 {
31 31 "code": "attendance_data",
32   - "name": "签到/退",
  32 + "name": "&#x7B7E;&#x5230;/&#x9000;",
33 33 "page": "/pages/attendance/att_data_main.html",
34 34 "items": [
35 35 {
36 36 "code": "maintain_plan",
37   - "name": "保养计划",
  37 + "name": "&#x4FDD;&#x517B;&#x8BA1;&#x5212;",
38 38 "page": "/pages/attendance/maintain_plan_list.html"
39 39 },
40 40 {
41 41 "code": "att_list",
42   - "name": "签到退记录",
  42 + "name": "&#x7B7E;&#x5230;&#x9000;&#x8BB0;&#x5F55;",
43 43 "page": "/pages/attendance/list.html"
44 44 }
45 45 ]
46 46 },
47 47 {
48 48 "code": "schedule_plan",
49   - "name": "计划排班",
  49 + "name": "&#x8BA1;&#x5212;&#x6392;&#x73ED;",
50 50 "page": "/pages/plan_schedule/p_s_main.html",
51 51 "items": [
52 52 {
53 53 "code": "p_s_tzrc",
54   - "name": "调整人车",
  54 + "name": "&#x8C03;&#x6574;&#x4EBA;&#x8F66;",
55 55 "page": "/pages/plan_schedule/tzrc/list.html"
56 56 }
57 57 ]
58 58 },
59 59 {
60 60 "code": "basic_data",
61   - "name": "基础数据",
  61 + "name": "&#x57FA;&#x7840;&#x6570;&#x636E;",
62 62 "page": "/pages/basic_data/main.html",
63 63 "items": [
64 64 {
65 65 "code": "person_card",
66   - "name": "人员/人卡",
  66 + "name": "&#x4EBA;&#x5458;/&#x4EBA;&#x5361;",
67 67 "page": "/pages/basic_data/person_card/list.html"
68 68 },
69 69 {
70 70 "code": "bus",
71   - "name": "车辆信息",
  71 + "name": "&#x8F66;&#x8F86;&#x4FE1;&#x606F;",
72 72 "page": "/pages/basic_data/bus/list.html"
73 73 },
74 74 {
75 75 "code": "bus_card",
76   - "name": "车卡信息",
  76 + "name": "&#x8F66;&#x5361;&#x4FE1;&#x606F;",
77 77 "page": "/pages/basic_data/bus_card/bus_card_list.html"
78 78 },
79 79 {
80 80 "code": "private_car",
81   - "name": "私家车",
  81 + "name": "&#x79C1;&#x5BB6;&#x8F66;",
82 82 "page": "/pages/basic_data/car/car_list.html"
83 83 },
84 84 {
85 85 "code": "berth",
86   - "name": "区域和泊位",
  86 + "name": "&#x533A;&#x57DF;&#x548C;&#x6CCA;&#x4F4D;",
87 87 "page": "/pages/basic_data/berth/berth_main.html"
88 88 }
89 89 ]
90 90 },
91 91 {
92 92 "code": "system_manager",
93   - "name": "系统管理",
  93 + "name": "&#x7CFB;&#x7EDF;&#x7BA1;&#x7406;",
94 94 "page": "/pages/system_manager/sm_main.html",
95 95 "items": [
96 96 {
97 97 "code": "role",
98   - "name": "角色和权限",
  98 + "name": "&#x89D2;&#x8272;&#x548C;&#x6743;&#x9650;",
99 99 "page": "/pages/system_manager/role/auths.html"
100 100 },
101 101 {
102 102 "code": "user",
103   - "name": "用户和账号",
  103 + "name": "&#x7528;&#x6237;&#x548C;&#x8D26;&#x53F7;",
104 104 "page": "/pages/system_manager/user/user_list.html"
105 105 }
106 106 ]
... ...
src/main/resources/config.properties
  View file @ea964b9
... ... @@ -4,8 +4,10 @@
4 4 data.company.json={"55": {"name": "上南公司","fgs": {"4": "上南一分公司","3": "上南六分公司","1": "上南二分公司","2": "上南三分公司"}},"22": {"name": "金高公司","fgs": {"2": "二分公司","1": "四分公司","3": "三分公司","5": "一分公司"}},"05": {"name": "杨高公司","fgs": {"5": "杨高分公司","6": "周浦分公司","3": "芦潮港分公司","1": "川沙分公司","2": "金桥分公司"}},"26": {"name": "南汇公司","fgs": {"3": "南汇三分","2": "南汇二分","1": "南汇一分","4": "南汇维修公司","5": "南汇公司"}}}
5 5  
6 6 ## 数据接口服务
7   -data.base.url=http://127.0.0.1:9089/webservice
8   -#data.base.url=http://114.80.178.12:9089/webservice
  7 +##data.base.url=http://127.0.0.1:9089/webservice
  8 +## 驾驶员照片
  9 +data.base.pic.url=http://114.80.178.12:9003
  10 +data.base.url=http://114.80.178.12:9089/webservice
9 11  
10 12  
11 13 # 集调接口密码
... ...