Update

徐烜
1 parent 7a40065f
Showing 4 changed files with 66 additions and 1 deletions
src/main/java/com/bsth/service/schedule/rules/ScheduleRuleServiceImpl.java
src/main/java/com/bsth/service/schedule/rules/shiftloop/ScheduleRule_input.java
src/main/java/com/bsth/service/schedule/utils/Md5Util.java
src/main/resources/application-dev.properties
@@ -112,6 +112,9 @@ public class ScheduleRuleServiceImpl implements ScheduleRuleService {
             public SchedulePlanRuleResult mapRow(ResultSet rs, int i) throws SQLException {
                 SchedulePlanRuleResult obj = new SchedulePlanRuleResult();
                 obj.setRuleId(rs.getString("rule_id"));
+                obj.setCcZbh(rs.getString("cc_zbh"));
+                obj.setGids(rs.getString("gids"));
+                obj.setEcids(rs.getString("ecids"));
                 obj.setScheduleDate(rs.getDate("schedule_date"));
                 obj.setGidindex(rs.getString("gidindex"));
                 obj.setEcindex(rs.getString("ecindex"));
 package com.bsth.service.schedule.rules.shiftloop;
 import com.bsth.entity.schedule.rule.ScheduleRule1Flat;
+import com.bsth.service.schedule.utils.Md5Util;
 import com.google.common.base.Splitter;
 import org.apache.commons.lang3.StringUtils;
 import org.joda.time.DateTime;
@@ -17,6 +18,12 @@ public class ScheduleRule_input {
     /** 规则Id */
     private String ruleId;
+    /**
+     * 规则md5值（不使用id判定，使用md5判定）
+     * 使用，启用日期，路牌范围，人员范围 结合生成md5编码
+     */
+    private String ruleMd5;
+
     /** 规则启用日期 */
     private DateTime qyrq;
@@ -78,9 +85,20 @@ public class ScheduleRule_input {
             }
         }
+        /** 生成规则md5编码 */
+        ruleMd5 = Md5Util.getMd5(
+                String.valueOf(qyrq.getMillis()) + "_" +
+                        scheduleRule1Flat.getLpIds() + "_" +
+                        scheduleRule1Flat.getRyConfigIds()
+        );
+
+        System.out.println("rule的md5：" + ruleMd5 + " 车辆：" + scheduleRule1Flat.getCarConfigInfo().getCl().getInsideCode());
+
         this.self = scheduleRule1Flat;
     }
+
+
     public String getRuleId() {
         return ruleId;
     }
@@ -160,4 +178,12 @@ public class ScheduleRule_input {
     public void setSelf(ScheduleRule1Flat self) {
         this.self = self;
     }
+
+    public String getRuleMd5() {
+        return ruleMd5;
+    }
+
+    public void setRuleMd5(String ruleMd5) {
+        this.ruleMd5 = ruleMd5;
+    }
 }
+package com.bsth.service.schedule.utils;
+
+import java.security.MessageDigest;
+
+/**
+ * Md5工具。
+ */
+public class Md5Util {
+    private static MessageDigest md5 = null;
+    static {
+        try {
+            md5 = MessageDigest.getInstance("MD5");
+        } catch (Exception exp) {
+            exp.printStackTrace();
+        }
+    }
+
+    /**
+     * 用于获取一个String的md5值。
+     * @param str
+     * @return
+     */
+    public static String getMd5(String str) {
+        byte[] bs = md5.digest(str.getBytes());
+        StringBuilder s = new StringBuilder();
+        for (byte x : bs) {
+            if ((x & 0xff) >>4 == 0) {
+                s.append("0").append(Integer.toHexString(x & 0xff));
+            } else {
+                s.append(Integer.toHexString(x & 0xff));
+            }
+        }
+        return s.toString();
+    }
+
+}
@@ -10,7 +10,7 @@ spring.jpa.show-sql= true
 spring.datasource.driver-class-name= com.mysql.jdbc.Driver
 spring.datasource.url= jdbc:mysql://127.0.0.1/control?useUnicode=true&characterEncoding=utf-8&useSSL=false
 spring.datasource.username= root
-spring.datasource.password= root
+spring.datasource.password=
 #spring.datasource.url= jdbc:mysql://192.168.168.117/pd_control?useUnicode=true&characterEncoding=utf-8&useSSL=false
 #spring.datasource.username= root
 #spring.datasource.password= root