update...

panzhaov5
1 parent 5d00aa0e
Showing 7 changed files with 52 additions and 24 deletions
pom.xml
src/main/java/com/bsth/data/utils/HttpClientUtils.java
src/main/java/com/bsth/service/schedule/impl/ScheduleServiceImpl.java
src/main/resources/application-prod.properties
src/main/resources/application.properties
src/main/resources/auths.json
src/main/resources/config.properties
@@ -97,6 +97,12 @@
 			<artifactId>commons-io</artifactId>
 			<version>2.4</version>
 		</dependency>
+
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-data-redis</artifactId>
+		</dependency>
+
 		<dependency>
 			<groupId>org.codehaus.janino</groupId>
 			<artifactId>janino</artifactId>
@@ -8,6 +8,7 @@ import org.apache.http.client.methods.HttpPost;
 import org.apache.http.entity.StringEntity;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClients;
+import org.apache.http.message.BasicHeader;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -29,6 +30,10 @@ public class HttpClientUtils {
         try {
             httpClient = HttpClients.createDefault();
             HttpGet get = new HttpGet(url);
+
+            get.setHeader("Accept", "application/json;charset=utf-8");
+            get.setHeader(new BasicHeader("Content-Type", "application/json; charset=utf-8"));
+
             //超时时间
             RequestConfig requestConfig = RequestConfig.custom()
                     .setConnectTimeout(12500).setConnectionRequestTimeout(12000)
@@ -156,6 +156,13 @@ public class ScheduleServiceImpl implements ScheduleService {
     public Map<String, Object> dftz(Map<String, Object> map) {
         Map<String, Object> rs = new HashMap<>();
         try {
+            //拦截
+            if(1 == 1){
+                rs.put("status", ResponseCode.ERROR);
+                rs.put("msg", "相关功能还未进行培训，功能禁止提交！！");
+                return rs;
+            }
+
             map.put("userId", SecurityUtils.getCurrentUser().getUserName());
             StringBuilder sb = HttpClientUtils.post(ScheduleDataBuffer.dataUrl + "/tcc_dftz" + RsRequestUtils.getParams(), JSON.toJSONString(map));
@@ -248,7 +255,7 @@ public class ScheduleServiceImpl implements ScheduleService {
             AbnormalEntity ae = mainAbnormalClient.rybd(id, timeStr, reason, remarks);
             //重新计算签到准点率
-            if(RateNCalculator.calcBdzdRateNo())
+            if (RateNCalculator.calcBdzdRateNo())
                 sendUtils.sendAllRates();
             rs.put("status", ResponseCode.SUCCESS);
@@ -289,7 +296,7 @@ public class ScheduleServiceImpl implements ScheduleService {
             //处理掉异常
             AbnormalEntity ae = mainAbnormalClient.cycc(id, timeStr, reason, remarks);
             //重新计算出场准点率
-            if(RateNCalculator.calcCczdRateNo())
+            if (RateNCalculator.calcCczdRateNo())
                 sendUtils.sendAllRates();
             rs.put("status", ResponseCode.SUCCESS);
@@ -306,6 +313,13 @@ public class ScheduleServiceImpl implements ScheduleService {
     public Map<String, Object> tzrc_check(Map<String, String> map) {
         Map<String, Object> rs = new HashMap<>();
         try {
+            //拦截
+            if(1 == 1){
+                rs.put("status", ResponseCode.ERROR);
+                rs.put("msg", "相关功能还未进行培训，功能禁止提交！！");
+                return rs;
+            }
+
             rs.put("status", ResponseCode.SUCCESS);
             String jsy = map.get("jsy");
             String lineCode = map.get("line");
@@ -2,7 +2,7 @@ server.port=9999
 management.port= 10001
 management.address= 127.0.0.1
-spring.jpa.hibernate.ddl-auto= none
+spring.jpa.hibernate.ddl-auto= update
 spring.jpa.hibernate.naming_strategy= org.hibernate.cfg.ImprovedNamingStrategy
 #DATABASE
 spring.jpa.database= MYSQL
 spring.profiles: dev,prod
 spring.profiles.active: dev
+server.tomcat.uri-encoding=UTF-8
 spring.view.suffix=.html
 server.session-timeout=-1
 security.basic.enabled=false
@@ -2,105 +2,105 @@
   "list": [
     {
       "code": "b_p_manager",
-      "name": "停放监管",
+      "name": "&#x505C;&#x653E;&#x76D1;&#x7BA1;",
       "page": "/pages/b_p_manager/b_p_main.html"
     },
     {
       "code": "abnormal_data",
-      "name": "异常监管",
+      "name": "&#x5F02;&#x5E38;&#x76D1;&#x7BA1;",
       "page": "/pages/abnormal/main.html"
     },
     {
       "code": "inout_data",
-      "name": "进出场",
+      "name": "&#x8FDB;&#x51FA;&#x573A;",
       "page": "/pages/inout/in_out_main.html",
       "items": [
         {
           "code": "in_out_schedule",
-          "name": "计划出场",
+          "name": "&#x8BA1;&#x5212;&#x51FA;&#x573A;",
           "page": "/pages/inout/in_out_schedule/list.html"
         },
         {
           "code": "rfid_cljcc_list",
-          "name": "车辆进出场",
+          "name": "&#x8F66;&#x8F86;&#x8FDB;&#x51FA;&#x573A;",
           "page": "/pages/inout/signal/signal_inout_list.html"
         }
       ]
     },
     {
       "code": "attendance_data",
-      "name": "签到/退",
+      "name": "&#x7B7E;&#x5230;/&#x9000;",
       "page": "/pages/attendance/att_data_main.html",
       "items": [
         {
           "code": "maintain_plan",
-          "name": "保养计划",
+          "name": "&#x4FDD;&#x517B;&#x8BA1;&#x5212;",
           "page": "/pages/attendance/maintain_plan_list.html"
         },
         {
           "code": "att_list",
-          "name": "签到退记录",
+          "name": "&#x7B7E;&#x5230;&#x9000;&#x8BB0;&#x5F55;",
           "page": "/pages/attendance/list.html"
         }
       ]
     },
     {
       "code": "schedule_plan",
-      "name": "计划排班",
+      "name": "&#x8BA1;&#x5212;&#x6392;&#x73ED;",
       "page": "/pages/plan_schedule/p_s_main.html",
       "items": [
         {
           "code": "p_s_tzrc",
-          "name": "调整人车",
+          "name": "&#x8C03;&#x6574;&#x4EBA;&#x8F66;",
           "page": "/pages/plan_schedule/tzrc/list.html"
         }
       ]
     },
     {
       "code": "basic_data",
-      "name": "基础数据",
+      "name": "&#x57FA;&#x7840;&#x6570;&#x636E;",
       "page": "/pages/basic_data/main.html",
       "items": [
         {
           "code": "person_card",
-          "name": "人员/人卡",
+          "name": "&#x4EBA;&#x5458;/&#x4EBA;&#x5361;",
           "page": "/pages/basic_data/person_card/list.html"
         },
         {
           "code": "bus",
-          "name": "车辆信息",
+          "name": "&#x8F66;&#x8F86;&#x4FE1;&#x606F;",
           "page": "/pages/basic_data/bus/list.html"
         },
         {
           "code": "bus_card",
-          "name": "车卡信息",
+          "name": "&#x8F66;&#x5361;&#x4FE1;&#x606F;",
           "page": "/pages/basic_data/bus_card/bus_card_list.html"
         },
         {
           "code": "private_car",
-          "name": "私家车",
+          "name": "&#x79C1;&#x5BB6;&#x8F66;",
           "page": "/pages/basic_data/car/car_list.html"
         },
         {
           "code": "berth",
-          "name": "区域和泊位",
+          "name": "&#x533A;&#x57DF;&#x548C;&#x6CCA;&#x4F4D;",
           "page": "/pages/basic_data/berth/berth_main.html"
         }
       ]
     },
     {
       "code": "system_manager",
-      "name": "系统管理",
+      "name": "&#x7CFB;&#x7EDF;&#x7BA1;&#x7406;",
       "page": "/pages/system_manager/sm_main.html",
       "items": [
         {
           "code": "role",
-          "name": "角色和权限",
+          "name": "&#x89D2;&#x8272;&#x548C;&#x6743;&#x9650;",
           "page": "/pages/system_manager/role/auths.html"
         },
         {
           "code": "user",
-          "name": "用户和账号",
+          "name": "&#x7528;&#x6237;&#x548C;&#x8D26;&#x53F7;",
           "page": "/pages/system_manager/user/user_list.html"
         }
       ]
@@ -4,8 +4,10 @@
 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": "南汇公司"}}}
 ## 数据接口服务
-data.base.url=http://127.0.0.1:9089/webservice
-#data.base.url=http://114.80.178.12:9089/webservice
+##data.base.url=http://127.0.0.1:9089/webservice
+## 驾驶员照片
+data.base.pic.url=http://114.80.178.12:9003
+data.base.url=http://114.80.178.12:9089/webservice
 # 集调接口密码