Forráskód Böngészése

数据库访问地址改成IP

wukai 1 hónapja
szülő
commit
759b3d0667

+ 1 - 1
jjt-admin/src/main/resources/application-prod.yml

@@ -28,7 +28,7 @@ spring:
     druid:
       # 主库数据源
       master:
-        url: jdbc:sqlserver://cpsdb.tlct.com.cn:1433;DataBaseName=twin2025
+        url: jdbc:sqlserver://192.168.66.138:1433;DataBaseName=twin2025
         username: sa
         password: Azxcvb!1
       # 从库数据源

+ 10 - 9
jjt-biz/src/main/java/com/jjt/biz/vo/YrProdEfficiencyVO.java

@@ -82,17 +82,18 @@ public class YrProdEfficiencyVO {
         this.energy = BigDecimal.valueOf(2.6d);
         this.ratio = BigDecimal.valueOf(this.open * 100).divide(BigDecimal.valueOf(this.total), 2, RoundingMode.HALF_UP);
         this.lengthA = BigDecimal.valueOf(3000 + 3000 * random.nextDouble()).multiply(BigDecimal.valueOf(ldt.getHour() / 12f)).setScale(2, RoundingMode.HALF_UP);
-        this.weightA = lengthA.multiply(BigDecimal.valueOf(1.5)).divide(BigDecimal.valueOf(1000), 2,RoundingMode.HALF_UP);
-        if (ldt.getHour() > 12) {
-            this.timeA = BigDecimal.valueOf(12).subtract(BigDecimal.valueOf(ldt.getHour() * 0.25 * random.nextFloat())).setScale(1, RoundingMode.HALF_UP);
+        this.weightA = lengthA.multiply(BigDecimal.valueOf(1.5)).divide(BigDecimal.valueOf(1000), 2, RoundingMode.HALF_UP);
+        int hour = ldt.getHour() + 1;
+        if (hour > 12) {
+            this.timeA = BigDecimal.valueOf(12).subtract(BigDecimal.valueOf(hour * 0.25 * random.nextFloat())).setScale(1, RoundingMode.HALF_UP);
             this.effA = timeA.divide(BigDecimal.valueOf(12), 4, RoundingMode.HALF_UP);
-            this.lengthB = BigDecimal.valueOf(3000 + 3000 * random.nextDouble()).multiply(BigDecimal.valueOf((ldt.getHour() - 12) / 12f)).setScale(2, RoundingMode.HALF_UP);
-            this.weightB = lengthB.multiply(BigDecimal.valueOf(1.5)).divide(BigDecimal.valueOf(1000), 2,RoundingMode.HALF_UP);;
-            this.timeB = BigDecimal.valueOf(ldt.getHour() - 12).subtract(BigDecimal.valueOf((ldt.getHour()-12) * 0.25 * random.nextFloat())).setScale(1, RoundingMode.HALF_UP);
-            this.effB = timeB.divide(BigDecimal.valueOf(ldt.getHour() - 12), 4, RoundingMode.HALF_UP);
+            this.lengthB = BigDecimal.valueOf(3000 + 3000 * random.nextDouble()).multiply(BigDecimal.valueOf((hour - 12) / 12f)).setScale(2, RoundingMode.HALF_UP);
+            this.weightB = lengthB.multiply(BigDecimal.valueOf(1.5)).divide(BigDecimal.valueOf(1000), 2, RoundingMode.HALF_UP);
+            this.timeB = BigDecimal.valueOf(hour - 12).subtract(BigDecimal.valueOf((hour - 12) * 0.25 * random.nextFloat())).setScale(1, RoundingMode.HALF_UP);
+            this.effB = timeB.divide(BigDecimal.valueOf(hour - 12), 4, RoundingMode.HALF_UP);
         } else {
-            this.timeA = BigDecimal.valueOf(ldt.getHour()).subtract(BigDecimal.valueOf(ldt.getHour() * 0.25 * random.nextFloat())).setScale(1, RoundingMode.HALF_UP);
-            this.effA = timeA.divide(BigDecimal.valueOf(ldt.getHour()), 4, RoundingMode.HALF_UP);
+            this.timeA = BigDecimal.valueOf(hour).subtract(BigDecimal.valueOf(hour * 0.25 * random.nextFloat())).setScale(1, RoundingMode.HALF_UP);
+            this.effA = timeA.divide(BigDecimal.valueOf(hour), 4, RoundingMode.HALF_UP);
             this.timeB = BigDecimal.ZERO;
             this.lengthB = BigDecimal.ZERO;
             this.weightB = BigDecimal.ZERO;

+ 1 - 1
jjt-biz/src/main/java/com/jjt/utils/MssqlUtil.java

@@ -28,7 +28,7 @@ public class MssqlUtil {
      * 连接sqlserver数据库;本地连接;通过1433号端口号连接(根据你自身数据库的端口号来),数据库名称DBMS
      * 你需要现在Sql Server客户端上建立一个数据库
      */
-    private static final String DB_URL = "jdbc:sqlserver://wmsdb.tlct.com.cn:1433;databaseName=WMS_V2_1";
+    private static final String DB_URL = "jdbc:sqlserver://192.168.33.153:1433;databaseName=WMS_V2_1";
     /**
      * 用户名
      */