1.浦交历史路单修改时间,T+(3或5),

王通
1 parent d00e297b
Showing 8 changed files with 148 additions and 9 deletions
src/main/java/com/bsth/common/Constants.java
src/main/java/com/bsth/controller/realcontrol/AdminUtilsController.java
src/main/java/com/bsth/controller/realcontrol/ScheduleRealInfoController.java
src/main/java/com/bsth/data/BasicData.java
src/main/java/com/bsth/entity/SystemParam.java
src/main/java/com/bsth/repository/SystemParamRepository.java
src/main/java/com/bsth/service/SystemParamService.java
src/main/java/com/bsth/service/impl/SystemParamServiceImpl.java
@@ -66,4 +66,6 @@ public class Constants {
 	public static final String FILE_AUTH = "/.well-known/pki-validation/fileauth.txt";
  
 	public static final String SSO_TOKEN = "ssoToken";
+
+	public static final String SPECIAL_ROLES = "special.roles";
 }
@@ -343,4 +343,17 @@ public class AdminUtilsController {
  
         return "error";
     }
+
+    @RequestMapping("/reloadSystemParam")
+    public String reloadSystemParam() {
+        Map<String, Object> result = new HashMap<>();
+        try {
+            basicDataLoader.loadSystemParam();
+            return "success";
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        return "error";
+    }
 }
 \ No newline at end of file
@@ -11,9 +11,12 @@ import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.util.*;
  
+import com.bsth.common.Constants;
 import com.bsth.data.forecast.entity.ArrivalEntity;
 import com.bsth.data.maintenance_plan.MaintenancePlan;
 import com.bsth.data.maintenance_plan.MtPlanCenter;
+import com.bsth.entity.SystemParam;
+import com.bsth.entity.sys.Role;
 import com.bsth.entity.sys.SysUser;
 import com.bsth.security.util.SecurityUtils;
 import com.bsth.util.HttpClientUtils;
@@ -624,11 +627,22 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 	@RequestMapping("dateArray")
 	public List<String> dateArray(@RequestParam(defaultValue = "0") int c){
 		List<String> rs = new ArrayList<>();
+		Set<Role> roles = SecurityUtils.getCurrentUser().getRoles();
+		SystemParam param = BasicData.getSystemParam().get(Constants.SPECIAL_ROLES);
+		int days = 3;
+		if (param != null && param.getValue() != null) {
+			for (Role role : roles) {
+				if (param.getValue().contains(String.format(",%s,", role.getCodeName()))) {
+					days = 5;
+				}
+			}
+		}
  
 		long t = System.currentTimeMillis();
-		if(c != 1)
+		if (c != 1) {
 			t -= (ONE_DAY + (1000 * 60 * 60 * 6));
-		for(int i = 0; i < 3; i ++){
+		}
+		for (int i = 1; i < days; i++) {
 			rs.add(fmtyyyyMMdd.print(t));
 			t -= ONE_DAY;
 		}
@@ -13,6 +13,7 @@ import java.util.Map;
 import java.util.Set;
  
 import com.bsth.entity.*;
+import com.bsth.repository.*;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -25,13 +26,6 @@ import com.bsth.data.gpsdata_v2.cache.GeoCacheData;
 import com.bsth.data.pinyin.PersionPinYinBuffer;
 import com.bsth.entity.calc.CalcInterval;
 import com.bsth.entity.schedule.CarConfigInfo;
-import com.bsth.repository.BusinessRepository;
-import com.bsth.repository.CarParkRepository;
-import com.bsth.repository.CarsRepository;
-import com.bsth.repository.LineRepository;
-import com.bsth.repository.PersonnelRepository;
-import com.bsth.repository.StationRepository;
-import com.bsth.repository.StationRouteRepository;
 import com.bsth.repository.calc.CalcIntervalRepository;
 import com.bsth.repository.schedule.CarConfigInfoRepository;
 import com.google.common.collect.BiMap;
@@ -106,6 +100,8 @@ public class BasicData {
  
     public static List<WhiteIp> whiteIpList;
  
+    private static Map<String, SystemParam> key2param = new HashMap<>();
+
     static Logger logger = LoggerFactory.getLogger(BasicData.class);
  
     public static String getStationNameByCode(String code, String prefix){
@@ -164,6 +160,9 @@ public class BasicData {
         @Autowired
         CalcIntervalRepository calcIntervalRepository;
  
+        @Autowired
+        private SystemParamRepository systemParamRepository;
+
         @Override
         public void run() {
             loadAllData();
@@ -195,6 +194,7 @@ public class BasicData {
                 logger.info("load geo cache..，");
                 geoCacheData.loadData();
                 station2ParkBuffer.saveAll();
+                loadSystemParam();
                 logger.info("加载基础数据成功！，");
             } catch (Exception e) {
                 logger.error("加载基础数据时出现异常，", e);
@@ -451,6 +451,22 @@ public class BasicData {
  
         	lineDate2Level = result;
         }
+
+        /**
+         * 加载系统配置参数
+         */
+        public void loadSystemParam() {
+            Map<String, SystemParam> key2param = new HashMap<>();
+            Iterator<SystemParam> systemParamIterator = systemParamRepository.findAll().iterator();
+            while (systemParamIterator.hasNext()) {
+                SystemParam systemParam = systemParamIterator.next();
+                key2param.put(systemParam.getKey(), systemParam);
+            }
+
+            if (key2param.size() > 0) {
+                BasicData.key2param = key2param;
+            }
+        }
     }
  
     @Component
@@ -487,4 +503,8 @@ public class BasicData {
             whiteIpList = result;
         }
     }
+
+    public static Map<String, SystemParam> getSystemParam() {
+        return key2param;
+    }
 }
+package com.bsth.entity;
+
+import javax.persistence.*;
+
+/**
+ * @author Hill
+ */
+@Entity
+@Table(name = "bsth_c_sys_param")
+public class SystemParam {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Integer id;
+
+    /**
+     * 键名(唯一)
+     */
+    private String key;
+
+    /**
+     * 值
+     */
+    private String value;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getKey() {
+        return key;
+    }
+
+    public void setKey(String key) {
+        this.key = key;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+}
+package com.bsth.repository;
+
+import com.bsth.entity.SystemParam;
+
+/**
+ * @author Hill
+ */
+public interface SystemParamRepository extends BaseRepository<SystemParam, Integer> {
+}
+package com.bsth.service;
+
+import com.bsth.entity.SystemParam;
+
+/**
+ * @author Hill
+ */
+public interface SystemParamService extends BaseService<SystemParam, Integer> {
+}
+package com.bsth.service.impl;
+
+import com.bsth.entity.SystemParam;
+import com.bsth.service.SystemParamService;
+
+/**
+ * @author Hill
+ */
+public class SystemParamServiceImpl extends BaseServiceImpl<SystemParam, Integer> implements SystemParamService {
+}